Merge branch 'mazq-authApiModify-230222' into 'develop'

feature: 令牌接口返回值修改

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

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

@@ -2,6 +2,7 @@ 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.DataRespVO;
 import com.dragoninfo.dcuc.auth.api.vo.ResultRespVO;
 import com.dragoninfo.dcuc.auth.auth.api.IApiDataAuthFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.AppDataSensitiveLevelDTO;
@@ -70,18 +71,18 @@ public class AuthV4Controller {
      * @return 应用级权限
      */
     @PostMapping("appAuth")
-    public ResultRespVO<String> appAuth(@RequestBody AppAuthReqVO appAuthReqVO) {
+    public DataRespVO<String> appAuth(@RequestBody AppAuthReqVO appAuthReqVO) {
         String appTokenId = appAuthReqVO.getAppTokenId();
 
         if (StrUtil.isBlank(appTokenId)) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.TOKEN_FAIL);
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.TOKEN_FAIL);
         }
 
         TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
 
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (userInfo == null) {
-            return ResultRespVO.respRequestErrorMessage("用户不存在");
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
         }
 
         // 缓存应用令牌
@@ -102,7 +103,7 @@ public class AuthV4Controller {
         }
 
         String appAuth = LangUtil.subLastSymbol(appAuthBuilder.toString(), StrUtil.COMMA);
-        return ResultRespVO.success(appAuth);
+        return DataRespVO.success(appAuth);
     }
 
     /**
@@ -112,17 +113,17 @@ public class AuthV4Controller {
      * @return 功能级鉴权
      */
     @PostMapping("functionAuth")
-    public ResultRespVO<String> functionAuth(@RequestBody FunctionAuthReqVO functionAuthReqVO) {
+    public DataRespVO<String> functionAuth(@RequestBody FunctionAuthReqVO functionAuthReqVO) {
         String appTokenId = functionAuthReqVO.getAppTokenId();
         String taskId = functionAuthReqVO.getTaskId();
 
         if (StrUtil.isBlank(appTokenId)) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
         }
         TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (userInfo == null) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
         }
         String appCode = tokenInfo.getAppToken().getAppId();
 
@@ -140,7 +141,7 @@ public class AuthV4Controller {
         }
 
         String appAuth = LangUtil.subLastSymbol(functionAuthBuilder.toString(), StrUtil.COMMA);
-        return ResultRespVO.success(appAuth);
+        return DataRespVO.success(appAuth);
     }
 
     /**
@@ -150,17 +151,17 @@ public class AuthV4Controller {
      * @return 服务级鉴权
      */
     @PostMapping("serviceAuth")
-    public ResultRespVO<String> serviceAuth(@RequestBody ServiceAuthReqVO serviceAuthReqVO) {
+    public DataRespVO<String> serviceAuth(@RequestBody ServiceAuthReqVO serviceAuthReqVO) {
         String appTokenId = serviceAuthReqVO.getAppTokenId();
         String taskId = serviceAuthReqVO.getTaskId();
         if (StrUtil.isBlank(appTokenId)) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
         }
 
         TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (userInfo == null) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
         }
         String appCode = tokenInfo.getAppToken().getAppId();
 
@@ -174,7 +175,7 @@ public class AuthV4Controller {
         }
 
         String serviceAuth = LangUtil.subLastSymbol(serviceAuthBuilder.toString(), StrUtil.COMMA);
-        return ResultRespVO.success(serviceAuth);
+        return DataRespVO.success(serviceAuth);
     }
 
     /**
@@ -184,22 +185,22 @@ public class AuthV4Controller {
      * @return 数据级鉴权
      */
     @PostMapping("dataAuth")
-    public ResultRespVO<List<DataAuthRespVO>> dataAuth(@RequestBody DataAuthReqVO dataAuthReqVO) {
+    public DataRespVO<List<DataAuthRespVO>> dataAuth(@RequestBody DataAuthReqVO dataAuthReqVO) {
         String appTokenId = dataAuthReqVO.getAppTokenId();
 
         if (StrUtil.isBlank(appTokenId)) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
         }
 
         String resourceId = dataAuthReqVO.getResourceId();
         if (StrUtil.isBlank(resourceId)) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.PARAM_ERROR);
         }
 
         TokenDetailRespVo tokenInfo = authTokenFacade.getByAppTokenId(appTokenId, true, false);
         AuthUserVo userInfo = tokenInfo.getUserInfo();
         if (null == userInfo) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
         }
 
         DataAuthV2ReqDTO v2ReqDTO = new DataAuthV2ReqDTO();
@@ -208,7 +209,7 @@ public class AuthV4Controller {
 
         ResponseDTO<DataAuthV2RespDTO> dto = apiDataAuthFacade.dataItemsCheckV2(v2ReqDTO);
         if (!ResponseUtil.isSuccess(dto)) {
-            return ResultRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
+            return DataRespVO.resultEnumMessage(BusinessRespEnum.AUTH_FAIL);
         } else {
             DataAuthV2RespDTO respDTO = (DataAuthV2RespDTO) dto.getResult();
             Set<String> resultSet = respDTO.getItemIdentifier();
@@ -218,7 +219,7 @@ public class AuthV4Controller {
                 vo.setItemIdentifier(e);
                 return vo;
             }).collect(Collectors.toList());
-            return ResultRespVO.success(collect);
+            return DataRespVO.success(collect);
         }
     }