中煤完善

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/component/ZmCrawlerRequestComponent.java

@@ -3,6 +3,7 @@ package com.jzg.quotation.zhongmei.crawler.component;
 import cn.hutool.core.util.XmlUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.jzg.commons.entity.quote.vo.AttributionInformationVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.component.RequestComponent;
 import com.jzg.quotation.commons.constant.CacheConstant;
@@ -196,11 +197,17 @@ public class ZmCrawlerRequestComponent {
     /**
      * 获取授权信息
      *
-     * @param username 用户名
+     * @param attributionInformationVo 用户名
      * @return 授权token
      */
-    public String getAuthorization(String username) {
-        return (String) redissonClient.getMap(CacheConstant.ZHONGMEI_AUTHORIZATION + username).get(AUTHORIZATION);
+    public String getAuthorization(AttributionInformationVo attributionInformationVo) {
+        String authorization = (String) redissonClient.getMap(CacheConstant.ZHONGMEI_AUTHORIZATION + attributionInformationVo.getUsername()).get(AUTHORIZATION);
+        if (!org.springframework.util.StringUtils.hasLength(authorization)) {
+            authorization = authenticate(attributionInformationVo.getUsername(),
+                    attributionInformationVo.getPassword(),
+                    ZmCrawlerRequestComponent.REQUEST_NUMBER);
+        }
+        return authorization;
     }
 
     /**
@@ -953,6 +960,4 @@ public class ZmCrawlerRequestComponent {
         String response = s.hasNext() ? s.next() : "";
         System.out.println(response);
     }
-
-
 }

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/crawler/service/Impl/ZhongMeiCrawlerRequestImpl.java

@@ -72,7 +72,7 @@ public class ZhongMeiCrawlerRequestImpl implements ZhongMeiCrawlerRequest {
                 .getOrder()
                 .getAttributionInformationVo();
         String userCode = zmCrawlerRequestComponent.getUserCode(attributionInformationVo.getUsername());
-        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo.getUsername());
+        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo);
         // 1.1 配置信息
         ZmCrawlerConfigureParameters zmCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(ZmCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         BaseRequestHead head = new BaseRequestHead(authorization, "2");
@@ -114,7 +114,7 @@ public class ZhongMeiCrawlerRequestImpl implements ZhongMeiCrawlerRequest {
                 .getAttributionInformationVo();
         ZmCrawlerOrder zmCrawlerOrder = zmCrawlerOrderService.findByOrdersNo(underwritingVo.getOrder().getOrdersNo());
         String userCode = zmCrawlerRequestComponent.getUserCode(attributionInformationVo.getUsername());
-        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo.getUsername());
+        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo);
         //获取配置信息
         ZmCrawlerConfigureParameters zmCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(ZmCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         BaseRequestHead head = new BaseRequestHead(authorization, "2");
@@ -135,7 +135,7 @@ public class ZhongMeiCrawlerRequestImpl implements ZhongMeiCrawlerRequest {
         // 1.0获取token的请求头
         AttributionInformationVo attributionInformationVo = paymentLinkVo.getOrder().getAttributionInformationVo();
         String userCode = zmCrawlerRequestComponent.getUserCode(attributionInformationVo.getUsername());
-        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo.getUsername());
+        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo);
         ZmCrawlerOrder crawlerOrder = zmCrawlerOrderService.findByOrdersNo(paymentLinkVo.getOrder().getOrdersNo());
         //获取配置信息
         ZmCrawlerConfigureParameters zmCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(ZmCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
@@ -185,7 +185,7 @@ public class ZhongMeiCrawlerRequestImpl implements ZhongMeiCrawlerRequest {
         AttributionInformationVo attributionInformationVo = insuranceUploadImageVo
                 .getOrder()
                 .getAttributionInformationVo();
-        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo.getUsername());
+        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo);
         ZmCrawlerOrder crawlerOrder = zmCrawlerOrderService.findByOrdersNo(insuranceUploadImageVo.getOrder().getOrdersNo());
         // 上传影像 封装
         zhongMeiCrawlerQuoteProcessService.uploadImage(authorization, crawlerOrder, insuranceUploadImageVo.getImageVoList());
@@ -200,7 +200,7 @@ public class ZhongMeiCrawlerRequestImpl implements ZhongMeiCrawlerRequest {
     public DownloadPolicyResultVo downloadPolicy(DownloadPolicyVo downloadPolicyVo) {
         // 1.0获取token的请求头
         AttributionInformationVo attributionInformationVo = downloadPolicyVo.getOrder().getAttributionInformationVo();
-        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo.getUsername());
+        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo);
         //获取配置信息
         ZmCrawlerConfigureParameters zmCrawlerConfigureParameters = ConfigureParametersConversion.conversionEntity(ZmCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         BaseRequestHead head = new BaseRequestHead(authorization, "2");
@@ -221,7 +221,7 @@ public class ZhongMeiCrawlerRequestImpl implements ZhongMeiCrawlerRequest {
     public OrderStatusResultVo queryOrderState(OrderStatusVo orderStatusVo) {
         OrderBase orderBase = orderStatusVo.getOrder();
         AttributionInformationVo attributionInformationVo = orderBase.getAttributionInformationVo();
-        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo.getUsername());
+        String authorization = zmCrawlerRequestComponent.getAuthorization(attributionInformationVo);
         //获取配置信息
         ZmCrawlerConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(ZmCrawlerConfigureParameters.class, attributionInformationVo.getConfigInfo());
         BaseRequestHead requestHead = new BaseRequestHead(authorization, "2");