Merge branch 'release/v2.2.0-data-beta' into 'release/v2.2.1'

Release/v2.2.0 data beta

See merge request dcuc-tjdsj/auth-back!46

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/login/DcucLoginController.java

@@ -55,7 +55,7 @@ public class DcucLoginController {
     }
 
     @GetMapping(value = "/info")
-    public SecurityUser info(@RequestHeader(value = "userToken", required = false) String userToken,
+    public SecurityUser info(@RequestHeader(value = "userToken",required = false) String userToken,
                              @RequestHeader(value = "appToken", required = false) String appToken) {
         logger.info("UserToken:{},appToken:{}", userToken, appToken);
 
@@ -69,10 +69,7 @@ public class DcucLoginController {
             } else {
                 userInfo = iUserInfoFacade.userDetail(securityUser.getId());
             }
-            String userId = securityUser.getId();
-            if (StrUtil.isBlank(userId)) {
                 securityUser.setId(userInfo.getId());
-            }
             List<SecurityRight> authmenu = getAuthmenu(securityUser, userInfo);
             securityUser.setSecurityRightList(authmenu);
             //ADMIN管理员