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

java/urge_dispatcher.properties → java/urge-dispatcher.properties

@@ -2,9 +2,23 @@ filter.allowedOrigin = *
 filter.allowedHeaders=Origin, No-Cache, x-auth-token, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type,Authorization,login_token
 spring.profiles.active=test
 #测试环境urge_dispatcher database config
-data.source.dispatcher.jdbcUrl=jdbc:mysql://db:3306/urge_dispatcher_1?useUnicode=true&characterEncoding=UTF8&useSSL=false
-data.source.dispatcher.username=qa
-data.source.dispatcher.password=qatest
+#data.source.dispatcher.jdbcUrl=jdbc:mysql://192.168.4.204:3306/urge_dispatcher_1?useUnicode=true&characterEncoding=UTF8&useSSL=false
+#data.source.dispatcher.username=qa
+#data.source.dispatcher.password=qatest
+
+#开发自己的催收库
+data.source.dispatcher.jdbcUrl=jdbc:mysql://192.168.4.204:3306/urge_dispatcher_w?useUnicode=true&characterEncoding=UTF8&useSSL=false
+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
 data.source.xyqb.jdbcUrl=jdbc:mysql://db:3306/xyqb?useUnicode=true&characterEncoding=UTF8&useSSL=false

nodejs/op-api.js

@@ -12,7 +12,7 @@ module.exports = {
     userCenter_api: 'http://passportapi2.domain.com',
     zbj_api: 'http://taurus.quantgroup.cn/',
     gdxd_api: 'http://gyxd.domain.com',
-		 clotho_api:'http://clotho.domain.com'
+		clotho_api:'http://clotho.domain.com'
   },
 
   // 站点相关的配置