feature: tokenBusiness迁移、权限变更通知开发

src/main/java/com/dragoninfo/dcuc/authweb/business/IAuthTokenBusiness.java

@@ -1,40 +0,0 @@
-package com.dragoninfo.dcuc.authweb.business;
-
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserContactDTO;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.AppTokenInfoRespVO;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.TokenDetailRespVo;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.UserTokenInfoRespVO;
-
-/**
- * @author mazq
- * @date 2023/2/14
- */
-public interface IAuthTokenBusiness {
-
-    /**
-     * 查询用户令牌
-     *
-     * @param userTokenId
-     * @return
-     */
-    UserTokenInfoRespVO getUserTokenInfo(String userTokenId);
-
-    /**
-     * 查询应用令牌
-     *
-     * @param appTokenId
-     * @return
-     */
-    AppTokenInfoRespVO getAppTokenInfo(String appTokenId);
-
-    /**
-     * 根据应用tokenId获取用户和应用信息
-     *
-     * @param appTokenId 应用令牌id
-     * @param needUserInfo 是否需要人员信息
-     * @param needAppInfo 是否需要应用信息
-     * @return
-     */
-    TokenDetailRespVo getByAppTokenId(String appTokenId, boolean needUserInfo, boolean needAppInfo);
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/business/impl/AuthTokenBusinessImpl.java

@@ -1,164 +0,0 @@
-package com.dragoninfo.dcuc.authweb.business.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.dragoninfo.dcuc.app.entity.ApplyInfo;
-import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
-import com.dragoninfo.dcuc.auth.sub.vo.ApplyInfoVo;
-import com.dragoninfo.dcuc.authweb.business.IAuthTokenBusiness;
-import com.dragoninfo.dcuc.authweb.config.DcucAuthWebConfig;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.*;
-import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.user.AuthUserVo;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.commons.util.string.StringUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.List;
-
-/**
- * token业务类
- *
- * @author mazq
- * @date 2023/2/14
- */
-@Slf4j
-@Service
-public class AuthTokenBusinessImpl implements IAuthTokenBusiness {
-
-    private RestTemplate restTemplate;
-
-    private DcucAuthWebConfig dcucAuthConfig;
-
-    private IApplyInfoFacade applyInfoFacade;
-
-    private IAuthUserInfoFacade userInfoFacade;
-
-    @Autowired
-    public void setRestTemplate(RestTemplate restTemplate) {
-        this.restTemplate = restTemplate;
-    }
-
-    @Autowired
-    public void setApplyInfoFacade(IApplyInfoFacade applyInfoFacade) {
-        this.applyInfoFacade = applyInfoFacade;
-    }
-
-    @Autowired
-    public void setDcucAuthConfig(DcucAuthWebConfig dcucAuthConfig) {
-        this.dcucAuthConfig = dcucAuthConfig;
-    }
-
-    @Override
-    public UserTokenInfoRespVO getUserTokenInfo(String userTokenId) {
-        // 查询用户令牌
-        String tokenQueryUrl = dcucAuthConfig.getUserTokenQueryUrl();
-        return getTokenInfo(tokenQueryUrl, userTokenId);
-    }
-
-    @Override
-    public AppTokenInfoRespVO getAppTokenInfo(String appTokenId) {
-        // 获取应用令牌
-        String tokenQueryUrl = dcucAuthConfig.getAppTokenQueryUrl();
-        return getTokenInfo(tokenQueryUrl, appTokenId);
-    }
-
-    @Override
-    public TokenDetailRespVo getByAppTokenId(String appTokenId, boolean needUserInfo, boolean needAppInfo) {
-        AppTokenInfoRespVO appToken = getAppTokenInfo(appTokenId);
-        if (null == appToken) {
-            return TokenDetailRespVo.empty();
-        }
-        TokenDetailRespVo.TokenDetailRespVoBuilder builder = TokenDetailRespVo.builder();
-        UserTokenInfoRespVO userToken = appToken.getUserToken();
-        builder.appToken(appToken).userToken(userToken);
-        // 根据用户令牌获取用户信息
-        if (needUserInfo) {
-            AuthUserVo userVo = getAuthUserVo(userToken.getPId());
-            builder.userInfo(userVo);
-        }
-        // 查询应用信息
-        if (needAppInfo) {
-            ApplyInfoVo applyInfoVo = new ApplyInfoVo();
-            String appCode = appToken.getAppId();
-            ApplyInfo applyInfo = applyInfoFacade.getAppByCode(appCode);
-            BeanUtils.copyProperties(applyInfo, applyInfoVo);
-            builder.applyInfo(applyInfoVo);
-        }
-        return builder.build();
-    }
-
-    private AuthUserVo getAuthUserVo(String pid) {
-        TokenUserInfoRespVo userInfoRespVo = getTokenUserByPid(pid);
-        if (userInfoRespVo == null) {
-            return null;
-        }
-        // 查询权限中心用户信息, 填充id字段
-        String idcard = userInfoRespVo.getIdcard();
-        AuthUserDTO authUserInfo = userInfoFacade.findByIdcard(idcard);
-        if (null == authUserInfo) {
-            return null;
-        }
-        AuthUserVo userVo = new AuthUserVo();
-        BeanUtils.copyProperties(authUserInfo, userVo);
-        return userVo;
-    }
-
-    private TokenUserInfoRespVo getTokenUserByPid(String pid) {
-        if (StringUtils.isBlank(pid)) {
-            return null;
-        }
-        String url = dcucAuthConfig.getUserInfoQueryUrl();
-        TokenUserInfoReqVo userReqVo = new TokenUserInfoReqVo();
-        userReqVo.setId(pid);
-        HttpEntity<TokenUserInfoReqVo> entity = new HttpEntity<>(userReqVo);
-        ResponseEntity<ResultRespPageVo<TokenUserInfoRespVo>> response = restTemplate.exchange(url, HttpMethod.POST, entity, new ParameterizedTypeReference<ResultRespPageVo<TokenUserInfoRespVo>>() {
-        });
-        ResultRespPageVo<TokenUserInfoRespVo> respBody = getRespBody(response);
-        if (null == respBody) {
-            return null;
-        }
-        ResultRespPageVo.ResultPageContent<TokenUserInfoRespVo> pageContent = respBody.getResult();
-        if (null == pageContent) {
-            return null;
-        }
-        List<TokenUserInfoRespVo> rows = pageContent.getRows();
-        return CollectionUtils.isEmpty(rows) ? null : rows.get(0);
-
-    }
-
-    private <T> T getTokenInfo(String tokenQueryUrl, Object... param) {
-        ResponseEntity<ResultRespVO<T>> response = restTemplate.exchange(tokenQueryUrl, HttpMethod.GET, null,
-                new ParameterizedTypeReference<ResultRespVO<T>>() {
-                }, param);
-        ResultRespVO<T> respBody = getRespBody(response);
-        if (null == respBody) {
-            return null;
-        }
-        return respBody.getResult();
-    }
-
-    private <T extends MessageRespVO> T getRespBody(ResponseEntity<T> response) {
-        HttpStatus statusCode = response.getStatusCode();
-        if (!statusCode.is2xxSuccessful()) {
-            log.info("request failed, resp:{}", response);
-            return null;
-        }
-        T body = response.getBody();
-        if (body == null || !ResponseStatus.SUCCESS_CODE.equals(body.getStatusCode())) {
-            log.info("response body failed, body:{}", JSON.toJSONString(body));
-            return null;
-        }
-        return body;
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/config/DcucAuthWebConfig.java

@@ -28,10 +28,4 @@ public class DcucAuthWebConfig {
      * 凭据鉴权类型
      */
     private CheckTypeEnum checkTypeEnum = CheckTypeEnum.TOKEN;
-
-    private String userTokenQueryUrl;
-
-    private String appTokenQueryUrl;
-
-    private String userInfoQueryUrl;
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v2/controller/DataAuthApiV2Controller.java

@@ -2,17 +2,14 @@ package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v2.controller
 
 import cn.hutool.core.util.StrUtil;
 import com.auth0.jwt.JWT;
-import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.dragoninfo.dcuc.auth.auth.api.IApiDataAuthFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.data.DataAuthV2ReqDTO;
 import com.dragoninfo.dcuc.auth.auth.vo.DataAuthV2ReqVO;
 import com.dragoninfo.dcuc.auth.auth.dto.data.DataAuthV2RespDTO;
 import com.dragoninfo.dcuc.auth.auth.vo.DataAuthV2RespVO;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums.BusinessRespEnum;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.ResultRespVO;
+import com.dragoninfo.dcuc.auth.api.vo.BusinessRespEnum;
+import com.dragoninfo.dcuc.auth.api.vo.ResultRespVO;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
@@ -31,7 +28,6 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * 数据鉴权

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/controller/AuthV4Controller.java

@@ -1,6 +1,8 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.controller;
 
 import cn.hutool.core.util.StrUtil;
+import com.dragoninfo.dcuc.auth.api.vo.BusinessRespEnum;
+import com.dragoninfo.dcuc.auth.api.vo.ResultRespVO;
 import com.dragoninfo.dcuc.auth.auth.api.IApiDataAuthFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.AppDataSensitiveLevelDTO;
 import com.dragoninfo.dcuc.auth.auth.dto.AppFunInfoDTO;
@@ -12,10 +14,11 @@ import com.dragoninfo.dcuc.auth.auth.facade.IRoleFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IServiceAuthFlowFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IStaffAssignAuthInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.vo.ServiceAuthenticationResVO;
-import com.dragoninfo.dcuc.authweb.business.IAuthTokenBusiness;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums.BusinessRespEnum;
+import com.dragoninfo.dcuc.auth.sub.vo.AuthUserVo;
+import com.dragoninfo.dcuc.auth.token.facade.IAuthTokenFacade;
+import com.dragoninfo.dcuc.auth.token.vo.TokenDetailRespVo;
+import com.dragoninfo.dcuc.auth.token.vo.UserTokenInfoRespVO;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo.*;
-import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.user.AuthUserVo;
 import com.dragoninfo.dcuc.common.utils.LangUtil;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
@@ -58,7 +61,7 @@ public class AuthV4Controller {
     private IApiDataAuthFacade apiDataAuthFacade;
 
     @Autowired
-    private IAuthTokenBusiness tokenBusiness;
+    private IAuthTokenFacade authTokenFacade;
 
     /**
      * 应用级鉴权
@@ -74,12 +77,19 @@ public class AuthV4Controller {
             return ResultRespVO.resultEnumMessage(BusinessRespEnum.TOKEN_FAIL);
         }
 
-        TokenDetailRespVo tokenInfo = tokenBusiness.getByAppTokenId(appTokenId, true, false);
+        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
 
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (userInfo == null) {
             return ResultRespVO.respRequestErrorMessage("用户不存在");
         }
+
+        // 缓存应用令牌
+        UserTokenInfoRespVO userToken = tokenInfo.getUserToken();
+        int expiredTime = (int) ((userToken.getExpireAt().getTime() - System.currentTimeMillis()) / 1000);
+
+        authTokenFacade.cacheStandardUserToken(userInfo.getIdcard(), userToken.getId(), expiredTime);
+
         String userId = userInfo.getId();
         List<AppDataSensitiveLevelDTO> appList = staffAssignAuthInfoFacade.getAppLitByUserId(userId);
 
@@ -109,7 +119,7 @@ public class AuthV4Controller {
         if (StrUtil.isBlank(appTokenId)) {
             return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
         }
-        TokenDetailRespVo tokenInfo = tokenBusiness.getByAppTokenId(appTokenId, true, false);
+        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (userInfo == null) {
             return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
@@ -147,7 +157,7 @@ public class AuthV4Controller {
             return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
         }
 
-        TokenDetailRespVo tokenInfo = tokenBusiness.getByAppTokenId(appTokenId, true, false);
+        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (userInfo == null) {
             return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
@@ -186,7 +196,7 @@ public class AuthV4Controller {
             return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
         }
 
-        TokenDetailRespVo tokenInfo = tokenBusiness.getByAppTokenId(appTokenId, true, false);
+        TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (null == userInfo) {
             return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/enums/BusinessRespEnum.java

@@ -1,68 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums;
-
-import com.dragonsoft.duceap.base.enums.ICodeEnum;
-
-/**
- * <p>
- * 业务通用响应码
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-public enum BusinessRespEnum implements ICodeEnum {
-    /**
-     * 操作成功
-     */
-    SUCCESS("0000", "鉴权成功"),
-
-    /**
-     * 鉴权失败
-     */
-    AUTH_FAIL("0001", "鉴权失败"),
-
-    /**
-     * 令牌失效
-     */
-    TOKEN_FAIL("0002", "令牌失效"),
-
-    /**
-     * 权限冻结
-     */
-    PERMISSION_FREEZE("0003", "权限冻结"),
-
-    // 自行定义状态码
-    /**
-     * 请求参数异常
-     */
-    PARAM_ERROR("9001", "请求参数异常"),
-
-    /**
-     * 服务异常
-     */
-    SERVER_ERROR("9002", "服务异常"),
-    /**
-     * 未知异常
-     */
-    UNKNOWN_ERROR("9999", "未知异常");
-
-    private final String value;
-
-    private final String label;
-
-
-    BusinessRespEnum(String value, String label) {
-        this.value = value;
-        this.label = label;
-    }
-
-    @Override
-    public String getValue() {
-        return this.value;
-    }
-
-    @Override
-    public String getLabel() {
-        return this.label;
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/AppTokenInfoRespVO.java

@@ -1,47 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <p>
- * 应用令牌校验服务接口
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class AppTokenInfoRespVO {
-
-    /**
-     * 应用标识
-     */
-    private String appId;
-
-    /**
-     * 用户令牌创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 用户令牌到期时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date expireAt;
-
-    /**
-     * 应用令牌ID
-     */
-    @JsonProperty("Id")
-    private String id;
-
-    /**
-     * 用户令牌详细信息
-     */
-    private UserTokenInfoRespVO userToken;
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/MessageRespVO.java

@@ -1,107 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums.BusinessRespEnum;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * <p>
- * 用户令牌校验返回
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class MessageRespVO {
-
-    /**
-     * “0000” 表示令牌有效；
-     * 其他值表示无效或接口调用出错
-     */
-    @JsonProperty("status_code")
-    private String statusCode;
-
-    /**
-     * 状态码对应的详细描述
-     */
-    private String message;
-
-    /**
-     * 设置业务枚举
-     *
-     * @param businessRespEnum 业务枚举
-     */
-    public void setBusinessRespEnum(BusinessRespEnum businessRespEnum) {
-        setStatusCode(businessRespEnum.getValue());
-        setMessage(businessRespEnum.getLabel());
-    }
-
-
-    /**
-     * 设置业务枚举
-     *
-     * @param businessRespEnum 业务枚举
-     */
-    public static MessageRespVO messageEnumMessage(BusinessRespEnum businessRespEnum) {
-        MessageRespVO messageRespVO = new MessageRespVO();
-        messageRespVO.setBusinessRespEnum(businessRespEnum);
-        return messageRespVO;
-    }
-
-    /**
-     * 设置请求参数异常
-     *
-     * @param message 异常信息
-     */
-    public static MessageRespVO requestErrorMessage(String message) {
-        return messageEnumMessage(BusinessRespEnum.PARAM_ERROR, message);
-    }
-
-    /**
-     * 设置请求参数异常
-     *
-     * @param businessRespEnum 枚举
-     * @param message          异常信息
-     */
-    public static MessageRespVO messageEnumMessage(BusinessRespEnum businessRespEnum, String message) {
-        MessageRespVO messageRespVO = new MessageRespVO();
-        messageRespVO.setStatusCode(businessRespEnum.getValue());
-        messageRespVO.setMessage(message);
-        return messageRespVO;
-    }
-
-    /**
-     * 是否成功
-     *
-     * @return 是否成功
-     */
-    @JsonIgnore
-    public boolean isRespSuccess() {
-        return this.statusCode.equalsIgnoreCase(BusinessRespEnum.SUCCESS.getValue());
-    }
-
-    /**
-     * 是否失败
-     *
-     * @return 是否失败
-     */
-    @JsonIgnore
-    public boolean isRespFail() {
-        return !isRespSuccess();
-    }
-
-    /**
-     * 转发Result返回
-     *
-     * @param <T> 泛型
-     * @return Result返回
-     */
-    public <T> ResultRespVO<T> toResultRespVO() {
-        ResultRespVO<T> objectResultRespVO = new ResultRespVO<>();
-        objectResultRespVO.setStatusCode(statusCode);
-        objectResultRespVO.setMessage(message);
-        return objectResultRespVO;
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/ResultRespPageVo.java

@@ -1,38 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.util.List;
-
-/**
- * @author mazq
- * @date 2023/2/15
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class ResultRespPageVo<T> extends MessageRespVO {
-
-    private ResultPageContent<T> result;
-
-    /**
-     * 数据总条数
-     */
-    private Integer total;
-
-    /**
-     * 查询起始下标,默认 0，可不传
-     */
-    private Integer start;
-
-    /**
-     * 数据页大小 默认 1000，可不传
-     */
-    private Integer size;
-
-    @Data
-    public static class ResultPageContent<T> {
-        private List<T> rows;
-    }
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/ResultRespVO.java

@@ -1,54 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.enums.BusinessRespEnum;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- * 用户令牌校验返回
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@EqualsAndHashCode(callSuper = true)
-@Data
-public class ResultRespVO<T> extends MessageRespVO {
-
-    /***
-     * 返回内容
-     */
-    private T result;
-
-    public static <T> ResultRespVO<T> success(T result) {
-        ResultRespVO<T> objectResultRespVO = new ResultRespVO<>();
-        objectResultRespVO.setBusinessRespEnum(BusinessRespEnum.SUCCESS);
-        objectResultRespVO.setResult(result);
-        return objectResultRespVO;
-    }
-
-    /**
-     * 设置枚举消息
-     *
-     * @param businessRespEnum 枚举类型
-     * @param <T>              泛型
-     * @return 消息
-     */
-    public static <T> ResultRespVO<T> resultEnumMessage(BusinessRespEnum businessRespEnum) {
-        ResultRespVO<T> objectResultRespVO = new ResultRespVO<>();
-        objectResultRespVO.setBusinessRespEnum(businessRespEnum);
-        return objectResultRespVO;
-    }
-
-    /**
-     * 设置请求参数异常
-     *
-     * @param message 异常信息
-     */
-    public static <T> ResultRespVO<T> respRequestErrorMessage(String message) {
-        ResultRespVO<T> objectResultRespVO = resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
-        objectResultRespVO.setMessage(message);
-        return objectResultRespVO;
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/TokenDetailRespVo.java

@@ -1,45 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import com.dragoninfo.dcuc.auth.sub.vo.ApplyInfoVo;
-import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.user.AuthUserVo;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 令牌详情响应结果
- *
- * @author mazq
- * @date 2023/2/14
- */
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
-public class TokenDetailRespVo {
-
-    /**
-     * 根据令牌标识查询的用户信息
-     */
-    private AuthUserVo userInfo;
-
-    /**
-     * 根据令牌标识查询的应用信息
-     */
-    private ApplyInfoVo applyInfo;
-
-    /**
-     * 解析后的应用令牌
-     */
-    private AppTokenInfoRespVO appToken;
-
-    /**
-     * 解析后的用户令牌
-     */
-    private UserTokenInfoRespVO userToken;
-
-    public static TokenDetailRespVo empty() {
-        return new TokenDetailRespVo();
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/TokenUserInfoReqVo.java

@@ -1,57 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 认证服务用户请求Vo
- * @author mazq
- * @date 2023/2/15
- */
-@Data
-public class TokenUserInfoReqVo {
-
-    /**
-     * 用户唯一标识
-     */
-    @JsonProperty("Id")
-    private String id;
-
-    /**
-     * 身份证号码
-     */
-    @JsonProperty("Idcard")
-    private String idcard;
-
-    /**
-     * 姓名
-     */
-    private String userName;
-
-    /**
-     * 姓名拼音
-     */
-    private String pinyin;
-
-    /**
-     * 组织机构编码
-     */
-    private String orgCode;
-
-    /**
-     * 警号
-     */
-    private String policeNo;
-
-    /**
-     * 查询起始下标,默认 0，可不传
-     */
-    private Integer start;
-
-    /**
-     * 数据页大小 默认 1000，可不传
-     */
-    private Integer size;
-
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/TokenUserInfoRespVo.java

@@ -1,67 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-/**
- * 认证服务用户信息响应Vo
- *
- * @author mazq
- * @date 2023/2/15
- */
-@Data
-public class TokenUserInfoRespVo {
-
-    /**
-     * 用户唯一标识
-     */
-    @JsonProperty("Id")
-    private String id;
-
-    /**
-     * 身份证号码
-     */
-    @JsonProperty("Idcard")
-    private String idcard;
-
-    /**
-     * 姓名
-     */
-    private String userName;
-
-    /**
-     * 组织机构编码
-     */
-    private String orgCode;
-
-    /**
-     * 组织机构名称
-     */
-    private String orgName;
-
-    /**
-     * 警种编码
-     */
-    private String policeType;
-
-    /**
-     * 岗位编码
-     */
-    private String positionCode;
-
-    /**
-     * 职务编码
-     */
-    private String dutyCode;
-
-    /**
-     * 手机号码
-     */
-    private String mobile;
-
-    /**
-     * 座机号码
-     */
-    private String telephone;
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v4/vo/UserTokenInfoRespVO.java

@@ -1,65 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <p>
- * 用户令牌校验服务接口
- * </p>
- *
- * @author huangzqa
- * @date 2022/8/1
- */
-@Data
-public class UserTokenInfoRespVO {
-
-    /**
-     * 用户标识
-     */
-    @JsonProperty("pId")
-    private String pId;
-
-    /**
-     * 用户名称
-     */
-    private String name;
-
-    /**
-     * 组织机构编码
-     */
-    private String orgCode;
-
-    /**
-     * 终端设备标识
-     */
-    @JsonProperty("mId")
-    private String mId;
-
-    /**
-     * 终端环境类型
-     */
-    private String env;
-
-    /**
-     * 用户令牌创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
-
-    /**
-     * 用户令牌到期时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date expireAt;
-
-    /**
-     * 用户令牌
-     */
-    @JsonProperty("Id")
-    private String id;
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/sub/AuthUserInfoController.java

@@ -3,7 +3,7 @@ package com.dragoninfo.dcuc.authweb.restcontroller.sub;
 import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
 import com.dragoninfo.dcuc.auth.sub.enumresource.JobTypeEnum;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
-import com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.user.AuthUserVo;
+import com.dragoninfo.dcuc.auth.sub.vo.AuthUserVo;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.core.search.Searchable;

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/sub/vo/user/AuthUserVo.java

@@ -1,114 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.sub.vo.user;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-/**
- * @author mazq
- * @date 2021/6/11
- */
-@ApiModel("人员信息Vo")
-@Data
-public class AuthUserVo {
-
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    /**
-     * 身份证
-     */
-    @ApiModelProperty(value = "身份证")
-    private String idcard;
-
-    /**
-     * 姓名
-     */
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
-    /**
-     * 性别
-     */
-    @ApiModelProperty(value = "性别")
-    private String sex;
-
-    /**
-     * 用户类型
-     */
-    @ApiModelProperty(value = "用户类型")
-    private String userType;
-
-    /**
-     * 警号
-     */
-    @ApiModelProperty(value = "警号")
-    private String policeNumber;
-
-    /**
-     * 所在机构id
-     */
-    @ApiModelProperty(value = "所在机构id")
-    private String orgId;
-
-    /**
-     * 所在机构编码
-     */
-    @ApiModelProperty(value = "所在机构编码")
-    private String orgCode;
-
-    /**
-     * 所在机构名称
-     */
-    @ApiModelProperty(value = "所在机构名称")
-    private String orgName;
-
-    /**
-     * 人员身份类型10：民警 15：现役特警 20：辅警 25：外部党政人员 30：在编文员  99999：其他工勤人员
-     */
-    @ApiModelProperty(value = "人员身份类型")
-    private String manType;
-
-    /**
-     * 辅警类型 （10：合同工、20：聘用、 30：事业编、 90：其它）
-     */
-    @ApiModelProperty(value = "辅警类型 （10：合同工、20：聘用、 30：事业编、 90：其它）")
-    private String auxiliaryType;
-
-    /**
-     * 警种
-     */
-    @ApiModelProperty(value = "警种")
-    private String policeCategory;
-
-    /**
-     * 职级
-     */
-    @ApiModelProperty(value = "职级")
-    private String title;
-
-    /**
-     * 警衔
-     */
-    @ApiModelProperty(value = "警衔")
-    private String rank;
-
-    /**
-     * 业务域标签
-     */
-    @ApiModelProperty(value = "业务域标签")
-    private String policeBusiness;
-
-    /**
-     * 删除标识
-     */
-    @ApiModelProperty(value = "删除标识")
-    private String deleted;
-
-    /**
-     * 所属区域
-     */
-    @ApiModelProperty(value = "所属区域")
-    private String area;
-
-}