feature: 用户信息设置令牌修改

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

@@ -8,11 +8,11 @@ import com.dragoninfo.dcuc.auth.auth.facade.IRoleFacade;
 import com.dragoninfo.dcuc.auth.sub.dto.AuthUserContactDTO;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
 import com.dragoninfo.dcuc.authweb.config.DcucAuthWebConfig;
+import com.dragoninfo.dcuc.authweb.util.HeadTokenUtils;
 import com.dragoninfo.dcuc.common.enums.UserExtInfoEnum;
 import com.dragonsoft.duceap.base.entity.security.SecurityRight;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
-import com.dragonsoft.duceap.commons.util.UUIDUtils;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
@@ -20,10 +20,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -52,9 +52,11 @@ public class DcucLoginController {
     }
 
     @GetMapping(value = "/info")
-    public SecurityUser info(@RequestHeader(value = "userToken", required = false) String userToken,
-                             @RequestHeader(value = "appToken", required = false) String appToken) {
-        logger.info("UserToken:{},appToken:{}", userToken, appToken);
+    public SecurityUser info(HttpServletRequest request) {
+
+        String userToken = HeadTokenUtils.getUserToken(request);
+        String appToken = HeadTokenUtils.getAppToken(request);
+        logger.info("用户令牌id:{} , 应用令牌id:{}", userToken, appToken);
         try {
             SecurityUser securityUser = UserContextUtils.getCurrentUser();
             String idcard = securityUser.getIdcard();
@@ -72,7 +74,6 @@ public class DcucLoginController {
 
             Map<String, Object> map = new HashMap<>(UserExtInfoEnum.values().length);
 
-            logger.info("用户令牌id:{} , 应用令牌id:{}", userToken, appToken);
             map.put(UserExtInfoEnum.USER_TOKEN_ID.getValue(), userToken);
             map.put(UserExtInfoEnum.APP_TOKEN_ID.getValue(), appToken);
             securityUser.setExtendtions(map);

src/main/java/com/dragoninfo/dcuc/authweb/util/HeadTokenUtils.java

@@ -57,6 +57,11 @@ public class HeadTokenUtils {
             userToken = request.getHeader(Constants.USER_TOKEN);
         }
 
+        if (StrUtil.isBlank(userToken)) {
+            userToken = request.getHeader(Constants.RZZX_USERTOKEN);
+        }
+
+
         return userToken;
     }
 
@@ -72,6 +77,10 @@ public class HeadTokenUtils {
             appToken = request.getHeader(Constants.APP_TOKEN);
         }
 
+        if (StrUtil.isBlank(appToken)) {
+            appToken = request.getHeader(Constants.RZZX_APPTOKEN);
+        }
+
         return appToken;
     }
 }