合并分支 'subscribe2.0' 到 'master'

测试

查看合并请求 !27

esf_core/config/database.php

@@ -51,7 +51,9 @@ $active_group = 'default';
 $active_record = TRUE;
 //$dsn_esf = "dbdriver://$conf_db_user:$conf_db_password@$conf_db_host/$conf_db_name?char_set=$conf_db_charset&dbcollat=utf8_general_ci&cache_on=false";
 $IpHostAllow =explode('.',get_ip());
-
+if(isset($_GET['dev']) && $_GET['dev']==1){
+    echo 'fefefef';exit;
+}
 if($IpHostAllow['0']=='127')
 {
     $conf_db_host       ='njesfdbmastervip.house365.com';
@@ -123,6 +125,23 @@ $db['dsn_esfbak']['swap_pre'] = '';
 $db['dsn_esfbak']['autoinit'] = FALSE;
 $db['dsn_esfbak']['stricton'] = FALSE;
 
+
+$db['dsn_esfuser_dev']['hostname'] = '192.168.105.107';
+$db['dsn_esfuser_dev']['username'] = 'root';
+$db['dsn_esfuser_dev']['password'] = 'd53b21ffb24d9c34';
+$db['dsn_esfuser_dev']['database'] = 'user';
+$db['dsn_esfuser_dev']['dbdriver'] = 'mysql';
+$db['dsn_esfuser_dev']['dbprefix'] = '';
+$db['dsn_esfuser_dev']['pconnect'] = FALSE;
+$db['dsn_esfuser_dev']['db_debug'] = FALSE;
+$db['dsn_esfuser_dev']['cache_on'] = FALSE;
+$db['dsn_esfuser_dev']['cachedir'] = '';
+$db['dsn_esfuser_dev']['char_set'] = 'gbk';
+$db['dsn_esfuser_dev']['dbcollat'] = 'gbk';
+$db['dsn_esfuser_dev']['swap_pre'] = '';
+$db['dsn_esfuser_dev']['autoinit'] = FALSE;
+$db['dsn_esfuser_dev']['stricton'] = FALSE;
+
 if(GB_CITY=='nj')
 {
     $db['dsn_esfhouse']['hostname'] = $conf_db_host;
@@ -156,6 +175,23 @@ if(GB_CITY=='nj')
     $db['dsn_esfhousebak']['swap_pre'] = '';
     $db['dsn_esfhousebak']['autoinit'] = FALSE;
     $db['dsn_esfhousebak']['stricton'] = FALSE;
+
+    $db['dsn_esfhouse_dev']['hostname'] = '192.168.105.107';
+    $db['dsn_esfhouse_dev']['username'] = 'root';
+    $db['dsn_esfhouse_dev']['password'] = 'd53b21ffb24d9c34';
+    $db['dsn_esfhouse_dev']['database'] = 'house';
+    $db['dsn_esfhouse_dev']['dbdriver'] = 'mysql';
+    $db['dsn_esfhouse_dev']['dbprefix'] = '';
+    $db['dsn_esfhouse_dev']['pconnect'] = FALSE;
+    $db['dsn_esfhouse_dev']['db_debug'] = FALSE;
+    $db['dsn_esfhouse_dev']['cache_on'] = FALSE;
+    $db['dsn_esfhouse_dev']['cachedir'] = '';
+    $db['dsn_esfhouse_dev']['char_set'] = 'gbk';
+    $db['dsn_esfhouse_dev']['dbcollat'] = 'gbk';
+    $db['dsn_esfhouse_dev']['swap_pre'] = '';
+    $db['dsn_esfhouse_dev']['autoinit'] = FALSE;
+    $db['dsn_esfhouse_dev']['stricton'] = FALSE;
+
 }elseif(GB_CITY=='hf'){
     $db['dsn_esfhouse']['hostname'] = $conf_db_host;
     $db['dsn_esfhouse']['username'] = 'root';