GITZYY vor 1 Monat
Ursprung
Commit
965886008a
36 geänderte Dateien mit 112 neuen und 58 gelöschten Zeilen
  1. 1 1
      egress-gateway-service-adapter/pom.xml
  2. 2 1
      egress-gateway-service-app/pom.xml
  3. 5 4
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/comon/CommonServiceImpl.java
  4. 12 12
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/CommonService.java
  5. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/ChuanjinCreditService.java
  6. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/DfrzwCreditService.java
  7. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/FangxinwangiCreditService.java
  8. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/GexinjinfuCreditService.java
  9. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/HamiguaCreditService.java
  10. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/HaohanwuyinCreditService.java
  11. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/HuirongCrmCreditService.java
  12. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/HuixinCreditService.java
  13. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/JinDieV2CreditService.java
  14. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/JinDieV3CreditService.java
  15. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/KuaiyidaiCreditService.java
  16. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/KuaiyidaiFourToOneCreditService.java
  17. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/KuaiyidaiNightCreditService.java
  18. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/KuaiyidaiV2CreditService.java
  19. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/OpenApiCreditService.java
  20. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/QingyuCreditService.java
  21. 2 2
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XiangKeDaCreditService.java
  22. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XinluCreditService.java
  23. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XinyidaiCreditService.java
  24. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XuzhoufuliCreditService.java
  25. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XuzhoufuliV2CreditService.java
  26. 1 1
      egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/YiQiHuaCreditService.java
  27. 1 1
      egress-gateway-service-client/pom.xml
  28. 4 1
      egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/dto/data/common/LocalEnumDto.java
  29. 1 1
      egress-gateway-service-domain/pom.xml
  30. 1 1
      egress-gateway-service-infrastructure/pom.xml
  31. 5 1
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/config/MyMetaObjectHandler.java
  32. 2 1
      egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/service/impl/EgApiServiceImpl.java
  33. 6 6
      pom.xml
  34. 1 1
      start/pom.xml
  35. 1 1
      start/src/main/resources/application-pre.yaml
  36. 47 3
      start/src/test/java/StartApiTest.java

+ 1 - 1
egress-gateway-service-adapter/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.hrsk.cloud</groupId>
         <artifactId>egress-gateway-service</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>egress-gateway-service-adapter</artifactId>

+ 2 - 1
egress-gateway-service-app/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.hrsk.cloud</groupId>
         <artifactId>egress-gateway-service</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>egress-gateway-service-app</artifactId>
@@ -23,6 +23,7 @@
         <dependency>
             <groupId>com.hrsk.cloud</groupId>
             <artifactId>egress-gateway-service-client</artifactId>
+            <version>1.0</version>
         </dependency>
     </dependencies>
 

+ 5 - 4
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/api/comon/CommonServiceImpl.java

@@ -18,11 +18,12 @@ import java.util.List;
 @RequestMapping("common")
 @RestController
 public class CommonServiceImpl {
+
     @Resource private CommonService commonService;
 
 
-    @RequestMapping("/localEnumList")
-    public DefaultResponseVo<List<LocalEnumDto>> getLocalEnumList(){
-        return  DefaultResponseVo.success(commonService.getLocalEnumList());
-    }
+//    @RequestMapping("/localEnumList")
+//    public DefaultResponseVo<List<LocalEnumDto>> getLocalEnumList(){
+//        return  DefaultResponseVo.success(commonService.getLocalEnumList());
+//    }
 }

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

@@ -22,16 +22,16 @@ public class CommonService {
      * @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;
-    }
+//    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;
+//    }
 }

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/ChuanjinCreditService.java

@@ -78,7 +78,7 @@ public class ChuanjinCreditService implements LoanDockingApi {
         try {
             log.info("credit ChuanjinCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            Object requestConfig = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()) ;
+            Object requestConfig = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()) ;
             JSONObject config = JSONObject.parseObject(requestConfig.toString());
             log.info("川金对接参数:{}", JSON.toJSONString(config));
             String url = config.getString("url") + qualityCheckPath;

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/DfrzwCreditService.java

@@ -71,7 +71,7 @@ public class DfrzwCreditService implements LoanDockingApi {
         }
         EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
 
-        Object deserialize = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig());
+        Object deserialize = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig());
         JSONObject data = JSONObject.parseObject(deserialize.toString());
         String url = data.getString("url");
         String timeStampStr = DateUtil.getFormatDate(new Date(), "yyyyMMddHHmmss");

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/FangxinwangiCreditService.java

