微信扫码登录

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

@@ -39,8 +39,8 @@ import java.util.stream.Collectors;
 
 /**
  * 登录校验方法
- * 
- 
+ *
+
  */
 @Component
 @Slf4j
@@ -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

@@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * 登录校验方法
- * 
+ *
 
  */
 @Component
@@ -50,7 +50,7 @@ public class SysLoginService
 
     @Autowired
     private RedisCache redisCache;
-    
+
     @Autowired
     private ISysUserService userService;
 
@@ -65,12 +65,12 @@ 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;
 
     /**
      * 登录验证
-     * 
+     *
      * @param username 用户名
      * @param password 密码
      * @param code 验证码
@@ -115,7 +115,7 @@ public class SysLoginService
 
     /**
      * 校验验证码
-     * 
+     *
      * @param username 用户名
      * @param code 验证码
      * @param uuid 唯一标识

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

@@ -223,12 +223,12 @@ enableRedPackAccount: 0
 
 wechat:
     company:
-        appid: wxf
-        secret: 01edaa0c0596f
+        appid: wxaf8d72368754ff9d
+        secret: e3ebd05c29e155d1e2d43fb375546537
         redirectUri: http://company.xintaihl.cn/prod-api/callback
-        isNeedScan: false
+        isNeedScan: true
     admin:
-        appid: wxd7c
-        secret: 70d3ed4f8eb
+        appid: wx05256efd9d6d3c23
+        secret: c3a55f7fc69f15390c49c2a56de4710e
         redirectUri: http://admin.xintaihl.cn/prod-api/callback
-        isNeedScan: false
+        isNeedScan: true