GITZYY пре 2 недеља
родитељ
комит
7a6618da9a
100 измењених фајлова са 970 додато и 644 уклоњено
  1. 34 0
      egress-gateway-service-adapter/src/main/java/adapter/api/controller/ApiController.java
  2. 0 39
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/ApiCheckIntoServiceImpl.java
  3. 56 0
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/ApiGatewayService.java
  4. 0 27
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/comon/CommonServiceImpl.java
  5. 0 32
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/CommonService.java
  6. 0 107
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/EgOperateBusinessService.java
  7. 0 16
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/LoanServiceImpl.java
  8. 5 4
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/ApiCustomizeBizHandler.java
  9. 18 15
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/ApiCustomizeRouteService.java
  10. 36 0
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/CodeStrategyCmd.java
  11. 32 0
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/ApiInvokeCmdExe.java
  12. 53 59
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/GenerateCheckIntoHttpApiConfigCmdExe.java
  13. 5 12
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/GenerateCheckIntoHttpApiConfigV2CmdExe.java
  14. 19 0
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/checkInto/CheckCmdExe.java
  15. 38 0
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/common/CommonCmdExe.java
  16. 18 0
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/route/EndpointRouteService.java
  17. 48 0
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/route/impl/CheckIntoCmd.java
  18. 0 13
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/api/LoanService.java
  19. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/constant/BusinessPrefixEnum.java
  20. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/constant/GlobalDataStatusEnum.java
  21. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/constant/ResultCodeEnum.java
  22. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/CustomerDTO.java
  23. 45 0
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/EgLoanApiConfigInfoDto.java
  24. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/ErrorCode.java
  25. 29 0
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/command/ApiInvokeParamCmd.java
  26. 25 0
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/command/CheckIntoParamCmd.java
  27. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/common/LocalEnumDTO.java
  28. 3 8
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/plan/command/PlanCmd.java
  29. 1 3
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserAssetCarInfoCmd.java
  30. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserAssetHouseInfoCmd.java
  31. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserAssetInsuranceInfoCmd.java
  32. 4 2
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserBaseInfoCmd.java
  33. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserProfessionBusinessOwnerCmd.java
  34. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserProfessionEcommerceOwnersCmd.java
  35. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserProfessionOfficeWorkersCmd.java
  36. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/data/user/command/UserProfessionSelfEmployedCmd.java
  37. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/event/CustomerCreatedEvent.java
  38. 1 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/dto/event/DomainEventConstant.java
  39. 117 0
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/clinet/vo/DataVo.java
  40. 0 23
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/dto/data/CheckIntoParamDto.java
  41. 52 0
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/BusinessServiceEnums.java
  42. 1 1
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/EgApiTypeEnum.java
  43. 44 0
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/EgRouteTypeEnum.java
  44. 32 0
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/EgressApiEndpointIntegrationModeEnum.java
  45. 34 0
      egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/EgressApiStatusEnum.java
  46. 5 5
      egress-gateway-service-infrastructure/pom.xml
  47. 0 33
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/apiGateWayImpl/ApiGatewayImpl.java
  48. 1 1
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/MyMetaObjectHandler.java
  49. 1 1
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/DiamondConfig.java
  50. 0 5
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/HttpTemPlateClient.java
  51. 1 1
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/RetryRequestConfig.java
  52. 1 3
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/RetryRestTemplate.java
  53. 1 1
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/redis/FastJson2RedisSerializer.java
  54. 1 0
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/redis/PrefixRedisSerializer.java
  55. 0 1
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/redis/RedisConfig.java
  56. 6 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/LoanDockingApi.java
  57. 8 8
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/AnHuiHengDaoCreditService.java
  58. 7 8
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BaiXinShunTaiCreditService.java
  59. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BaiYiJinFuCreditService.java
  60. 4 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BeiJingChongHeCreditService.java
  61. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/CangZhouSuYiRonogCreditService.java
  62. 4 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/CheYouRongCreditService.java
  63. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChengDuYiHeShengCreditService.java
  64. 4 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChengHongHuiCreditService.java
  65. 5 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChongQinDongRunCreditService.java
  66. 5 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChongQingRuiShangXinCreditService.java
  67. 4 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChongQingYiYueCreditService.java
  68. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/ChuanjinCreditService.java
  69. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeLuoXuanAesCreditService.java
  70. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeLuoXuanCreditService.java
  71. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeZhouXinYiRongCreditService.java
  72. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DeZhouXinYiRongV2CreditService.java
  73. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/DfrzwCreditService.java
  74. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FangxinwangiCreditService.java
  75. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FuChengCreditService.java
  76. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FuZhouBeiJiuCreditService.java
  77. 4 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/FuZhouBeiYinJinRongCreditService.java
  78. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GexinjinfuCreditService.java
  79. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuanZhouPuHuiCreditService.java
  80. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuangDongHaoEnCreditService.java
  81. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuangDongHongZhanCreditService.java
  82. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/GuangZhouHuaXinCreditService.java
  83. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HamiguaCreditService.java
  84. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HaohanwuyinCreditService.java
  85. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HeFeiShenDaiCreditService.java
  86. 4 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HeZeRongXinCreditService.java
  87. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HengYangJiuZhenCreditService.java
  88. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HengaiCreditService.java
  89. 5 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HongShengJinFuCreditService.java
  90. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HongXinPuHuiCreditService.java
  91. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HuNanDiShuiYanCreditService.java
  92. 5 7
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HuirongCrmCreditService.java
  93. 6 7
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HuixinCreditService.java
  94. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HuizhongCreditService.java
  95. 4 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JianZhanCreditService.java
  96. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JiechengCreditService.java
  97. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JilingHuiRongCreditService.java
  98. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JinDieV2CreditService.java
  99. 5 6
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JinDieV3CreditService.java
  100. 4 4
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JinDieV4CreditService.java

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

@@ -0,0 +1,34 @@
+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 - 39
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/ApiCheckIntoServiceImpl.java

