Merge branch 'feature-butt-joint-2024-08-26' into pre_test

README.md

@@ -2,6 +2,18 @@
 
 接出网关工程：egress-gateway-service，提供业务/数据的接出能力。
 
+# 统一返回的信息封装
+1 http/https 统一返回信息实体DataVo
+2 spel 表达式接受并且转化所有的信息为map，map解析的结果用#root “#root” 为map 的根
+
+# eg eg_api
+1 redis key code 编码信息 eg+前缀+'历史loan-web-api对接code值'
+
+# mybatis plus meta handler 
+1 使用 BaseDo 进行填充
+2 BaseDo 添加了    @TableField(fill = FieldFill.INSERT)     @TableField(fill = FieldFill.UPDATE) 注解
+
+
 # http 加载信息 初始化 参考
 ```
  JSONObject jsonObject=JSONObject.parseObject(param);
@@ -74,10 +86,4 @@
 //        s.add(s2);
 //        hac.setPath(p).setSearch(s).setHeader(h).setMethod("GET");
 //        hac.setContent("{\"merchant\":\"xxxxxxfffff\",\"phone\":\"#{\\\"value\\\":\\\"#param.userMobile\\\",\\\"type\\\": \\\"spel\\\",\\\"functions\\\":[ {\\\"code\\\": \\\"md5\\\"}]}\"}");
-```
-# 统一返回的信息封装
-1 http/https 统一返回信息实体DataVo
-2 spel 表达式接受并且转化所有的信息为map，map解析的结果用#root “#root” 为map 的根
-
-# eg eg_api
-1 code 编码信息 eg+前缀+'历史loan-web-api对接code值'
+```

egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/business/ApiRouteService.java

@@ -12,6 +12,7 @@ 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;
 
 /**
  * @author zhangyy
@@ -62,6 +63,9 @@ public class ApiRouteService {
     @Resource
     private QingyuV3CreditService qingyuV3CreditService;
 
+    @Resource
+    private PubNoCheckCreditService pubNoCheckCreditService;
+
 
     /**
      * API 路由
@@ -73,8 +77,11 @@ public class ApiRouteService {
         if (null == xdProduct.getApiId()) return null;
         ProductBusinessApiInfoDo apiInfo = apiInfoService.getApiInfoByRedis(xdProduct.getApiId());
         LoanDockingApi apiService = null;
+        if (Objects.isNull(apiInfo)&&apiInfo.getNeedCheck()==0){
+             apiService= pubNoCheckCreditService;
+             return apiService;
+        }
         JoinMethodEnums method = JoinMethodEnums.getByCode(apiInfo.getJoinMethod());
-
         if (null == method) return null;
         switch (method) {
             case CRM_QY:

egress-gateway-service-app/src/main/java/com/hrsk/cloud/eg/app/constant/ServerCodeEnums.java

@@ -164,6 +164,7 @@ public enum ServerCodeEnums {
         HUIRONG_CRM("9", "惠融易客CRM"),
         CRM_QY_V3("11", "三方CRM(庆鱼3.0)"),
         CRM_JDV3("12", "三方CRM(锦蝶V3)"),
+        NoCheck("NoCheck","不撞库通用"),
         OPEN_API_AES("13", "我方通用AES模式");
         ;
 

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

@@ -0,0 +1,43 @@
+package com.hrsk.cloud.eg.app.threedocking.impl;
+
+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.vo.response.DataVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author zhangyy
+ * @Date 2023 11 08.
+ * 用于处理所有不撞库的助贷相关逻辑
+ **/
+@Component
+@Slf4j
+public class PubNoCheckCreditService implements LoanDockingApi {
+
+
+
+    @Override
+    public ServerCodeEnums getType() {
+        return ServerCodeEnums.NoCheck;
+    }
+    /**
+     * 撞库 虚假的撞库   暂时直接返回成功，后续需要兼容排重包等功能
+     *
+     * @param userInfo
+     * @param product
+     * @return
+     */
+    @Override
+    public DataVo qualityCheck(UserBaseInfoDto userInfo, PlanDto product) {
+        log.info("虚假的助贷撞库请求参数 userInfo：{}  product:{}", userInfo, product);
+        String productName = "";
+        if (null != product && StringUtils.isNotBlank(product.getPlanName())){
+            productName = product.getPlanName();
+        }
+        return DataVo.success(0, productName+"撞库成功", product.getPlanId());
+    }
+}

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

@@ -20,6 +20,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
 //        注释的这种方式只是填充了id和状态
      //this.strictInsertFill(metaObject,"create_uid",String.class, String.valueOf(SnowflakeIdWorker.nextId()));
         try {
+            //时间格式的时候不能填充所以使用了这种方式。
             BaseDo baseDO = (BaseDo) metaObject.getOriginalObject();
             // 插入操作时的自动填充逻辑
             baseDO.setId(SnowflakeIdWorker.nextId());

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

@@ -11,6 +11,13 @@ import org.springframework.data.redis.serializer.SerializationException;
 
 import java.util.Objects;
 
+/**
+ * @description:  fast2 json 格式化默认和web-api 保持一致
+ * @param:
+ * @return:
+ * @author zhangyy
+ * @date: 2024/9/19 14:09
+ */
 @Slf4j
 public class FastJson2RedisSerializer<T> implements RedisSerializer<T> {
 

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

@@ -8,7 +8,7 @@ package com.hrsk.cloud.eg.infrastructure.config.redis;
  */
 public class RedisKeys {
     /**
-     * 前缀
+     * 默认工程都加eg 直接使用业务key即可默认或自定添加到key 前缀
      */
     public static String getPrefixKey(){
         return "eg:";

egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/repository/database/entity/ProductBusinessApiInfoDo.java

@@ -1,6 +1,5 @@
 package com.hrsk.cloud.eg.infrastructure.repository.database.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -10,7 +9,7 @@ import java.util.Date;
 /**
  * 商户对接配置信息表
  *
- * @author Mybatis Plus Generator
+ * @author zhangyy
  * @date 2023.05.09 10:11
  */
 @Data
@@ -131,7 +130,10 @@ public class ProductBusinessApiInfoDo implements Serializable {
      * */
     private String maintenance;
 
-
+    /**
+     * 是否是需要撞库
+     */
+    private Integer needCheck;
 
 
 }

egress-gateway-service-infrastructure/src/main/resources/mapper/ProductBusinessApiInfoMapper.xml

@@ -23,6 +23,7 @@
         <result column="operation_id" property="operationId"/>
         <result column="contract_signaturer_id" property="contractSignaturerId"/>
         <result column="contract_signaturer" property="contractSignaturer"/>
+        <result column="need_check" property="needCheck"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->

start/src/main/resources/logback-spring-dev.xml

@@ -84,5 +84,5 @@
         <appender-ref ref="errorFile" />
         <appender-ref ref="warnFile" />
     </root>
-    <logger name="com.hrsk.cloud" level="debug"/>
+    <logger name="com.hrsk.cloud" level="info"/>
 </configuration>

start/src/main/resources/logback-spring-pre.xml

@@ -85,5 +85,5 @@
         <appender-ref ref="errorFile" />
         <appender-ref ref="warnFile" />
     </root>
-    <logger name="com.hrsk.cloud" level="debug"/>
+    <logger name="com.hrsk.cloud" level="info"/>
 </configuration>