GITZYY 1 settimana fa
parent
commit
a88fae7b77
100 ha cambiato i file con 198 aggiunte e 1365 eliminazioni
  1. 0 11
      egress-gateway-service-adapter/src/main/java/adapter/api/Test.java
  2. 0 34
      egress-gateway-service-adapter/src/main/java/adapter/api/controller/ApiController.java
  3. 0 51
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/ApiGatewayService.java
  4. 0 26
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/ApiServiceImpl.java
  5. 0 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/executor/ApiInvokeCmdExe.java
  6. 0 48
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/ApiCustomizeBizHandler.java
  7. 0 142
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/ApiCustomizeRouteService.java
  8. 0 35
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/CodeStrategyCmd.java
  9. 0 2
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/ApiInvokeCmdExe.java
  10. 24 26
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/GenerateCheckIntoHttpApiConfigCmdExe.java
  11. 5 7
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/GenerateCheckIntoHttpApiConfigV2CmdExe.java
  12. 0 19
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/checkInto/CheckCmdExe.java
  13. 0 17
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/route/EndpointRouteService.java
  14. 0 50
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/route/impl/CheckIntoCmd.java
  15. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/constant/BusinessPrefixEnum.java
  16. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/constant/GlobalDataStatusEnum.java
  17. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/constant/ResultCodeEnum.java
  18. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/EgLoanApiConfigInfoDto.java
  19. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/plan/command/EgLoanApiConfigInfoCmd.java
  20. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/plan/command/PlanCmd.java
  21. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserAssetCarInfoCmd.java
  22. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserAssetHouseInfoCmd.java
  23. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserAssetInsuranceInfoCmd.java
  24. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserBaseInfoCmd.java
  25. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserProfessionBusinessOwnerCmd.java
  26. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserProfessionEcommerceOwnersCmd.java
  27. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserProfessionOfficeWorkersCmd.java
  28. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserProfessionSelfEmployedCmd.java
  29. 0 18
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/CustomerDTO.java
  30. 0 6
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/ErrorCode.java
  31. 0 29
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/command/ApiInvokeParamCmd.java
  32. 0 31
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/command/LoanParamCmd.java
  33. 0 18
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/common/LocalEnumDTO.java
  34. 0 21
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/event/CustomerCreatedEvent.java
  35. 0 11
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/event/DomainEventConstant.java
  36. 0 117
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/vo/DataVo.java
  37. 9 1
      egress-gateway-service-domain/pom.xml
  38. 1 0
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/ApiGateway.java
  39. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/KeyValueObject.java
  40. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/ValueObject.java
  41. 0 33
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/common/ApiContext.java
  42. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/func/FunctionObject.java
  43. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/http/HttpApiRequest.java
  44. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/payload/ApiJsonPayloadResolver.java
  45. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/payload/ApiPayloadResolver.java
  46. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/payload/ApiPayloadResolverManage.java
  47. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/BasicTypeValueObjectResolver.java
  48. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/JsonPathValueObjectResolver.java
  49. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/SpelValueObjectResolver.java
  50. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/ValueObjectResolver.java
  51. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/ValueObjectResolverManager.java
  52. 2 2
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/resolver/payload/ApiJsonPayloadResolver.java
  53. 0 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/resolver/result/ApiJsonResultResolver.java
  54. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/BizPreconditions.java
  55. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/HessianUtils.java
  56. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/BusinessServiceEnums.java
  57. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/JoinMethodEnums.java
  58. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/ResultCode.java
  59. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/ServerCodeEnums.java
  60. 0 24
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/utils/GsonUtils.java
  61. 1 4
      egress-gateway-service-infrastructure/pom.xml
  62. 0 2
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/client/http/HttpClient.java
  63. 6 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/client/http/RetryRequestConfig.java
  64. 8 38
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/client/http/RetryRestTemplate.java
  65. 1 1
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/MyMetaObjectHandler.java
  66. 0 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/DiamondConfig.java
  67. 0 114
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/HessianUtils.java
  68. 0 52
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/HttpTemPlateClient.java
  69. 0 69
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/RetryRequestConfig.java
  70. 0 111
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/RetryRestTemplate.java
  71. 1 1
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/exception/ExceptionAdvice.java
  72. 5 8
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/gatewayimpl/ApiGatewayImpl.java
  73. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/LoanDockingApi.java
  74. 4 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/AnHuiHengDaoCreditService.java
  75. 4 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BaiXinShunTaiCreditService.java
  76. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BaiYiJinFuCreditService.java
  77. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BeiJingChongHeCreditService.java
  78. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/CangZhouSuYiRonogCreditService.java
  79. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/CheYouRongCreditService.java
  80. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChengDuYiHeShengCreditService.java
  81. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChengHongHuiCreditService.java
  82. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChongQinDongRunCreditService.java
  83. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChongQingRuiShangXinCreditService.java
  84. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChongQingYiYueCreditService.java
  85. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChuanjinCreditService.java
  86. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeLuoXuanAesCreditService.java
  87. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeLuoXuanCreditService.java
  88. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeZhouXinYiRongCreditService.java
  89. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeZhouXinYiRongV2CreditService.java
  90. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DfrzwCreditService.java
  91. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FangxinwangiCreditService.java
  92. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FuChengCreditService.java
  93. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FuZhouBeiJiuCreditService.java
  94. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FuZhouBeiYinJinRongCreditService.java
  95. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GexinjinfuCreditService.java
  96. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuanZhouPuHuiCreditService.java
  97. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuangDongHaoEnCreditService.java
  98. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuangDongHongZhanCreditService.java
  99. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuangZhouHuaXinCreditService.java
  100. 4 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HamiguaCreditService.java

+ 0 - 11
egress-gateway-service-adapter/src/main/java/adapter/api/Test.java

@@ -1,11 +0,0 @@
-package adapter.api;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: Test
- * @date 2024/9/18 15:11
- */
-public class Test {
-
-}

+ 0 - 34
egress-gateway-service-adapter/src/main/java/adapter/api/controller/ApiController.java

@@ -1,34 +0,0 @@
-package adapter.api.controller;
-
-import com.hrsk.cloud.eg.app.api.ApiGatewayService;
-import com.hrsk.cloud.eg.clinet.dto.data.command.ApiInvokeParamCmd;
-import com.hrsk.pangu.dto.SingleResponse;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: ApiController
- * @date 2024/11/6 13:47
- */
-@RestController
-@RequestMapping("/api/eg")
-public class ApiController {
-
-    @Resource
-     private ApiGatewayService apiGatewayService;
-    /**
-     * @description:  接口
-     * @param:
-     * @return:
-     * @author zhangyy
-     * @date: 2024/8/30 14:34
-     */
-    @RequestMapping("/loans/v1")
-    public SingleResponse loans(ApiInvokeParamCmd apiInvokeParamCmd) {
-        return SingleResponse.of(apiGatewayService.invoke(apiInvokeParamCmd));
-    }
-}

+ 0 - 51
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/ApiGatewayService.java

@@ -1,51 +0,0 @@
-package com.hrsk.cloud.eg.app.api;
-
-
-import com.hrsk.cloud.eg.app.route.EndpointRouteService;
-import com.hrsk.cloud.eg.clinet.dto.data.command.ApiInvokeParamCmd;
-import com.hrsk.cloud.eg.domain.common.constant.BusinessServiceEnums;
-import com.hrsk.cloud.eg.domain.common.constant.egress.EgRouteTypeEnum;
-import com.hrsk.pangu.dto.SingleResponse;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: ApiService
- * @date 2024/11/6 14:07
- */
-@Slf4j
-@Service
-public class ApiGatewayService {
-
-    @Resource
-    private List<EndpointRouteService> endpointRouteServices;
-
-
-
-    /**
-     * @description:  网管寻找对应的服务
-     * @param:
-     * @return:
-     * @author zhangyy
-     * @date: 2024/11/6 16:19
-     */
-  public   SingleResponse invoke(ApiInvokeParamCmd apiInvokeParamCmd){
-    try {
-       if (EgRouteTypeEnum.CHECK_INTO.getCode().equals(apiInvokeParamCmd.getRoute())){
-           Map<String, EndpointRouteService> collect = endpointRouteServices.stream().collect(Collectors.toMap(EndpointRouteService::getRoute, EndpointRouteService -> EndpointRouteService));
-         return   collect.get(apiInvokeParamCmd.getRoute()).apiEndPoint(apiInvokeParamCmd);
-       }
-    }catch (Exception e){
-      log.error("网关错误",e.getMessage());
-    }
-    return SingleResponse.buildFailure(BusinessServiceEnums.FAIL.getCode(), BusinessServiceEnums.FAIL.getMessage());
-  }
-
-}

