Merge remote-tracking branch 'origin/dev_goblin' into dev_goblin

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/spring/RestTemplateConfig.java

@@ -31,9 +31,9 @@ public class RestTemplateConfig {
         PoolingHttpClientConnectionManager poolConnManager =
                 new PoolingHttpClientConnectionManager(20, TimeUnit.SECONDS);
         // 设置最大链接数
-        poolConnManager.setMaxTotal(500 * getMaxCpuCore() + 500);
+        poolConnManager.setMaxTotal(100000 * getMaxCpuCore());
         // 单路由的并发数
-        poolConnManager.setDefaultMaxPerRoute(500 * getMaxCpuCore());
+        poolConnManager.setDefaultMaxPerRoute(25000 * getMaxCpuCore());
 
         HttpClientBuilder httpClientBuilder = HttpClients.custom();
         httpClientBuilder.setConnectionManager(poolConnManager);

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/manage/GoblinZhengzaiServiceImpl.java

@@ -109,10 +109,13 @@ public class GoblinZhengzaiServiceImpl implements IGoblinZhengzaiService {
             if (skuVo.getDelFlg().equals("1")) {
                 continue;
             }
+            if (marketSkuVo == null) {
+                continue;
+            }
             GoblinSelfZhengzaiSkuVo vo = GoblinSelfZhengzaiSkuVo.getNew();
             vo.setMarketSkuId(marketSkuId);
             vo.setSkuId(marketSkuId.split(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue())[0]);
-            vo.setSkuSpecList(marketSkuVo.getSkuSpecList());
+            vo.setSkuSpecList(skuVo.getSkuSpecList());
             vo.setPrice(skuVo.getPrice());
             vo.setStock(skuVo.getStock());
             vo.setSkuStock(skuVo.getSkuStock());

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/InnerController.java

 package com.liquidnet.service.kylin.controller;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
+import com.liquidnet.commons.lang.util.JsonUtils;
+import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
@@ -9,7 +14,10 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -17,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
+import java.util.List;
 
 @Api(tags = "内部接口")
 @RestController
@@ -25,8 +34,8 @@ import java.time.temporal.ChronoUnit;
 public class InnerController {
     @Autowired
     DataUtils dataUtils;
-    @Autowired
-    FeignAdamBaseClient adamBaseClient;
+    @Value("${liquidnet.adam.url}")
+    private String adamUrl;
 
     @PostMapping("cache/member")
     @ApiOperation("获取会员相关数据")
@@ -35,7 +44,14 @@ public class InnerController {
     })
     public void cacheMember(@RequestParam("uid") String uid) {
         try {
-            ResponseDto<AdamUserMemberVo> memberVo = adamBaseClient.queryMember(uid);
+            MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+            header.add("Accept", "application/json;charset=UTF-8");
+            MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
+            params.add("uid", uid);
+            String returnData = HttpUtil.get(adamUrl + "/adam/inquire/member", params, header);
+            ResponseDto<AdamUserMemberVo> memberVo = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<AdamUserMemberVo>>() {
+            });
+
             AdamUserMemberVo userMemberVo = memberVo.getData();
             if (userMemberVo.getState() == 1) {
                 long second = ChronoUnit.SECONDS.between(LocalDateTime.now(), userMemberVo.getExpiryAt());

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -10,11 +10,11 @@ import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.candy.param.BackCouponParam;
 import com.liquidnet.service.candy.vo.CandyUseResultVo;
-import com.liquidnet.service.feign.adam.api.FeignAdamBaseClient;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.returns.InnerReturnVo;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -40,8 +40,6 @@ public class OrderUtils {
     private String stoneUrl;
     @Value("${liquidnet.service.kylin.url}")
     private String kylinUrl;
-    @Autowired
-    FeignAdamBaseClient adamBaseClient;
 
     public String judgeOrderLimit(
             int type,
@@ -201,7 +199,12 @@ public class OrderUtils {
         }
         try {
             if (unExists.size() > 0) {
-                ResponseDto<List<AdamEntersVo>> res = adamBaseClient.querysEnters(unExists, uid);
+                log.error("调用接口");
+                MultiValueMap<String, String> header = CollectionUtil.linkedMultiValueMapStringString();
+                header.add("Accept", "application/json;charset=UTF-8");
+                String returnData = HttpUtil.get(adamUrl + "/adam/rsc/inquire/enters?entersIds="+StringUtils.join(unExists, ",")+"&uid="+uid, null, header);
+                ResponseDto<List<AdamEntersVo>> res = JsonUtils.fromJson(returnData, new TypeReference<ResponseDto<List<AdamEntersVo>>>() {
+                });
                 List<AdamEntersVo> entersVoList = res.getData();
                 for (AdamEntersVo vo : entersVoList) {
                     dataUtils.setEnterVo(vo);