Merge branch 'master' of git.shenbd.com:qm-develop/shenbd into lyz

conf/application.ini

@@ -17,20 +17,20 @@ redis.redisPublishName='redisPublish'
 [productone : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "172.16.142.15"
+resources.database.params.hostname = "rm-bp1j835zol35h2nm0.mysql.rds.aliyuncs.com"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
-resources.database.params.username = "root"
+resources.database.params.username = "chenchuanwen"
 resources.database.params.password = "!@#$%12345werty"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 ;
 ; ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "172.16.142.13"
+resources.database.slave.params.hostname = "rm-bp1j835zol35h2nm0.mysql.rds.aliyuncs.com"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
-resources.database.slave.params.username = "root"
+resources.database.slave.params.username = "chenchuanwen"
 resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
@@ -60,24 +60,24 @@ elastic.master.port="9200"
 elastic.master.scheme="http";
 
 password.key='~!@#$`1234qwertasdfgzxcvb';
-//生产环境
+;生产环境
 [product : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "127.0.0.1"
+resources.database.params.hostname = "rm-bp1j835zol35h2nm0.mysql.rds.aliyuncs.com"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
-resources.database.params.username = "root"
+resources.database.params.username = "chenchuanwen"
 resources.database.params.password = "!@#$%12345werty"
 resources.database.params.charset  = "UTF8"
 resources.database.params.driver_options.1002 = "SET NAMES utf8"
 
 ; 从库配置
 resources.database.slave.params.driver   = "pdo_mysql"
-resources.database.slave.params.hostname = "172.16.142.13"
+resources.database.slave.params.hostname = "rm-bp1j835zol35h2nm0.mysql.rds.aliyuncs.com"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
-resources.database.slave.params.username = "root"
+resources.database.slave.params.username = "chenchuanwen"
 resources.database.slave.params.password = "!@#$%12345werty"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
@@ -107,6 +107,7 @@ elastic.master.port="9200"
 elastic.master.scheme="http";
 password.key='~!@#$`1234qwertasdfgzxcvb';
 
+
 ; 生 产环境配置
 [pre : common]
 ; 数据库配置

public/index.php

@@ -5,12 +5,12 @@ define("TIMESTAMP",time());
 define("APPLICATION_PATH", realpath(dirname(__FILE__) . '/../'));
 define("APP_ENV",ini_get('yaf.environ'));
 if(APP_ENV=='develop'){
-    error_reporting(E_ALL);
+   error_reporting(E_ALL);
 }
 if(APP_ENV=='test' || APP_ENV=='pre' ||APP_ENV=='ccwdevelop' || APP_ENV=='product' || APP_ENV=='productone'|| APP_ENV=='lyztest' ){
     if(isset($_POST['data']['debug'])&&!empty($_POST['data']['debug'])){
        // define("DEBUG",1);
-        error_reporting(E_ALL);
+       error_reporting(E_ALL);
     }else{
         error_reporting(0);
     }