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

java/urge-dispatcher.properties

@@ -6,10 +6,17 @@ spring.profiles.active=test
 #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

lua-ui/nginx/paycenter-ui--new-paycenter-ui.vh.conf

@@ -14,15 +14,17 @@ server {
 
     set $registerChannel "758,222,198";
     set $merchantChannel "";
-
+		
+		set $excludeChannel "504,900";
+		set $tailNumber "1,2,3,4,5,6,7,8,9"; 
+		
     location / {
-        expires -1;
-	
-	    set_by_lua_file $rootPath /usr/local/openresty/nginx/lua/toChannel.lua;
-        header_filter_by_lua_file /usr/local/openresty/nginx/lua/addCookie.lua;
+    	expires -1;
+	    set_by_lua_file $rootPath /usr/local/openresty/nginx/lua/phoneChannel.lua;
+      header_filter_by_lua_file /usr/local/openresty/nginx/lua/addCookie.lua;
 
-        root $rootPath;
-        try_files $uri $uri/ /index.html?$query_string;
+      root $rootPath;
+      try_files $uri $uri/ /index.html?$query_string;
 
     }
 }

lua-ui/nginx/xyqb-ui--xjd-ui.vh.conf

@@ -12,19 +12,19 @@ server {
     set $normalPath "/home/quant_group/xyqb-ui/dist/public";
     set $channelPath "/home/quant_group/xjd-ui/dist";
     
-	set $registerChannel "999999";
-	set $merchantChannel "";
+		set $registerChannel "999999";
+		set $merchantChannel "";
     
-	set $excludeChannel "504,900";
-	set $tailNumber "1,2,3,4,5,6,7,8,9"; 
+		set $excludeChannel "504,900";
+		set $tailNumber "1,2,3,4,5,6,7,8,9"; 
    
     location / {
-		expires -1;
-        set_by_lua_file $rootPath /usr/local/openresty/nginx/lua/phoneChannel.lua;
+			expires -1;
+      set_by_lua_file $rootPath /usr/local/openresty/nginx/lua/phoneChannel.lua;
 	    header_filter_by_lua_file /usr/local/openresty/nginx/lua/addCookie.lua;
 
-        root $rootPath;
-        try_files $uri $uri/ /index.html?$query_string;
+      root $rootPath;
+      try_files $uri $uri/ /index.html?$query_string;
     }
 
 }