update:区分开后台和销售后台扫码

fs-company/src/main/java/com/fs/framework/service/CompanyLoginService.java

@@ -64,7 +64,7 @@ public class CompanyLoginService
     private String secret;
     @Value("${wechat.company.redirectUri:#{null}}")
     private String redirectUri;
-    @Value("${wechat.isNeedScan:false}")
+    @Value("${wechat.company.isNeedScan:false}")
     private Boolean isNeedScan;
 
     @Autowired

fs-framework/src/main/java/com/fs/framework/web/service/SysLoginService.java

@@ -65,7 +65,7 @@ public class SysLoginService
     private String secret;
     @Value("${wechat.admin.redirectUri:#{null}}")
     private String redirectUri;
-    @Value("${wechat.isNeedScan:false}")
+    @Value("${wechat.admin.isNeedScan:false}")
     private Boolean isNeedScan;
 
     /**

fs-service/src/main/resources/application-druid-jnmy.yml

@@ -237,13 +237,14 @@ isNewWxMerchant: true
 
 wechat:
     company:
-        appid: wxd7c1e221622a0ccf
-        secret: 70d3ed4f8eb68cca0cf525b8ce07405d
+        appid: wxff0d2ab979546bf7
+        secret: 01edaa0c0596f54add4133079cf8042c
         redirectUri: https://company.jnmyunl.com/prod-api/callback
+        isNeedScan: false
     admin:
         appid: wxd7c1e221622a0ccf
         secret: 70d3ed4f8eb68cca0cf525b8ce07405d
         redirectUri: https://admin.jnmyunl.com/prod-api/callback
-    isNeedScan: true
+        isNeedScan: true