From 97eb06d5ed4e48f20bee047e4b426a9904f64c26 Mon Sep 17 00:00:00 2001 From: kk <1910333201@qq.com> Date: Wed, 25 Oct 2023 11:30:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4ELK=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 6 +- .../resources/application-prod-中车.yml | 6 +- .../src/main/resources/application-prod.yml | 6 +- .../src/main/resources/logback-spring.xml | 138 ------------------ ...noConsoleInvoiceApiZhongQiServiceImpl.java | 40 +++++ 5 files changed, 49 insertions(+), 147 deletions(-) delete mode 100644 jianshui-admin/src/main/resources/logback-spring.xml diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml index f27c688..849ddab 100644 --- a/jianshui-admin/src/main/resources/application-dev.yml +++ b/jianshui-admin/src/main/resources/application-dev.yml @@ -89,6 +89,6 @@ spring: ele_auth_url: https://openapi.zncspt.com/api/ ele_check_url: https://openapi.zncspt.com/api/ elephant_entcode_check: 91370102MA3UD2FG21 -logstash: - host: 43.138.58.64:14560 - indexname: jianshui-dev \ No newline at end of file +#logstash: +# host: 43.138.58.64:14560 +# indexname: jianshui-dev \ No newline at end of file diff --git a/jianshui-admin/src/main/resources/application-prod-中车.yml b/jianshui-admin/src/main/resources/application-prod-中车.yml index 50490f8..4000ec8 100644 --- a/jianshui-admin/src/main/resources/application-prod-中车.yml +++ b/jianshui-admin/src/main/resources/application-prod-中车.yml @@ -83,6 +83,6 @@ spring: ele_auth_url: https://openapi.ele-cloud.com/api/dxhy-open-income/v1/ ele_check_url: https://openapi.zncspt.com/api/ elephant_entcode_check: 91370102MA3UD2FG21 -logstash: - host: 43.138.58.64:14560 - indexname: jianshui-prod \ No newline at end of file +#logstash: +# host: 43.138.58.64:14560 +# indexname: jianshui-prod \ No newline at end of file diff --git a/jianshui-admin/src/main/resources/application-prod.yml b/jianshui-admin/src/main/resources/application-prod.yml index 525d6f4..26b6915 100644 --- a/jianshui-admin/src/main/resources/application-prod.yml +++ b/jianshui-admin/src/main/resources/application-prod.yml @@ -83,6 +83,6 @@ spring: ele_auth_url: https://openapi.ele-cloud.com/api/dxhy-open-income/v1/ ele_check_url: https://openapi.zncspt.com/api/ elephant_entcode_check: 91370102MA3UD2FG21 -logstash: - host: 43.138.58.64:14560 - indexname: jianshui-prod \ No newline at end of file +#logstash: +# host: 43.138.58.64:14560 +# indexname: jianshui-prod \ No newline at end of file diff --git a/jianshui-admin/src/main/resources/logback-spring.xml b/jianshui-admin/src/main/resources/logback-spring.xml deleted file mode 100644 index f2d5abe..0000000 --- a/jianshui-admin/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/sys-info.log - - - - ${log.path}/sys-info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/sys-error.log - - - - ${log.path}/sys-error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - ${log.path}/sys-user.log - - - ${log.path}/sys-user.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - - - - - - - - ${logstash-host} - - - - - - - { - - "indexname":"${logstash-indexname}", - - "appname":"${spring.application.name}", - - - - - - "timestamp": "%d{yyyy-MM-dd HH:mm:ss.SSS}", - - "thread": "%thread", - - "level": "%level", - - "logger_name": "%logger", - - "message": "%msg", - - "stack_trace": "%exception" - } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java index 40dd724..e74dc3a 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiZhongQiServiceImpl.java @@ -1039,7 +1039,47 @@ public class AisinoConsoleInvoiceApiZhongQiServiceImpl implements IInvoiceApiSer // TODO: 2023/10/24 读取nginx地址，读取数据。 String indexPage = HttpUtil.get("http://localhost:8082/"); + System.out.println(indexPage); + String startDate = "2023.10.10"; + String endDate = "2023.10.12"; + + // 构建要匹配的日期范围字符串 + String dateRange = startDate + "-" + endDate; + // 使用Jsoup解析HTML + Document doc = Jsoup.parse(indexPage); + + // 获取带有动态日期范围的标签 + Elements aTags = doc.select("a[href*='%28" + dateRange + "%29.dat']"); + + // 遍历标签，提取href属性内容 + for (Element aTag : aTags) { + String href = aTag.attr("href"); + log.info("读取到的机动车加密文件名为"+href); + continue; + } + + // TODO: 2023/10/24 调用重汽的推送接口 + + HashMap paramMap = new HashMap<>(); + paramMap.put("File", ""); + paramMap.put("qyjc", "KS"); + paramMap.put("zdr", ""); + + String result = HttpUtil.post("",paramMap); + + cn.hutool.json.JSONObject jsonObject = JSONUtil.parseObj(result); + + String retCode = jsonObject.get("retCode") != null ? jsonObject.get("retCode").toString() : ""; + String retMsg = jsonObject.get("retMsg") != null ? jsonObject.get("retMsg").toString() : ""; + + if("1".equals(retCode)){ + + } else if ("0".equals(retCode)) { + + }else { + + }