@@ -1,39 +0,0 @@
-package com.hrsk.cloud.eg.app.api;
-import com.hrsk.cloud.eg.app.business.ApiRouteService;
-import com.hrsk.cloud.eg.dto.data.CheckIntoParamDto;
-import com.hrsk.cloud.eg.vo.response.DataVo;
-import com.hrsk.cloud.eg.vo.response.DefaultResponseVo;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * @author: bianlanzhou
- * @create: 2024-08-02 10:57
- * @description: 保存api
- **/
-@RestController
-@RequestMapping("/api/checkInto")
-public class ApiCheckIntoServiceImpl {
-
-    @Resource
-    private ApiRouteService  apiRouteService;
-
-
-    /**
-     * @description:  助贷撞库接口
-     * @param:
-     * @return:
-     * @author zhangyy
-     * @date: 2024/8/30 14:34
-     */
-    @RequestMapping("/loans/v1")
-    public DefaultResponseVo<DataVo> checkInto(@RequestBody CheckIntoParamDto paramDto) {
-        DataVo dataVo = apiRouteService.loanCheckInto(paramDto);
-        return DefaultResponseVo.success(dataVo);
-    }
-
-
-}

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

@@ -0,0 +1,56 @@
+package com.hrsk.cloud.eg.app.api;
+
+
+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.EgLoanApiConfigInfoDto;
+import com.hrsk.cloud.eg.clinet.dto.data.command.ApiInvokeParamCmd;
+import com.hrsk.cloud.eg.clinet.dto.data.command.CheckIntoParamCmd;
+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.checkerframework.checker.units.qual.A;
+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 - 27
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/comon/CommonServiceImpl.java

@@ -1,27 +0,0 @@
-package com.hrsk.cloud.eg.app.api.comon;
-
-import com.hrsk.cloud.eg.app.business.CommonService;
-import com.hrsk.cloud.eg.vo.response.DefaultResponseVo;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: commonService
- * @date 2024/9/24 11:47
- */
-@RequestMapping("common")
-@RestController
-public class CommonServiceImpl {
-
-    @Resource private CommonService commonService;
-
-
-//    @RequestMapping("/localEnumList")
-//    public DefaultResponseVo<List<LocalEnumDto>> getLocalEnumList(){
-//        return  DefaultResponseVo.success(commonService.getLocalEnumList());
-//    }
-}

+ 0 - 32
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/CommonService.java

@@ -1,32 +0,0 @@
-package com.hrsk.cloud.eg.app.business;
-
-import org.springframework.stereotype.Service;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: CommonService 公共信息操作类
- * @date 2024/9/24 11:48
- */
-@Service
-public class CommonService {
-
-    /**
-     * @description:  获取本地枚举返回给前端
-     * @author zhangyy
-     * @date 2024/9/24 11:56
-     * @version 1.0
-     */
-//    public List<LocalEnumDto> getLocalEnumList() {
-//        List<LocalEnumDto> localEnumDtoList = new ArrayList<>();
-//        EgApiTypeEnum[] values = EgApiTypeEnum.values();
-//        LocalEnumDto localEnumDto=null;
-//        for (int i = 0; i < values.length; i++) {
-//            localEnumDto = new LocalEnumDto();
-//            localEnumDto.setCode(values[i].getCode());
-//            localEnumDto.setMsg(values[i].getMsg());
-//            localEnumDtoList.add(localEnumDto);
-//        }
-//        return localEnumDtoList;
-//    }
-}

+ 0 - 107
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/EgOperateBusinessService.java

@@ -1,107 +0,0 @@
-package com.hrsk.cloud.eg.app.business;
-
-import com.alibaba.cola.exception.BizException;
-import com.hrsk.cloud.eg.app.request.api.EgApiEndpointReq;
-import com.hrsk.cloud.eg.app.request.api.EgApiLoanExtendReq;
-import com.hrsk.cloud.eg.app.request.api.EgApiProductExtendReq;
-import com.hrsk.cloud.eg.app.request.api.EgApiReq;
-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.repository.database.entity.EgApiLoanExtendDo;
-import com.hrsk.cloud.eg.infrastructure.service.EgApiEndpointService;
-import com.hrsk.cloud.eg.infrastructure.service.EgApiLoanExtendService;
-import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.utils.BeanCopyUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.Objects;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: EgOperateBusinessService eg接出操作类
- * @date 2024/9/23 13:49
- */
-@Service
-public class EgOperateBusinessService {
-    @Resource
-    private EgApiService egApiService;
-
-    @Resource
-    private EgApiEndpointService egApiEndpointService;
-    @Resource
-    private EgApiProductExtendService egApiProductExtendService;
-
-    @Resource
-    private EgApiLoanExtendService egApiLoanExtendService;
-
-    /**
-     * @description:  保存接出api
-     * @author zhangyy
-     * @date 2024/9/23 14:08
-     * @version 1.0
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Long saveApiInfo(EgApiReq req) {
-        EgApiDo copy = BeanCopyUtils.copy(req, EgApiDo.class);
-        egApiService.save(copy);
-        return copy.getId();
-
-    }
-
-    /**
-     * @description:  保存api的配置
-     * @author zhangyy
-     * @date 2024/9/23 14:18
-     * @version 1.0
-     */
-    @Transactional(rollbackFor = Exception.class)
-    public Long saveApiConfig(EgApiEndpointReq req) {
-        EgApiEndpointDo copy = BeanCopyUtils.copy(req, EgApiEndpointDo.class);
-        EgApiDo apiDo = egApiService.getById(req.getApiId());
-        if (Objects.isNull(apiDo)) {
-           throw new BizException("主api信息为空");
-        }
-        copy.setApiName(apiDo.getApiName());
-        copy.setApiCode(apiDo.getApiCode());
-        copy.setApiConfig(HessianUtils.serialize(req.getApiConfig()));
-        copy.setRequestConfig(HessianUtils.serialize(req.getRequestConfig()));
-        copy.setResponseConfig(HessianUtils.serialize(req.getResponseConfig()));
-        egApiEndpointService.save(copy);
-        return copy.getId();
-    }
-
-    /** 
-     * @description: 保存api扩展信息
-     * @param:  
-     * @return:  
-     * @author zhangyy
-     * @date: 2024/9/23 14:26
-     */ 
-    @Transactional(rollbackFor = Exception.class)
-    public void saveLoanApiExtend(EgApiLoanExtendReq req) {
-        if (Objects.isNull(req)){
-            throw new BizException("信息不能为空");
-        }
-        EgApiLoanExtendDo copy = BeanCopyUtils.copy(req, EgApiLoanExtendDo.class);
-        egApiLoanExtendService.save(copy);
-    }
-    /**
-     * @description: 保存api扩展信息
-     * @param:
-     * @return:
-     * @author zhangyy
-     * @date: 2024/9/23 14:26
-     */
-    public void saveInterbankApiExtend(EgApiProductExtendReq req) {
-        if (Objects.isNull(req)){
-            throw new BizException("信息不能为空");
-        }
-        EgApiProductExtendDo copy = BeanCopyUtils.copy(req, EgApiProductExtendDo.class);
-        egApiProductExtendService.save(copy);
-    }
-
-}

