Merge branch 'fangliyan' into 'master'

1

See merge request !15

new_admincp/applications/models/zsb_api_model.php

@@ -3,7 +3,7 @@
 class zsb_api_model extends MY_Model{
 
 
-	private $host = 'https://newrent.house365.com';
+	private $host = 'http://newrent.house365.com';
 	private $apiSource = 'PC';// 访问API使用的公用source
 	private $apiVersion = '1.0.1';// 访问API使用的公用版本号
 	private $token = 'ZSB_API';

new_admincp/applications/zsb/config/constants.php

@@ -140,8 +140,14 @@ if(GB_CITY == 'nj')
 }
 else
 {
+    $base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
+    $base_url .= '://'. $_SERVER['HTTP_HOST'];
+    $base_url .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
     //define('STATIC_SOURCE_URL', 'http://esf.fz.house365.com');
-	define('STATIC_SOURCE_URL', 'http://'.$_SERVER['HTTP_HOST'].'/source');
+    if(isset($_GET['test'])){
+        echo $base_url;exit;
+    }
+	define('STATIC_SOURCE_URL', 'http://zsb.house365.com/source');
     define('GB_WO_HELP', "http://zsb.house365.com/help/");
 }