Merge branch 'master' of git.quantgroup.cn:QA/config_repository

java/urge_dispatcher.properties

@@ -10,7 +10,10 @@ data.source.dispatcher.jdbcUrl=jdbc:mysql://192.168.4.204:3306/urge_dispatcher_w
 data.source.dispatcher.username=root
 data.source.dispatcher.password=root
 
-
+data.source.collection.user=collection_r
+data.source.collection.password=9HZkyR2KPFqOCzFN
+data.source.collection.url=jdbc:mysql://192.168.4.6:7315/collection?useUnicode=true&characterEncoding=utf8
+data.source.collection.maxPoolSize=10
 
 data.source.dispatcher.maxPoolSize=20
 #测试环境xyqb db connection config

lua-ui/lua/phoneChannel.lua

@@ -72,4 +72,4 @@ if (ngx.var.excludeChannel ~= '' or ngx.var.tailNumber ~= '') then
   end
 end
 
-return channelPath;
+return path;

nodejs/xyqb-h5-backend.js

@@ -6,16 +6,16 @@ module.exports = {
   port:80,
   api: {
 
-    passport_api: 'http://xyqb-user2',
-    xjd_api: 'http://xyqb',
-    redpacket_api: 'http://redpacket',
-    score_api: 'http://score',
-    auth_api: 'https://han-gu-guan',
-    flow_api: 'http://traffic-webapp',
-    mall_api: 'http://xyqb-mall',
-    bt_api: 'http://baitiao',
-    appbackend_api: 'http://app-backend',
-    pay_api: 'http://gu-bei'
+    passport_api: 'http://passport.domain.com',
+    xjd_api: 'http://api.domain.com',
+    redpacket_api: 'http://redpacket.domain.com',
+    score_api: 'http://scoreapi.domain.com',
+    auth_api: 'https://auth.domain.com',
+    flow_api: 'http://flow.domain.com',
+    mall_api: 'http://mallapi.domain.com',
+    bt_api: 'http://btapi.domain.com',
+    appbackend_api: 'http://sappbackend.domain.com',
+    pay_api: 'http://payapi.domain.com'
   },
 
   redis: {