二维码扫描免登录

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java

@@ -77,6 +77,8 @@ public class LoginController {
     private AppletsConfigApiService appletsConfigApiService;
     @Autowired
     private ServiceConfigApiService serviceConfigApiService;
+    @Autowired
+    private ResourceGroupApiService resourceGroupApiService;
 
     private static final String MENU_LOCAL_CACHE_KEY = "auth:menu:list:all";
 
@@ -90,6 +92,7 @@ public class LoginController {
      */
     @RequestMapping("get-user-qrcode")
     @HeaderSignIgnore
+    @IgnoreLogin
     public RestResponse getUserQrcode(String nationCode, String phoneNumber, Integer enterpriseId, String password) {
         if (StringUtils.isBlank(password) || StringUtils.isBlank(phoneNumber) || enterpriseId == null) {
             return EnterpriseRestResponse.failure(ErrorCode.PARAMETER_ERROR);
@@ -274,6 +277,8 @@ public class LoginController {
         ServiceResponse<UserResourceDTO> resource = this.userResourceApiService.getResourceByUserId(userId);
         detail.setUserResourceInfo(new UserResourceInfo());
         if (resource.isSuccess() && resource.getResult() != null) {
+            //查询管理员的资源组信息
+            //todo 暂时保留旧代码，防止环境报错，等前端同步，删除
             ServiceResponse<ResourceDTO> serviceResource = this.resourceApiService
                     .getResource(resource.getResult().getResourceId());
             if (serviceResource.isSuccess() && serviceResource.getResult() != null) {

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceGroupDetailVO.java

@@ -27,7 +27,7 @@ public class ResourceGroupDetailVO implements Serializable{
     private Integer customUser;
 
     /**
-     * 用户域配置，json格式 [{"type":1,"sort":1,"cu":"","cuSelectId":""}]
+     * 用户域配置，json格式 [{"type":1,"sort":1,"areaValue":"","cuSelectId":""}]
      */
     private String customUserData;