Merge branch 'ccw' of http://git.shenbd.com/api-project-dev/api.shenbd.com into master_dev

application/library/Our/Common.php

@@ -314,7 +314,7 @@ public static function convertArrKey($arr, $key_name)
 
     public static function getRealStr($originStr)
     {
-        $result = str_replace(array("\r\n", "\r", "\n"), "", $originStr);
+        $result = str_replace(array("\r\n", "\r", "\n","\t"), "", $originStr);
         $result = trim($result);
         return $result;
     }

application/models/Business/Order/RefundService.php

@@ -1394,6 +1394,7 @@ class RefundServiceModel extends \Business\AbstractModel
             } else {
                 $address = $addressDao->getAddressByStoreId($refundReturn['storeId'], $this->daddressField);
             }
+            $address['areaInfo']=Common::getRealStr($address['areaInfo']);
             if(!empty($address)){
                 $address['isDefault'] = (int)$address['isDefault'];
                 $address['company']=isset( $address['company'])? $address['company']:'';

conf/application.ini

@@ -173,21 +173,21 @@ elastic.master.scheme="http";
 [test : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
-resources.database.params.hostname = "127.0.0.1"
+resources.database.params.hostname = "172.18.0.5"
 resources.database.params.port     = 3306
 resources.database.params.database = "qmcs"
 resources.database.params.username = "root"
-resources.database.params.password = "!@#$%12345werty"
+resources.database.params.password = "root"
 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 = "127.0.0.1"
+resources.database.slave.params.hostname = "172.18.0.5"
 resources.database.slave.params.port     = 3306
 resources.database.slave.params.database = "qmcs"
 resources.database.slave.params.username = "root"
-resources.database.slave.params.password = "!@#$%12345werty"
+resources.database.slave.params.password = "root"
 resources.database.slave.params.charset  = "UTF8"
 resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
 
@@ -201,10 +201,10 @@ resources.database.mongo.params.password = "123456asdfgh"
 resources.database.mongo.params.charset  = "UTF8"
 resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
 
-redis.database.params.host = "127.0.0.1"
+redis.database.params.host = "172.18.0.3"
 redis.database.params.port = "6379"
 redis.database.params.prefix = "qm_"
-redis.database.params.password = "23456ertyu"
+redis.database.params.password = ""
 out.config="/data/config"
 
 ;锁文件
@@ -213,7 +213,7 @@ out.locks="/data/locks";
 
 ;redis.database.params.password = "test"
 ;推送配置
-push.clientHost="ws://192.168.80.18:9502"
+push.clientHost="ws://192.168.1.145:9502"
 push.host="127.0.0.1"
 push.port="9503"
 push.open=1

conf/url.ini

@@ -72,15 +72,20 @@ config.url.source="/www/web/testadmin_shenbd_com/public_html/data/upload/"
 ; 开发环境配置
 
 ; url相关配置
-config.url.resourcesHost = "http://apitest.qm.com"
+config.url.resourcesHost = "http://test.qm.com"
 ; 用户中心host
 config.url.userHost = ""
-config.url.ossHost = "https://img.shenbd.com"
+config.url.ossHost = "https://imgpre.shenbd.com"
 ; oss 域名
 ;config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
 
 ;推送域名
 config.url.pushHost="127.0.0.1:9503";
+config.url.indexUrl="/www/yaf/application/library/React"
+config.url.libary="/www/yaf/application/library"
+
+config.url.source="/www/yaf/data/upload/"
+
 
 [develop : common]
 ; 开发环境配置