Merge branch 'mazq-roleauth-apply-231123' into 'master'

Mazq roleauth apply 231123

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

pom.xml

@@ -362,6 +362,32 @@
                             <target>8</target>
                         </configuration>
                     </plugin>
+                    <!--生成git-infos.properties 版本文件-->
+                    <plugin>
+                        <groupId>pl.project13.maven</groupId>
+                        <artifactId>git-commit-id-plugin</artifactId>
+                        <version>4.9.10</version>
+                        <executions>
+                            <execution>
+                                <id>get-the-git-infos</id>
+                                <goals>
+                                    <goal>revision</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <abbrevLength>8</abbrevLength>
+                            <dateFormat>yyyy-MM-dd HH:mm:ss</dateFormat>
+                            <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                            <includeOnlyProperties>
+                                <includeOnlyProperty>^git.branch</includeOnlyProperty>
+                                <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                                <includeOnlyProperty>^git.commit.(id|id.abbrev|message.full)*</includeOnlyProperty>
+                            </includeOnlyProperties>
+                            <generateGitPropertiesFilename>${project.build.outputDirectory}/git-infos.properties
+                            </generateGitPropertiesFilename>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/ApprovalApiController.java

@@ -1,25 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.controller;
-
-import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustMessageRespVO;
-import com.dragoninfo.dcuc.auth.auth.facade.IApprovalFacade;
-import com.dragoninfo.dcuc.auth.auth.vo.zerotrust.approval.ApprovalCallBackReqVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.validation.Valid;
-
-@RestController
-@RequestMapping(value = "api/auth-service/v1/approval")
-public class ApprovalApiController {
-    @Autowired
-    private IApprovalFacade iApprovalFacade;
-
-    @PostMapping("call-back")
-    public ZeroTrustMessageRespVO approvalCallBack(@Valid @RequestBody ApprovalCallBackReqVO approvalCallBackReqVO) {
-        return iApprovalFacade.callBack(approvalCallBackReqVO);
-    }
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/WorkFlowApiController.java

@@ -1,17 +1,11 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.controller;
 
-import com.auth0.jwt.JWT;
-import com.auth0.jwt.interfaces.DecodedJWT;
 import com.dragoninfo.dcuc.auth.auth.dto.ServiceAuthFlowDTO;
-import com.dragoninfo.dcuc.auth.auth.dto.WorkFlowResutlAcceptDTO;
-import com.dragoninfo.dcuc.auth.auth.enumresources.WorkFlowStatusEnum;
 import com.dragoninfo.dcuc.auth.auth.facade.IServiceAuthFlowFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.vo.AuthFlowRepeatCheckVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.vo.ResourceInfoVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.vo.ServiceAuthFlowAcceptVo;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.vo.WorkFlowResutlAcceptVo;
 import com.dragoninfo.dcuc.authweb.util.HeadTokenUtils;
-import com.dragoninfo.dcuc.common.Constants;
 import com.dragoninfo.dcuc.common.entity.ApiResult;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
@@ -22,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -32,7 +25,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Optional;
 
 /**
  * @author mazq
@@ -96,7 +88,6 @@ public class WorkFlowApiController {
         }
     }
 
-
     /**
      * 服务授权撤销是否存在授权结果
      */
@@ -118,29 +109,6 @@ public class WorkFlowApiController {
         }
     }
 
-
-
-//    /**
-//     * 服务授权工作单审批结果处理
-//     * 提供接口
-//     * 也提供kafka消息的形式
-//     * kafka形式在auth服务内部处理
-//     */
-//    @ApiOperation(value = "服务授权工作单审批结果处理")
-//    @ApiImplicitParams({@ApiImplicitParam(name = "workFlowResutlVo", value = "审批结果vo")})
-//    @PostMapping(value = "service-result", consumes = MediaType.APPLICATION_JSON_VALUE)
-//    @ResponseBody
-//    public ApiResult dealAuthFlowResult(@RequestBody WorkFlowResutlAcceptVo flowResutlVo) {
-//        WorkFlowResutlAcceptDTO dto = new WorkFlowResutlAcceptDTO();
-//        dto.setApproveResult(WorkFlowStatusEnum.SUCCESS.getValue());
-//        dto.setProcessInstanceId(flowResutlVo.getProcessInstanceId());
-//        dto.setRemark(flowResutlVo.getDesc());
-//        dto.setMessageId(flowResutlVo.getMessageId());
-//        serviceAuthFlowFacade.dealAuthFlowResult(dto);
-//        return ApiResult.setSuccess();
-//    }
-
-
     /**
      * 设置申请单appCode和serviceCode信息
      */

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/zerotrust/AuthApplyApiController.java