+ 0 - 26
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/ApiServiceImpl.java

@@ -1,26 +0,0 @@
-package com.hrsk.cloud.eg.app.api;
-
-import com.hrsk.cloud.eg.app.api.executor.ApiInvokeCmdExe;
-import com.hrsk.cloud.eg.client.api.ApiService;
-import com.hrsk.cloud.eg.client.dto.cmd.ApiInvokeCmd;
-import com.hrsk.pangu.dto.SingleResponse;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-/**
- * @author: bianlanzhou
- * @create: 2024-11-09 10:35
- * @description: API服务实现
- **/
-@Service
-public class ApiServiceImpl implements ApiService {
-    @Resource
-    private ApiInvokeCmdExe apiInvokeCmdExe;
-
-    @Override
-    public SingleResponse<String> invoke(ApiInvokeCmd apiInvokeCmd) {
-        String result = apiInvokeCmdExe.execute(apiInvokeCmd);
-        return SingleResponse.of(result);
-    }
-}

+ 0 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/executor/ApiInvokeCmdExe.java

@@ -1,7 +1,6 @@
 package com.hrsk.cloud.eg.app.api.executor;
 
 import com.hrsk.cloud.eg.client.dto.cmd.ApiInvokeCmd;
-import com.hrsk.cloud.eg.domain.api.ApiGateway;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;

+ 0 - 48
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/ApiCustomizeBizHandler.java

@@ -1,48 +0,0 @@
-package com.hrsk.cloud.eg.app.loan.customize;
-
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
-import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: ApiBizHandler
- * @date 2024/9/13 09:34
- */
-@Component
-public class ApiCustomizeBizHandler implements ApplicationContextAware {
-
-    private final Map<ServerCodeEnums, LoanDockingApi> bizHandlerMap = new HashMap<>();
-
-
-    public void putBizHandler(ServerCodeEnums  type, LoanDockingApi handler) {
-        bizHandlerMap.put(type, handler);
-    }
-
-    public LoanDockingApi getBizHandler(ServerCodeEnums type) {
-        LoanDockingApi bizHandler = this.bizHandlerMap.get(type);
-        if (bizHandler == null) {
-            throw new RuntimeException("not.found.BizHandler");
-        }
-        return bizHandler;
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        Map<String, LoanDockingApi> beansOfType = applicationContext.getBeansOfType(LoanDockingApi.class);
-        Collection<LoanDockingApi> services = beansOfType.values();
-        for (LoanDockingApi service : services) {
-            ServerCodeEnums type = service.getType();
-            bizHandlerMap.put(type, service);
-        }
-    }
-
-}

+ 0 - 142
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/ApiCustomizeRouteService.java

@@ -1,142 +0,0 @@
-package com.hrsk.cloud.eg.app.loan.customize;
-
-import com.hrsk.cloud.eg.clinet.dto.data.command.LoanParamCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.JoinMethodEnums;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
-import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl.*;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.Objects;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: ApiRouteService
- * @date 2024/9/13 09:29
- */
-@Slf4j
-@Service
-public class ApiCustomizeRouteService {
-
-    @Resource
-    private EgApiService egApiService;
-
-    @Resource
-    private ApiCustomizeBizHandler apiCustomizeBizHandler;
-
-    @Resource
-    private QingyuCreditService qingyuCreditService;
-
-    @Resource
-    private XinluCreditService xinluCreditService;
-
-    @Resource
-    private OpenApiCreditService openApiCreditService;
-
-    @Resource
-    private QingyuV2CreditService qingyuV2CreditService;
-
-    @Resource
-    private XiangKeDaCreditService xiangKeDaCreditService;
-
-    @Resource
-    private RxkCreditService rxkCreditService;
-
-    @Resource
-    private OpenApiAesCreditService openApiAesCreditService;
-
-    @Resource
-    private HuirongCrmCreditService huirongCrmCreditService;
-
-    @Resource
-    private JinDieV2CreditService jinDieV2CreditService;
-
-    @Resource
-    private JinDieV3CreditService jinDieV3CreditService;
-
-    @Resource
-    private QingyuV3CreditService qingyuV3CreditService;
-
-    @Resource
-    private PubNoCheckCreditService pubNoCheckCreditService;
-
-
-    /**
-     * API 路由
-     *
-     * @param xdProduct
-     * @return
-     */
-    public LoanDockingApi apiRouter(PlanCmd xdProduct) {
-        if (null == xdProduct.getApiId()) return null;
-        EgLoanApiConfigInfoDo apiInfo = egApiService.getApiInfoByRedis(xdProduct.getApiId());
-        LoanDockingApi apiService = null;
-        if (Objects.isNull(apiInfo)&&apiInfo.getNeedCheck()==0){
-             apiService=pubNoCheckCreditService;
-             return apiService;
-        }
-        JoinMethodEnums method = JoinMethodEnums.getByCode(apiInfo.getApiCode());
-        if (null == method) return null;
-        switch (method) {
-            case CRM_QY:
-                apiService = qingyuCreditService;
-                break;
-            case CRM_XL:
-                apiService = xinluCreditService;
-                break;
-            case OPEN_API:
-                apiService = openApiCreditService;
-                break;
-            case CRM_QY_V2:
-                apiService = qingyuV2CreditService;
-                break;
-            case CRM_XKD:
-                apiService = xiangKeDaCreditService;
-                break;
-            case CRM_RXK:
-                apiService = rxkCreditService;
-                break;
-            case HUIRONG_CRM:
-                apiService = huirongCrmCreditService;
-                break;
-            case CRM_EC:
-                break;
-            case CRM_JD:
-                apiService = jinDieV2CreditService;
-                break;
-            case CRM_JDV3:
-                apiService = jinDieV3CreditService;
-                break;
-            case BUSI_API:
-                apiService = apiCustomizeBizHandler.getBizHandler(ServerCodeEnums.map.get(apiInfo.getApiCode()));
-                break;
-            case CRM_QY_V3:
-                apiService = qingyuV3CreditService;
-                break;
-            case OPEN_API_AES:
-                apiService = openApiAesCreditService;
-                break;
-            default:
-                log.error("不支持的对接方式:productId={}", xdProduct.getPlanId());
-        }
-        return apiService;
-    }
-
-    /**
-     * @description:  助贷撞库api
-     * @param:
-     * @return:
-     * @author zhangyy
-     * @date: 2024/9/13 09:59
-     */
-    public DataVo loanCheckInto(LoanParamCmd checkIntoParamCmd){
-        LoanDockingApi loanDockingApi = apiRouter(checkIntoParamCmd.getPlan());
-      return   loanDockingApi.qualityCheck(checkIntoParamCmd.getUser(), checkIntoParamCmd.getPlan(),checkIntoParamCmd.getApiConfigInfo());
-    }
-}

+ 0 - 35
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/CodeStrategyCmd.java

@@ -1,35 +0,0 @@
-package com.hrsk.cloud.eg.app.loan.customize;
-
-import com.hrsk.cloud.eg.app.loan.executor.checkInto.CheckCmdExe;
-import com.hrsk.cloud.eg.clinet.dto.data.command.LoanParamCmd;
-import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.egress.EgressApiEndpointIntegrationModeEnum;
-import com.hrsk.pangu.dto.SingleResponse;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: CodeStrategyCmd
- * @date 2024/11/6 16:14
- */
-@Service
-public class CodeStrategyCmd implements CheckCmdExe {
-
-    @Resource
-    private ApiCustomizeRouteService apiCustomizeRouteService;
-
-    @Override
-    public SingleResponse route(LoanParamCmd checkIntoParamCmd) {
-        DataVo dataVo = apiCustomizeRouteService.loanCheckInto(checkIntoParamCmd);
-        return SingleResponse.of(dataVo);
-    }
-
-    @Override
-    public String getMode() {
-        return EgressApiEndpointIntegrationModeEnum.CUSTOMIZE.getCode();
-    }
-}

