Merge branch 'fix-修改依赖-chenbh' into 'release/v1.2.0'

Fix 修改依赖 chenbh

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

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

@@ -49,6 +49,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
         registry.addInterceptor(getAuthBeforeResInterceptor())
                 .addPathPatterns("/api/auth-service/**")
                 .addPathPatterns("/api/app-service/**")
+                .excludePathPatterns("/api/auth-service/v1/approval/call-back")
                 .excludePathPatterns("/api/auth-service/v1/apps/authentication")
                 .excludePathPatterns("/api/auth-service/v4/**");
 

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

@@ -0,0 +1,26 @@
+package com.dragoninfo.dcuc.authweb.restcontroller.api.controller.api.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/login/DcucLoginController.java

@@ -12,6 +12,7 @@ import com.dragoninfo.dcuc.common.enums.UserExtInfoEnum;
 import com.dragonsoft.duceap.base.entity.security.SecurityRight;
 import com.dragonsoft.duceap.base.entity.security.SecurityUser;
 import com.dragonsoft.duceap.base.utils.UserContextUtils;
+import com.dragonsoft.duceap.commons.util.UUIDUtils;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import com.dragonsoft.duceap.commons.util.string.StringUtils;
@@ -70,6 +71,8 @@ public class DcucLoginController {
             securityUser.setSecurityRightList(authmenu);
 
             Map<String, Object> map = new HashMap<>(UserExtInfoEnum.values().length);
+//            map.put(UserExtInfoEnum.USER_TOKEN_ID.getValue(), UUIDUtils.getUUID());
+//            map.put(UserExtInfoEnum.APP_TOKEN_ID.getValue(), UUIDUtils.getUUID());
             map.put(UserExtInfoEnum.USER_TOKEN_ID.getValue(), userToken);
             map.put(UserExtInfoEnum.APP_TOKEN_ID.getValue(), appToken);
             securityUser.setExtendtions(map);

src/main/resources/application-base.yml

@@ -35,7 +35,7 @@ management:
 duceap:
   swagger:
     enabled: true
-    package-path: com.dragoninfo.dcuc.authweb.restcontroller.auth
+    package-path: com.dragoninfo.dcuc.authweb.restcontroller.auth,com.dragoninfo.dcuc.authweb.restcontroller.statistics
   license:
     #配置用来指定license对接的后端项目地址(格式：ip:port/context，如http://10.10.10.10:8080/ctx)，
     #默认使用HttpServletRequest.getLocalAddr()方法获取ip地址，
@@ -46,16 +46,16 @@ duceap:
       host: http://10.201.3.20:8070
   security-access:
     jwt:
-      enabled: true
+      enabled: false
       user-token-header-name: userToken
   security:
-    #type: dcuc # 注解掉不开启认证登录
+    type: dcuc # 注解掉不开启认证登录
     dcuc:
-      cas-server-url-prefix: http://192.168.10.2:8877/sso
-      server-name: 10.11.1.25:8871 10.11.1.237:8871
+      cas-server-url-prefix: http://10.201.1.50:8877/sso
+      server-name: 10.11.1.25:8871 10.11.1.237:8871 10.11.0.83:8871 10.11.0.83:8872
       ignore-pattern: '/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/|/auditsvr/|/authsvr/|/codelist/|/swagger-ui.html'
       app-code: QXXT0000000000000001
-      api-url: http://192.168.10.2:8860/dcuc
+      api-url: http://10.201.1.50:8860/dcuc
     dids2:
       appCode: YHZX0000000000000001
       SSOLoginUrl: http://192.168.6.128:9995/didsserver/login