@@ -0,0 +1,58 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.controller.zerotrust;
+
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustDataRespVO;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustMessageRespVO;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.authapply.ApiRoleAuthReqVo;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.authapply.ApiServiceAuthReqVo;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.authapply.AuthApplyRespVo;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.role.ApiAppRoleRespVo;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.role.ApiRolesReqVo;
+import com.dragoninfo.dcuc.auth.auth.api.IZeroTrustAuthApplyFacade;
+import com.dragoninfo.dcuc.auth.auth.api.IZeroTrustAuthFacade;
+import com.dragoninfo.dcuc.auth.auth.vo.zerotrust.approval.ApprovalCallBackReqVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * @author mazq
+ * @date 2023/11/22
+ */
+@RestController
+@RequestMapping("api/auth-service/v1/")
+public class AuthApplyApiController {
+
+    @Autowired
+    private IZeroTrustAuthApplyFacade zeroTrustAuthApplyFacade;
+
+    @ApiOperation(value = "角色授权申请列表")
+    @PostMapping("/roles/search")
+    public ZeroTrustDataRespVO<List<ApiAppRoleRespVo>> appRoleInfos(@Valid @RequestBody ApiRolesReqVo reqVo) {
+        return zeroTrustAuthApplyFacade.appRoleInfos(reqVo);
+    }
+
+    @ApiOperation(value = "角色授权申请")
+    @PostMapping("auth-apply/roles")
+    public ZeroTrustDataRespVO<AuthApplyRespVo> roleAuthApply(@Valid @RequestBody ApiRoleAuthReqVo reqVo) {
+        return zeroTrustAuthApplyFacade.roleAuthApply(reqVo);
+    }
+
+    @ApiOperation(value = "服务授权申请")
+    @PostMapping("auth-apply/services")
+    public ZeroTrustDataRespVO<AuthApplyRespVo> serviceAuthApply(@Valid @RequestBody ApiServiceAuthReqVo reqVo) {
+        return zeroTrustAuthApplyFacade.serviceAuthApply(reqVo);
+    }
+
+    @ApiOperation(value = "审批结果回调")
+    @PostMapping("approval/call-back")
+    public ZeroTrustMessageRespVO approvalCallBack(@Valid @RequestBody ApprovalCallBackReqVO approvalCallBackReqVO) {
+        return zeroTrustAuthApplyFacade.callBack(approvalCallBackReqVO);
+    }
+
+}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/vo/AuthFlowAcceptBaseVo.java

@@ -0,0 +1,97 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Date;
+
+/**
+ * @author mazq
+ * @date 2023/11/21
+ */
+@Data
+@ApiModel(value = "权限流程申请基础Vo")
+public class AuthFlowAcceptBaseVo {
+
+    /**
+     * 流程类型
+     */
+    @ApiModelProperty(value = "流程类型")
+    private String processType;
+
+    /**
+     * 流程标识码
+     */
+    @ApiModelProperty(value = "流程标识码")
+    private String businessCode;
+
+
+    /**
+     * 工作单类型
+     * SERVICE_AUTH-服务授权工作单 SERVICE_CANCEL-服务权限撤销工作单
+     */
+    @ApiModelProperty(value = "工作单类型 SERVICE_AUTH-服务授权工作单 SERVICE_CANCEL-服务权限撤销工作单")
+    private String flowType;
+
+
+    /**
+     * 申请理由
+     */
+    @ApiModelProperty(value = "申请理由")
+    @NotBlank
+    private String applyReason;
+
+    /**
+     * 申请人身份证号
+     */
+    @ApiModelProperty(value = "申请人身份证号")
+    @NotBlank
+    private String applicantIdcard;
+    /**
+     * 申请人姓名
+     */
+    @ApiModelProperty(value = "申请人姓名")
+    @NotBlank
+    private String applicantName;
+
+    /**
+     * 申请机构code
+     */
+    @ApiModelProperty(value = "申请人单位编码")
+    @NotBlank
+    private String applicantOrgCode;
+    /**
+     * 申请机构名称
+     */
+    @ApiModelProperty(value = "申请人单位名称")
+    @NotBlank
+    private String applicantOrgName;
+
+    /**
+     * 申请人联系方式
+     */
+    @ApiModelProperty(value = "申请人联系方式")
+    @NotBlank
+    private String applicantPhoneNo;
+
+    /**
+     * 权限有效类型（01：自定义 | 02：长期）
+     */
+    @ApiModelProperty(value = "权限有效类型")
+    @NotBlank
+    private String permissionValidType;
+
+    @ApiModelProperty(value = "权限有效起始时间（2020-01-01 00:00:00）")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    @ApiModelProperty(value = "权限有效终止时间（2020-01-01 00:00:00）")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/vo/ServiceAuthFlowAcceptVo.java

@@ -1,15 +1,12 @@
 package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,15 +15,11 @@ import java.util.List;
  * @author mazq
  * @date 2021/2/19
  */
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "提交工作流申请信息Vo")
 @Data
