refactor: 优化代码结构

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IApproveApiBusiness.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/api/IApproveApiBusiness.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business;
+package com.dragonsoft.dcuc.approve.business.api;
 
 import com.dragonsoft.dcuc.approve.model.req.v3.ZeroTrustApproveCreateReqV3VO;
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ApproveApiBusinessImpl.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/api/impl/ApproveApiBusinessImpl.java

@@ -1,8 +1,8 @@
-package com.dragonsoft.dcuc.approve.business.impl;
+package com.dragonsoft.dcuc.approve.business.api.impl;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
-import com.dragonsoft.dcuc.approve.business.IApproveApiBusiness;
+import com.dragonsoft.dcuc.approve.business.api.IApproveApiBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
 import com.dragonsoft.dcuc.approve.model.req.v3.ZeroTrustApproveCreateReqV3VO;
 import com.dragonsoft.smtools.loader.SMFactory;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IBimBusiness.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/IBimBusiness.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business;
+package com.dragonsoft.dcuc.approve.business.external;
 
 import com.dragonsoft.dcuc.approve.model.resp.bim.ZeroTrustAppTokenInfoRespVO;
 import com.dragonsoft.dcuc.approve.model.resp.bim.ZeroTrustUserTokenInfoRespVO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IBuSyncBusiness.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/IBuSyncBusiness.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business;
+package com.dragonsoft.dcuc.approve.business.external;
 
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.vo.ApprovalInfoMsgItemDTO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IDcucAuthBusiness.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/IDcucAuthBusiness.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business;
+package com.dragonsoft.dcuc.approve.business.external;
 
 import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IDcucBusiness.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/IDcucBusiness.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business;
+package com.dragonsoft.dcuc.approve.business.external;
 
 import com.dragoninfo.dcuc.common.entity.ApiResultPage;
 import com.dragoninfo.dcuc.common.entity.ApiSearchReq;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IQmAuditBusiness.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/IQmAuditBusiness.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business;
+package com.dragonsoft.dcuc.approve.business.external;
 
 import com.dragonsoft.auditlog.collection.qmtj.pojo.req.ApproveRegisterLog;
 import com.dragonsoft.auditlog.collection.qmtj.pojo.resp.BaseResponse;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IUserOrgSyncBusiness.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/IUserOrgSyncBusiness.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business;
+package com.dragonsoft.dcuc.approve.business.external;
 
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/IZeroTrustTokenBusiness.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/IZeroTrustTokenBusiness.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business;
+package com.dragonsoft.dcuc.approve.business.external;
 
 import com.dragonsoft.dcuc.approve.model.req.v1.token.TokenReceiveVO;
 import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustMessageRespVO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/BimBusinessImpl.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/BimBusinessImpl.java

@@ -1,11 +1,10 @@
-package com.dragonsoft.dcuc.approve.business.impl;
+package com.dragonsoft.dcuc.approve.business.external.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.dragoninfo.dcuc.common.utils.LangUtil;
-import com.dragonsoft.dcuc.approve.business.IBimBusiness;
-import com.dragonsoft.dcuc.approve.config.ApproveConfig;
+import com.dragonsoft.dcuc.approve.business.external.IBimBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveBeanConstants;
 import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustBusinessRespEnum;
 import com.dragonsoft.dcuc.approve.model.req.bim.ZeroTrustAppTokenInfoReqVO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/BuSyncBusinessImpl.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/BuSyncBusinessImpl.java

@@ -1,11 +1,11 @@
-package com.dragonsoft.dcuc.approve.business.impl;
+package com.dragonsoft.dcuc.approve.business.external.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
 import com.dragoninfo.dcuc.common.annotation.CacheLock;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
-import com.dragonsoft.dcuc.approve.business.IBuSyncBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IBuSyncBusiness;
 import com.dragonsoft.dcuc.approve.business.INoticeBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
 import com.dragonsoft.dcuc.approve.enumresources.bu.ApproveModeEnum;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/DcucAuthBusinessImpl.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/DcucAuthBusinessImpl.java

@@ -1,9 +1,9 @@
-package com.dragonsoft.dcuc.approve.business.impl;
+package com.dragonsoft.dcuc.approve.business.external.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.dragoninfo.dcuc.common.entity.*;
 import com.dragonsoft.auditlog.collection.qmtj.provider.IRestTemplateProvider;
-import com.dragonsoft.dcuc.approve.business.IDcucAuthBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IDcucAuthBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
 import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/DcucBusinessImpl.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/DcucBusinessImpl.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business.impl;
