Merge remote-tracking branch 'origin/master'

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/vfj/VfjQryCardsManagerImpl.java

@@ -23,7 +23,7 @@ public class VfjQryCardsManagerImpl extends AbstractCommManager implements VfjQr
 
     @Override
     public void execute() {
-        logger.info("--卡片发行批次列查询开始--");
+        logger.info("--卡片一行数据列查询开始--");
         int num = 0;
         try {
             int start = Math.toIntExact(repo.countId());
@@ -55,9 +55,9 @@ public class VfjQryCardsManagerImpl extends AbstractCommManager implements VfjQr
                 num += size;
                 hasMoreData = size >= BATCH_SIZE;
             }
-            logger.info("--卡片发行批次列查询结束，共处理 {} 条记录--", num);
+            logger.info("--卡卡片一行数据列查询结束，共处理 {} 条记录--", num);
         } catch (ManagerException e) {
-            logger.error("--卡片发行批次列查询失败：", e);
+            logger.error("--卡片一行数据列查询失败：", e);
             e.printStackTrace();
         }
     }

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/vfj/VfjQueryGmobusManagerImpl.java

@@ -23,7 +23,7 @@ public class VfjQueryGmobusManagerImpl extends AbstractCommManager implements Vf
 
     @Override
     public void execute() {
-        logger.info("--双片国密OBU发行批次列表查询开始--");
+        logger.info("--双片国密OBU一发列表查询开始--");
         int num = 0;
         try {
             int start = Math.toIntExact(repo.countByEncryptType("0"));
@@ -56,9 +56,9 @@ public class VfjQueryGmobusManagerImpl extends AbstractCommManager implements Vf
                 num += size;
                 hasMoreData = size >= BATCH_SIZE;
             }
-            logger.info("--双片国密OBU发行批次列表查询结束，共处理 {} 条记录--", num);
+            logger.info("--双片国密OBU一发列表查询结束，共处理 {} 条记录--", num);
         } catch (ManagerException e) {
-            logger.error("--双片国密OBU发行批次列表查询失败：", e);
+            logger.error("--双片国密OBU一发列表查询失败：", e);
             e.printStackTrace();
         }
     }

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/vfj/VfjQueryScobusManagerImpl.java

@@ -23,7 +23,7 @@ public class VfjQueryScobusManagerImpl extends AbstractCommManager implements Vf
 
     @Override
     public void execute() {
-        logger.info("--单片OBU发行批次列表查询开始--");
+        logger.info("--单片OBU一发列表查询开始--");
         int num = 0;
         try {
             int start = Math.toIntExact(repo.countByEncryptType("1"));
@@ -56,9 +56,9 @@ public class VfjQueryScobusManagerImpl extends AbstractCommManager implements Vf
                 num += size;
                 hasMoreData = size >= BATCH_SIZE;
             }
-            logger.info("--单片OBU发行批次列表查询结束，共处理 {} 条记录--", num);
+            logger.info("--单片OBU一发列表查询结束，共处理 {} 条记录--", num);
         } catch (ManagerException e) {
-            logger.error("--单片OBU发行批次列表查询失败：", e);
+            logger.error("--单片OBU一发列表查询失败：", e);
             e.printStackTrace();
         }
     }

zhywpt-dps-iasq/src/main/java/cn/com/taiji/iasq/manager/quartz/vfj/VfjQueryTriDesObusManagerImpl.java

@@ -23,7 +23,7 @@ public class VfjQueryTriDesObusManagerImpl extends AbstractCommManager implement
 
     @Override
     public void execute() {
-        logger.info("--3DESOBU发行批次列表查询开始--");
+        logger.info("--3DESOBU一发列表查询开始--");
         int num = 0;
         try {
             int start = Math.toIntExact(repo.countByEncryptType("2"));
@@ -56,9 +56,9 @@ public class VfjQueryTriDesObusManagerImpl extends AbstractCommManager implement
                 num += size;
                 hasMoreData = size >= BATCH_SIZE;
             }
-            logger.info("--3DESOBU发行批次列表查询结束，共处理 {} 条记录--", num);
+            logger.info("--3DESOBU一发列表查询结束，共处理 {} 条记录--", num);
         } catch (ManagerException e) {
-            logger.error("--3DESOBU发行批次列表查询失败：", e);
+            logger.error("--3DESOBU一发列表查询失败：", e);
             e.printStackTrace();
         }
     }

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/ocr/BaiduOcrUtil.java

