Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

application/library/Our/Common.php

@@ -94,7 +94,7 @@ class Common
 
     public static function getBaseUrl(){
         $prefix = 'http';
-        if(self::is_https()){
+        if(self::is_https() || $_SERVER['SERVER_NAME'] == 'apiceshi.shenbd.com'){
             $prefix = 'https';
         }
         $url = $prefix.'://'.$_SERVER['SERVER_NAME'];

public/test.php

 <?php
+ function is_https() {
+    if ( !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
+        return true;
+    } elseif ( isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' ) {
+        return true;
+    } elseif ( !empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') {
+        return true;
+    }elseif($_SERVER['SERVER_PORT'] == 89){
+        return true;
+    }
 
+return false;
+}
+$res=is_https();
+if($res){
+ echo 1;
+}else{
+    echo 2;
+}
+exit;
 function getSortArr($sortArray){
     ksort($sortArray);
     $str='';