+ 0 - 2
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/ApiInvokeCmdExe.java

@@ -1,7 +1,5 @@
 package com.hrsk.cloud.eg.app.loan.executor;
 
-import com.hrsk.cloud.eg.app.api.ApiGatewayService;
-import com.hrsk.cloud.eg.clinet.dto.data.command.ApiInvokeParamCmd;
 import com.hrsk.pangu.dto.SingleResponse;
 import org.springframework.stereotype.Component;
 

+ 24 - 26
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/GenerateCheckIntoHttpApiConfigCmdExe.java

@@ -1,17 +1,15 @@
 package com.hrsk.cloud.eg.app.loan.executor;
 
-import com.alibaba.fastjson2.JSONObject;
-import com.google.common.collect.Lists;
-import com.hrsk.cloud.eg.clinet.constant.BusinessPrefixEnum;
+import com.hrsk.cloud.eg.client.constant.BusinessPrefixEnum;
 import com.hrsk.cloud.eg.domain.api.*;
 import com.hrsk.cloud.eg.domain.api.common.ApiPayloadTypeEnum;
 import com.hrsk.cloud.eg.domain.api.common.ValueObjectTypeEnum;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgApiDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgApiEndpointDo;
-import com.hrsk.cloud.eg.infrastructure.service.EgApiEndpointService;
+import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgressApiDo;
+import com.hrsk.cloud.eg.infrastructure.service.EgApiChannelService;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import lombok.extern.slf4j.Slf4j;
+import net.minidev.json.JSONObject;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
@@ -32,7 +30,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
     private EgApiService egApiService;
 
     @Resource