@@ -225,7 +225,7 @@ public class BaiduOcrUtil {
         HttpClient client = HttpClients.createDefault();
         // 发送请求
         HttpResponse response = sendRequest(client, url, params);
-        ;
+
         // 处理返回 无响应则重试两次
         for (int i = 0; i < RETRY_TIMES; i++) {
             response = sendRequest(client, url, params);

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/ocr/BusinessLicenseOcrManager.java

@@ -17,6 +17,9 @@ public class BusinessLicenseOcrManager extends AbstractManager {
     private BaiduOcrUtil baiduOcrUtil;
     @Autowired
     private ImageCompressManager imageCompressManager;
+
+    private static final String BASEURL="http://100.65.10.25:8049";
+
     public BusinessLicenseOcrResponse serviceHandle(BusinessLicenseOcrRequest req) throws ServiceHandleException {
         if(!StringTools.hasText(req.getUrl())){
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请传入图片地址");
@@ -26,12 +29,17 @@ public class BusinessLicenseOcrManager extends AbstractManager {
 
     public BusinessLicenseOcrResponse doBusiness(BusinessLicenseOcrRequest req) throws ServiceHandleException {
         try {
-            URL url = new URL(req.getUrl());
-            URL downloadUrl = new URL("http", "100.65.10.25", 8049, url.getPath());
-
-            String compressedImgBase64 = imageCompressManager.getBaiduOcrCompressBase64(downloadUrl.toString());
+            String reqUrl = req.getUrl();
+            // 判断是否为/开头
+            if (reqUrl.startsWith("/")) {
+                reqUrl = BASEURL + reqUrl;
+            }else {
+                reqUrl = BASEURL + "/" + reqUrl;
+            }
+            URL url = new URL(reqUrl);
+            String compressedImgBase64 = imageCompressManager.getBaiduOcrCompressBase64(url.toString());
             BusinessLicenseOcrResponse res = baiduOcr(compressedImgBase64);
-            res.setImageUrl(url == null ? "" : url.toString());
+            res.setImageUrl(req.getUrl());
             logger.info("营业执照识别结果>{}", res);
             return res;
         } catch (Exception e) {

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/ocr/IdCardOcrManager.java

@@ -19,6 +19,8 @@ public class IdCardOcrManager extends AbstractManager{
     @Autowired
     private ImageCompressManager imageCompressManager;
 
+    private static final String BASEURL="http://100.65.10.25:8049";
+
     public IdCardOcrResponse serviceHandle(IdCardOcrRequest req) throws ServiceHandleException {
         if(!StringTools.hasText(req.getUrl())){
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请传入图片地址");
@@ -31,12 +33,18 @@ public class IdCardOcrManager extends AbstractManager{
 
     public IdCardOcrResponse doBusiness(IdCardOcrRequest req) throws ServiceHandleException {
         try {
-            URL url = new URL(req.getUrl());
-            URL downloadUrl = new URL("http", "100.65.10.25", 8049, url.getPath());
+            String reqUrl = req.getUrl();
+            // 判断是否为/开头
+            if (reqUrl.startsWith("/")) {
+                reqUrl = BASEURL + reqUrl;
+            }else {
+                reqUrl = BASEURL + "/" + reqUrl;
+            }
+            URL url = new URL(reqUrl);
 
-            String compressedImgBase64 = imageCompressManager.getBaiduOcrCompressBase64(downloadUrl.toString());
+            String compressedImgBase64 = imageCompressManager.getBaiduOcrCompressBase64(url.toString());
             IdCardOcrResponse res = baiduOcr(compressedImgBase64, req.getImageType());
-            res.setImageUrl(url == null ? "" : url.toString());
+            res.setImageUrl(req.getUrl());
             logger.info("身份证识别结果>{}", res);
             return res;
         } catch (Exception e) {

zhywpt-service-ats/src/main/java/cn/com/taiji/ats/manager/ocr/VehicleLicenseOcrManager.java

@@ -18,6 +18,8 @@ public class VehicleLicenseOcrManager extends AbstractManager {
     @Autowired
     private ImageCompressManager imageCompressManager;
 
+    private static final String BASEURL="http://100.65.10.25:8049";
+
     public VehicleLicenseOcrResponse serviceHandle(VehicleLicenseOcrRequest req) throws ServiceHandleException {
         if(!StringTools.hasText(req.getUrl())){
             throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("请传入图片地址");
@@ -30,12 +32,18 @@ public class VehicleLicenseOcrManager extends AbstractManager {
 
     public VehicleLicenseOcrResponse doBusiness(VehicleLicenseOcrRequest req) throws ServiceHandleException {
         try {
-            URL url = new URL(req.getUrl());
-            URL downloadUrl = new URL("http", "100.65.10.25", 8049, url.getPath());
+            String reqUrl = req.getUrl();
+            // 判断是否为/开头
+            if (reqUrl.startsWith("/")) {
+                reqUrl = BASEURL + reqUrl;
+            }else {
+                reqUrl = BASEURL + "/" + reqUrl;
+            }
+            URL url = new URL(reqUrl);
 
-            String compressedImgBase64 = imageCompressManager.getBaiduOcrCompressBase64(downloadUrl.toString());
+            String compressedImgBase64 = imageCompressManager.getBaiduOcrCompressBase64(url.toString());
             VehicleLicenseOcrResponse res = baiduOcr(compressedImgBase64, req.getImageType());
-            res.setImageUrl(url == null ? "" : url.toString());
+            res.setImageUrl(req.getUrl());
             logger.info("驾驶证识别结果>{}", res);
             return res;
         } catch (Exception e) {