冲突

src/config.json

@@ -32,7 +32,7 @@
         }
     },
     "agreement": "http",
-    "webdomain": "http://web-jydev-xzh.jianyu360.cn",
+    "webdomain": "http://web-jydev-ws.jianyu360.cn",
     "redirect": {
         "searchinfo": "/jylab/mainSearch",
         "rssset": "/swordfish/historypush",
@@ -210,8 +210,8 @@
     "advertName": "广告",
     "advertUrl": "/swordfish/about",
     "wxJianyu": {
-        "appid": "wx41a95e706276804d",
-        "appsecret": "1b385c7dd14274c5e0898b9b208580b7",
+        "appid": "wx5b1c6e7cc4dac0e4",
+        "appsecret": "b026103ffebd2291b3edb7a269612112",
         "pay": {
             "mchid": "1418321102",
             "key": "topnet2016topnet2016topnet2016ab",

src/jfw/modules/subscribepay/src/config.json

@@ -30,7 +30,7 @@
         "passWord": "Topnet123"
     },
 	"appPushServiceRpc": "127.0.0.1:5566",
-    "webdomain": "http://web-jydev-xzh.jianyu360.cn",
+    "webdomain": "http://web-jydev-ws.jianyu360.cn",
     "mail": [
         {
             "addr": "smtp.exmail.qq.com",