+package com.dragonsoft.dcuc.approve.business.external.impl;
 
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjectUtil;
@@ -9,7 +9,7 @@ import com.dragoninfo.dcuc.common.entity.ApiResultPage;
 import com.dragoninfo.dcuc.common.entity.ApiSearchReq;
 import com.dragoninfo.dcuc.common.entity.Proofs;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
-import com.dragonsoft.dcuc.approve.business.IDcucBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IDcucBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveBeanConstants;
 import com.dragonsoft.dcuc.approve.model.vo.dcuc.ApiOrgResultVo;
 import com.dragonsoft.dcuc.approve.model.vo.dcuc.ApiPoliceResultVo;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/QmAuditBusinessImpl.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/QmAuditBusinessImpl.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business.impl;
+package com.dragonsoft.dcuc.approve.business.external.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.digest.DigestUtil;
@@ -6,7 +6,7 @@ import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.auditlog.collection.qmtj.LogSendComponent;
 import com.dragonsoft.auditlog.collection.qmtj.pojo.req.ApproveRegisterLog;
 import com.dragonsoft.auditlog.collection.qmtj.pojo.resp.BaseResponse;
-import com.dragonsoft.dcuc.approve.business.IQmAuditBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IQmAuditBusiness;
 import com.dragonsoft.duceap.base.entity.http.ResponseDTO;
 import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import lombok.extern.slf4j.Slf4j;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/UserOrgSyncBusinessImpl.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/UserOrgSyncBusinessImpl.java

@@ -1,4 +1,4 @@
-package com.dragonsoft.dcuc.approve.business.impl;
+package com.dragonsoft.dcuc.approve.business.external.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
@@ -9,8 +9,8 @@ import com.dragoninfo.dcuc.common.entity.ApiResultPage;
 import com.dragoninfo.dcuc.common.entity.ApiSearchReq;
 import com.dragoninfo.dcuc.common.entity.SearchParam;
 import com.dragonsoft.dcuc.approve.business.ICacheBusiness;
-import com.dragonsoft.dcuc.approve.business.IDcucBusiness;
-import com.dragonsoft.dcuc.approve.business.IUserOrgSyncBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IDcucBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IUserOrgSyncBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveLockConstants;
 import com.dragonsoft.dcuc.approve.model.ApproveOrgInfo;
 import com.dragonsoft.dcuc.approve.model.ApproveUserInfo;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ZeroTrustTokenBusinessiImpl.java → approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/external/impl/ZeroTrustTokenBusinessImpl.java

@@ -1,7 +1,7 @@
-package com.dragonsoft.dcuc.approve.business.impl;
+package com.dragonsoft.dcuc.approve.business.external.impl;
 
 import com.dragonsoft.dcuc.approve.business.ICacheBusiness;
-import com.dragonsoft.dcuc.approve.business.IZeroTrustTokenBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IZeroTrustTokenBusiness;
 import com.dragonsoft.dcuc.approve.dto.zerotrust.AppTokenInfoDTO;
 import com.dragonsoft.dcuc.approve.dto.zerotrust.UserTokenInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustBusinessRespEnum;
@@ -9,6 +9,7 @@ import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustTokenTypeEnum;
 import com.dragonsoft.dcuc.approve.model.req.v1.token.TokenReceiveVO;
 import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustMessageRespVO;
 import com.dragonsoft.smtools.loader.SMFactory;
