Merge remote-tracking branch 'origin/master'

new_admincp/applications/zsb/config/database.php

@@ -47,7 +47,7 @@
 $IpHostAllow =explode('.',GetIp());
 $server_ip = $_SERVER['SERVER_ADDR'];
 //if($IpHostAllow['0']=='192' || $IpHostAllow['0']=='127')
-if($server_ip =='192.168.105.107')
+if( IS_ENV_TEST || $server_ip =='192.168.105.107')
 {
     $host_city_nj = '192.168.105.243';
 	if(GB_CITY=='nj')
@@ -331,7 +331,7 @@ if($server_ip =='192.168.105.107')
 
 		//从库轮询
 		$nowtime = date('G');
-		$dbback_hostname = '172.17.1.50';
+		$dbback_hostname = '192.168.105.243';// 172.17.1.50无法连接
 		
 		//从库
 		$db['dbback']['hostname'] = $dbback_hostname;

new_admincp/applications/zsb/views/nj/realHouse_agreement.php

@@ -44,7 +44,7 @@
                             </div>
                             <div class="text_box">
                                 <div class="text_i">
-                                    <p>2.1保证金数额：299元/账户；</p>
+                                    <p>2.1保证金数额：99元/账户；</p>
                                     <p>2.2保证金的缴纳不提倡他人代付，若因代付产生的纠纷，全由代付人承担；</p>
                                     <p>2.3对于经纪人所缴存的保证金，三六五网不需向经纪人支付任何利息。</p>
                                     <p>2.4提现周期：单个账户六个月内仅支持两次保证金提现操作；（六个月开始日是按照保证金首次提现日开始计算）</p>

new_admincp/index.php

@@ -21,6 +21,17 @@
 //DEBUG模式
 isset($_COOKIE['admin_debug']) && $_COOKIE['admin_debug'] == 1 ? define('ENVIRONMENT', 'development') : define('ENVIRONMENT', 'production');
 //define('ENVIRONMENT', 'development');
+if( $_COOKIE['admin_debug'] || preg_match('/^(192|127).*$/i', $_SERVER['SERVER_ADDR']) ){
+    // 本地/测试环境
+    // error_reporting(E_ALL);
+    // ini_set('display_errors', true);
+    defined('IS_ENV_TEST') or define('IS_ENV_TEST', true);// 是否本地/测试环境
+    defined('IS_ENV_PROD') or define('IS_ENV_PROD', false);// 是否线上环境
+}else{
+    // 线上环境
+    defined('IS_ENV_TEST') or define('IS_ENV_TEST', false);
+    defined('IS_ENV_PROD') or define('IS_ENV_PROD', true);
+}
 /*
  *---------------------------------------------------------------
  * ERROR REPORTING