Selaa lähdekoodia

feat: 新增标准鉴权返回

huangzqa 2 vuotta sitten
vanhempi
sitoutus
015f4e792e

+ 5 - 0
dcuc-auth-api/pom.xml

@@ -27,5 +27,10 @@
             <artifactId>dcuc-auth-model</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

+ 2 - 1
dcuc-auth-api/src/main/java/com/dragoninfo/dcuc/auth/auth/facade/IServiceAuthFlowFacade.java

@@ -4,6 +4,7 @@ package com.dragoninfo.dcuc.auth.auth.facade;
 import com.dragoninfo.dcuc.auth.auth.dto.ServiceAuthFlowDTO;
 import com.dragoninfo.dcuc.auth.auth.dto.WorkFlowResutlAcceptDTO;
 import com.dragoninfo.dcuc.auth.auth.entity.ServiceAuthResult;
+import com.dragoninfo.dcuc.auth.auth.vo.ServiceAuthenticationResVO;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -64,7 +65,7 @@ public interface IServiceAuthFlowFacade {
      * @param appToken
      */
     @PostMapping(value = "serviceAuthentication")
-    Object serviceAuthentication(@RequestParam("idcard") String idcard, @RequestParam("appCode") String appCode, @RequestParam(value = "userToken",required = false) String userToken, @RequestParam(value = "appToken",required = false) String appToken);
+    List<ServiceAuthenticationResVO> serviceAuthentication(@RequestParam("idcard") String idcard, @RequestParam("appCode") String appCode, @RequestParam(value = "userToken",required = false) String userToken, @RequestParam(value = "appToken",required = false) String appToken);
 
 
     /**

+ 18 - 0
dcuc-auth-model/src/main/java/com/dragoninfo/dcuc/auth/auth/vo/AuthNoticeReq.java

@@ -0,0 +1,18 @@
+package com.dragoninfo.dcuc.auth.auth.vo;
+
+/**
+ * <p>
+ * 权限通知请求
+ * </p>
+ *
+ * @author huangzqa
+ * @date 2022/8/24
+ */
+public class AuthNoticeReq {
+
+    /**
+     * 用户令牌标识
+     */
+    private String userTokenId;
+
+}

+ 25 - 0
dcuc-auth-model/src/main/java/com/dragoninfo/dcuc/auth/auth/vo/AuthNoticeResp.java

@@ -0,0 +1,25 @@
+package com.dragoninfo.dcuc.auth.auth.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * <p>
+ * 权限通知返回
+ * </p>
+ *
+ * @author huangzqa
+ * @date 2022/8/24
+ */
+public class AuthNoticeResp {
+
+    /**
+     * 状态码
+     */
+    @JsonProperty("status_code")
+    private String statusCode;
+
+    /**
+     * 消息
+     */
+    private String message;
+}

+ 2 - 1
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/facade/ServiceAuthFlowFacade.java

@@ -8,6 +8,7 @@ import com.dragoninfo.dcuc.auth.auth.dto.WorkFlowResutlAcceptDTO;
 import com.dragoninfo.dcuc.auth.auth.entity.ServiceAuthResult;
 import com.dragoninfo.dcuc.auth.auth.service.IServiceAuthResultService;
 import com.dragoninfo.dcuc.auth.auth.service.IWorkFlowService;
+import com.dragoninfo.dcuc.auth.auth.vo.ServiceAuthenticationResVO;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.core.search.Searchable;
@@ -107,7 +108,7 @@ public class ServiceAuthFlowFacade implements IServiceAuthFlowFacade {
      * @param appToken
      */
     @Override
-    public Object serviceAuthentication(String idcard, String appCode, String userToken, String appToken) {
+    public List<ServiceAuthenticationResVO> serviceAuthentication(String idcard, String appCode, String userToken, String appToken) {
         return authResultService.serviceAuthentication(idcard, appCode, userToken, appToken);
     }
 

+ 2 - 1
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/IServiceAuthResultService.java

@@ -4,6 +4,7 @@ package com.dragoninfo.dcuc.auth.auth.service;
 import com.dragoninfo.dcuc.auth.auth.dto.ServiceAuthResultDTO;
 import com.dragoninfo.dcuc.auth.auth.entity.ServiceAuthResult;
 import com.dragoninfo.dcuc.auth.auth.entity.WorkFlow;
+import com.dragoninfo.dcuc.auth.auth.vo.ServiceAuthenticationResVO;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.core.search.Searchable;
 import org.springframework.data.domain.Page;
@@ -75,7 +76,7 @@ public interface IServiceAuthResultService {
      * @param userToken
      * @param appToken
      */
-    Object serviceAuthentication(String idcard, String appCode, String userToken, String appToken);
+    List<ServiceAuthenticationResVO> serviceAuthentication(String idcard, String appCode, String userToken, String appToken);
 
     /**
      * 保存

+ 1 - 1
dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/auth/service/impl/ServiceAuthResultServiceImpl.java

@@ -306,7 +306,7 @@ public class ServiceAuthResultServiceImpl implements IServiceAuthResultService {
      * @param appToken
      */
     @Override
-    public Object serviceAuthentication(String idcard, String appCode, String userToken, String appToken) {
+    public List<ServiceAuthenticationResVO> serviceAuthentication(String idcard, String appCode, String userToken, String appToken) {
 //        String redisKey = DcucConstantsUtil.AUTHENTICATION_SPACE + appCode;
 //        //PermissionUpdateService已存入鉴权结果
 //        Object redisValue = redisTemplate.opsForValue().get(redisKey);

+ 1 - 1
pom.xml

@@ -22,7 +22,7 @@
         <duceap.version>2.1.0-SNAPSHOT</duceap.version>
         <oracle.version>11.2.0.1.0</oracle.version>
         <mysql.version>5.1.49</mysql.version>
-        <lombok.version>1.18.8</lombok.version>
+        <lombok.version>1.18.24</lombok.version>
     </properties>
 
     <dependencyManagement>