-public class ServiceAuthFlowAcceptVo {
+public class ServiceAuthFlowAcceptVo extends AuthFlowAcceptBaseVo {
 
-    /**
-     * 流程类型
-     */
-    @ApiModelProperty(value = "流程类型")
-    private String processType;
     /**
      * 工单号
      */
@@ -34,69 +27,6 @@ public class ServiceAuthFlowAcceptVo {
     private String applicantId;
 
 
-    /**
-     * 流程标识码
-     */
-    @ApiModelProperty(value = "流程标识码")
-    private String businessCode;
-
-    /**
-     * 申请理由
-     */
-    @ApiModelProperty(value = "申请理由")
-    @NotBlank
-    private String applyReason;
-
-    /**
-     * 申请人身份证号
-     */
-    @ApiModelProperty(value = "申请人身份证号")
-    @NotBlank
-    private String applicantIdcard;
-    /**
-     * 申请人姓名
-     */
-    @ApiModelProperty(value = "申请人姓名")
-    @NotBlank
-    private String applicantName;
-
-    /**
-     * 申请机构code
-     */
-    @ApiModelProperty(value = "申请人单位编码")
-    @NotBlank
-    private String applicantOrgCode;
-    /**
-     * 申请机构名称
-     */
-    @ApiModelProperty(value = "申请人单位名称")
-    @NotBlank
-    private String applicantOrgName;
-
-    /**
-     * 申请人联系方式
-     */
-    @ApiModelProperty(value = "申请人联系方式")
-    @NotBlank
-    private String applicantPhoneNo;
-
-    /**
-     * 权限有效类型（01：自定义 | 02：长期）
-     */
-    @ApiModelProperty(value = "权限有效类型")
-    @NotBlank
-    private String permissionValidType;
-
-    @ApiModelProperty(value = "权限有效起始时间（2020-01-01 00:00:00）")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date startTime;
-
-    @ApiModelProperty(value = "权限有效终止时间（2020-01-01 00:00:00）")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    private Date endTime;
-
     @ApiModelProperty(value = "服务共享方式")
     private String fwgxfs;
 
@@ -108,14 +38,6 @@ public class ServiceAuthFlowAcceptVo {
     @NotNull
     private ResourceInfoVo resourceInfo;
 
-    /**
-     * 工作单类型
-     * SERVICE_AUTH-服务授权工作单 SERVICE_CANCEL-服务权限撤销工作单
-     */
-    @ApiModelProperty(value = "工作单类型 SERVICE_AUTH-服务授权工作单 SERVICE_CANCEL-服务权限撤销工作单")
-    private String flowType;
-
-
     @ApiModelProperty(value = "下一任务对象信息")
     private List<ActivitiHolderVo> activitiHolderList;
 }

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

@@ -3,7 +3,8 @@ package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v4.controller
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.dragoninfo.dcuc.auth.api.enums.zerotrust.ZeroTrustBusinessRespEnum;
-import com.dragoninfo.dcuc.auth.api.vo.zerotrust.*;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.ZeroTrustDataRespVO;
+import com.dragoninfo.dcuc.auth.api.vo.zerotrust.authticate.*;
 import com.dragoninfo.dcuc.auth.auth.api.IZeroTrustAuthFacade;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -39,13 +40,12 @@ public class AuthV4Controller {
     @PostMapping("appAuth")
     public ZeroTrustDataRespVO<String> appAuth(@RequestBody AppAuthReqVO appAuthReqVO) {
         String userTokenId = appAuthReqVO.getUserTokenId();
-        log.info("=============应用级鉴权开始, 请求参数:{}===============", userTokenId);
         if (StrUtil.isBlank(userTokenId)) {
             log.error("鉴权参数为空");
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL);
         }
         ZeroTrustDataRespVO<String> respVo = zeroTrustAuthFacade.appAuth(appAuthReqVO);
-        log.info("应用鉴权结果:{}", JSON.toJSONString(respVo));
+        log.info("应用鉴权结果:{}, userTokenId:{}", JSON.toJSONString(respVo), userTokenId);
         return respVo;
     }
 
@@ -59,13 +59,12 @@ public class AuthV4Controller {
     public ZeroTrustDataRespVO<String> functionAuth(@RequestBody FunctionAuthReqVO functionAuthReqVO) {
         String appTokenId = functionAuthReqVO.getAppTokenId();
         String taskId = functionAuthReqVO.getTaskId();
-        log.info("==============功能级鉴权开始, 请求参数appTokenId:{}, taskId:{}================", appTokenId, taskId);
         if (StrUtil.isBlank(appTokenId) || StrUtil.isBlank(taskId)) {
             log.error("鉴权参数为空");
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL);
         }
         ZeroTrustDataRespVO<String> respVO = zeroTrustAuthFacade.functionAuth(functionAuthReqVO);
-        log.info("功能鉴权结果:{}", JSON.toJSONString(respVO));
+        log.info("请求参数appTokenId:{}, taskId:{}, 功能鉴权结果:{}", appTokenId, taskId, JSON.toJSONString(respVO));
         return respVO;
     }
 
@@ -79,15 +78,13 @@ public class AuthV4Controller {
     public ZeroTrustDataRespVO<String> serviceAuth(@RequestBody ServiceAuthReqVO serviceAuthReqVO) {
         String appTokenId = serviceAuthReqVO.getAppTokenId();
         String taskId = serviceAuthReqVO.getTaskId();
-        log.info("===========服务级鉴权开始,appTokenId:{}, taskId:{}===========", appTokenId, taskId);
-
         if (StrUtil.isBlank(taskId) || StrUtil.isBlank(appTokenId)) {
             log.error("鉴权参数为空");
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL);
         }
 
         ZeroTrustDataRespVO<String> respVO = zeroTrustAuthFacade.serviceAuth(serviceAuthReqVO);
-        log.info("服务级鉴权结果:{}", JSON.toJSONString(respVO));
+        log.info("appTokenId:{}, taskId:{}, 服务级鉴权结果:{}", appTokenId, taskId, JSON.toJSONString(respVO));
         return respVO;
     }
 
@@ -102,13 +99,12 @@ public class AuthV4Controller {
         String resourceId = dataAuthReqVO.getResourceId();
         String taskId = dataAuthReqVO.getTaskId();
         String appTokenId = dataAuthReqVO.getAppTokenId();
-        log.info("======数据级鉴权开始, 请求参数resourceId:{}, taskId:{}, appTokenId:{}=====", resourceId, taskId, appTokenId);
         if (StrUtil.isBlank(resourceId) || StrUtil.isBlank(taskId) || StrUtil.isBlank(appTokenId)) {
             log.error("鉴权参数为空");
             return ZeroTrustDataRespVO.resultEnumMessage(ZeroTrustBusinessRespEnum.OPERATE_FAIL, DataAuthRespVO.empty());
         }
         ZeroTrustDataRespVO<DataAuthRespVO> respVO = zeroTrustAuthFacade.dataAuth(dataAuthReqVO);
-        log.info("数据鉴权结果:{}", JSON.toJSONString(respVO));
+        log.info("请求参数resourceId:{}, taskId:{}, appTokenId:{}, 数据鉴权结果:{}", resourceId, taskId, appTokenId, JSON.toJSONString(respVO));
         return respVO;
     }
 

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/controller/AuthApiController.java

@@ -4,15 +4,11 @@ import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.facade.IApplyInfoFacade;
 import com.dragoninfo.dcuc.auth.auth.dto.AppFunInfoDTO;
 import com.dragoninfo.dcuc.auth.auth.dto.AppResourcesDto;
-import com.dragoninfo.dcuc.auth.auth.dto.ApprovalDto;
 import com.dragoninfo.dcuc.auth.auth.dto.RoleApiDto;
-import com.dragoninfo.dcuc.auth.auth.facade.IApprovalFacade;
 import com.dragoninfo.dcuc.auth.auth.facade.IRoleFacade;
 import com.dragoninfo.dcuc.auth.power.facade.IAppFunInfoFacade;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
 import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v3.vo.AppFunInfoApiVo;
-import com.dragoninfo.dcuc.authweb.restcontroller.api.controller.pojo.FunAppovalParamVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.controller.pojo.RoleApiParamVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.api.controller.pojo.UpdataAppFunVO;
 import com.dragoninfo.duceap.core.enums.ResultEnum;
@@ -48,8 +44,6 @@ public class AuthApiController {
     @Autowired
     private IRoleFacade roleFacade;
     @Autowired
-    private IApprovalFacade iApprovalFacade;
-    @Autowired
     private IApplyInfoFacade applyInfoFacade;
     @Autowired
     private IAppFunInfoFacade iAppFunInfoFacade;
@@ -95,61 +89,8 @@ public class AuthApiController {
         return roleFacade.getRolesByAppCodeAndUserId(appCode, userId);
     }
 
-    /**
-     * 动态授权申请
-     *
-     * @param appCode        应用代码
-     * @param roleCode       角色代码
-     * @param userIdCard     申请人身份证
-     * @param approvalIdCard 审批人身份证
-     * @param reason         申请事由
-     * @return
-     */
-    @ApiOperation(value = "动态授权申请")
-    @ApiImplicitParams({@ApiImplicitParam(name = "appCode", value = "应用代码", required = true
-            , example = "11111"), @ApiImplicitParam(name = "roleCode", value = "角色代码", required = true
-            , example = "11111"), @ApiImplicitParam(name = "userIdCard", value = "用户身份证号", required = true
-            , example = "340111197810194754"), @ApiImplicitParam(name = "approvalIdCard", value = "审批人身份证", required = true
-            , example = "340111197810194754"), @ApiImplicitParam(name = "reason", value = "申请事由", required = true
-            , example = "340111197810194754")})
-    @GetMapping(value = "/auth/apply")
-    @ResponseBody
-    public ResponseDTO proposer(
-            @RequestParam(value = "appCode", required = true) String appCode,
-            @RequestParam(value = "roleCode", required = true) String roleCode,
-            @RequestParam(value = "userIdCard", required = true) String userIdCard,
-            @RequestParam(value = "approvalIdCard", required = true) String approvalIdCard,
-            @RequestParam(value = "reason", required = true) String reason) {
-//        http://172.16.105.196:8888/dcuc/api/auth/apply?appCode=YHZX0000000000000001&roleCode=MANAGER_APP&userIdCard=000000000000000001&approvalIdCard=000000000000000001&reason=111
-        return iApprovalFacade.authApply(appCode, roleCode, userIdCard, approvalIdCard, reason);
-    }
 
-    /**
-     * 动态授权的角色功能获取
-     *
-     * @param appCode    应用代码
-     * @param roleCode   角色代码
-     * @param userIdCard 申请批人身份证
-     * @return
-     */
-    @ApiOperation(value = "动态授权的角色功能获取")
-    @ApiImplicitParams({@ApiImplicitParam(name = "appCode", value = "应用代码", required = true
-            , example = "11111"), @ApiImplicitParam(name = "roleCode", value = "角色代码", required = true
-            , example = "11111"), @ApiImplicitParam(name = "userIdCard", value = "用户身份证号", required = true
-            , example = "340111197810194754")})
-    @GetMapping(value = "/auth/applyResult")
-    @ResponseBody
-    public ResponseDTO getProposerFuns(
-            @RequestParam(value = "appCode", required = true) String appCode,
-            @RequestParam(value = "roleCode", required = true) String roleCode,
-            @RequestParam(value = "userIdCard", required = true) String userIdCard) {
-        ApprovalDto approvalDto = new ApprovalDto();
-        approvalDto.setAppCode(appCode);
-        approvalDto.setRoleCode(roleCode);
-        approvalDto.setUserIdCard(userIdCard);
-//        http://172.16.105.196:8888/dcuc/api/auth/applyResult?appCode=YHZX0000000000000001&roleCode=MANAGER_APP&userIdCard=000000000000000001
-        return iApprovalFacade.applyResult(approvalDto);
-    }
+
 
     /**
      * 1.1
@@ -232,41 +173,6 @@ public class AuthApiController {
         }
     }
 
-
-    /**
-     * 1.4
-     * 动态授权
-     *
-     * @param vo
-     * @return
-     */
-    @ApiOperation(value = "动态授权")
-    @ApiImplicitParams({@ApiImplicitParam(name = "FunAppovalParamVo", value = "动态授权")})
-    @RequestMapping("/pushData")
-    @ResponseBody
-    public Result pushData(@RequestBody FunAppovalParamVo vo) {
-        String appCode = vo.getAppCode();
-        String roleCode = vo.getRoleCode();
-        String userIdCard = vo.getProposerIdcard();
-        String approvalIdCard = vo.getApprpvalIdcard();
-        String reason = vo.getProposerReason();
-        if (StringUtils.isEmpty(appCode) || StringUtils.isEmpty(roleCode)
-                || StringUtils.isEmpty(approvalIdCard) || StringUtils.isEmpty(userIdCard)
-                || StringUtils.isEmpty(vo.getVerifiy()) || StringUtils.isEmpty(vo.getProposerOrg())) {
-            return Result.fail("必填参数不能为空");
-        }
-        AuthUserDTO proposerUserInfo = authUserInfoFacade.findByIdcard(userIdCard);
-        if (proposerUserInfo == null || !proposerUserInfo.getOrgId().equals(vo.getProposerOrg())) {
-            return Result.fail("申请人不存在或机构错误");
-        }
-        ResponseDTO responseDTO = iApprovalFacade.authApply(appCode, roleCode, userIdCard, approvalIdCard, reason);
-        if (ResponseDTO.FAIL_CODE.equals(responseDTO.getStatusCode())) {
-            return Result.fail(responseDTO.getMessage());
-        }
-        return Result.success();
-    }
-
-
     /**
      * 1.5
      * 获取权限列表成功

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/approval/ApprovalController.java

@@ -1,119 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.approval;
-
-
-import com.dragoninfo.dcuc.auth.auth.dto.ApprovalDto;
-import com.dragoninfo.dcuc.auth.auth.entity.FuncApproval;
-import com.dragoninfo.dcuc.auth.auth.facade.IApprovalFacade;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthOrgDTO;
-import com.dragoninfo.dcuc.auth.sub.dto.AuthUserDTO;
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthOrgInfoFacade;
-import com.dragoninfo.dcuc.auth.sub.facade.IAuthUserInfoFacade;
-import com.dragoninfo.dcuc.authweb.restcontroller.approval.vo.FuncApprovalVo;
-import com.dragoninfo.duceap.core.response.Result;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.base.entity.search.SearchDTO;
-import com.dragonsoft.duceap.web.annotation.Permission;
-import io.swagger.annotations.*;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-@Api(tags = {"动态授权管理接口"})
-@Permission(value = "power_config")
-@RestController
-@RequestMapping(value = "approsvr/v2/approval/")
-public class ApprovalController {
-    @Autowired
-    private IApprovalFacade iApprovalFacade;
-    @Autowired
-    private IAuthOrgInfoFacade authOrgInfoFacade;
-    @Autowired
-    private IAuthUserInfoFacade authUserInfoFacade;
-
-    @ApiOperation(value = "获取动态授权信息列表")
-    @ApiImplicitParam(name = "searchDTO", value = "查询条件", paramType = "body",
-            examples = @Example({
-                    @ExampleProperty(value = "{'appName_like':'应用名称','roleName_like':'角色名称','proposerName_like':'申请人'," +
-                            "'proposerOrg_eq':'id申请机构id','approvalStatus_eq':'申请状态'}",
-                            mediaType = "application/json")
-            }))
-    @PostMapping(value = "_search")
-    public Result<List<FuncApproval>> approvalPage(SearchDTO searchDTO) {
-        Page<FuncApproval> page = iApprovalFacade.approvalPage(searchDTO);
-        page.getContent().stream().forEach(this::setValues);
-        return Result.success(page.getTotalElements(), page.getContent());
-    }
-
-
-    @ApiOperation(value = "同意授权")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "id"),
-            @ApiImplicitParam(name = "hasTime", value = "hasTime,0：不存在时间限制 1：存在时间限制。"),
-            @ApiImplicitParam(name = "validTime", value = "授权截止时间 格式：yyyyMMddHHmmss", paramType = "string")
-    })
-    @PutMapping(value = "agree")
-    public Result agree(@RequestBody FuncApprovalVo funcApprovalVo) {
-        ApprovalDto approvalDto = new ApprovalDto();
-        BeanUtils.copyProperties(funcApprovalVo, approvalDto);
-        ResponseStatus responseStatus = iApprovalFacade.agree(approvalDto);
-        Result result = dealResponseStatus(responseStatus);
-        return result;
-    }
-
-    @ApiOperation(value = "拒绝授权")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "id"),
-            @ApiImplicitParam(name = "approvalOpinion", value = "拒绝意见"),
-    })
-    @PutMapping(value = "disagree")
-    public Result disagree(@RequestBody FuncApprovalVo funcApprovalVo) {
-        ApprovalDto approvalDto = new ApprovalDto();
-        BeanUtils.copyProperties(funcApprovalVo, approvalDto);
-        ResponseStatus responseStatus = iApprovalFacade.disagree(approvalDto);
-        Result result = dealResponseStatus(responseStatus);
-        return result;
-
-    }
-
-    @ApiOperation(value = "获取详情")
-    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", name = "id", value = "授权ID", required = true
-            , example = "40288a8b699fc2500169a33b20540000")})
-    @GetMapping(value = "detail/{id}")
-    public Result<FuncApprovalVo> toDetail(@PathVariable("id") String id) {
-        FuncApproval approval = iApprovalFacade.detail(id);
-        setValues(approval);
-        FuncApprovalVo vo = new FuncApprovalVo();
-        BeanUtils.copyProperties(approval, vo);
-        if (approval.getValidTime() != null) {
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            vo.setValidTime(format.format(approval.getValidTime()));
-        }
-
-        return Result.success(vo);
-    }
-
-    private FuncApproval setValues(FuncApproval approval) {
-        AuthOrgDTO orgInfo = authOrgInfoFacade.get(approval.getProposerOrg());
-        if (orgInfo != null) {
-            approval.setOrgName(orgInfo.getFullName());
-        }
-        AuthUserDTO approvalUser = authUserInfoFacade.get(approval.getApprovalId());
-        if (orgInfo != null) {
-            approval.setApprovalName(approvalUser.getName());
-        }
-        return approval;
-    }
-
-
-    private Result dealResponseStatus(ResponseStatus responseStatus) {
-        if (ResponseStatus.SUCCESS_CODE.equals(responseStatus.getStatusCode())) {
-            return Result.success(responseStatus.getMessage());
-        } else {
-            return Result.fail(responseStatus.getMessage());
-        }
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/approval/vo/FuncApprovalVo.java

@@ -1,110 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.approval.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.Date;
-
-
-@Data
-@ApiModel(value = "动态授权资源Vo")
-public class FuncApprovalVo {
-
-    //编号
-    @ApiModelProperty(value = "id")
-    private String id;
-
-    //应用ID
-    @ApiModelProperty(value = "应用ID")
-    private String appId;
-
-    //应用名称
-    @ApiModelProperty(value = "应用名称")
-    private String appName;
-
-    //功能id
-    @ApiModelProperty(value = "功能id")
-    private String funcId;
-
-    //功能名称
-    @ApiModelProperty(value = "功能名称")
-    private String funcName;
-
-    //角色id
-    @ApiModelProperty(value = "角色id")
-    private String roleId;
-
-    //申请单位
-    @ApiModelProperty(value = "申请单位")
-    private String proposerOrg;
-
-    //申请人
-    @ApiModelProperty(value = "申请人id")
-    private String proposerId;
-
-    //申请人身份证
-    @ApiModelProperty(value = "申请人身份证")
-    private String proposerIdcard;
-
-    //申请时间
-    @ApiModelProperty(value = "申请时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date proposerTime;
-
-    //申请事由
-    @ApiModelProperty(value = "申请事由")
-    private String proposerReason;
-
-    //审核状态：-1：审批中 0：未通过 1：通过
-    @ApiModelProperty(value = "审核状态")
-    private String approvalStatus;
-
-    //审批意见
-    @ApiModelProperty(value = "审批意见")
-    private String approvalOpinion;
-
-    //审批时间
-    @ApiModelProperty(value = "审批时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
-    private Date approvalTime;
-
-    //审批人
-    @ApiModelProperty(value = "审批人id")
-    private String approvalId;
-
-    //有效标志(0：无效 1：有效)
-    @ApiModelProperty(value = "有效标志")
-    private String isActive;
-
-    //角色名称
-    @ApiModelProperty(value = "角色名称")
-    private String roleName;
-
-    //申请人名称
-    @ApiModelProperty(value = "申请人名称")
-    private String proposerName;
-
-    //调用次数
-    @ApiModelProperty(value = "调用次数")
-    private int callTime;
-
-    //申请人机构名称
-    @ApiModelProperty(value = "申请人机构名称")
-    private String orgName;
-
-    //审批人名称
-    @ApiModelProperty(value = "审批人名称")
-    private String approvalName;
-
-    //审批人名称
-    @ApiModelProperty(value = "hasTime,0：不存在时间限制 1：存在时间限制")
-    private String hasTime;
-
-    //审批人名称
-    @ApiModelProperty(value = "权限有效期限 格式：yyyyMMddHHmmss")
-    private String validTime;
-
-
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/AppFunInfoController.java

@@ -4,11 +4,9 @@ package com.dragoninfo.dcuc.authweb.restcontroller.auth;
 import com.dragoninfo.dcuc.auth.auth.dto.AppFunTreeDTO;
 import com.dragoninfo.dcuc.auth.auth.entity.AppFunInfo;
 import com.dragoninfo.dcuc.auth.auth.vo.AppFunInfoVo;
-import com.dragoninfo.dcuc.auth.auth.vo.EventInfoVO;
 import com.dragoninfo.dcuc.auth.auth.vo.TreeInfoVO;
 import com.dragoninfo.dcuc.auth.auth.vo.appfun.RespAppFunTreeVo;
 import com.dragoninfo.dcuc.auth.power.facade.IAppFunInfoFacade;
-import com.dragoninfo.dcuc.auth.power.facade.IFunEventFacade;
 import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.AppFunTreeVo;
 import com.dragoninfo.duceap.core.response.Result;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
@@ -32,7 +30,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -53,9 +50,6 @@ public class AppFunInfoController {
     @Autowired
     private IAppFunInfoFacade iAppFunInfoFacade;
 
-    @Autowired
-    private IFunEventFacade iFunEventFacade;
-
     /**
      * 获取所有菜单信息列表
      *
@@ -103,9 +97,6 @@ public class AppFunInfoController {
     public Result<List<Map<String, Object>>> getMenu(@PathVariable("appId") String appId) {
         //获取该应用的所有节点
         List<TreeInfoVO> appAllTreeList = iAppFunInfoFacade.getAllTreeList(appId, BooleanEnum.TRUE.value);
-        for (TreeInfoVO treeInfoVO : appAllTreeList) {
-            getPreterMission(treeInfoVO);
-        }
         List<Map<String, Object>> maps = TreeNodeUtils.generateTree(appAllTreeList, new SimpleTreeNodeItemResolver("code", "pid"));
         for (Map<String, Object> map : maps) {
             List children = (List) map.get("children");
@@ -202,88 +193,4 @@ public class AppFunInfoController {
         return Result.success(treeVos);
     }
 
-
-    public List<TreeInfoVO> getChildTreeObjects(List<TreeInfoVO> list,
-                                                String parentCode) {
-        List<TreeInfoVO> returnList = new ArrayList<TreeInfoVO>();
-        for (Iterator<TreeInfoVO> iterator = list.iterator(); iterator
-                .hasNext(); ) {
-            TreeInfoVO treeInfoVo = iterator.next();
-            //获取指定parentCode节点的子节点列表
-            String treePid = null;
-            if (null == treeInfoVo.getPid()) {
-                treePid = "";
-            } else {
-                treePid = treeInfoVo.getPid();
-            }
-
-            //获取指定parentCode节点的子节点列表
-            if (parentCode.equals(treePid)) {
-                //递归获取当前节点的子节点
-                recursionFn(list, treeInfoVo);
-
-                getPreterMission(treeInfoVo);
-
-                returnList.add(treeInfoVo);
-            }
-        }
-        return returnList;
-    }
-
-    public void recursionFn(List<TreeInfoVO> list, TreeInfoVO t) {
-        //获取子节点列表
-        List<TreeInfoVO> childsList = getChildList(list, t);
-        // 设置子节点列表
-        t.setChildren(childsList);
-
-        for (TreeInfoVO nextChild : childsList) {
-            // 判断子节点是否有子节点
-            if (hasChild(list, nextChild)) {
-                // 有子节点,递归获取
-                recursionFn(list, nextChild);
-                /*
-                Iterator<TreeInfoVO> it = childsList.iterator();
-				while (it.hasNext()) {
-					TreeInfoVO node = it.next();
-					//递归获取子节点
-					recursionFn(list, node);
-				}
-				*/
-            }
-
-            getPreterMission(nextChild);
-
-        }
-    }
-
-    public static List<TreeInfoVO> getChildList(List<TreeInfoVO> list, TreeInfoVO t) {
-        List<TreeInfoVO> childsList = new ArrayList<TreeInfoVO>();
-        Iterator<TreeInfoVO> it = list.iterator();
-        while (it.hasNext()) {
-            TreeInfoVO child = it.next();
-            if (t.getId().equals(child.getPid())) {
-                childsList.add(child);
-            }
-        }
-        return childsList;
-    }
-
-    public static boolean hasChild(List<TreeInfoVO> list, TreeInfoVO t) {
-        return getChildList(list, t).size() > 0;
-    }
-
-    /**
-     * 组装菜单按钮
-     *
-     * @param nextChild
-     */
-    public void getPreterMission(TreeInfoVO nextChild) {
-        List<EventInfoVO> eventInfoVOList = iFunEventFacade.getEventByTreeId(nextChild.getId());
-        String pretermission = "";
-
-        for (EventInfoVO eventInfoVO : eventInfoVOList) {
-            pretermission += "&nbsp;&nbsp;<input name='" + nextChild.getId() + "' type='checkbox' flag='common' value='" + eventInfoVO.getId() + "' />" + eventInfoVO.getName() + "";
-        }
-        nextChild.setDesc(pretermission);
-    }
 }

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/FunEventController.java

