From 011db55d8e0bb217518177cb5527e0c104cbaa43 Mon Sep 17 00:00:00 2001 From: kk <1910333201@qq.com> Date: Fri, 15 Mar 2024 15:15:34 +0800 Subject: [PATCH] =?UTF-8?q?feature:=20=E7=AD=BE=E7=AB=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 6 ++++-- .../src/main/resources/application-prod.yml | 1 + jianshui-admin/src/main/resources/application.yml | 2 +- .../request/AisinoIncomeRequestAdapterImpl.java | 2 +- .../request/AisinoInvoiceRequestAdapterImpl.java | 2 +- .../invoice/utils/elephant/ElephantUtils.java | 13 +++++++++++-- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/jianshui-admin/src/main/resources/application-dev.yml b/jianshui-admin/src/main/resources/application-dev.yml index 0be2c65..c1108e3 100644 --- a/jianshui-admin/src/main/resources/application-dev.yml +++ b/jianshui-admin/src/main/resources/application-dev.yml @@ -94,11 +94,13 @@ elephant_invoice_file: http://127.0.0.1:8081/invoice/fileUrl/ # 德才定制 放到数据库 #elephant_invoice_file_dc: http://127.0.0.1:8088/sdFile/ # 大象V6数电对应平台地址 -#ele_url_v6: https://js.ele12.com/order-api -ele_url_v6: http://192.168.3.60:18108/order-api +ele_url_v6: https://js.ele12.com/order-api +#ele_url_v6: http://192.168.3.60:18108/order-api #ele_url_v6: http://127.0.0.1:18108/order-api # 大象纸票服务对应平台地址 ele_url: http://140.143.226.17:8087/order-api +#签章获取token +ele_url_qz: https://openapi.zncspt.com/api/authen/token #logstash: # host: 43.138.58.64:14560 # indexname: jianshui-dev diff --git a/jianshui-admin/src/main/resources/application-prod.yml b/jianshui-admin/src/main/resources/application-prod.yml index c1eca6c..b793c5b 100644 --- a/jianshui-admin/src/main/resources/application-prod.yml +++ b/jianshui-admin/src/main/resources/application-prod.yml @@ -89,6 +89,7 @@ elephant_invoice_file: http://dev.goldentaxcloud.com:8081/invoice/fileUrl/ ele_url_v6: https://js.ele12.com/order-api # 大象纸票服务对应平台地址 ele_url: http://140.143.226.17:8087/order-api +ele_url_qz: https://openapi.ele-cloud.com/api/ #logstash: # host: 43.138.58.64:14560 # indexname: jianshui-prod diff --git a/jianshui-admin/src/main/resources/application.yml b/jianshui-admin/src/main/resources/application.yml index 89970ee..aa11daa 100644 --- a/jianshui-admin/src/main/resources/application.yml +++ b/jianshui-admin/src/main/resources/application.yml @@ -46,7 +46,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: prod + active: dev # 文件上传 servlet: multipart: diff --git a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java index 200e679..663d619 100644 --- a/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java +++ b/jianshui-invoice-all/src/main/java/com/jianshui/invoiceall/service/impl/adapter/request/AisinoIncomeRequestAdapterImpl.java @@ -88,7 +88,7 @@ public class AisinoIncomeRequestAdapterImpl implements IInvoiceAllRequestService // 平台解密 try { -// order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); + order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); } catch (Exception e) { e.printStackTrace(); throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "invoiceall"); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java index 93f2f77..40e712f 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/adapter/request/AisinoInvoiceRequestAdapterImpl.java @@ -105,7 +105,7 @@ public class AisinoInvoiceRequestAdapterImpl implements IInvoiceRequestService { // 平台解密 try { // TODO: 2023/9/20 -// order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); + order = AisinoInvoiceDecryptUtil.decrypt(order, JKey); } catch (Exception e) { e.printStackTrace(); throw new JianshuiParamErrorException(ErrorCode.DECRYPT_ERROR, companyservice, "invoice"); diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java index 2ff2b76..5538571 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/elephant/ElephantUtils.java @@ -64,11 +64,13 @@ public class ElephantUtils { private static String ELE_URL_v6; // 大象普通服务 private static String ELE_URL; + private static String ELE_URL_QZ; static { Environment environment = SpringUtils.getBean(Environment.class); ELE_URL_v6 = environment.getProperty("ele_url_v6"); ELE_URL = environment.getProperty("ele_url"); + ELE_URL_QZ = environment.getProperty("ele_url_qz"); } @@ -301,7 +303,9 @@ public class ElephantUtils { url = ElephantConstants.DEV_HOST_LOCAL_V6_JingDongYun; }*/ - String url = ELE_URL; +// String url = ELE_URL; + log.info("所属签章服务，走配置文件地址，地址为{}",ELE_URL_QZ); + String url = ELE_URL_QZ; JSONObject jsonObject = new JSONObject(); jsonObject.put("appKey", appkey); @@ -309,7 +313,7 @@ public class ElephantUtils { Map header = new HashMap<>(); header.put("Content-Type", "application/json"); String info = HttpUtils.sendJsonPost(url, jsonObject, header); - log.info("【销项】【大象接口】调用京东云，调用地址：{},入参：{},头信息：{},返回结果：{}",url,jsonObject,header,info); + log.info("【销项】【大象接口】签章调用京东云，调用地址：{},入参：{},头信息：{},返回结果：{}",url,jsonObject,header,info); JSONObject obj = JSONObject.parseObject(info); redisCache.setCacheObject(ElephantConstants.TOKEN_REDIS_KEY + "appkey:" + appkey, obj, (int) obj.get("expires_in") - 60, TimeUnit.SECONDS); return (String) obj.get("access_token"); @@ -473,6 +477,11 @@ public class ElephantUtils { String host = ELE_URL; + /* if(ElephantConstants.SIGN.equals(uri) || ElephantConstants.SIGN_CREATE.equals(uri)|| ElephantConstants.SIGN_REGISTER.equals(uri)){ + log.info("所属签章服务，走配置文件地址，地址为{}",ELE_URL_QZ); + uri = ELE_URL_QZ; + }*/ + //kk TODO : 2023/9/5 大象接口迁京东云 //https://js.ele12.com/ // host = "https://js.ele12.com/order-api";