Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/core/config/WxOpenProperties.java

@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
 @ConfigurationProperties("wx.open")
 public class WxOpenProperties {
 
-    private String appId = "wxcb1e78baf03c0662";
+    private String appId;
 
-    private String secret = "d041d3e2392a68a3e86dc22d976ed4a0";
+    private String secret;
 }

fs-service/src/main/resources/application-config-zkzh.yml

@@ -94,9 +94,9 @@ wx:
         secret: 473a992e28d5c524b4ff3783559026cb
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
-    open:
-      appId: wx40f3de7bd405fb5c
-      secret: 4038e9209ddaf5f23dcde35e41be3120
+  open:
+    appId: wx40f3de7bd405fb5c
+    secret: 4038e9209ddaf5f23dcde35e41be3120
 jpush:
   appKey: cc9a0120a3e4270c9cba340d
   masterSecret: cfc2575d3cd7470d584c990c