@@ -1,119 +0,0 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.auth;
-
-import com.dragoninfo.dcuc.auth.auth.entity.AppFunInfo;
-import com.dragoninfo.dcuc.auth.auth.entity.FunEvent;
-import com.dragoninfo.dcuc.auth.power.facade.IAppFunInfoFacade;
-import com.dragoninfo.dcuc.auth.power.facade.IFunEventFacade;
-import com.dragoninfo.dcuc.auth.auth.vo.AppFunInfoVo;
-import com.dragoninfo.dcuc.authweb.restcontroller.auth.vo.FunEventVo;
-import com.dragoninfo.duceap.core.response.Result;
-import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
-import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
-import com.dragonsoft.duceap.base.entity.search.SearchDTO;
-import com.dragonsoft.duceap.commons.util.string.StringUtils;
-import com.dragonsoft.duceap.core.search.Searchable;
-import com.dragonsoft.duceap.core.search.filter.Condition;
-import com.dragonsoft.duceap.web.annotation.Permission;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Api(tags = {"授权模块-事件管理接口"})
-@RestController
-@RequestMapping(value = "authsvr/v2/funevent")
-public class FunEventController {
-
-    public static Logger logger = LoggerFactory.getLogger(FunEventController.class);
-
-    @Autowired
-    private IFunEventFacade iFunEventFacade;
-
-    @Autowired
-    private IAppFunInfoFacade iAppFunInfoFacade;
-
-
-    /**
-     * 菜单列表
-     * @param searchDTO
-     * @return
-     */
-    @ApiOperation(value = "根据功能菜单id获取菜单的功能事件列表")
-    @ApiImplicitParam(name = "searchable", value = "查询条件,pkMenuId可为空")
-    @GetMapping(value = "/menuList")
-    public Result<List<FunEventVo>> menuList(SearchDTO searchDTO) {
-        Searchable searchable = Searchable.toSearchable(searchDTO);
-        Condition condition = searchable.getSearchFilterByKey("pkMenuId_eq");
-        List<FunEventVo> resultList = new ArrayList<>();
-        String pkMenuId = null;
-        if(null !=condition) pkMenuId = (String) condition.getValue();
-        List<FunEvent> funEvents = iFunEventFacade.getMenuData(pkMenuId, searchDTO);
-        for (FunEvent funEvent : funEvents) {
-            FunEventVo vo = new FunEventVo();
-            BeanUtils.copyProperties(funEvent,vo);
-            resultList.add(vo);
-        }
-        return Result.success(resultList);
-    }
-
-    /**
-     *
-     * @param appFunInfoVo
-     * @return
-     */
-    @ApiOperation(value = "保存应用菜单")
-    @Permission(value = "power_config")
-    @PutMapping(value = "/funEvent",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Result updateFunEvent(@RequestBody AppFunInfoVo appFunInfoVo) {
-        Result result;
-//        String menuId = request.getParameter("menuId");
-        String id = appFunInfoVo.getId();
-        ResponseDTO responseDTO;
-        String message;
-        AppFunInfo appFunInfo = new AppFunInfo();
-        BeanUtils.copyProperties(appFunInfoVo,appFunInfo);
-        if (StringUtils.isBlank(id)) {
-            message = "保存";
-            //id设置为null,避免detached entity passed to persist 异常
-            appFunInfo.setId(null);
-            responseDTO = iAppFunInfoFacade.save(appFunInfo);
-        } else {
-            message = "更新";
-            appFunInfo.setId(id);
-            responseDTO = iAppFunInfoFacade.update(appFunInfo);
-        }
-        if(ResponseStatus.SUCCESS_CODE.equals(responseDTO.getStatusCode())){
-            result = Result.success(message + "成功");
-        }else {
-            result = Result.fail(message+"失败");
-        }
-        return result;
-    }
-
-    @ApiOperation(value = "删除应用菜单,如果(应用菜单)该节点下有子节点也进行删除")
-    @ApiImplicitParams({@ApiImplicitParam(name = "deletedId", value = "菜单id"),@ApiImplicitParam(name = "appId", value = "应用id")})
-    @Permission(value = "power_config")
-    @DeleteMapping(value = "/menu",produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Result deleteMenu(@RequestParam("deletedId") String deletedId,@RequestParam("appId") String appId) {
-        Result result;
-        try {
-            if (deletedId != null) {
-                iAppFunInfoFacade.deleteMenuAll(deletedId, appId);
-            }
-            result = Result.success("删除成功");
-        } catch (Exception e) {
-            result = Result.fail("删除异常");
-            logger.error("删除异常", e);
-        }
-        return result;
-    }
-}

src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/RoleAuthInfoController.java

@@ -40,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -297,7 +298,7 @@ public class RoleAuthInfoController {
 
     @ApiOperation(value = "角色授权申请")
     @PostMapping(value = "role-auth-apply")
-    public Result<Object> roleAuthApply(@RequestBody RoleAuthApplySaveVo saveVo) {
+    public Result<Object> roleAuthApply(@Valid @RequestBody RoleAuthApplySaveVo saveVo) {
         ResponseStatus responseStatus = iRoleAuthInfoFacade.roleAuthApply(saveVo);
         return getResult(responseStatus);
     }