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

application/library/Our/Common.php

@@ -115,13 +115,14 @@ class Common
 
     public static function getBaseUrl(){
         $prefix = 'http';
-        if(self::is_https() || $_SERVER['SERVER_NAME'] == 'apiceshi.shenbd.com'){
+        if(self::is_https()){
             $prefix = 'https';
         }
         $url = $prefix.'://'.$_SERVER['SERVER_NAME'];
         return $url;
     }
 
+
     public static function is_https() {
         if ( !empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') {
             return true;
@@ -129,10 +130,12 @@ class Common
             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;
     }
-
     /**
      * 获取静态资源文件
      *