Merge remote-tracking branch 'origin/master'

web/src/main/resources/application-production.yml

@@ -38,9 +38,9 @@ wx:
   #荆楚云服务器内不能访问自身域名
   commonAccessTokenUrl: http://192.168.0.1:8080/weixin/token
   pay:
-    #企业联合会
-    appId: wx343bf93d2a3dc8af
-    appSecret: ac61fa669a7a79c7d2a8188ff7ddaef6
+    #小鹏管家
+    appId: wx7e70eb62a8459869
+    appSecret: 909d17e353268da57c4f18cc09798049
 #    appId: wx0b3c41a903053808
 #    appSecret: 43557bd62f77b0c3d6670e991872f0e7
     mchId: 1500160622

web/src/main/resources/application-test.yml

@@ -42,9 +42,9 @@ springfox:
 
 wx:
   pay:
-    #企业联合会
-    appId: wx343bf93d2a3dc8af
-    appSecret: ac61fa669a7a79c7d2a8188ff7ddaef6
+    #小鹏管家
+    appId: wx7e70eb62a8459869
+    appSecret: 909d17e353268da57c4f18cc09798049
     token: weixin
     tokenUrl: "https://api.weixin.qq.com/cgi-bin/token"
     refreshOAuth2TokenUrl: "https://api.weixin.qq.com/sns/oauth2/refresh_token"