add API决策

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

@@ -14,8 +14,6 @@ import com.hrsk.cloud.eg.vo.response.DataVo;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.util.EntityUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -73,9 +71,7 @@ public class HuirongCrmCreditService implements LoanDockingApi {
             }
 
             checkData.setSecretKey(huirongJointDTO.getString("secretKey"));
-            checkData.setChanelCode(huirongJointDTO.getString("chanelCode"));
-            checkData.setMerchantNo(product.getBid());
-
+            checkData.setChanelCode(huirongJointDTO.getString("channelCode"));
             checkData.setMerchantNo(product.getBid());
             String requestJson = JSON.toJSONString(checkData);
             log.info("credit qualityCheck HuirongCrmCreditService request userId:{}, url:{},requestParam:{}", userInfo.getUserId(), url, requestJson);
@@ -83,9 +79,8 @@ public class HuirongCrmCreditService implements LoanDockingApi {
             try {
                 Map<String, String> head = new HashMap<>();
                 head.put("Content-Type", "application/json");
-                HttpResponse httpResponse = httpRestTemplate.restTemplate().postForObject(url, null, null, head, null, requestJson);
-                String responseStr = EntityUtils.toString(httpResponse.getEntity());
-                response = JSONObject.parseObject(responseStr, ResultHt.class);
+                response = httpRestTemplate.restTemplate().postForObject(url,head,ResultHt.class, checkData);
+              log.info("hui ron result {}",JSONObject.toJSONString(response));
             } catch (Exception e) {
                 log.error("惠融crm准入异常,异常信息：{}", e.getMessage(), e);
             }

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

@@ -7,7 +7,7 @@ package com.hrsk.cloud.eg.infrastructure.config.client.config;
  */
 public class RetryRequestConfig {
     //http请求timeout时的重试次数
-    int retryCount = 0;
+    int retryCount = 1;
     //http请求timeout，重试间隔时间，重试间隔时间=次数*100 ms.
     long retryIntervalTime = 0;
     //连接池连接数量

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

@@ -69,7 +69,8 @@ public class RetryRestTemplate {
             public boolean retryRequest(IOException exception, int curRetryCount, HttpContext context) {
                 if (exception instanceof ConnectTimeoutException
                         || exception instanceof NoHttpResponseException || exception instanceof ConnectException) {
-                    return true;
+                    // 报错不需要重试
+                    return false;
                 }
 
                 HttpClientContext clientContext = HttpClientContext.adapt(context);

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

@@ -15,7 +15,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-@TableName("product_business_api_info")
+@TableName("product_business_api_info_v2")
 public class ProductBusinessApiInfoDo implements Serializable {
 
     private Integer id;

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

@@ -35,5 +35,14 @@ public interface ProductBusinessApiInfoService extends IService<ProductBusinessA
      * @return
      */
     ProductBusinessApiInfoDo getApiInfoByRedis(Integer apiId);
+
+    /**
+     * @description:  查询api集合
+     * @param:
+     * @return:
+     * @author zhangyy
+     * @date: 2024/9/13 10:23
+     */
+    List<ProductBusinessApiInfoDo> apiList();
 }
 

egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/service/impl/ProductBusinessApiInfoServiceImpl.java

@@ -69,4 +69,16 @@ public class ProductBusinessApiInfoServiceImpl extends ServiceImpl<ProductBusine
         }
         return JSONObject.parseObject((String) value, ProductBusinessApiInfoDo.class);
     }
+
+    @Override
+    public List<ProductBusinessApiInfoDo> apiList() {
+        LambdaQueryWrapper<ProductBusinessApiInfoDo> queryWrapper=new LambdaQueryWrapper<>();
+        queryWrapper.isNotNull(ProductBusinessApiInfoDo::getJointType);
+        queryWrapper.orderByDesc(ProductBusinessApiInfoDo::getCreateTime);
+        List<ProductBusinessApiInfoDo> productBusinessApiInfoDos = baseMapper.selectList(new LambdaQueryWrapper<>());
+        if (CollectionUtils.isEmpty(productBusinessApiInfoDos)) {
+            return Collections.emptyList();
+        }
+        return productBusinessApiInfoDos;
+    }
 }

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

@@ -21,7 +21,6 @@ spring:
       maxOpenPreparedStatements: 20
       logSlowSql: true
   redis:
-
     database: 8
     host: 47.96.139.31
     port: 6380
@@ -31,8 +30,8 @@ spring:
         min-idle: 50
         max-idle: 50
         max-active: 100
-        max-wait: -1
-    timeout: 500
+        max-wait: 3000s
+    timeout: 5000s
 
 
 

start/src/test/java/RedisTest.java

@@ -15,6 +15,8 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
 
+import static com.hrsk.cloud.eg.infrastructure.constant.RedisConstant.BUSINESS_API_KEY;
+
 /**
  * @author zhangyy
  * @version 1.0
@@ -37,6 +39,9 @@ public class RedisTest {
     @Test
     public void getRedisUtil(){
         System.out.println(redisUtil.get("key1"));
+        String key = String.format(BUSINESS_API_KEY, 1);
+        Object value = redisUtil.get(key);
+        System.out.println(value);
     }
 }
 

start/src/test/java/StartApiTest.java

@@ -1,9 +1,11 @@
 import com.hrsk.cloud.eg.Application;
+import com.hrsk.cloud.eg.app.business.ApiRouteService;
 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.UserInBaseInfoDto;
 import com.hrsk.cloud.eg.app.business.GenerateCheckIntoHttpApiConfigService;
+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.ProductBusinessApiInfoService;
 import org.junit.Test;
@@ -19,6 +21,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * @author zhangyy
@@ -42,13 +46,16 @@ public class StartApiTest {
     @Resource
     private ApiGateway apiGateway;
 
+    @Resource
+    private ApiRouteService apiRouteService;
+
     @Test
     public void apiHuiRonTest(){
-      Long apiId= 441293753667392L;
+//      Integer apiId= 441293753667392;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -59,12 +66,12 @@ public class StartApiTest {
 
     @Test
     public void openApiRsaTest(){
-        Long apiId= 441312253769280L;
+//        Long apiId= 441312253769280L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -81,12 +88,12 @@ public class StartApiTest {
      */ 
     @Test
     public void qinYuApiRsaTest(){
-        Long apiId= 441333216126016L;
+//        Long apiId= 441333216126016L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -103,12 +110,12 @@ public class StartApiTest {
      */
     @Test
     public void xinLuApiRsaTest(){
-        Long apiId= 441336439865408L;
+//        Long apiId= 441336439865408L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -125,12 +132,12 @@ public class StartApiTest {
      */
     @Test
     public void xkdApiRsaTest(){
-        Long apiId= 441336439865408L;
+//        Long apiId= 441336439865408L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -147,12 +154,12 @@ public class StartApiTest {
      */
     @Test
     public void jinDieApiRsaTest(){
-        Long apiId= 441425735573312L;
+//        Long apiId= 441425735573312L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -170,12 +177,12 @@ public class StartApiTest {
      */
     @Test
     public void rxkApiTest(){
-        Long apiId= 441338278858304L;
+//        Long apiId= 441338278858304L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -193,12 +200,12 @@ public class StartApiTest {
      */
     @Test
     public void huiZhonApiTest(){
-        Long apiId= 441421777748032L;
+//        Long apiId= 441421777748032L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -215,12 +222,12 @@ public class StartApiTest {
      */
     @Test
     public void huiZhongApiTest(){
-        Long apiId= 441425580433728L;
+//        Long apiId= 441425580433728L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -237,12 +244,12 @@ public class StartApiTest {
      */
     @Test
     public void yinHuaApiTest(){
-        Long apiId= 441425513479232L;
+//        Long apiId= 441425513479232L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -259,12 +266,12 @@ public class StartApiTest {
      */
     @Test
     public void huiXinApiTest(){
-        Long apiId= 441424531642944L;
+//        Long apiId= 441424531642944L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -275,12 +282,12 @@ public class StartApiTest {
 
     @Test
     public void yuKuaiHuaApiTest(){
-        Long apiId= 441424861741888L;
+//        Long apiId= 441424861741888L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -290,12 +297,12 @@ public class StartApiTest {
 
     @Test
     public void youRonApiTest(){
-        Long apiId= 441426447379776L;
+//        Long apiId= 441426447379776L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -305,12 +312,12 @@ public class StartApiTest {
 
     @Test
     public void HamiguaApiTest(){
-        Long apiId= 441426784657728L;
+//        Long apiId= 441426784657728L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -320,12 +327,12 @@ public class StartApiTest {
 
     @Test
     public void haohanwuyinApiTest(){
-        Long apiId= 441427018106688L;
+//        Long apiId= 441427018106688L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -335,12 +342,12 @@ public class StartApiTest {
 
     @Test
     public void gexinjinfuApiTest(){
-        Long apiId= 441427703907136L;
+//        Long apiId= 441427703907136L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCompanyCity("重庆");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -350,12 +357,12 @@ public class StartApiTest {
 
     @Test
     public void kuaiyidaiApiTest(){
-        Long apiId= 441428658950208L;
+//        Long apiId= 441428658950208L;
         UserInBaseInfoDto user =new UserInBaseInfoDto();
         user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
         user.setCityAllName("重庆市");
         PlanDto  plan =new PlanDto();
-        plan.setApiId(apiId);
+//        plan.setApiId(apiId);
         plan.setBid("aff1c7b30d8b240826030235business");
         CheckIntoParamDto checkin =new CheckIntoParamDto();
         checkin.setPlan(plan);
@@ -363,6 +370,30 @@ public class StartApiTest {
         apiGateway.checkIntoRequest(checkin);
     }
 
+    @Test
+    public void apiTest(){
+        UserInBaseInfoDto user =new UserInBaseInfoDto();
+        user.setPhoneMd5("b5500dfab55f42b340d31326561e16cb");
+        user.setCityAllName("重庆市");
+        user.setCompanyCity("重庆");
+
+        CheckIntoParamDto checkin =new CheckIntoParamDto();
+//        ProductBusinessApiInfoDo apiInfoByRedis = productBusinessApiInfoService.getApiInfoByRedis(1491);
+        List<ProductBusinessApiInfoDo> productBusinessApiInfoDos = productBusinessApiInfoService.apiList();
+        for (ProductBusinessApiInfoDo productBusinessApiInfoDo : productBusinessApiInfoDos) {
+//        ExecutorService executorService= Executors.newFixedThreadPool(75);
+//            executorService.execute(()->{
+                PlanDto  plan =new PlanDto();
+                plan.setApiId(productBusinessApiInfoDo.getId());
+                plan.setBid("aff1c7b30d8b240826030235business");
+                checkin.setPlan(plan);
+                checkin.setUser(user);
+                apiRouteService.loanCheckInto(checkin);
+//            });
+        }
+
+    }
+
     @Test
     public void spel(){
         Map<String,Object> map =new HashMap<>();