+ 0 - 16
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/LoanServiceImpl.java

@@ -1,16 +0,0 @@
-package com.hrsk.cloud.eg.app.loan;
-
-
-import com.hrsk.cloud.eg.api.LoanService;
-
-/**
- * @author: bianlanzhou
- * @create: 2024-07-26 17:20
- * @description: 贷款服务
- **/
-public class LoanServiceImpl implements LoanService {
-    @Override
-    public void checkInto() {
-
-    }
-}

+ 5 - 4
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/ApiBizHandler.java → egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/ApiCustomizeBizHandler.java

@@ -1,10 +1,12 @@
-package com.hrsk.cloud.eg.app.business;
+package com.hrsk.cloud.eg.app.loan.customize;
 
-import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
+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;
@@ -16,12 +18,11 @@ import java.util.Map;
  * @date 2024/9/13 09:34
  */
 @Component
-public class ApiBizHandler implements ApplicationContextAware {
+public class ApiCustomizeBizHandler implements ApplicationContextAware {
 
     private final Map<ServerCodeEnums, LoanDockingApi> bizHandlerMap = new HashMap<>();
 
 
-
     public void putBizHandler(ServerCodeEnums  type, LoanDockingApi handler) {
         bizHandlerMap.put(type, handler);
     }

+ 18 - 15
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/ApiRouteService.java → egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/customize/ApiCustomizeRouteService.java

@@ -1,14 +1,17 @@
-package com.hrsk.cloud.eg.app.business;
-
-import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.app.threedocking.impl.*;
-import com.hrsk.cloud.eg.dto.data.CheckIntoParamDto;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
+package com.hrsk.cloud.eg.app.loan.customize;
+
+import com.hrsk.cloud.eg.clinet.dto.data.command.CheckIntoParamCmd;
+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 com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import java.util.Objects;
 
@@ -20,13 +23,13 @@ import java.util.Objects;
  */
 @Slf4j
 @Service
-public class ApiRouteService {
+public class ApiCustomizeRouteService {
 
     @Resource
     private EgApiService egApiService;
 
     @Resource
-    private ApiBizHandler apiBizHandler;
+    private ApiCustomizeBizHandler apiCustomizeBizHandler;
 
     @Resource
     private QingyuCreditService qingyuCreditService;
@@ -71,12 +74,12 @@ public class ApiRouteService {
      * @param xdProduct
      * @return
      */
-    public LoanDockingApi apiRouter(PlanDto xdProduct) {
+    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;
+             apiService=pubNoCheckCreditService;
              return apiService;
         }
         JoinMethodEnums method = JoinMethodEnums.getByCode(apiInfo.getApiCode());
@@ -112,7 +115,7 @@ public class ApiRouteService {
                 apiService = jinDieV3CreditService;
                 break;
             case BUSI_API:
-                apiService = apiBizHandler.getBizHandler(ServerCodeEnums.map.get(apiInfo.getApiCode()));
+                apiService = apiCustomizeBizHandler.getBizHandler(ServerCodeEnums.map.get(apiInfo.getApiCode()));
                 break;
             case CRM_QY_V3:
                 apiService = qingyuV3CreditService;
@@ -133,8 +136,8 @@ public class ApiRouteService {
      * @author zhangyy
      * @date: 2024/9/13 09:59
      */
-    public DataVo loanCheckInto(CheckIntoParamDto checkIntoParamDto){
-        LoanDockingApi loanDockingApi = apiRouter(checkIntoParamDto.getPlan());
-      return   loanDockingApi.qualityCheck(checkIntoParamDto.getUser(),checkIntoParamDto.getPlan());
+    public DataVo loanCheckInto(CheckIntoParamCmd checkIntoParamCmd){
+        LoanDockingApi loanDockingApi = apiRouter(checkIntoParamCmd.getPlan());
+      return   loanDockingApi.qualityCheck(checkIntoParamCmd.getUser(), checkIntoParamCmd.getPlan());
     }
 }

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

@@ -0,0 +1,36 @@
+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.ApiInvokeParamCmd;
+import com.hrsk.cloud.eg.clinet.dto.data.command.CheckIntoParamCmd;
+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(CheckIntoParamCmd checkIntoParamCmd) {
+        DataVo dataVo = apiCustomizeRouteService.loanCheckInto(checkIntoParamCmd);
+        return SingleResponse.of(dataVo);
+    }
+
+    @Override
+    public String getMode() {
+        return EgressApiEndpointIntegrationModeEnum.CUSTOMIZE.getCode();
+    }
+}

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

@@ -0,0 +1,32 @@
+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;
+
+import javax.annotation.Resource;
+
+/**
+ * @author zhangyy
+ * @version 1.0
+ * @description: CheckIntoCmdExe
+ * @date 2024/11/6 14:18
+ */
+@Component
+public class ApiInvokeCmdExe {
+
+    @Resource
+    private ApiGatewayService apiGatewayService;
+
+    /** 
+     * @description: 执行api请求
+     * @param:  
+     * @return:  
+     * @author zhangyy
+     * @date: 2024/11/6 15:46
+     */ 
+    public SingleResponse execute(ApiInvokeParamCmd apiInvokeParamCmd){
+      return   apiGatewayService.invoke(apiInvokeParamCmd);
+    }
+}

+ 53 - 59
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/GenerateCheckIntoHttpApiConfigService.java → egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/GenerateCheckIntoHttpApiConfigCmdExe.java

@@ -1,8 +1,8 @@
-package com.hrsk.cloud.eg.app.business;
+package com.hrsk.cloud.eg.app.loan.executor;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.google.common.collect.Lists;
-import com.hrsk.cloud.eg.constant.BusinessPrefixEnum;
+import com.hrsk.cloud.eg.clinet.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;
@@ -12,7 +12,7 @@ import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgApiEndpoint
 import com.hrsk.cloud.eg.infrastructure.service.EgApiEndpointService;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -24,9 +24,9 @@ import java.util.List;
  * @description: GenerateHttpApiConfig 迁移api配置的处理类
  * @date 2024/8/29 17:54
  */
+@Component
 @Slf4j
-@Service
-public class GenerateCheckIntoHttpApiConfigService {
+public class GenerateCheckIntoHttpApiConfigCmdExe {
 
     @Resource
     private EgApiService egApiService;
@@ -48,10 +48,7 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(huiRonApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createHuiRonCheckIntoBean(huiRonApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -69,10 +66,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createOpenApiRsaCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createOpenApiRsaCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -90,10 +87,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createOpenApiAesCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createOpenApiAesCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -111,10 +108,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createQinYuCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createQinYuCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -131,10 +128,7 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createXinLuApiCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -152,10 +146,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createXkdApiCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createXkdApiCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -173,10 +167,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createJinDieCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createJinDieCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -232,10 +226,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createJinDieCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createJinDieCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -292,10 +286,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createRxkCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createRxkCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -649,10 +643,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createHuiZhongCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHuiZhongCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -715,10 +709,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createYinHuaCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createYinHuaCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -777,10 +771,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(threeSystemConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createHuixinCheckIntoBean(threeSystemConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHuixinCheckIntoBean(threeSystemConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -846,10 +840,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createHuiZhongCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHuiZhongCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -913,10 +907,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createYuKuaiHuaCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createYuKuaiHuaCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -972,10 +966,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createYinJieCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createYinJieCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -1035,10 +1029,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createYouRonCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createYouRonCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -1095,10 +1089,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createHamiguaCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHamiguaCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -1161,10 +1155,10 @@ public class GenerateCheckIntoHttpApiConfigService {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
+        
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createHaohanwuyinCheckIntoBean(openApiConfig)));
+       
+        egApiEndpointDo.setRequestConfig(HessianUtils.serialize(createHaohanwuyinCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 

+ 5 - 12
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/GenerateCheckIntoHttpApiConfigV2Service.java → egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/GenerateCheckIntoHttpApiConfigV2CmdExe.java

@@ -1,19 +1,18 @@
-package com.hrsk.cloud.eg.app.business;
+package com.hrsk.cloud.eg.app.loan.executor;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.google.common.collect.Lists;
-import com.hrsk.cloud.eg.constant.BusinessPrefixEnum;
+import com.hrsk.cloud.eg.clinet.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.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.service.EgApiService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -25,8 +24,8 @@ import java.util.List;
  * @date 2024/9/9 16:35
  */
 @Slf4j
-@Service
-public class GenerateCheckIntoHttpApiConfigV2Service {
+@Component
+public class GenerateCheckIntoHttpApiConfigV2CmdExe {
     @Resource
     private EgApiService egApiService;
 
@@ -45,10 +44,7 @@ public class GenerateCheckIntoHttpApiConfigV2Service {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createGexinjinfuCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 
@@ -114,10 +110,7 @@ public class GenerateCheckIntoHttpApiConfigV2Service {
         egApiService.save(egApiDo);
         JSONObject jsonObject = JSONObject.parseObject(openApiConfig);
         EgApiEndpointDo egApiEndpointDo=new EgApiEndpointDo();
-        egApiEndpointDo.setApiCode(egApiDo.getApiCode());
         egApiEndpointDo.setApiId(egApiDo.getId());
-        egApiEndpointDo.setApiName(jsonObject.getString("name"));
-        egApiEndpointDo.setApiConfig(HessianUtils.serialize(createKuaiyidaiCheckIntoBean(openApiConfig)));
         egApiEndpointService.save(egApiEndpointDo);
     }
 

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

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

+ 38 - 0
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/loan/executor/common/CommonCmdExe.java

@@ -0,0 +1,38 @@
+package com.hrsk.cloud.eg.app.loan.executor.common;
+
+import com.hrsk.cloud.eg.domain.common.constant.egress.EgApiTypeEnum;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.hrsk.cloud.eg.clinet.dto.data.common.LocalEnumDTO;
+/**
+ * @author zhangyy
+ * @version 1.0
+ * @description: CommonService 公共信息操作类
+ * @date 2024/9/24 11:48
+ */
+@Component
+public class CommonCmdExe {
+
+    /**
+     * @description:  获取本地枚举返回给前端
+     * @author zhangyy
+     * @date 2024/9/24 11:56
+     * @version 1.0
+     */
+    public List<LocalEnumDTO> getLocalEnumList() {
+        List<LocalEnumDTO> localEnumDtoList = new ArrayList<>();
+        EgApiTypeEnum[] values = EgApiTypeEnum.values();
+        LocalEnumDTO localEnumDto=null;
+        for (int i = 0; i < values.length; i++) {
+            localEnumDto = new LocalEnumDTO();
+            localEnumDto.setCode(values[i].getCode());
+            localEnumDto.setMsg(values[i].getMsg());
+            localEnumDtoList.add(localEnumDto);
+        }
+        return localEnumDtoList;
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.hrsk.cloud.eg.app.route;
+
+import com.hrsk.cloud.eg.clinet.dto.data.EgLoanApiConfigInfoDto;
+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();
+}

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

@@ -0,0 +1,48 @@
+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.EgLoanApiConfigInfoDto;
+import com.hrsk.cloud.eg.clinet.dto.data.command.ApiInvokeParamCmd;
+import com.hrsk.cloud.eg.clinet.dto.data.command.CheckIntoParamCmd;
+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) {
+        CheckIntoParamCmd checkIntoParamCmd = JSONObject.parseObject(apiInvokeParamCmd.getParam().toString(), CheckIntoParamCmd.class);
+        EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(checkIntoParamCmd.getPlan().getApiId());
+        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();
+    }
+}

+ 0 - 13
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/api/LoanService.java

@@ -1,13 +0,0 @@
-package com.hrsk.cloud.eg.api;
-
-/**
- * @author: bianlanzhou
- * @create: 2024-07-26 13:52
- * @description: 贷款类服务
- **/
-public interface LoanService {
-    /**
-     * 撞库
-     */
-    void checkInto();
-}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,45 @@
+package com.hrsk.cloud.eg.clinet.dto.data;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhangyy
+ * @version 1.0
+ * @description: EgApiConfigInfoDo api配置信息类 综合实体
+ * @date 2024/10/21 11:21
+ */
+@Data
+public class EgLoanApiConfigInfoDto implements Serializable {
+    /**
+     * API名称
+     */
+    private String apiName;
+
+    /**
+     * API类型
+     */
+    private String apiType;
+
+    /**
+     * 数据API主键
+     */
+    private Long apiId;
+    /**
+     * 通道类型
+     */
+    private String apiCode;
+
+    /**
+     * 请求配置 对应原始数据表中的 threeConfig
+     */
+    private byte[] requestConfig;
+
+    private byte[] apiConfig;
+
+    /**
+     * 是否需要撞库0:不需要;1:需要
+     */
+    private Integer needCheck;
+}

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

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.dto.data;
+package com.hrsk.cloud.eg.clinet.dto.data;
 
 
 public class ErrorCode {

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

@@ -0,0 +1,29 @@
+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;
+
+
+}

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

@@ -0,0 +1,25 @@
+package com.hrsk.cloud.eg.clinet.dto.data.command;
+
+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 CheckIntoParamCmd implements Serializable {
+    /**
+     * 用户信息
+     * */
+    private UserBaseInfoCmd user;
+    /**
+     * 推广计划信息
+     * */
+    private PlanCmd plan;
+}

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

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

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

@@ -1,21 +1,16 @@
-package com.hrsk.cloud.eg.dto.data.egPlan;
+package com.hrsk.cloud.eg.clinet.dto.data.plan.command;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
 import java.io.Serializable;
 
 /**
  * @author zhangyy
  * @version 1.0
- * @description: PlanDto 对外的推广计划Dto
+ * @description: PlanCmd 对外的推广计划Dto
  * @date 2024/8/29 17:48
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class PlanDto  implements Serializable {
+public class PlanCmd implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

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

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.dto.data.user;
+package com.hrsk.cloud.eg.clinet.dto.data.user.command;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -15,8 +15,6 @@ import java.util.Date;
  * @since 2019-09-29
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 public class UserAssetCarInfoCmd implements Serializable {
 
 

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

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

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

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

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

@@ -1,14 +1,16 @@
-package com.hrsk.cloud.eg.dto.data.user;
+package com.hrsk.cloud.eg.clinet.dto.data.user.command;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * @author: bianlanzhou
  * @create: 2024-08-01 13:48
  * @description: User信息Dto
  **/
 @Data
-public class UserBaseInfoCmd {
+public class UserBaseInfoCmd implements Serializable {
     /**
      * 用户ID
      * */

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.dto.event;
+package com.hrsk.cloud.eg.clinet.dto.event;
 
 /**
  * CustomerCreatedEvent

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

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.dto.event;
+package com.hrsk.cloud.eg.clinet.dto.event;
 
 /**
  * @author niexiaolong

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

@@ -0,0 +1,117 @@
+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;
+    }
+}

+ 0 - 23
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/dto/data/CheckIntoParamDto.java

@@ -1,23 +0,0 @@
-package com.hrsk.cloud.eg.dto.data;
-
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
-import lombok.Data;
-
-/**
- * @author zhangyy
- * @version 1.0
- * @description: CheckIntoParamDto
- * @date 2024/8/30 09:52
- */
-@Data
-public class CheckIntoParamDto {
-    /**
-     * 用户信息
-     * */
-    private UserBaseInfoCmd user;
-    /**
-     * 推广计划信息
-     * */
-    private PlanDto plan;
-}

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

@@ -0,0 +1,52 @@
+package com.hrsk.cloud.eg.domain.common.constant;
+
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author zhangyy
+ * @version 1.0
+ * @description: BusinessServiceEnums
+ * @date 2024/11/6 16:00
+ */
+@Getter
+public enum BusinessServiceEnums {
+
+    ACCESS_DENIED("100009","您没有当前操作权限!"),
+    CAPTCHA_NOT_MATCH("100008","验证码错误!"),
+    NOT_LOGIN("100007","尚未登录,请先登录!"),
+    OTP_NOT_MATCH("100006","验证码错误!"),
+    USER_PASSWORD_RETRY_LIMIT_EXCEED("100005","用户密码重试超过最大次数!"),
+    USER_HAS_DEACTIVATED("100004","用户已经被停用!"),
+    USER_HAS_DELETED("100003","用户已经被删除!"),
+    PASSWORD_NOT_MATCH("100002","用户名密码不匹配!"),
+    USER_NOT_FOUND("100001","用户不存在!"),
+    OK("000000","操作成功!"),
+    FAIL("-999999","操作失败!");
+
+
+    ;
+
+
+    private String code;
+    private String message;
+
+    static Map<String, BusinessServiceEnums> map = new HashMap();
+
+    static {
+        for (BusinessServiceEnums value : BusinessServiceEnums.values()) {
+            map.put(value.code, value);
+        }
+    }
+
+    BusinessServiceEnums(String number, String message) {
+        this.code = number;
+        this.message = message;
+    }
+
+    public static BusinessServiceEnums getByCode(String code) {
+        return map.get(code);
+    }
+}

+ 1 - 1
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/EgApiTypeEnum.java → egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/EgApiTypeEnum.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;

+ 44 - 0
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/EgRouteTypeEnum.java

@@ -0,0 +1,44 @@
+package com.hrsk.cloud.eg.domain.common.constant.egress;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author zhangyy
+ * @version 1.0
+ * @description: EgApiTypeEnum
+ * @date 2024/9/23 13:58
+ */
+@Getter
+@AllArgsConstructor
+public enum EgRouteTypeEnum {
+    CHECK_INTO("CHECK_INTO","准入"),
+    APPLY("APPLY","注册"),
+
+    ;
+    static Map<String, EgRouteTypeEnum> map = new HashMap();
+
+    static {
+        for (EgRouteTypeEnum value : EgRouteTypeEnum.values()) {
+            map.put(value.code, value);
+        }
+    }
+
+    public static EgRouteTypeEnum getByCode(String code) {
+        return map.get(code);
+    }
+    private String code;
+
+    private String msg;
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+}

+ 32 - 0
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/EgressApiEndpointIntegrationModeEnum.java

@@ -0,0 +1,32 @@
+package com.hrsk.cloud.eg.domain.common.constant.egress;
+
+import lombok.Getter;
+
+/**
+ * @author: bianlanzhou
+ * @create: 2024-11-04 10:43
+ * @description: 通道接出方式
+ **/
+@Getter
+public enum EgressApiEndpointIntegrationModeEnum {
+    CUSTOMIZE("customize","自定义代码模式"),
+    GUIDE("guide","向导模式");
+    /**
+     * 编码
+     */
+    private String code;
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 构造函数
+     * @param code
+     * @param desc
+     */
+    EgressApiEndpointIntegrationModeEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+}

+ 34 - 0
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/constant/egress/EgressApiStatusEnum.java

@@ -0,0 +1,34 @@
+package com.hrsk.cloud.eg.domain.common.constant.egress;
+
+import lombok.Getter;
+
+/**
+ * @author: bianlanzhou
+ * @create: 2024-10-22 10:49
+ * @description: 接出API状态枚举
+ **/
+@Getter
+public enum EgressApiStatusEnum {
+    DRAFT("draft","草稿"),
+    OK("ok","启用"),
+    DEACTIVATE("deactivate","停用"),
+    DELETE("delete","删除");
+    /**
+     * 编码
+     */
+    private String code;
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 构造函数
+     * @param code 编码
+     * @param desc 描述
+     */
+    EgressApiStatusEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+}

+ 5 - 5
egress-gateway-service-infrastructure/pom.xml

@@ -17,11 +17,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>com.caucho</groupId>
-            <artifactId>hessian</artifactId>
-            <version>4.0.60</version>
-        </dependency>
         <dependency>
             <groupId>com.hrsk.cloud</groupId>
             <artifactId>egress-gateway-service-domain</artifactId>
@@ -46,6 +41,11 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.caucho</groupId>
+            <artifactId>hessian</artifactId>
+            <version>${hessian.version}</version>
+        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

+ 0 - 33
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/apiGateWayImpl/ApiGatewayImpl.java

@@ -1,33 +0,0 @@
-package com.hrsk.cloud.eg.infrastructure.apiGateWayImpl;
-
-import com.hrsk.cloud.eg.domain.api.ApiGateway;
-import com.hrsk.cloud.eg.dto.data.CheckIntoParamDto;
-import com.hrsk.cloud.eg.infrastructure.request.HttpRequestCheckIntoService;
-import com.hrsk.cloud.eg.vo.response.DataVo;
-import com.hrsk.cloud.eg.vo.response.DefaultResponseVo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-
-/**
- * @author: bianlanzhou
- * @create: 2024-08-01 18:15
- * @description: API防腐层
- **/
-@Slf4j
-@Component
-public class ApiGatewayImpl implements ApiGateway {
-
-
-    @Resource
-    private HttpRequestCheckIntoService checkIntoService;
-
-
-
-    @Override
-    public DefaultResponseVo<DataVo> checkIntoRequest(CheckIntoParamDto param) {
-        DataVo data = checkIntoService.checkInto(param);
-        return DefaultResponseVo.success(data);
-
-    }
-}

+ 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.constant.GlobalDataStatusEnum;
+import com.hrsk.cloud.eg.clinet.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;

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

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

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

@@ -1,12 +1,7 @@
 package com.hrsk.cloud.eg.infrastructure.config.client;
 
 import com.hrsk.cloud.eg.domain.api.HttpApi;
-import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 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;

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

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.infrastructure.config.client.config;
+package com.hrsk.cloud.eg.infrastructure.config.client;
 
 /**
  * Author: zhangyy

+ 1 - 3
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/config/RetryRestTemplate.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/client/RetryRestTemplate.java

@@ -1,4 +1,4 @@
-package com.hrsk.cloud.eg.infrastructure.config.client.config;
+package com.hrsk.cloud.eg.infrastructure.config.client;
 
 import org.apache.http.HttpEntityEnclosingRequest;
 import org.apache.http.NoHttpResponseException;
@@ -24,11 +24,9 @@ import org.springframework.web.client.RestTemplate;
 
 import java.io.IOException;
 import java.net.ConnectException;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Author: zhangyy

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

@@ -6,8 +6,8 @@ import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.filter.Filter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.SerializationException;
 import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
 
 import java.util.Objects;
 

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

@@ -1,5 +1,6 @@
 package com.hrsk.cloud.eg.infrastructure.config.redis;
 
+
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 /**

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

@@ -10,7 +10,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 import javax.annotation.Resource;
 

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

@@ -1,9 +1,9 @@
-package com.hrsk.cloud.eg.domain.threedocking;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking;
 
-import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
-import com.hrsk.cloud.eg.vo.response.DataVo;
+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.clinet.vo.DataVo;
+import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
 
 /**
  * @author zhangyy
@@ -20,7 +20,7 @@ public interface LoanDockingApi {
      * @author zhangyy
      * @date: 2024/9/10 14:33
      */
-    DataVo qualityCheck(UserBaseInfoDto user, PlanDto planDto);
+    DataVo qualityCheck(UserBaseInfoCmd user, PlanCmd planDto);
 
 
     /**

+ 8 - 8
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/AnHuiHengDaoCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/AnHuiHengDaoCreditService.java

@@ -1,17 +1,17 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
-import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+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.clinet.vo.DataVo;
+import com.hrsk.cloud.eg.domain.common.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
+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;
-import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -81,7 +81,7 @@ public class AnHuiHengDaoCreditService implements LoanDockingApi {
      * @param product
      * @return
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit AnHuiHengDaoCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 7 - 8
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/BaiXinShunTaiCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/BaiXinShunTaiCreditService.java

@@ -1,18 +1,17 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
-import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+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.clinet.vo.DataVo;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
-import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
+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;
-import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
@@ -89,7 +88,7 @@ public class BaiXinShunTaiCreditService implements LoanDockingApi {
     }
 
     @Override
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit QingDaoBaiXinShunTaiCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -86,7 +86,7 @@ public class BaiYiJinFuCreditService implements LoanDockingApi {
      * @param product
      * @return
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit BaiYiJinFuCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,16 +1,14 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -170,7 +168,7 @@ public class BeiJingChongHeCreditService implements LoanDockingApi {
      * @return
      *  {"channel_code":"34","checkUrl":"http://120.46.41.14:8888/api/customer/collisionLibrary","channel_secret_key":"HrYk20230829KYR6"}
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit BeiJingChongHeCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -66,7 +66,7 @@ public class CangZhouSuYiRonogCreditService implements LoanDockingApi {
 
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit CangZhouSuYiRongCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,17 +1,15 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -72,7 +70,7 @@ public class CheYouRongCreditService implements LoanDockingApi {
 
 
     }
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit JiangXiCheYouRongCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -70,7 +70,7 @@ public class ChengDuYiHeShengCreditService implements LoanDockingApi {
         private Integer has_ali_score;//是否有芝麻分,0,0-599,1.600-649,2.650-699,3.700+
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit ChengDuYiHeShengCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,16 +1,14 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -82,7 +80,7 @@ public class ChengHongHuiCreditService implements LoanDockingApi {
     }
 
     @Override
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
 //            log.info("credit ChengHongHuiCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,22 +1,21 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+
 import javax.annotation.Resource;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKey;
@@ -94,7 +93,7 @@ public class ChongQinDongRunCreditService implements LoanDockingApi {
         private String dataStr;// 加密后参数
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit ChongQinDongRunCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,23 +1,22 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import javax.crypto.Cipher;
 import javax.crypto.SecretKeyFactory;
@@ -88,7 +87,7 @@ public class ChongQingRuiShangXinCreditService implements LoanDockingApi {
     "iv": "18521959"
     }
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit ChongQingRuiShangXinCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,17 +1,15 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -76,7 +74,7 @@ public class ChongQingYiYueCreditService implements LoanDockingApi {
 
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit ChongQingYiYueCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,12 +1,12 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -72,7 +72,7 @@ public class ChuanjinCreditService implements LoanDockingApi {
     }
 
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit ChuanjinCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -69,7 +69,7 @@ public class DeLuoXuanAesCreditService implements LoanDockingApi {
         private Integer platform_id;//不需要回传值为 0,回传必传(平台提供)
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit DeLuoXuanAesCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -69,7 +69,7 @@ public class DeLuoXuanCreditService implements LoanDockingApi {
 
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit DeLuoXuanCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -73,7 +73,7 @@ public class DeZhouXinYiRongCreditService implements LoanDockingApi {
         private Integer fund;//公积金 1:有 2:无
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit DeZhouXinYiRongCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -71,7 +71,7 @@ public class DeZhouXinYiRongV2CreditService implements LoanDockingApi {
 
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit DeZhouXinYiRongV2CreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -61,7 +61,7 @@ public class DfrzwCreditService implements LoanDockingApi {
         return ServerCodeEnums.DongFangRZ;
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
 
         String cellPhoneNumber = userInfo.getPhoneMd5().toLowerCase();
         Boolean isNotBlack = preFilter(cellPhoneNumber);

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -79,7 +79,7 @@ public class FangxinwangiCreditService implements LoanDockingApi {
      * @return
      *  {"channelSource":"birong","url":"http://apitest.shlyxxjs.com","key":"mgjr@3des123#dhjr9763089"}
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit FangxinwangCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -62,7 +62,7 @@ public class FuChengCreditService implements LoanDockingApi {
     }
 
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit FuChengCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,12 +1,12 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+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.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -48,7 +48,7 @@ public class FuZhouBeiJiuCreditService implements LoanDockingApi {
     }
 
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit FuZhouBeiJiuCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,17 +1,15 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -93,7 +91,7 @@ public class FuZhouBeiYinJinRongCreditService implements LoanDockingApi {
      * 	"publicKey": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsLuutChHG1O_PG6Xo7IE6EMr9S5DdIc4PX2T0OoWqf7-jLMvdgq0ueEBPXC-JmyE-vHFkejVwZBwte7eoVaW6KeW0v1FYuN_hDA7bra__zWpLKnlyvYs8TsqkwbCq5EhL7pnhi08ypoEEXQVsyjjBy7cttDMWz7b4bjkEPSdWulmTKeOadLJKdGA95MpC1kbA_TlKJf4bwaBluWSFdb7jyms-KtzcCygQLVD5z1NcPIQVe44HXGUYqelThZ0MwokcnLS2ow7RpkE3_-ut0Lrwk9zT2gJ3_gPEL6IE1XXXvsDZwsKdv252AfBiZwUqVc26XsMd7pd-jowK1QiLnOmSQIDAQAB"
      * }
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit FuZhouBeiYinJinRongCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -76,7 +76,7 @@ public class GexinjinfuCreditService implements LoanDockingApi {
      * @return
      *  {"channelSource":"birong","url":"http://apitest.shlyxxjs.com","key":"mgjr@3des123#dhjr9763089"}
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit GexinjinfuCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -62,7 +62,7 @@ public class GuanZhouPuHuiCreditService  implements LoanDockingApi {
         private String remarks; //备注
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit GuanZhouPuHuiCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -64,7 +64,7 @@ public class GuangDongHaoEnCreditService implements LoanDockingApi {
         private Integer zhima;//芝麻分
         private Integer additional;//其他信息
     }
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit GuangDongHaoEnCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -49,7 +49,7 @@ import javax.annotation.Resource;
         private String area;//城市
         private String situation;//备注
     }
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit GuangDongHongZhanCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -84,7 +84,7 @@ public class GuangZhouHuaXinCreditService implements LoanDockingApi {
 
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit GuangZhouHuaXinCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -73,7 +73,7 @@ public class HamiguaCreditService implements LoanDockingApi {
      * @return
      *  {"channelSource":"birong","url":"http://apitest.shlyxxjs.com","key":"mgjr@3des123#dhjr9763089"}
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HamiguaCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HaohanwuyinCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HaohanwuyinCreditService.java

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -77,7 +77,7 @@ public class HaohanwuyinCreditService implements LoanDockingApi {
      *  {"channelSource":"birong","url":"http://apitest.shlyxxjs.com","key":"mgjr@3des123#dhjr9763089"}
      */
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HaohanwuyinCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HeFeiShenDaiCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HeFeiShenDaiCreditService.java

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -55,7 +55,7 @@ public class HeFeiShenDaiCreditService implements LoanDockingApi {
     }
 
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HeFeiShenDaiCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

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

@@ -1,17 +1,15 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -59,7 +57,7 @@ public class HeZeRongXinCreditService implements LoanDockingApi {
         private Integer credit;//是否有信用卡 (  1:有  0:无 )
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HeZeRongXinCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HengYangJiuZhenCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HengYangJiuZhenCreditService.java

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -73,7 +73,7 @@ public class HengYangJiuZhenCreditService implements LoanDockingApi {
 
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
 //            log.info("credit YunHaiLianDongCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HengaiCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HengaiCreditService.java

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -99,7 +99,7 @@ public class HengaiCreditService implements LoanDockingApi {
     }
 
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HengaiCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());

+ 5 - 6
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HongShengJinFuCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HongShengJinFuCreditService.java

@@ -1,16 +1,14 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -21,6 +19,7 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+
 import javax.annotation.Resource;
 
 
@@ -70,7 +69,7 @@ public class HongShengJinFuCreditService implements LoanDockingApi {
         private String remark;
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
             byte[] requestConfig = loanApiConfigInfo.getApiConfig();

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HongXinPuHuiCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HongXinPuHuiCreditService.java

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -70,7 +70,7 @@ public class HongXinPuHuiCreditService implements LoanDockingApi {
         private Integer is_encrypt;//是否加密(1:是 0:否)
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HongXinPuHuiCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HuNanDiShuiYanCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HuNanDiShuiYanCreditService.java

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -60,7 +60,7 @@ public class HuNanDiShuiYanCreditService implements LoanDockingApi {
         private Integer note; //备注可为空(其他信息可传这
     }
 
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HuNanDiShuiYanCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 5 - 7
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HuirongCrmCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HuirongCrmCreditService.java

@@ -1,17 +1,15 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -22,7 +20,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.Objects;
 
 /**
  * 惠融crmAPI接单
@@ -62,7 +60,7 @@ public class HuirongCrmCreditService implements LoanDockingApi {
      *
      * @return {"channelSource":"birong","url":"http://apitest.shlyxxjs.com","key":"mgjr@3des123#dhjr9763089"}
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HuirongCrmCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 6 - 7
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HuixinCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HuixinCreditService.java

@@ -1,15 +1,14 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
+
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.StringDecodeUtils;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -21,7 +20,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.Objects;
 
 /**
  * @Descrption
@@ -90,7 +89,7 @@ public class HuixinCreditService implements LoanDockingApi {
      * @param product
      * @return {"channelSource":"birong","url":"http://apitest.shlyxxjs.com","key":"mgjr@3des123#dhjr9763089"}
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HuixinCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/HuizhongCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/HuizhongCreditService.java

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -90,7 +90,7 @@ public class HuizhongCreditService implements LoanDockingApi {
      * @return
      *  {"channelSource":"birong","url":"http://apitest.shlyxxjs.com","key":"mgjr@3des123#dhjr9763089"}
      */
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit HuizhongCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());

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

@@ -1,17 +1,15 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.infrastructure.utils.Md5Util;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
@@ -94,7 +92,7 @@ public class JianZhanCreditService implements LoanDockingApi {
     }
 
     @Override
-    public DataVo qualityCheck(UserBaseInfoDto user, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd user, PlanCmd product) {
         try {
             log.info("credit JianZhanCreditService qualityCheck begin...userId:{}", user.getPhoneMd5());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/JiechengCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JiechengCreditService.java

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -45,7 +45,7 @@ public class JiechengCreditService implements LoanDockingApi {
      *  {"key":"5lvNIA1Kmchq2gu3C9P5g+rttvQXq3lh","url":"http://www.cs.ahaiyu.com"}
      */
     @Override
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit JiechengCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/JilingHuiRongCreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JilingHuiRongCreditService.java

@@ -1,11 +1,11 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -53,7 +53,7 @@ public class JilingHuiRongCreditService implements LoanDockingApi {
      *
      */
     @Override
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit JilingHuiRongCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/JinDieV2CreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JinDieV2CreditService.java

@@ -1,12 +1,12 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+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.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -56,7 +56,7 @@ public class JinDieV2CreditService implements LoanDockingApi {
      * @return {"url":"http://apitest.shlyxxjs.com","key":"fluxZhudai*_key","tenantId":"1405729496904110081","trafficPlatformId":"13872425018351111"}
      */
     @Override
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit JindieV2CreditService qualityCheck begin...userId:{},productId={}", userInfo.getUserId(), product.getPlanId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 5 - 6
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/JinDieV3CreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JinDieV3CreditService.java

@@ -1,22 +1,21 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
-import com.hrsk.cloud.eg.infrastructure.repository.database.entity.ProductBusinessApiInfoDo;
 import com.hrsk.cloud.eg.infrastructure.service.EgApiService;
-import com.hrsk.cloud.eg.infrastructure.service.ProductBusinessApiInfoService;
 import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
+
 import javax.annotation.Resource;
 
 /**
@@ -60,7 +59,7 @@ public class JinDieV3CreditService implements LoanDockingApi {
      * @return {"url":"http://apitest.shlyxxjs.com","key":"fluxZhudai*_key","tenantId":"1405729496904110081","trafficPlatformId":"13872425018351111"}
      */
     @Override
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit JinDieV3CreditService qualityCheck begin...userId:{},productId={}", userInfo.getUserId(), product.getPlanId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

+ 4 - 4
egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/threedocking/impl/JinDieV4CreditService.java → egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/loanMannager/threedocking/impl/JinDieV4CreditService.java

@@ -1,10 +1,10 @@
-package com.hrsk.cloud.eg.domain.threedocking.impl;
+package com.hrsk.cloud.eg.infrastructure.loanMannager.threedocking.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.app.constant.ServerCodeEnums;
 import com.hrsk.cloud.eg.app.threedocking.LoanDockingApi;
-import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
-import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
+import com.hrsk.cloud.eg.dto.data.egPlan.PlanCmd;
+import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoCmd;
 import com.hrsk.cloud.eg.infrastructure.config.client.HessianUtils;
 import com.hrsk.cloud.eg.infrastructure.config.client.config.RetryRestTemplate;
 import com.hrsk.cloud.eg.infrastructure.repository.database.entity.EgLoanApiConfigInfoDo;
@@ -44,7 +44,7 @@ public class JinDieV4CreditService implements LoanDockingApi {
     }
 
     @Override
-    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+    public DataVo qualityCheck(UserBaseInfoCmd userInfo, PlanCmd product) {
         try {
             log.info("credit JinDieV4CreditService qualityCheck begin...userId:{}", userInfo.getUserId());
            EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());

Неке датотеке нису приказане због велике количине промена