@@ -83,7 +83,7 @@ public class FangxinwangiCreditService implements LoanDockingApi {
             log.info("credit FangxinwangCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject fangxinwangJointDTO = JSON.parseObject(configJson);
             log.info("放心网对接参数:{}", JSON.toJSONString(fangxinwangJointDTO));
             String url = fangxinwangJointDTO.getString("url") + qualityCheckPath;

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/GexinjinfuCreditService.java

@@ -81,7 +81,7 @@ public class GexinjinfuCreditService implements LoanDockingApi {
         try {
             log.info("credit GexinjinfuCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject gexinjinfuJointDTO = JSON.parseObject(configJson);
             log.info("格鑫金服对接参数:{}", JSON.toJSONString(gexinjinfuJointDTO));
             String md5 = userInfo.getPhoneMd5() == null ? Md5Util.encoderByMd5(userInfo.getUserMobile()) : userInfo.getPhoneMd5();

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/HamiguaCreditService.java

@@ -79,7 +79,7 @@ public class HamiguaCreditService implements LoanDockingApi {
             log.info("credit HamiguaCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString() ;
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString() ;
             JSONObject hamiguaJointDTO = JSON.parseObject(configJson);
             log.info("哈密瓜对接参数:{}", JSON.toJSONString(hamiguaJointDTO));
 //            CheckInfo checkInfo = new CheckInfo();

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/HaohanwuyinCreditService.java

@@ -81,7 +81,7 @@ public class HaohanwuyinCreditService implements LoanDockingApi {
         try {
             log.info("credit HaohanwuyinCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString() ;
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString() ;
             com.alibaba.fastjson2.JSONObject HaohanwuyinJointDTO = JSON.parseObject(configJson);
             log.info("灏瀚无崟对接参数:{}", JSON.toJSONString(HaohanwuyinJointDTO));
             Map<String,String> checkData = new HashMap<>();

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/HuirongCrmCreditService.java

@@ -66,7 +66,7 @@ public class HuirongCrmCreditService implements LoanDockingApi {
         try {
             log.info("credit HuirongCrmCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String config = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String config = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject huirongJointDTO = JSON.parseObject(config);
             String url = huirongJointDTO.getString("checkUrl");
             CheckData checkData = new CheckData();

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/HuixinCreditService.java

@@ -95,7 +95,7 @@ public class HuixinCreditService implements LoanDockingApi {
             log.info("credit HuixinCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject huiXinJointDTO = JSONObject.parseObject(configJson);
             log.info("汇鑫对接参数:{}", JSONObject.toJSONString(huiXinJointDTO));
 

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/JinDieV2CreditService.java

@@ -60,7 +60,7 @@ public class JinDieV2CreditService implements LoanDockingApi {
             log.info("credit JindieV2CreditService qualityCheck begin...userId:{},productId={}", userInfo.getUserId(), product.getPlanId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
 
-            HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString()
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             if (StringUtils.isBlank(configJson)) {
                 return DataVo.fail(product.getPlanName(), product.getPlanId());
             }

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/JinDieV3CreditService.java

@@ -64,7 +64,7 @@ public class JinDieV3CreditService implements LoanDockingApi {
         try {
             log.info("credit JinDieV3CreditService qualityCheck begin...userId:{},productId={}", userInfo.getUserId(), product.getPlanId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             if (StringUtils.isBlank(configJson)) {
                 return DataVo.fail(product.getPlanName(), product.getPlanId());
             }

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/KuaiyidaiCreditService.java

@@ -67,7 +67,7 @@ public class KuaiyidaiCreditService implements LoanDockingApi {
             log.info("credit KuaiyidaiCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject kuaiyidaiJointDTO = JSONObject.parseObject(configJson);
             log.info("快易贷对接参数:{}", JSON.toJSONString(kuaiyidaiJointDTO));
 

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/KuaiyidaiFourToOneCreditService.java

@@ -62,7 +62,7 @@ public class KuaiyidaiFourToOneCreditService implements LoanDockingApi {
         try {
             log.info("credit KuaiyidaiCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject kuaiyidaiJointDTO = JSON.parseObject(configJson);
             log.info("快易贷对接参数:{}", JSON.toJSONString(kuaiyidaiJointDTO));
 

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/KuaiyidaiNightCreditService.java

@@ -66,7 +66,7 @@ public class KuaiyidaiNightCreditService implements LoanDockingApi {
         try {
             log.info("credit KuaiyidaiCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject kuaiyidaiJointDTO = JSON.parseObject(configJson);
             log.info("快易贷对接参数:{}", JSON.toJSONString(kuaiyidaiJointDTO));
 

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/KuaiyidaiV2CreditService.java

@@ -73,7 +73,7 @@ public class KuaiyidaiV2CreditService implements LoanDockingApi {
         try {
             log.info("credit KuaiyidaiCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject kuaiyidaiJointDTO = JSON.parseObject(configJson);
             log.info("快易贷对接参数:{}", JSON.toJSONString(kuaiyidaiJointDTO));
 

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/OpenApiCreditService.java

@@ -61,7 +61,7 @@ public class OpenApiCreditService implements LoanDockingApi {
         log.info("credit OpenApiCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
         try {
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String config = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String config = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject jsonObject = JSONObject.parseObject(config);
             if (StringUtils.isAnyEmpty(jsonObject.getString("openapiCheckUrl"), jsonObject.getString("openapiAccessKeySecret"))) {
                 return DataVo.fail(product.getPlanName(), product.getPlanId());

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/QingyuCreditService.java

@@ -58,7 +58,7 @@ public class QingyuCreditService implements LoanDockingApi {
         try {
             log.info("credit QingyuCreditService qualityCheck begin...userId:{},productId={}", userInfo.getUserId(), product.getPlanId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             if (StringUtils.isBlank(configJson)) {
                 return DataVo.timeout(product.getPlanId(), product.getPlanName());
             }

+ 2 - 2
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XiangKeDaCreditService.java

@@ -78,7 +78,7 @@ public class XiangKeDaCreditService implements LoanDockingApi {
             }
             log.info("credit XiangKeDaCreditService qualityCheck begin...userId:{},productId={}", userInfo.getUserId(), product.getPlanId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             if (StringUtils.isBlank(configJson)) {
                 return qualityCheck(userInfo.getPhoneMd5(), product);
             }
@@ -118,7 +118,7 @@ public class XiangKeDaCreditService implements LoanDockingApi {
         try {
             log.info("credit XiangKeDaCreditService qualityCheck begin...md5Phone:{},productId={}", md5Phone, product.getPlanId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             if (StringUtils.isBlank(configJson)) {
                 return DataVo.timeout(product.getPlanId(), product.getPlanName());
             }

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XinluCreditService.java

@@ -74,7 +74,7 @@ public class XinluCreditService implements LoanDockingApi {
         try {
             log.info("credit XinluCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject xinluJointDTO = JSONObject.parseObject(configJson);
             log.info("鑫鹿对接参数:{}", JSONObject.toJSONString(xinluJointDTO));
             String url = xinluJointDTO.getString("checkUrl");

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XinyidaiCreditService.java

@@ -84,7 +84,7 @@ public class XinyidaiCreditService implements LoanDockingApi {
             log.info("credit XinyidaiCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject xinyidaiJointDTO = JSON.parseObject(configJson);
             log.info("信易贷对接参数:{}", JSON.toJSONString(xinyidaiJointDTO));
             String url = xinyidaiJointDTO.getString("url") + qualityCheckPath+"?md5=" +userInfo.getPhoneMd5() ;

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XuzhoufuliCreditService.java

@@ -83,7 +83,7 @@ public class XuzhoufuliCreditService implements LoanDockingApi {
             log.info("credit XuzhoufuliCreditService qualityCheck begin...userId:{}",userInfo.getUserId());
 //            XdProductJointConfig xdProductJointConfig = xdProductJointConfigMapper.selectById(product.getJointType());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject xuzhoufuliJointDTO = JSON.parseObject(configJson);
             log.info("徐州富力对接参数:{}", JSON.toJSONString(xuzhoufuliJointDTO));
 

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/XuzhoufuliV2CreditService.java

@@ -81,7 +81,7 @@ public class XuzhoufuliV2CreditService implements LoanDockingApi {
         try {
             log.info("credit XuzhoufuliV2CreditService qualityCheck begin...userId:{}",userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString();
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString();
             JSONObject config = JSONObject.parseObject(configJson);
             log.info("徐州富丽对接参数:{}", JSON.toJSONString(config));
             CheckInfo checkInfo = new CheckInfo();

+ 1 - 1
egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/threedocking/impl/YiQiHuaCreditService.java

@@ -85,7 +85,7 @@ public class YiQiHuaCreditService implements LoanDockingApi {
         try {
             log.info("credit YiQiHuaCreditService qualityCheck begin...userId:{}", userInfo.getUserId());
             EgLoanApiConfigInfoDo loanApiConfigInfo = egApiService.getLoanApiConfigInfo(product.getApiId());
-            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getRequestConfig()).toString() ;
+            String configJson = HessianUtils.deserialize(loanApiConfigInfo.getApiConfig()).toString() ;
             YiQiHuaConfig config = getYiQiHuaConfig(configJson, userInfo.getCityCode());
             log.info("对接参数:{}", JSON.toJSONString(config));
             if (null == config) {

+ 1 - 1
egress-gateway-service-client/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.hrsk.cloud</groupId>
         <artifactId>egress-gateway-service</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>egress-gateway-service-client</artifactId>

+ 4 - 1
egress-gateway-service-client/src/main/java/com/hrsk/cloud/eg/dto/data/common/LocalEnumDto.java

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

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.hrsk.cloud</groupId>
         <artifactId>egress-gateway-service</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>egress-gateway-service-domain</artifactId>

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

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.hrsk.cloud</groupId>
         <artifactId>egress-gateway-service</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>egress-gateway-service-infrastructure</artifactId>

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

@@ -8,6 +8,8 @@ import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
+import java.util.Objects;
+
 /**
  * @description: mybatis 默认meta数据填充
  * @author zhangyy
@@ -23,7 +25,9 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             //时间格式的时候不能填充所以使用了这种方式。
             BaseDo baseDO = (BaseDo) metaObject.getOriginalObject();
             // 插入操作时的自动填充逻辑
-            baseDO.setId(SnowflakeIdWorker.nextId());
+            if (Objects.isNull(baseDO.getId())) {
+                baseDO.setId(SnowflakeIdWorker.nextId());
+            }
             baseDO.setStatus(GlobalDataStatusEnum.YES.getCode());
             baseDO.setGmtModify(new Date());
             baseDO.setGmtCreate(new Date());

+ 2 - 1
egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/service/impl/EgApiServiceImpl.java

@@ -49,6 +49,7 @@ public class EgApiServiceImpl extends ServiceImpl<EgApiMapper, EgApiDo> implemen
         egLoanApiConfigInfoDo.setApiName(egApiDo.getApiName());
         egLoanApiConfigInfoDo.setApiType(egApiDo.getApiType());
         egLoanApiConfigInfoDo.setApiId(egApiDo.getId());
+        egLoanApiConfigInfoDo.setApiCode(egApiDo.getApiCode());
         //查询对应的配置
         LambdaQueryWrapper<EgApiEndpointDo> egApiEndpointDoLambdaQueryWrapper=new LambdaQueryWrapper<>();
         egApiEndpointDoLambdaQueryWrapper.eq(EgApiEndpointDo::getApiId, apiId);
@@ -59,7 +60,7 @@ public class EgApiServiceImpl extends ServiceImpl<EgApiMapper, EgApiDo> implemen
         if (Objects.isNull(egApiEndpointDos)) {
             return egLoanApiConfigInfoDo;
         }
-        egLoanApiConfigInfoDo.setRequestConfig(egApiEndpointDos.getRequestConfig());
+        egLoanApiConfigInfoDo.setApiConfig(egApiEndpointDos.getApiConfig());
 
         //查询扩展配置
         LambdaQueryWrapper<EgApiLoanExtendDo> extendDoLambdaQueryWrapper=new LambdaQueryWrapper<>();

+ 6 - 6
pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.hrsk.cloud</groupId>
     <artifactId>egress-gateway-service</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
     <packaging>pom</packaging>
 
     <description>惠融数科基于COLA构建的应用骨架</description>
@@ -52,17 +52,17 @@
             <dependency>
                 <groupId>com.hrsk.cloud</groupId>
                 <artifactId>start</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>1.0</version>
             </dependency>
             <dependency>
                 <groupId>com.hrsk.cloud</groupId>
                 <artifactId>egress-gateway-service-app</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>1.0</version>
             </dependency>
             <dependency>
                 <groupId>com.hrsk.cloud</groupId>
                 <artifactId>egress-gateway-service-adapter</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>1.0</version>
             </dependency>
             <dependency>
                 <groupId>com.hrsk.cloud</groupId>
@@ -72,12 +72,12 @@
             <dependency>
                 <groupId>com.hrsk.cloud</groupId>
                 <artifactId>egress-gateway-service-infrastructure</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>1.0</version>
             </dependency>
             <dependency>
                 <groupId>com.hrsk.cloud</groupId>
                 <artifactId>egress-gateway-service-domain</artifactId>
-                <version>1.0-SNAPSHOT</version>
+                <version>1.0</version>
             </dependency>
             <dependency>
                 <groupId>com.alibaba.cola</groupId>

+ 1 - 1
start/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.hrsk.cloud</groupId>
         <artifactId>egress-gateway-service</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>
     </parent>
 
     <artifactId>start</artifactId>

+ 1 - 1
start/src/main/resources/application-pre.yaml

@@ -21,7 +21,7 @@ spring:
       maxOpenPreparedStatements: 20
       logSlowSql: true
   redis:
-    database: 8
+    database: 9
     host: 47.96.139.31
     port: 6380
     password: IICdQIBA#DANB%gkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAK8f%

+ 47 - 3
start/src/test/java/StartApiTest.java

@@ -1,15 +1,24 @@
 import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.fastjson2.JSONObject;
 import com.hrsk.cloud.eg.Application;
 import com.hrsk.cloud.eg.app.business.ApiRouteService;
+import com.hrsk.cloud.eg.app.constant.EgApiTypeEnum;
+import com.hrsk.cloud.eg.constant.GlobalDataStatusEnum;
 import com.hrsk.cloud.eg.domain.api.ApiGateway;
 import com.hrsk.cloud.eg.dto.data.CheckIntoParamDto;
 import com.hrsk.cloud.eg.dto.data.egPlan.PlanDto;
 import com.hrsk.cloud.eg.dto.data.user.UserBaseInfoDto;
 import com.hrsk.cloud.eg.app.business.GenerateCheckIntoHttpApiConfigService;
+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.repository.database.entity.ProductBusinessApiInfoDo;
 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.service.ProductBusinessApiInfoService;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -50,7 +59,10 @@ public class StartApiTest {
     private ApiRouteService apiRouteService;
 
     @Resource
-    private DruidDataSource druidDataSource;
+    private EgApiLoanExtendService egApiLoanExtendService;
+
+    @Resource
+    private EgApiService egApiService;
 
 
 
@@ -422,10 +434,42 @@ public class StartApiTest {
     @Test
     public void initApi(){
         List<ProductBusinessApiInfoDo> productBusinessApiInfoDos = productBusinessApiInfoService.apiList();
-        for (ProductBusinessApiInfoDo productBusinessApiInfoDo : productBusinessApiInfoDos) {
+
+        List<EgApiDo> egApiDoList=new ArrayList<>();
+        for (ProductBusinessApiInfoDo api : productBusinessApiInfoDos) {
             EgApiDo egApiDo = new EgApiDo();
-            egApiDo.setApiType();
+            egApiDo.setApiType(EgApiTypeEnum.LOAN_API.getCode());
+            egApiDo.setApiCode(api.getJoinMethod());
+            egApiDo.setApiName(api.getName());
+            egApiDo.setStatus(GlobalDataStatusEnum.YES.getCode());
+            egApiDo.setBusiOwnerUsername(api.getContractSignaturer());
+            egApiDo.setTechOwnerUsername(api.getCreater());
+            egApiDo.setId(Long.valueOf(api.getId()));
+            egApiDoList.add(egApiDo);
+
+            EgApiEndpointDo egApiEndpointDo = new EgApiEndpointDo();
+            egApiEndpointDo.setApiCode(api.getJoinMethod());
+            egApiEndpointDo.setApiName(api.getName());
+            egApiEndpointDo.setStatus(GlobalDataStatusEnum.YES.getCode());
+            if (StringUtils.isNotBlank(api.getThreeSystemConfig())) {
+                egApiEndpointDo.setApiConfig(HessianUtils.serialize(api.getThreeSystemConfig()));
+            }else{
+                egApiEndpointDo.setApiConfig(HessianUtils.serialize(JSONObject.toJSONString(api)));
+            }
+            egApiEndpointDo.setApiId(Long.valueOf(api.getId()));
+             egApiEndpointService.save(egApiEndpointDo);
+
+            EgApiLoanExtendDo egApiLoanExtendDo = new EgApiLoanExtendDo();
+            egApiLoanExtendDo.setEndpointId(egApiEndpointDo.getId());
+            egApiLoanExtendDo.setNeedCheck(api.getNeedCheck());
+            egApiLoanExtendDo.setStatus(GlobalDataStatusEnum.YES.getCode());
+            egApiLoanExtendDo.setProtocol(api.getProtocol());
+            egApiLoanExtendDo.setShareType(api.getShareType());
+            egApiLoanExtendDo.setSharePurpose(api.getSharePurpose());
+            egApiLoanExtendDo.setSharePurpose(api.getSharePurpose());
+            egApiLoanExtendService.save(egApiLoanExtendDo);
         }
+         egApiService.saveBatch(egApiDoList);
 
     }