-    private EgApiEndpointService egApiEndpointService;
+    private EgApiChannelService egApiChannelService;
 
     /**
      * @description:  原始惠融对接api转化
@@ -42,14 +40,14 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
      * @date: 2024/8/29 17:58
      */
     public void  generateHuiRonHuiRonApiConfig(String huiRonApiConfig){
-        EgApiDo egApiDo=new EgApiDo();
+        EgressApiDo egApiDo=new EgressApiDo();
         egApiDo.setApiCode("EG:"+BusinessPrefixEnum.CHECK_INTO_PREFIX.getCode()+":HUIRONG_CRM:9");
         egApiDo.setApiName(BusinessPrefixEnum.CHECK_INTO_PREFIX.getMsg());
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(huiRonApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     /**
@@ -70,7 +68,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createOpenApiRsaCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     /**
@@ -91,7 +89,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createOpenApiAesCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     /** 
@@ -112,7 +110,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createQinYuCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     /**
@@ -129,7 +127,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     /**
@@ -150,7 +148,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createXkdApiCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     /**
@@ -171,7 +169,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createJinDieCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createJinDieCheckIntoBean(String openApiConfig) {
@@ -230,7 +228,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createJinDieCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createJinDieV3CheckIntoBean(String openApiConfig) {
@@ -290,7 +288,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createRxkCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createRxkCheckIntoBean(String openApiConfig) {
@@ -647,7 +645,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHuiZhongCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     /**
@@ -713,7 +711,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createYinHuaCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createYinHuaCheckIntoBean(String openApiConfig) {
@@ -775,7 +773,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHuixinCheckIntoBean(threeSystemConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createHuixinCheckIntoBean(String threeSystemConfig) {
@@ -844,7 +842,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHuiZhongCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     /**
@@ -911,7 +909,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createYuKuaiHuaCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createYuKuaiHuaCheckIntoBean(String openApiConfig) {
@@ -970,7 +968,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createYinJieCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createYinJieCheckIntoBean(String openApiConfig) {
@@ -1033,7 +1031,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createYouRonCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createYouRonCheckIntoBean(String openApiConfig) {
@@ -1093,7 +1091,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHamiguaCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createHamiguaCheckIntoBean(String openApiConfig) {
@@ -1159,7 +1157,7 @@ public class GenerateCheckIntoHttpApiConfigCmdExe {
         egApiEndpointDo.setApiId(egApiDo.getId());
        
         egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHaohanwuyinCheckIntoBean(openApiConfig)));
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createHaohanwuyinCheckIntoBean(String openApiConfig) {

+ 5 - 7
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/GenerateCheckIntoHttpApiConfigV2CmdExe.java

@@ -2,14 +2,12 @@ package com.hrsk.cloud.eg.app.loan.executor;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.google.common.collect.Lists;
-import com.hrsk.cloud.eg.clinet.constant.BusinessPrefixEnum;
+import com.hrsk.cloud.eg.client.constant.BusinessPrefixEnum;
 import com.hrsk.cloud.eg.domain.api.HttpApiConfig;
 import com.hrsk.cloud.eg.domain.api.KeyValueObject;
 import com.hrsk.cloud.eg.domain.api.common.ApiPayloadTypeEnum;
 import com.hrsk.cloud.eg.domain.api.common.ValueObjectTypeEnum;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgApiDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgApiEndpointDo;
-import com.hrsk.cloud.eg.infrastructure.service.EgApiEndpointService;
+import com.hrsk.cloud.eg.infrastructure.service.EgApiChannelService;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -30,7 +28,7 @@ public class GenerateCheckIntoHttpApiConfigV2CmdExe {
     private EgApiService egApiService;
 
     @Resource
-    private EgApiEndpointService egApiEndpointService;
+    private EgApiChannelService egApiChannelService;
     /**
      * @description:  灏瀚无崟
      * @author zhangyy
@@ -45,7 +43,7 @@ public class GenerateCheckIntoHttpApiConfigV2CmdExe {
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createGexinjinfuCheckIntoBean(String openApiConfig) {
@@ -111,7 +109,7 @@ public class GenerateCheckIntoHttpApiConfigV2CmdExe {
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointService.save(egApiEndpointDo);
+        egApiChannelService.save(egApiEndpointDo);
     }
 
     private HttpApiConfig createKuaiyidaiCheckIntoBean(String openApiConfig) {

+ 0 - 19
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/checkInto/CheckCmdExe.java

@@ -1,19 +0,0 @@
-package com.hrsk.cloud.eg.app.loan.executor.checkInto;
-
-import com.hrsk.cloud.eg.clinet.dto.data.command.LoanParamCmd;
-import com.hrsk.pangu.dto.SingleResponse;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: CheckCmdExe 撞库
- * @date 2024/11/6 15:28
- */
-public interface CheckCmdExe {
-
-
-    SingleResponse route(LoanParamCmd apiInvokeParamCmd);
-
-    String getMode();
-
-}

+ 0 - 17
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/route/EndpointRouteService.java

@@ -1,17 +0,0 @@
-package com.hrsk.cloud.eg.app.route;
-
-import com.hrsk.cloud.eg.clinet.dto.data.command.ApiInvokeParamCmd;
-import com.hrsk.pangu.dto.SingleResponse;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: EndpointService
- * @date 2024/11/6 16:26
- */
-public interface EndpointRouteService {
-
-    SingleResponse apiEndPoint(ApiInvokeParamCmd apiInvokeParamCmd);
-
-    String getRoute();
-}

+ 0 - 50
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/route/impl/CheckIntoCmd.java

@@ -1,50 +0,0 @@
-package com.hrsk.cloud.eg.app.route.impl;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.app.loan.executor.checkInto.CheckCmdExe;
-import com.hrsk.cloud.eg.app.route.EndpointRouteService;
-import com.hrsk.cloud.eg.clinet.dto.data.command.ApiInvokeParamCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.command.LoanParamCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.domain.common.constant.egress.EgRouteTypeEnum;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.utils.BeanCopyUtils;
-import com.hrsk.pangu.dto.SingleResponse;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: CheckIntoCmd
- * @date 2024/11/6 16:29
- */
-@Service
-public class CheckIntoCmd implements EndpointRouteService {
-
-    @Resource
-    private EgApiService egApiService;
-
-    @Resource
-    private List<CheckCmdExe> checkCmdExeList;
-
-    @Override
-    public SingleResponse apiEndPoint(ApiInvokeParamCmd apiInvokeParamCmd) {
-        LoanParamCmd checkIntoParamCmd = JSONObject.parseObject(apiInvokeParamCmd.getParam().toString(), LoanParamCmd.class);
-        EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(checkIntoParamCmd.getPlan().getApiId());
-        EgLoanApiConfigInfoCmd configCmd = BeanCopyUtils.copy(loanApiConfigInfo, EgLoanApiConfigInfoCmd.class);
-        Map<String, CheckCmdExe> collect = checkCmdExeList.stream().collect(Collectors.toMap(CheckCmdExe::getMode, CheckCmdExe -> CheckCmdExe));
-
-        return   collect.get(loanApiConfigInfo.getIntegrationMode()).route(checkIntoParamCmd);
-    }
-
-    @Override
-    public String getRoute() {
-        return EgRouteTypeEnum.CHECK_INTO.getCode();
-    }
-}

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/constant/BusinessPrefixEnum.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/constant/BusinessPrefixEnum.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.constant;
+package com.hrsk.cloud.eg.client.constant;
 
 /**
  * @description: BusinessPrefixEnum 

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/constant/GlobalDataStatusEnum.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/constant/GlobalDataStatusEnum.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.constant;
+package com.hrsk.cloud.eg.client.constant;
 
 /**
  * @author zhangyy

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/constant/ResultCodeEnum.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/constant/ResultCodeEnum.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.constant;
+package com.hrsk.cloud.eg.client.constant;
 
 public enum ResultCodeEnum {
     // 全局

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/EgLoanApiConfigInfoDto.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/EgLoanApiConfigInfoDto.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data;
+package com.hrsk.cloud.eg.client.dto;
 
 import lombok.Data;
 

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/plan/command/EgLoanApiConfigInfoCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/plan/command/EgLoanApiConfigInfoCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.plan.command;
+package com.hrsk.cloud.eg.client.dto.plan.command;
 
 import lombok.Data;
 

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/plan/command/PlanCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/plan/command/PlanCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.plan.command;
+package com.hrsk.cloud.eg.client.dto.plan.command;
 
 import lombok.Data;
 import java.io.Serializable;

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserAssetCarInfoCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserAssetCarInfoCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.user.command;
+package com.hrsk.cloud.eg.client.dto.user.command;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserAssetHouseInfoCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserAssetHouseInfoCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.user.command;
+package com.hrsk.cloud.eg.client.dto.user.command;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserAssetInsuranceInfoCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserAssetInsuranceInfoCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.user.command;
+package com.hrsk.cloud.eg.client.dto.user.command;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserBaseInfoCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserBaseInfoCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.user.command;
+package com.hrsk.cloud.eg.client.dto.user.command;
 
 import lombok.Data;
 

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserProfessionBusinessOwnerCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserProfessionBusinessOwnerCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.user.command;
+package com.hrsk.cloud.eg.client.dto.user.command;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserProfessionEcommerceOwnersCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserProfessionEcommerceOwnersCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.user.command;
+package com.hrsk.cloud.eg.client.dto.user.command;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserProfessionOfficeWorkersCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserProfessionOfficeWorkersCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.user.command;
+package com.hrsk.cloud.eg.client.dto.user.command;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 1 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserProfessionSelfEmployedCmd.java → egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/client/dto/user/command/UserProfessionSelfEmployedCmd.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.clinet.dto.data.user.command;
+package com.hrsk.cloud.eg.client.dto.user.command;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 0 - 18
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/CustomerDTO.java

@@ -1,18 +0,0 @@
-package com.hrsk.cloud.eg.clinet.dto.data;
-
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-
-
-@Data
-public class CustomerDTO{
-    private String customerId;
-    private String memberId;
-    private String customerName;
-    private String customerType;
-    @NotEmpty
-    private String companyName;
-    @NotEmpty
-    private String source;
-}

+ 0 - 6
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/ErrorCode.java

@@ -1,6 +0,0 @@
-package com.hrsk.cloud.eg.clinet.dto.data;
-
-
-public class ErrorCode {
-    public static final String B_CUSTOMER_companyNameConflict = "B_CUSTOMER_companyNameConflict";
-}

+ 0 - 29
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/command/ApiInvokeParamCmd.java

@@ -1,29 +0,0 @@
-package com.hrsk.cloud.eg.clinet.dto.data.command;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: ApiParamCmd
- * @date 2024/11/6 13:56
- */
-@Data
-public class ApiInvokeParamCmd  implements Serializable {
-
-    /** 
-     * 定义的路由类型
-     */ 
-    private String route;
-
-
-    /**
-     * 参数
-     */
-    private Object param;
-
-
-}

+ 0 - 31
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/command/LoanParamCmd.java

@@ -1,31 +0,0 @@
-package com.hrsk.cloud.eg.clinet.dto.data.command;
-
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: CheckIntoParamDto
- * @date 2024/8/30 09:52
- */
-@Data
-public class LoanParamCmd implements Serializable {
-    /**
-     * 用户信息
-     * */
-    private UserBaseInfoCmd user;
-    /**
-     * 推广计划信息
-     * */
-    private PlanCmd plan;
-
-    /**
-     * api信息配置
-     */
-    private EgLoanApiConfigInfoCmd apiConfigInfo;
-}

+ 0 - 18
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/common/LocalEnumDTO.java

@@ -1,18 +0,0 @@
-package com.hrsk.cloud.eg.clinet.dto.data.common;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: LocalEnumDto
- * @date 2024/9/24 11:53
- */
-@Data
-public class LocalEnumDTO implements Serializable {
-
-    private String code;
-    private String msg;
-}

+ 0 - 21
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/event/CustomerCreatedEvent.java

@@ -1,21 +0,0 @@
-package com.hrsk.cloud.eg.clinet.dto.event;
-
-/**
- * CustomerCreatedEvent
- *
- * @author Frank Zhang
- * @date 2019-01-04 10:32 AM
- */
-public class CustomerCreatedEvent{
-
-    private String customerId;
-
-    public String getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(String customerId) {
-        this.customerId = customerId;
-    }
-
-}

+ 0 - 11
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/event/DomainEventConstant.java

@@ -1,11 +0,0 @@
-package com.hrsk.cloud.eg.clinet.dto.event;
-
-/**
- * @author niexiaolong
- * @date 2019/4/16
- */
-public class DomainEventConstant {
-
-	public static final String CUSTOMER_CREATED_TOPIC = "CRM_CUSTOMER_CREATED_DOMAIN_EVENT_TOPIC";
-
-}

+ 0 - 117
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/vo/DataVo.java

@@ -1,117 +0,0 @@
-package com.hrsk.cloud.eg.clinet.vo;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class DataVo<T> implements Serializable {
-    private Integer status;
-    private String msg;
-    private T data;
-
-    public DataVo(Integer status, String msg) {
-        this.status = status;
-        this.msg = msg;
-    }
-
-    public DataVo() {
-    }
-
-    public DataVo(Integer status, String msg, T data) {
-        this.status = status;
-        this.msg = msg;
-        this.data = data;
-    }
-
-    public static <T> DataVo<T> dataVo(Integer status, String msg, T data) {
-        return createDefaulDataVo(status, msg, data);
-    }
-
-    public static <T> DataVo<T> success(String msg, T data) {
-        return createDefaulDataVo(0, msg, data);
-    }
-
-    public static <T> DataVo<T> success(Integer status, String msg, T data) {
-        return createDefaulDataVo(status, msg, data);
-    }
-
-    public static <T> DataVo<T> fail(String msg, T data) {
-        return createDefaulDataVo(1, msg, data);
-    }
-
-    public static <T> DataVo<T> fail(Integer status, String msg, T data) {
-        return createDefaulDataVo(status, msg, data);
-    }
-
-    public static <T> DataVo<T> createDefaulDataVo(Integer code, String message, T data) {
-        DataVo<T> responseVo = new DataVo();
-        if (code != null) {
-            responseVo.setStatus(code);
-        }
-
-        if (!Objects.isNull(message)) {
-            responseVo.setMsg(message);
-        }
-
-        if (data != null) {
-            responseVo.setData(data);
-        }
-
-        return responseVo;
-    }
-
-    public static DataVo timeout(String msg) {
-        return new DataVo(2, msg);
-    }
-
-    public static <T> DataVo<T> timeout(T data, String msg) {
-        return new DataVo(2, msg, data);
-    }
-
-    public static DataVo success() {
-        return new DataVo(0, "撞库成功");
-    }
-
-    public static DataVo success(String msg) {
-        return new DataVo(0, msg);
-    }
-
-    public static DataVo success(Integer status, String msg) {
-        return new DataVo(status, msg);
-    }
-
-    public static DataVo success(Integer status) {
-        return new DataVo(status, "成功");
-    }
-
-    public static DataVo fail() {
-        return new DataVo(1, "撞库失败");
-    }
-
-    public static DataVo fail(String msg) {
-        return new DataVo(1, msg + "撞库失败");
-    }
-
-    public Integer getStatus() {
-        return this.status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getMsg() {
-        return this.msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public T getData() {
-        return this.data;
-    }
-
-    public void setData(T data) {
-        this.data = data;
-    }
-}

+ 9 - 1
egress-gateway-service-domain/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.hrsk.cloud</groupId>
         <artifactId>egress-gateway-service</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>egress-gateway-service-domain</artifactId>
@@ -57,5 +57,13 @@
             <groupId>com.ibeetl</groupId>
             <artifactId>beetl</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.caucho</groupId>
+            <artifactId>hessian</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+        </dependency>
     </dependencies>
 </project>

+ 1 - 0
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/ApiGateway.java

@@ -1,5 +1,6 @@
 package com.hrsk.cloud.eg.domain.api;
 
+
 import com.hrsk.cloud.eg.client.dto.cmd.ApiInvokeCmd;
 
 /**

+ 1 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/KeyValueObject.java

@@ -1,6 +1,6 @@
 package com.hrsk.cloud.eg.domain.api;
 
-import com.hrsk.cloud.eg.domain.common.utils.BizPreconditions;
+import com.hrsk.cloud.eg.domain.common.BizPreconditions;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;

+ 1 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/ValueObject.java

@@ -1,7 +1,7 @@
 package com.hrsk.cloud.eg.domain.api;
 
 import com.hrsk.cloud.eg.domain.api.resolver.vo.ValueObjectResolverManager;
-import com.hrsk.cloud.eg.domain.common.utils.BizPreconditions;
+import com.hrsk.cloud.eg.domain.common.BizPreconditions;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

+ 0 - 33
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/common/ApiContext.java

@@ -1,33 +0,0 @@
-package com.hrsk.cloud.eg.domain.api.channel.guide.common;
-
-import lombok.Getter;
-import lombok.experimental.Accessors;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-
-import java.util.Map;
-
-/**
- * @author: bianlanzhou
- * @create: 2024-07-31 11:48
- * @description: API上下文
- **/
-@Getter
-@Accessors(chain = true)
-public class ApiContext {
-    /**
-     * 入参
-     */
-    private final Map<String,Object> data;
-    /**
-     * spel context
-     */
-    private final StandardEvaluationContext spelContext = new StandardEvaluationContext();
-    /**
-     * 构造函数
-     * @param data 入参
-     */
-    public ApiContext(Map<String,Object> data) {
-        this.data = data;
-        spelContext.setVariable("data",data);
-    }
-}

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/func/FunctionObject.java

@@ -1,7 +1,6 @@
 package com.hrsk.cloud.eg.domain.api.channel.guide.func;
 
 import com.google.common.collect.Lists;
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ValueObject;
 import com.hrsk.cloud.eg.domain.api.channel.guide.resolver.vo.ValueObjectResolverManager;
 import lombok.Data;

+ 1 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/http/HttpApiRequest.java

@@ -1,6 +1,6 @@
 package com.hrsk.cloud.eg.domain.api.channel.guide.http;
 
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
+import com.hrsk.cloud.eg.domain.api.ApiContext;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ContentTypeEnum;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.KeyValueObject;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ValueObject;

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/payload/ApiJsonPayloadResolver.java

@@ -5,7 +5,6 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ValueObject;
 import com.hrsk.cloud.eg.domain.common.GsonUtils;
 import com.hrsk.pangu.tool.exception.BizException;

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/payload/ApiPayloadResolver.java

@@ -1,7 +1,6 @@
 package com.hrsk.cloud.eg.domain.api.channel.guide.resolver.payload;
 
 import com.google.gson.JsonObject;
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
 
 /**
  * @author: bianlanzhou

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/payload/ApiPayloadResolverManage.java

@@ -2,7 +2,6 @@ package com.hrsk.cloud.eg.domain.api.channel.guide.resolver.payload;
 
 import com.google.common.collect.Maps;
 import com.google.gson.JsonObject;
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ContentTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/BasicTypeValueObjectResolver.java

@@ -1,7 +1,6 @@
 package com.hrsk.cloud.eg.domain.api.channel.guide.resolver.vo;
 
 
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ValueObject;
 
 /**

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/JsonPathValueObjectResolver.java

@@ -1,7 +1,6 @@
 package com.hrsk.cloud.eg.domain.api.channel.guide.resolver.vo;
 
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ValueObject;
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
 import com.jayway.jsonpath.JsonPath;
 
 /**

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/SpelValueObjectResolver.java

@@ -1,6 +1,5 @@
 package com.hrsk.cloud.eg.domain.api.channel.guide.resolver.vo;
 
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ValueObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.expression.ExpressionParser;

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/ValueObjectResolver.java

@@ -2,7 +2,6 @@ package com.hrsk.cloud.eg.domain.api.channel.guide.resolver.vo;
 
 
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ValueObject;
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
 
 /**
  * @author: bianlanzhou

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/channel/guide/resolver/vo/ValueObjectResolverManager.java

@@ -3,7 +3,6 @@ package com.hrsk.cloud.eg.domain.api.channel.guide.resolver.vo;
 import com.google.common.collect.Maps;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ValueObject;
 import com.hrsk.cloud.eg.domain.api.channel.guide.common.ValueObjectTypeEnum;
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.ApiContext;
 import com.hrsk.pangu.tool.exception.BizException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

+ 2 - 2
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/resolver/payload/ApiJsonPayloadResolver.java

@@ -1,10 +1,10 @@
 package com.hrsk.cloud.eg.domain.api.resolver.payload;
 
-import com.alibaba.cola.exception.BizException;
 import com.google.gson.*;
 import com.hrsk.cloud.eg.domain.api.ApiContext;
 import com.hrsk.cloud.eg.domain.api.ValueObject;
-import com.hrsk.cloud.eg.domain.common.utils.GsonUtils;
+import com.hrsk.cloud.eg.domain.common.GsonUtils;
+import com.hrsk.pangu.tool.exception.BizException;
 import org.apache.commons.lang3.StringUtils;
 
 /**

+ 0 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/resolver/result/ApiJsonResultResolver.java

@@ -4,7 +4,6 @@ import com.alibaba.cola.exception.BizException;
 import com.google.gson.*;
 import com.hrsk.cloud.eg.domain.api.ApiContext;
 import com.hrsk.cloud.eg.domain.api.ValueObject;
-import com.hrsk.cloud.eg.domain.common.utils.GsonUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;

+ 1 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/utils/BizPreconditions.java → egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/BizPreconditions.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.domain.common.utils;
+package com.hrsk.cloud.eg.domain.common;
 
 
 import com.hrsk.pangu.tool.exception.BizException;

+ 1 - 1
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/common/HessianUtils.java → egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/HessianUtils.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.infrastructure.common;
+package com.hrsk.cloud.eg.domain.common;
 
 import com.caucho.hessian.io.Hessian2Input;
 import com.caucho.hessian.io.Hessian2Output;

+ 1 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/BusinessServiceEnums.java → egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/BusinessServiceEnums.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.domain.common.constant;
+package com.hrsk.cloud.eg.domain.common.constant.egress;
 
 import lombok.Getter;
 

+ 1 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/JoinMethodEnums.java → egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/JoinMethodEnums.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.domain.common.constant;
+package com.hrsk.cloud.eg.domain.common.constant.egress;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

+ 1 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/ResultCode.java → egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/ResultCode.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.domain.common.constant;
+package com.hrsk.cloud.eg.domain.common.constant.egress;
 
 public enum ResultCode {
     // 全局

+ 1 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/ServerCodeEnums.java → egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/ServerCodeEnums.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.domain.common.constant;
+package com.hrsk.cloud.eg.domain.common.constant.egress;
 
 import java.util.HashMap;
 import java.util.Map;

+ 0 - 24
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/utils/GsonUtils.java

@@ -1,24 +0,0 @@
-package com.hrsk.cloud.eg.domain.common.utils;
-
-import com.google.gson.Gson;
-
-/**
- * @author: bianlanzhou
- * @create: 2024-08-01 16:58
- * @description: Gson工具类
- **/
-public class GsonUtils {
-    /**
-     * gson
-     */
-    public static final Gson GSON = new Gson();
-
-    /**
-     * 转换JSON
-     * @return 实体
-     * @param <T> 范型
-     */
-    public static  <T> T fromJson(String json,Class<T> classz){
-        return GSON.fromJson(json,classz);
-    }
-}

+ 1 - 4
egress-gateway-service-infrastructure/pom.xml

@@ -46,10 +46,7 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.caucho</groupId>
-            <artifactId>hessian</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>

+ 0 - 2
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/client/http/HttpClient.java

@@ -1,13 +1,11 @@
 package com.hrsk.cloud.eg.infrastructure.client.http;
 
-import com.hrsk.cloud.eg.domain.api.channel.guide.http.HttpApiRequest;
 import com.hrsk.cloud.eg.infrastructure.common.InfrastructureException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.util.Objects;

+ 6 - 6
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/client/http/RetryRequestConfig.java

@@ -7,17 +7,17 @@ package com.hrsk.cloud.eg.infrastructure.client.http;
  */
 public class RetryRequestConfig {
     //http请求timeout时的重试次数
-    int retryCount = 3;
+    int retryCount = 0;
     //http请求timeout,重试间隔时间,重试间隔时间=次数*100 ms.
-    long retryIntervalTime = 100;
+    long retryIntervalTime = 0;
     //连接池连接数量
-    int connectMaxTotal = 200;
+    int connectMaxTotal = 75;
     //连接超时时间
-    int connectTimeout = 30000;
+    int connectTimeout = 3000;
     // 数据读取超时时间,即SocketTimeout
-    int readTimeout = 30000;
+    int readTimeout = 3000;
     // 连接不够用的等待时间,不宜过长,必须设置,比如连接不够用时,时间过长将是灾难性的
-    int ConnectionRequestTimeout = 10000;
+    int ConnectionRequestTimeout = 2000;
 
     public int getRetryCount() {
         return retryCount;

+ 8 - 38
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/client/http/RetryRestTemplate.java

@@ -15,7 +15,6 @@ import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.protocol.HttpContext;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
@@ -28,7 +27,6 @@ import java.net.ConnectException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Author: zhangyy
@@ -37,16 +35,6 @@ import java.util.concurrent.TimeUnit;
  */
 @Configuration
 public class RetryRestTemplate {
-
-    @Value("${http.client.retryIntervalTime:0}")
-    private Long retryIntervalTime;
-
-    @Value("${http.client.connectTimeout:2500}")
-    private Integer connectTimeout;
-
-    @Value("${http.client.connectionRequestTimeout:1500}")
-    private Integer connectionRequestTimeout;
-
     private RetryRequestConfig requestConfig = new RetryRequestConfig();
 
     public RetryRestTemplate(RetryRequestConfig requestConfig) {
@@ -56,25 +44,9 @@ public class RetryRestTemplate {
     public RetryRestTemplate() {
     }
 
-    /**
-     * 配置restTemplate
-     */
-    private void config(){
-        if(retryIntervalTime!=null){
-            requestConfig.setRetryIntervalTime(retryIntervalTime);
-        }
-        if(connectTimeout!=null){
-            requestConfig.setConnectTimeout(connectTimeout);
-        }
-        if(connectionRequestTimeout!=null){
-            requestConfig.setConnectionRequestTimeout(connectionRequestTimeout);
-        }
-    }
-
     @Bean
     public RestTemplate restTemplate(){
         RestTemplate restTemplate = new RestTemplate();
-        config();
         //1.用UTF-8 StringHttpMessageConverter替换默认StringHttpMessageConverter
         List<HttpMessageConverter<?>> newMessageConverters = new ArrayList<>();
         for(HttpMessageConverter<?> converter : restTemplate.getMessageConverters()){
@@ -86,24 +58,19 @@ public class RetryRestTemplate {
             }
         }
         restTemplate.setMessageConverters(newMessageConverters);
+
+
         //2. retryHandler add
         HttpClientBuilder httpClientBuilder = HttpClients.custom();
         HttpRequestRetryHandler handler = new HttpRequestRetryHandler() {
             @Override
             public boolean retryRequest(IOException exception, int curRetryCount, HttpContext context) {
-                try {
-                    //重试延迟
-                    TimeUnit.SECONDS.sleep(curRetryCount*requestConfig.getRetryIntervalTime());
-                } catch (InterruptedException e) {
-
-                }
-                if (curRetryCount > requestConfig.getRetryCount()) {
-                    return false;
-                }
                 if (exception instanceof ConnectTimeoutException
                         || exception instanceof NoHttpResponseException || exception instanceof ConnectException) {
-                    return true;
+                    // 报错不需要重试
+                    return false;
                 }
+
                 HttpClientContext clientContext = HttpClientContext.adapt(context);
                 org.apache.http.HttpRequest request = clientContext.getRequest();
                 boolean idempotent = !(request instanceof HttpEntityEnclosingRequest);
@@ -111,6 +78,7 @@ public class RetryRestTemplate {
                 return idempotent;
             }
         };
+
         // 3.支持HTTP、HTTPS
         Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory> create()
                 .register("http", PlainConnectionSocketFactory.getSocketFactory())
@@ -120,10 +88,12 @@ public class RetryRestTemplate {
         connectionManager.setMaxTotal(this.requestConfig.getConnectMaxTotal());
         connectionManager.setDefaultMaxPerRoute(100);
         connectionManager.setValidateAfterInactivity(2000);
+
         httpClientBuilder.setRetryHandler(handler)
                             .setConnectionManager(connectionManager);
 
         CloseableHttpClient httpClient = httpClientBuilder.build();
+
         // httpClient连接配置,底层是配置RequestConfig
         HttpComponentsClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
         // 连接超时

+ 1 - 1
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/MyMetaObjectHandler.java

@@ -1,7 +1,7 @@
 package com.hrsk.cloud.eg.infrastructure.config;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.hrsk.cloud.eg.clinet.constant.GlobalDataStatusEnum;
+import com.hrsk.cloud.eg.client.constant.GlobalDataStatusEnum;
 import com.hrsk.cloud.eg.infrastructure.utils.SnowflakeIdWorker;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.BaseDo;
 import org.apache.ibatis.reflection.MetaObject;

+ 0 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/DiamondConfig.java

@@ -1,5 +0,0 @@
-package com.hrsk.cloud.eg.infrastructure.config.client;
-
-public class DiamondConfig {
-    public final static String DummyConfig = "DummyConfig";
-}

+ 0 - 114
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/HessianUtils.java

@@ -1,114 +0,0 @@
-package com.hrsk.cloud.eg.infrastructure.config.client;
-
-import com.alibaba.cola.exception.SysException;
-import com.caucho.hessian.io.Hessian2Input;
-import com.caucho.hessian.io.Hessian2Output;
-import com.google.common.collect.Lists;
-import com.hrsk.cloud.eg.domain.api.FunctionObject;
-import com.hrsk.cloud.eg.domain.api.HttpApiConfig;
-import com.hrsk.cloud.eg.domain.api.KeyValueObject;
-import com.hrsk.cloud.eg.domain.api.ValueObject;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * @author: bianlanzhou
- * @create: 2024-08-02 08:43
- * @description: hessian工具类
- **/
-@Slf4j
-public class HessianUtils {
-    public static byte[] serialize(Object object){
-        Hessian2Output ho = null;
-        try{
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            ho = new Hessian2Output(bos);
-            ho.writeObject(object);
-            ho.flush();
-            return bos.toByteArray();
-        } catch (IOException e) {
-            log.error("序列化对象异常!",e);
-            throw new SysException("序列化对象异常!",e);
-        }finally {
-            if(ho !=null){
-                try {
-                    ho.close();
-                } catch (IOException e) {
-                    log.error("序列化流关闭失败!",e);
-                }
-            }
-        }
-    }
-
-    /** Hessian反序列化 */
-    public static Object deserialize(byte[] bytes){
-        Hessian2Input hi = null;
-        try{
-            ByteArrayInputStream is = new ByteArrayInputStream(bytes);
-            hi = new Hessian2Input(is);
-            return hi.readObject();
-        }catch (Exception e){
-            log.error("反序列化对象异常!",e);
-            throw new SysException("反序列化对象异常!",e);
-        }finally {
-            if(hi !=null){
-                try {
-                    hi.close();
-                } catch (IOException e) {
-                    log.error("序列化流关闭失败!",e);
-                }
-            }
-        }
-    }
-
-    /**
-     * @description:  测试方法
-     * @author zhangyy
-     * @date 2024/8/27 10:14
-     * @version 1.0
-     */
-    public static void main(String[] args) {
-        FunctionObject md5 = new FunctionObject();
-        md5.setCode("md5");
-        HttpApiConfig hac = new HttpApiConfig()
-                .setUrl("https://baidu.com");
-        hac.setType("http");
-        List<KeyValueObject> h = Lists.newArrayList();
-        KeyValueObject h1 = new KeyValueObject();
-        h1.setKey("secretKey");
-        h1.setType("text");
-        h1.setValue("Khw99%$l%-2gF7P4jXglp_-jQqQirtYnOY5D");
-        h.add(h1);
-        KeyValueObject h2 = new KeyValueObject();
-        h2.setKey("merchantNo");
-        h2.setType("spel");
-        h2.setValue("#input.merchantNo");
-        h.add(h2);
-        List<ValueObject> p = Lists.newArrayList();
-        ValueObject p1 = new ValueObject();
-        p1.setType("text");
-        p1.setValue("123");
-        ValueObject p2 = new ValueObject();
-        p2.setType("text");
-        p2.setValue("456");
-        p2.getFunctions().add(md5);
-        p.add(p1);
-        p.add(p2);
-        List<KeyValueObject> s = Lists.newArrayList();
-        KeyValueObject s1 = new KeyValueObject();
-        s1.setKey("username");
-        s1.setType("spel");
-        s1.setValue("#input.username");
-        KeyValueObject s2 = new KeyValueObject();
-        s2.setKey("channel");
-        s2.setType("spel");
-        s2.setValue("#input.channel");
-        s.add(s2);
-        hac.setPath(p).setSearch(s).setHeader(h).setMethod("GET");
-        hac.setContent("{\"merchant\":\"xxxxxxfffff\",\"phone\":\"#{\\\"value\\\":\\\"#input.phone\\\",\\\"type\\\": \\\"spel\\\",\\\"functions\\\":[ {\\\"code\\\": \\\"md5\\\"}]}\"}");
-    }
-}

+ 0 - 52
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/HttpTemPlateClient.java

@@ -1,52 +0,0 @@
-package com.hrsk.cloud.eg.infrastructure.config.client;
-
-import com.hrsk.cloud.eg.domain.api.HttpApi;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import javax.annotation.Resource;
-import java.util.Map;
-import java.util.Objects;
-/**
- * @author: bianlanzhou
- * @create: 2024-08-02 17:08
- * @description: http请求客户端
- **/
-@Slf4j
-@Component
-public class HttpTemPlateClient {
-    @Resource
-    private RetryRestTemplate httpRestTemplate;
-    /**
-     * 请求
-     * @param httpApi http api对象
-     * @return 响应数据
-     */
-    public Object request(HttpApi httpApi){
-        ResponseEntity<String> responseEntity = null;
-        //补充headers
-        MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
-        if(!httpApi.getHeader().isEmpty()){
-          Map<String,Object> orgMap=httpApi.getHeader();
-            for (String key : orgMap.keySet()) {
-                headers.add(key, orgMap.get(key).toString());
-            }
-        }
-        try {
-            responseEntity = httpRestTemplate.restTemplate().exchange(httpApi.getUrl(),
-                    Objects.requireNonNull(HttpMethod.resolve(httpApi.getMethod())),
-                    new HttpEntity<>(httpApi.getPayload(),new HttpHeaders(headers))
-                    ,
-                    String.class);
-        } catch (Exception e) {
-            log.error("请求异常,请求数据:[{}].", httpApi.toString() ,e);
-        }
-        return responseEntity ==null?null:responseEntity.getBody();
-    }
-}

+ 0 - 69
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/RetryRequestConfig.java

@@ -1,69 +0,0 @@
-package com.hrsk.cloud.eg.infrastructure.config.client;
-
-/**
- * Author: zhangyy
- * Date: 2019/3/20
- * Description:
- */
-public class RetryRequestConfig {
-    //http请求timeout时的重试次数
-    int retryCount = 0;
-    //http请求timeout,重试间隔时间,重试间隔时间=次数*100 ms.
-    long retryIntervalTime = 0;
-    //连接池连接数量
-    int connectMaxTotal = 75;
-    //连接超时时间
-    int connectTimeout = 3000;
-    // 数据读取超时时间,即SocketTimeout
-    int readTimeout = 3000;
-    // 连接不够用的等待时间,不宜过长,必须设置,比如连接不够用时,时间过长将是灾难性的
-    int ConnectionRequestTimeout = 2000;
-
-    public int getRetryCount() {
-        return retryCount;
-    }
-
-    public void setRetryCount(int retryCount) {
-        this.retryCount = retryCount;
-    }
-
-    public long getRetryIntervalTime() {
-        return retryIntervalTime;
-    }
-
-    public void setRetryIntervalTime(long retryIntervalTime) {
-        this.retryIntervalTime = retryIntervalTime;
-    }
-
-    public int getConnectMaxTotal() {
-        return connectMaxTotal;
-    }
-
-    public void setConnectMaxTotal(int connectMaxTotal) {
-        this.connectMaxTotal = connectMaxTotal;
-    }
-
-    public int getConnectTimeout() {
-        return connectTimeout;
-    }
-
-    public void setConnectTimeout(int connectTimeout) {
-        this.connectTimeout = connectTimeout;
-    }
-
-    public int getReadTimeout() {
-        return readTimeout;
-    }
-
-    public void setReadTimeout(int readTimeout) {
-        this.readTimeout = readTimeout;
-    }
-
-    public int getConnectionRequestTimeout() {
-        return ConnectionRequestTimeout;
-    }
-
-    public void setConnectionRequestTimeout(int connectionRequestTimeout) {
-        ConnectionRequestTimeout = connectionRequestTimeout;
-    }
-}

+ 0 - 111
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/RetryRestTemplate.java

@@ -1,111 +0,0 @@
-package com.hrsk.cloud.eg.infrastructure.config.client;
-
-import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.NoHttpResponseException;
-import org.apache.http.client.HttpRequestRetryHandler;
-import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.config.Registry;
-import org.apache.http.config.RegistryBuilder;
-import org.apache.http.conn.ConnectTimeoutException;
-import org.apache.http.conn.socket.ConnectionSocketFactory;
-import org.apache.http.conn.socket.PlainConnectionSocketFactory;
-import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.protocol.HttpContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-
-import java.io.IOException;
-import java.net.ConnectException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Author: zhangyy
- * Date: 2019/3/20
- * Description:
- */
-@Configuration
-public class RetryRestTemplate {
-    private RetryRequestConfig requestConfig = new RetryRequestConfig();
-
-    public RetryRestTemplate(RetryRequestConfig requestConfig) {
-        this.requestConfig = requestConfig;
-    }
-
-    public RetryRestTemplate() {
-    }
-
-    @Bean
-    public RestTemplate restTemplate(){
-        RestTemplate restTemplate = new RestTemplate();
-        //1.用UTF-8 StringHttpMessageConverter替换默认StringHttpMessageConverter
-        List<HttpMessageConverter<?>> newMessageConverters = new ArrayList<>();
-        for(HttpMessageConverter<?> converter : restTemplate.getMessageConverters()){
-            if(converter instanceof StringHttpMessageConverter){
-                StringHttpMessageConverter messageConverter = new StringHttpMessageConverter(StandardCharsets.UTF_8);
-                newMessageConverters.add(messageConverter);
-            }else {
-                newMessageConverters.add(converter);
-            }
-        }
-        restTemplate.setMessageConverters(newMessageConverters);
-
-
-        //2. retryHandler add
-        HttpClientBuilder httpClientBuilder = HttpClients.custom();
-        HttpRequestRetryHandler handler = new HttpRequestRetryHandler() {
-            @Override
-            public boolean retryRequest(IOException exception, int curRetryCount, HttpContext context) {
-                if (exception instanceof ConnectTimeoutException
-                        || exception instanceof NoHttpResponseException || exception instanceof ConnectException) {
-                    // 报错不需要重试
-                    return false;
-                }
-
-                HttpClientContext clientContext = HttpClientContext.adapt(context);
-                org.apache.http.HttpRequest request = clientContext.getRequest();
-                boolean idempotent = !(request instanceof HttpEntityEnclosingRequest);
-                // 如果请求被认为是幂等的,那么就重试。即重复执行不影响程序其他效果的
-                return idempotent;
-            }
-        };
-
-        // 3.支持HTTP、HTTPS
-        Registry<ConnectionSocketFactory> registry = RegistryBuilder.<ConnectionSocketFactory> create()
-                .register("http", PlainConnectionSocketFactory.getSocketFactory())
-                .register("https", SSLConnectionSocketFactory.getSocketFactory())
-                .build();
-        PoolingHttpClientConnectionManager connectionManager = new PoolingHttpClientConnectionManager(registry);
-        connectionManager.setMaxTotal(this.requestConfig.getConnectMaxTotal());
-        connectionManager.setDefaultMaxPerRoute(100);
-        connectionManager.setValidateAfterInactivity(2000);
-
-        httpClientBuilder.setRetryHandler(handler)
-                            .setConnectionManager(connectionManager);
-
-        CloseableHttpClient httpClient = httpClientBuilder.build();
-
-        // httpClient连接配置,底层是配置RequestConfig
-        HttpComponentsClientHttpRequestFactory clientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
-        // 连接超时
-        clientHttpRequestFactory.setConnectTimeout(this.requestConfig.getConnectTimeout());
-        // 数据读取超时时间,即SocketTimeout
-        clientHttpRequestFactory.setReadTimeout(this.requestConfig.getReadTimeout());
-        // 连接不够用的等待时间,不宜过长,必须设置,比如连接不够用时,时间过长将是灾难性的
-        clientHttpRequestFactory.setConnectionRequestTimeout(this.requestConfig.getConnectionRequestTimeout());
-        // 缓冲请求数据,默认值是true。通过POST或者PUT大量发送数据时,建议将此属性更改为false,以免耗尽内存。
-        // clientHttpRequestFactory.setBufferRequestBody(false);
-        restTemplate.setRequestFactory(clientHttpRequestFactory);
-        return restTemplate;
-    }
-
-}

+ 1 - 1
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/exception/ExceptionAdvice.java

@@ -1,7 +1,7 @@
 package com.hrsk.cloud.eg.infrastructure.exception;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.domain.common.constant.ResultCode;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ResultCode;
 import com.hrsk.pangu.dto.SingleResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.properties.bind.BindException;

+ 5 - 8
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/gatewayimpl/ApiGatewayImpl.java

@@ -1,17 +1,14 @@
 package com.hrsk.cloud.eg.infrastructure.gatewayimpl;
 
 import com.google.gson.JsonElement;
+import com.hrsk.cloud.eg.client.api.ApiService;
 import com.hrsk.cloud.eg.client.dto.cmd.ApiInvokeCmd;
 import com.hrsk.cloud.eg.domain.api.Api;
-import com.hrsk.cloud.eg.domain.api.ApiChannel;
 import com.hrsk.cloud.eg.domain.api.ApiFactory;
-import com.hrsk.cloud.eg.domain.api.ApiGateway;
-import com.hrsk.cloud.eg.domain.api.channel.guide.common.EgressApiErrorCodeEnum;
-import com.hrsk.cloud.eg.domain.api.channel.guide.http.HttpApiResponse;
-import com.hrsk.cloud.eg.domain.common.GsonUtils;
+import com.hrsk.cloud.eg.domain.common.utils.GsonUtils;
 import com.hrsk.cloud.eg.infrastructure.client.http.HttpClient;
 import com.hrsk.cloud.eg.infrastructure.repository.database.dao.EgressApiChannelDao;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgressApiChannelDO;
+import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgressApiChannelDo;
 import com.hrsk.pangu.tool.exception.BizException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -29,7 +26,7 @@ import java.util.stream.Collectors;
  **/
 @Slf4j
 @Component
-public class ApiGatewayImpl implements ApiGateway {
+public class ApiGatewayImpl implements ApiService {
     @Resource
     private HttpClient httpClient;
     @Resource
@@ -42,7 +39,7 @@ public class ApiGatewayImpl implements ApiGateway {
      */
     @Override
     public String invoke(ApiInvokeCmd apiInvokeCmd) {
-        List<EgressApiChannelDO> egressApiChannels = egressApiChannelDao.selectByApiCode(apiInvokeCmd.getApiCode());
+        List<EgressApiChannelDo> egressApiChannels = egressApiChannelDao.selectByApiCode(apiInvokeCmd.getApiCode());
         if(CollectionUtils.isEmpty(egressApiChannels)){
             throw new BizException(EgressApiErrorCodeEnum.API_CHANNEL_NOT_EXIST.getCode(),
                     EgressApiErrorCodeEnum.API_CHANNEL_NOT_EXIST.getMessage());

+ 4 - 4
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/LoanDockingApi.java

@@ -1,10 +1,10 @@
 package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking;
 
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 
 /**
  * @author zhangyy

+ 4 - 6
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/AnHuiHengDaoCreditService.java

@@ -2,14 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 6
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BaiXinShunTaiCreditService.java

@@ -2,15 +2,13 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.DateUtil;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BaiYiJinFuCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BeiJingChongHeCreditService.java

@@ -1,13 +1,12 @@
 package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/CangZhouSuYiRonogCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/CheYouRongCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChengDuYiHeShengCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChengHongHuiCreditService.java

@@ -1,13 +1,12 @@
 package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChongQinDongRunCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChongQingRuiShangXinCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChongQingYiYueCreditService.java

@@ -2,16 +2,15 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChuanjinCreditService.java

@@ -3,13 +3,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import lombok.Data;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeLuoXuanAesCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeLuoXuanCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeZhouXinYiRongCreditService.java

@@ -1,13 +1,12 @@
 package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeZhouXinYiRongV2CreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DfrzwCreditService.java

@@ -1,13 +1,12 @@
 package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.DateUtil;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FangxinwangiCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FuChengCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FuZhouBeiJiuCreditService.java

@@ -3,16 +3,15 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
 
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FuZhouBeiYinJinRongCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GexinjinfuCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuanZhouPuHuiCreditService.java

@@ -1,13 +1,12 @@
 package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuangDongHaoEnCreditService.java

@@ -1,13 +1,12 @@
 package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuangDongHongZhanCreditService.java

@@ -1,13 +1,12 @@
 package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuangZhouHuaXinCreditService.java

@@ -1,13 +1,12 @@
 package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;

+ 4 - 5
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HamiguaCreditService.java

@@ -2,13 +2,12 @@ package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.EgLoanApiConfigInfoCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.plan.command.PlanCmd;
-import com.hrsk.cloud.eg.clinet.dto.data.user.command.UserBaseInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.EgLoanApiConfigInfoCmd;
+import com.hrsk.cloud.eg.client.dto.plan.command.PlanCmd;
+import com.hrsk.cloud.eg.client.dto.user.command.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.clinet.vo.DataVo;
-import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
+import com.hrsk.cloud.eg.domain.common.constant.egress.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.LoanDockingApi;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import lombok.Data;

Some files were not shown because too many files changed in this diff