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

application/library/Our/Common.php

@@ -115,7 +115,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'];