+import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.SneakyThrows;
@@ -22,7 +23,7 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
-public class ZeroTrustTokenBusinessiImpl implements IZeroTrustTokenBusiness {
+public class ZeroTrustTokenBusinessImpl implements IZeroTrustTokenBusiness {
 
     private ICacheBusiness cacheBusiness;
 
@@ -38,7 +39,7 @@ public class ZeroTrustTokenBusinessiImpl implements IZeroTrustTokenBusiness {
         this.cacheBusiness = cacheBusiness;
     }
 
-    @SneakyThrows
+    @SneakyThrows({JsonParseException.class, JsonProcessingException.class})
     @Override
     public ZeroTrustMessageRespVO tokenReceive(TokenReceiveVO receiveVo) {
         // 校验请求签名

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ApproveBusinessImpl.java

@@ -11,7 +11,7 @@ import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.approve.common.ErrorCode;
 import com.dragonsoft.dcuc.approve.business.IApproveBaseBusiness;
 import com.dragonsoft.dcuc.approve.business.IApproveBusiness;
-import com.dragonsoft.dcuc.approve.business.IDcucAuthBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IDcucAuthBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
 import com.dragonsoft.dcuc.approve.dto.ContentRespDTO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ApproveLogBusinessImpl.java

@@ -12,7 +12,7 @@ import com.dragoninfo.dcuc.duceap.enums.OperateDisposeTypeEnum;
 import com.dragoninfo.dcuc.duceap.enums.RequestDisposeTypeEnum;
 import com.dragoninfo.dcuc.duceap.enums.SchemeTypeEnum;
 import com.dragonsoft.dcuc.approve.business.IApproveLogBusiness;
-import com.dragonsoft.dcuc.approve.business.IDcucBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IDcucBusiness;
 import com.dragonsoft.dcuc.approve.business.IRiskBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
 import com.dragonsoft.dcuc.approve.dto.ApproveLogDTO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/business/impl/ApproveTaskBusinessImpl.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.dragoninfo.dcuc.common.utils.DcucBeanUtil;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.dcuc.approve.business.IApproveTaskBusiness;
-import com.dragonsoft.dcuc.approve.business.IBimBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IBimBusiness;
 import com.dragonsoft.dcuc.approve.model.ApproveRecordInfo;
 import com.dragonsoft.dcuc.approve.model.ApproveTaskClass;
 import com.dragonsoft.dcuc.approve.model.resp.bim.ZeroTrustUserTokenInfoRespVO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/event/listener/SyncToBuSendFinalResultListener.java

@@ -1,7 +1,7 @@
 package com.dragonsoft.dcuc.approve.event.listener;
 
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
-import com.dragonsoft.dcuc.approve.business.IBuSyncBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IBuSyncBusiness;
 import com.dragonsoft.dcuc.approve.enumresources.ApproveWorkFlowOperationEnum;
 import com.dragonsoft.dcuc.approve.event.event.ApproveFinalResultEvent;
 import com.dragonsoft.dcuc.approve.model.vo.ApprovalInfoMsgItemDTO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/ApproveFacade.java

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragonsoft.dcuc.approve.business.IApproveTipsBusiness;
-import com.dragonsoft.dcuc.approve.business.IDcucAuthBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IDcucAuthBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
 import com.dragonsoft.dcuc.approve.dto.OperateReqDTO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/ApproveOrgFacade.java

@@ -1,6 +1,6 @@
 package com.dragonsoft.dcuc.approve.facade;
 
-import com.dragonsoft.dcuc.approve.business.IUserOrgSyncBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IUserOrgSyncBusiness;
 import com.dragonsoft.dcuc.approve.model.resp.ApproveOrgInfoRespVO;
 import com.dragonsoft.dcuc.approve.service.IApproveOrgInfoService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/ApproveUserFacade.java

@@ -1,6 +1,6 @@
 package com.dragonsoft.dcuc.approve.facade;
 
-import com.dragonsoft.dcuc.approve.business.IUserOrgSyncBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IUserOrgSyncBusiness;
 import com.dragonsoft.dcuc.approve.model.resp.ApproveUserInfoRespVO;
 import com.dragonsoft.dcuc.approve.service.IApproveUserInfoService;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/OpsFacade.java

@@ -1,7 +1,7 @@
 package com.dragonsoft.dcuc.approve.facade;
 
 import com.dragonsoft.dcuc.approve.business.IApproveExpirationBusiness;
-import com.dragonsoft.dcuc.approve.business.IBuSyncBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IBuSyncBusiness;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/api/ApiV1TokenFacade.java

@@ -1,6 +1,6 @@
 package com.dragonsoft.dcuc.approve.facade.api;
 
-import com.dragonsoft.dcuc.approve.business.IZeroTrustTokenBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IZeroTrustTokenBusiness;
 import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustBusinessRespEnum;
 import com.dragonsoft.dcuc.approve.model.req.v1.token.TokenReceiveVO;
 import com.dragonsoft.dcuc.approve.model.resp.v3.ZeroTrustMessageRespVO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/api/ApiV2ApproveFacade.java

@@ -9,7 +9,7 @@ import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragoninfo.dcuc.common.utils.SearchableUtil;
 import com.dragoninfo.dcuc.duceap.enums.ManageDisposeTypeEnum;
 import com.dragonsoft.dcuc.approve.business.IApproveBusiness;
-import com.dragonsoft.dcuc.approve.business.IDcucBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IDcucBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
 import com.dragonsoft.dcuc.approve.dto.OperateReqDTO;
 import com.dragonsoft.dcuc.approve.enumresources.*;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/api/v3/ApiV3ApproveFacade.java

@@ -7,9 +7,9 @@ import com.dragoninfo.dcuc.common.entity.Proofs;
 import com.dragoninfo.dcuc.common.utils.LangUtil;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragoninfo.dcuc.duceap.enums.ManageDisposeTypeEnum;
-import com.dragonsoft.dcuc.approve.business.IApproveApiBusiness;
-import com.dragonsoft.dcuc.approve.business.IBimBusiness;
-import com.dragonsoft.dcuc.approve.business.IDcucBusiness;
+import com.dragonsoft.dcuc.approve.business.api.IApproveApiBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IBimBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IDcucBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
 import com.dragonsoft.dcuc.approve.business.api.IApiV3ApproveBusiness;
 import com.dragonsoft.dcuc.approve.dto.OperateReqDTO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/facade/api/v3/ApiV3SecurityPolicyFacade.java

@@ -1,6 +1,5 @@
 package com.dragonsoft.dcuc.approve.facade.api.v3;
 
-import com.dragonsoft.dcuc.approve.business.IApproveApiBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveBeanConstants;
 import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustBusinessRespEnum;
 import com.dragonsoft.dcuc.approve.model.req.v3.rzy.RzyRiskInfoDetailReqVO;

approve-core-service/src/main/java/com/dragonsoft/dcuc/approve/service/impl/ApproveServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
 import com.dragoninfo.dcuc.duceap.enums.ManageDisposeTypeEnum;
 import com.dragonsoft.dcuc.approve.business.*;
+import com.dragonsoft.dcuc.approve.business.external.IDcucAuthBusiness;
 import com.dragonsoft.dcuc.approve.constants.ApproveConstants;
 import com.dragonsoft.dcuc.approve.dto.BaseOperateReqDTO;
 import com.dragonsoft.dcuc.approve.dto.ContentRespDTO;

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/business/impl/ApproveApiBusinessImplTest.java

@@ -1,6 +1,7 @@
 package com.dragonsoft.dcuc.approve.business.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.dragonsoft.dcuc.approve.business.api.impl.ApproveApiBusinessImpl;
 import com.dragonsoft.dcuc.approve.model.req.v3.ZeroTrustApproveCreateReqV3VO;
 import com.dragonsoft.smtools.enums.SmTypeEunm;
 import com.dragonsoft.smtools.loader.SMFactory;

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/business/impl/BimBusinessImplTest.java

@@ -1,6 +1,7 @@
 package com.dragonsoft.dcuc.approve.business.impl;
 
 import com.dragoninfo.dcuc.common.http.SkipSslVerificationHttpRequestFactory;
+import com.dragonsoft.dcuc.approve.business.external.impl.BimBusinessImpl;
 import com.dragonsoft.dcuc.approve.model.resp.bim.ZeroTrustAppItemUserTokenInfoRespVO;
 import com.dragonsoft.dcuc.approve.model.resp.bim.ZeroTrustAppTokenInfoRespVO;
 import com.dragonsoft.dcuc.approve.model.resp.bim.ZeroTrustUserTokenInfoRespVO;
@@ -10,10 +11,10 @@ import com.dragonsoft.smtools.loader.SMFactory;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dreamhead.moco.HttpServer;
-import com.github.dreamhead.moco.junit.MocoJunitRunner;
+import com.github.dreamhead.moco.Runner;
+import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.springframework.web.client.RestTemplate;
 
@@ -32,20 +33,29 @@ import static com.github.dreamhead.moco.Moco.*;
  */
 public class BimBusinessImplTest {
 
+//
+//    public static void main(String[] args) {
+//        try {
+//            BimBusinessImplTest.before();
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//    }
 
-    HttpServer httpServer = httpServer(19000, log());
-    @Rule
-    public MocoJunitRunner mocoJunitRunner = MocoJunitRunner.httpRunner(httpServer);
+    public static Runner runner;
 
 
     static String identityUrl = "http://127.0.0.1:19000";
-    static String appInfoUrl = "/idp/rest/getAppTokenInfo";
+//    static String appInfoUrl = "/idp/rest/getAppTokenInfo";
+    static String appInfoUrl = "/idp/rest/testGetAppTokenInfo";
+
     static String userInfoUrl = "/idp/rest/getUserTokenInfo";
 
     static BimBusinessImpl bimBusiness;
 
-    @Before
-    public void before() throws Exception {
+    @BeforeClass
+    public static void before() throws Exception {
+        HttpServer httpServer = httpServer(19000, log());
 
         httpServer.request(by(uri(appInfoUrl)))
                 .response(pathResource("bim/getAppTokenInfo.json"));
@@ -54,6 +64,11 @@ public class BimBusinessImplTest {
         httpServer.request(by(uri(userInfoUrl)))
                 .response(pathResource("bim/getUserTokenInfo.json"));
 
+
+        runner = Runner.runner(httpServer);
+
+        runner.start();
+
         SkipSslVerificationHttpRequestFactory skipSslVerificationHttpRequestFactory
                 = new SkipSslVerificationHttpRequestFactory();
         skipSslVerificationHttpRequestFactory.setReadTimeout(5000);
@@ -75,6 +90,10 @@ public class BimBusinessImplTest {
         bimBusiness.setSmFactory(smFactory);
     }
 
+    @AfterClass
+    public static void stop() {
+        runner.stop();
+    }
 
     @Test
     public void getUserTokenInfo() {

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/business/impl/BuSyncBusinessImplTest.java

@@ -3,15 +3,13 @@ package com.dragonsoft.dcuc.approve.business.impl;
 
 import com.dragoninfo.dcuc.common.http.SkipSslVerificationHttpRequestFactory;
 import com.dragoninfo.dcuc.common.utils.ResponseUtil;
+import com.dragonsoft.dcuc.approve.business.external.impl.BuSyncBusinessImpl;
 import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncBizApproveReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncBizDataReqVO;
 import com.dragonsoft.dcuc.approve.model.resp.bu.BuApproveSyncReqVO;
 import com.dragonsoft.dcuc.approve.properties.ApproveBuProperties;
-import com.dragonsoft.dcuc.approve.properties.BimProperties;
 import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.commons.util.UUIDUtils;
-import com.dragonsoft.smtools.enums.SmTypeEunm;
-import com.dragonsoft.smtools.loader.SMFactory;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.dreamhead.moco.HttpServer;

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/business/impl/DcucAuthBusinessImplTest.java

@@ -1,10 +1,9 @@
 package com.dragonsoft.dcuc.approve.business.impl;
 
-import com.dragonsoft.dcuc.approve.business.impl.DcucAuthBusinessImpl;
+import com.dragonsoft.dcuc.approve.business.external.impl.DcucAuthBusinessImpl;
 import com.dragonsoft.dcuc.approve.dto.ResourceInfoDTO;
 import com.dragonsoft.dcuc.approve.enumresources.FlowTypeEnum;
 import com.dragonsoft.dcuc.approve.enumresources.ListLevelEnum;
-import com.dragonsoft.dcuc.approve.model.resp.ResourceInfoRespVO;
 import com.dragonsoft.dcuc.approve.model.resp.OperateRespVO;
 import org.junit.Assert;
 import org.junit.Test;

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/business/impl/DcucBusinessImplTest.java

@@ -3,6 +3,7 @@ package com.dragonsoft.dcuc.approve.business.impl;
 import com.dragoninfo.dcuc.common.entity.ApiResultPage;
 import com.dragoninfo.dcuc.common.entity.ApiSearchReq;
 import com.dragoninfo.dcuc.common.http.SkipSslVerificationHttpRequestFactory;
+import com.dragonsoft.dcuc.approve.business.external.impl.DcucBusinessImpl;
 import com.dragonsoft.dcuc.approve.model.vo.dcuc.ApiOrgResultVo;
 import com.dragonsoft.dcuc.approve.model.vo.dcuc.ApiPoliceResultVo;
 import com.dragonsoft.dcuc.approve.properties.ApproveProperties;

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/business/impl/UserOrgSyncBusinessImplTest.java

@@ -1,10 +1,9 @@
 package com.dragonsoft.dcuc.approve.business.impl;
 
+import com.dragonsoft.dcuc.approve.business.external.impl.UserOrgSyncBusinessImpl;
 import org.junit.Assert;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * <p>
  *

approve-core-service/src/test/java/com/dragonsoft/dcuc/approve/facade/api/ApiV3ApproveFacadeTest.java

@@ -1,6 +1,6 @@
 package com.dragonsoft.dcuc.approve.facade.api;
 
-import com.dragonsoft.dcuc.approve.business.IBimBusiness;
+import com.dragonsoft.dcuc.approve.business.external.IBimBusiness;
 import com.dragonsoft.dcuc.approve.business.IWorkFlowBusiness;
 import com.dragonsoft.dcuc.approve.enumresources.ZeroTrustBusinessRespEnum;
 import com.dragonsoft.dcuc.approve.facade.api.v3.ApiV3ApproveFacade;