mazq 1 год назад
Родитель
Сommit
84a84a2440

+ 0 - 26
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/ApprovalApiController.java

@@ -1,26 +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.api.IZeroTrustAuthApplyFacade;
-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 IZeroTrustAuthApplyFacade zeroTrustAuthApplyFacade;
-
-    @PostMapping("call-back")
-    public ZeroTrustMessageRespVO approvalCallBack(@Valid @RequestBody ApprovalCallBackReqVO approvalCallBackReqVO) {
-        return zeroTrustAuthApplyFacade.callBack(approvalCallBackReqVO);
-    }
-
-}

+ 15 - 1
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/AuthApplyApiController.java → src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/api/authservice/v1/controller/zerotrust/AuthApplyApiController.java

@@ -1,13 +1,15 @@
-package com.dragoninfo.dcuc.authweb.restcontroller.api.authservice.v1.controller;
+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;
@@ -41,4 +43,16 @@ public class AuthApplyApiController {
         return zeroTrustAuthApplyFacade.roleAuthApply(reqVo);
     }
 
+    @ApiOperation(value = "服务授权申请")
+    @PostMapping("")
+    public ZeroTrustDataRespVO<AuthApplyRespVo> serviceAuthApply(@Valid @RequestBody ApiServiceAuthReqVo reqVo) {
+        return zeroTrustAuthApplyFacade.serviceAuthApply(reqVo);
+    }
+
+
+    @PostMapping("approval/call-back")
+    public ZeroTrustMessageRespVO approvalCallBack(@Valid @RequestBody ApprovalCallBackReqVO approvalCallBackReqVO) {
+        return zeroTrustAuthApplyFacade.callBack(approvalCallBackReqVO);
+    }
+
 }