gLZ7)rtiL}LD#--n}jW_P1_GN}FP*G3bpoKTJw`&D@JIpd}IerW4
zDY<2w1x-iN+7BaV8}lt*toYUIrtClnrH+VLxkkzDsOeHKvB;zR?)S
zul9PfsO;o&c7@s9`dmVqMZZ*d&tj5{&^_`SciPl2Pdr1P1Yw0jgn>)|J8;57U`&@6
zxxi9JK!BI<-cH$Mk+tu!@
zJQ;fV>;k+huXmAaW?jijsm4gNM>vYg)FsD{)n&8Z>URlVjNwDwq>!E^J|fIBc$wi>
z3)3!gDJlvRiC%Zs&&Ue%eCb6lwYL
zJBkNZvdoSytMOmShY=~M&1*b%3<_g>zA#azHYZ}eeh*s-BZD$*J>-*HP7y}8agOU6
zLYVpftb3TbSeT@Ar3+EF{)Drdhwm)N&n@#IdOp<#oz7eCzP=O$4;JwNKLi5OoREDw
z>Q{<2Dq*R858+C-y@~cbwHqb_1FrOS;)D7?&zW1fgD8
zByq7h{J1CL+(-2C@sd-^a;9ZyI5~o0lenrs(=&38i!o*yh3iCWi%6T@&CuBDz09)#
zADAD#>+jrL5Z(*S&9ydmHnsT~{PX+8#J^t*;?Oca1qIkMLIP$X0lf_WXI?cK1vQ3$
z$uKxPwftEOc&HiBT#)sHVF)G2nRNqnxWfM5N&!HHbhWlB)l{-1m%wg^J0$8cF4yOX
z+hHVibjJv-h|aRoJJ8uI8+05SUr>Kcg@tQ;@bDh=KvRy<-9C|nik|Qg%I&>imgMBL
zOT@O~t-azcpSo}!h4!2FQ-jviCqfUR{Dw(Q=cC?5*pPf}BEoNqSr7J)*jtHOtpCu2
zmbOO0XErM6BmvhY);3Cnh*56BPZrEBPENTOofCqxA53Dk(p&^*mYBpllR2SH;vh7|
z$IB}!^;*>=e`UMEbGJ(?VfHFQrG
zqO~Dn31SpMjTr#>T+cmgH<|>(3hGc2_eg?>Xf9%6|7TIG1m?%;FPWFWU}!>_t}mZN
zQsmR`5lw5Ey=gGy^_6!ry*8AG*;_&@kHIP9rNp}0CGnUXkdKBj8v7s7L!Wp!s
zDw&>R*Q@o^O--TQI5Ad%^CyQ3a^o{;k+?-~YeZNSoSu%V??3KQ&(0>UBvB6f^w9Us
zYMsWYm-e7!wx1X}fdpwi6rR&-y#nYjL+ALB*8&8ZRfs3Sp&>b0{S}{9-A_mGb$mCF
zR{a{U$d4sVQ`TSVZ8L6_=io@!illQz6}+<`v@;anc|buA7^|Q7Lb@?T+|=IoL3ev4
zIuZ+2T1-SNn>TZXdj`dGss|RyJ-jbZsQ+xFz;-*gC)T&?sL|-!hLwas8Yyh_1*W2I
zvsudhG+KutG@F$o2|a#t781!%yU+tQx)Np${e^IxJyMD%7V=_f&SJ)IR*y|0XnAHs
z^!Rf>1q|lb+G#0Mqx9=hSuXM^m1N8nc8?~T<~&f=dcS>xwpxPI}terS9MRe~NZ>Vd%rxGPr_u?ECvsjXf&
zoj74=P}=0s@vFFlV_F(-keiSmmo??c{enoRjntm50l~Wt;pJym-L4*OwET}p5j@SV
zUJeJlU%zNhX)@U`8eU#)IoiADgw(GmaU}uGY=_O(3*)}{yh>}i-rh7%_bi{in3!B(
z?6KUWd79gZNQ}~FBivf!IHQSSnvO7cns$!y+@w7ZI~F5hP_d0lL{Swf_J{$n9@2StNs2duVRhila90`&RgH>IsHB1pzz`Y3nV+!wW*c9Qbfy2>Q9E40M>3q4
z$sQvEE=kcNAN3_jM|!V2XJQ_p{>B^h$M?VVJ0S2Ai0$O~%+x{6S!qa)L6%-dK}EVm
zeP4lIZfIpq^<)UBwof~x#>}e5%wEsRUdzg=2|z_vVP<7!{k%r|ZyY(t1lt(f2Ne6S
zc23C7YiqJh{Y(t|@|6n1z)88{-lB;CCRrJVPiwODw0-h&@{D(6VLdMHZTkf}g{xJ$
zHG*j4cc8Ih{!UH@RScBSp>}VBbiv~RINP5|>bDo)raa%<^X{Mc^^Zookht+%@cH+2n_~y`^%o2}INL41^2dd@pSNS&_jH>L3lzorGuw|*
z3!E8}_kD{v2WJ-kJ@ZeL_kXJEKUJK6SNX{Y`&H$36Xb{W+s|8Pt?%i!B5(eK%0Dsc
zf3MvwNFA)W_a790V%5Q7ki~oWL+f8p5*;Y~1frdPR`Lg^;MdARHvBDU{d>Bt?6cq1
zoc@hn|52bngV%qE8`8AdWYL@*n7{zv|uI7f2i(ST6z;S^=T=^S=E0*!&4j2WbV8AqKW02)cd$e^&lL
z6#Lc8?PCE6d;*&}yZ?7Hf2P;`>t73e_i6mq%x#-NVsXG`cnJPmGrvZ=L)wAFd4TO~
zf@au%YqcNm%xwVp&jZ9CLE%5)9+0*m2@GIcIi&xat$*+sAk9Id0>I`hKq2k_OVw^)
zo?GPHpKlpt%skj05Y$;h*!$5~zfy}KD*zcd2Nom%tzaMozxP0pVRVp^kTFeQ$#JH?
zNP@bfKSek}DnmN*f|a>JM87{47Q(F;QW4UJ4XhX?_!q_BJ=%U1{nME^STtVpFQPvm
zaPaotud26iE9B__SanI^FRFhyD}Ypm+<646&Z_)H6>=XEEcyEi`q!z*%?-EaFSDi}
zi|-%9+3%Tem*3wLI@HaL>F=3Acl@7=@xN=`F2})I+5e~3Z;SIE(tlo_{}9jf-T7~&
z|GiiTx8nDq7jhyFw(wN%w^oE`2#CVpS^!VWmE~YT=S#Pgb22DG&{)f@fBWnI0UM$3
AVgLXD
literal 0
HcmV?d00001
diff --git a/jianshui-invoice/pom.xml b/jianshui-invoice/pom.xml
index b8023a4..68fb234 100644
--- a/jianshui-invoice/pom.xml
+++ b/jianshui-invoice/pom.xml
@@ -16,11 +16,6 @@
-
- com.dxhy.order
- SIMS-order-sdk
- 1.2.3-RELEASE
-
com.jianshui
@@ -69,6 +64,12 @@
1.6.2
compile
+
+
+
+
+
+
diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/elephant/ElephantConstants.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/elephant/ElephantConstants.java
index 4d59458..761dce9 100644
--- a/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/elephant/ElephantConstants.java
+++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/constant/elephant/ElephantConstants.java
@@ -17,6 +17,7 @@ public class ElephantConstants {
public static String DEV_HOST = "https://sandbox.zncspt.com/api/";
public static String DEV_ELECLOUD_HOST = "https://sandbox.ele-cloud.com/api/";
public static String DEV_HOST_LOCAL = "http://140.143.226.17:8087/order-api";
+ public static String DEV_HOST_LOCAL_V6_JingDongYun = "https://js.ele12.com/order-api";
// 生产的域名
public static String PROD_HOST = "https://openapi.zncspt.com/api/";
@@ -24,6 +25,7 @@ public class ElephantConstants {
public static String PROD_ELECLOUD_HOST = "https://openapi.ele-cloud.com/api/";
public static String PROD_HOST_LOCAL = "http://140.143.226.17:8087/order-api";
+ public static String PROD_HOST_LOCAL_V6_JingDongYun = "https://js.ele12.com/order-api";
// 测试的获取token的域名
public static String DEV_TOKEN_HOST = "https://sandbox.zncspt.com/api/authen/token";
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 9f72d81..02c48ad 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
@@ -1,6 +1,8 @@
package com.jianshui.invoice.utils.elephant;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.ContentType;
@@ -331,6 +333,7 @@ public class ElephantUtils {
/**
* 大象请求 大象部署版 v6 无token
+ * Post请求
*
* @param uri 请求uri
* @param methodName 文档里的"接口方法"
@@ -339,33 +342,34 @@ public class ElephantUtils {
* @return
*/
public static DxhyInterfaceResponse sendRequestWithoutTokenV6(String uri, String methodName, JSON data, Companyservice companyservice) throws UnsupportedEncodingException, NoSuchAlgorithmException, InvalidKeyException {
- // v4的考过来的 没变
+
ICompanyservicePropService companyserviceProp = SpringUtils.getBean(ICompanyservicePropService.class);
CompanyserviceProp secretIdProp = companyserviceProp.selectPropByKey(companyservice.getCompanyid(), "elephant_secret_id");
if (secretIdProp == null) {
throw new JianshuiServiceException("企业未配置属性,请联系管理员!");
}
- // appid
+
String secretId = secretIdProp.getValue();
CompanyserviceProp sercretKeyProp = companyserviceProp.selectPropByKey(companyservice.getCompanyid(), "elephant_secret_key");
if (sercretKeyProp == null) {
throw new JianshuiServiceException("企业未配置属性,请联系管理员!");
}
- // appkey
+
String sercretKey = sercretKeyProp.getValue();
// 调用v6请求内容(content字段)
String str = JSONUtil.toJsonStr(data);
boolean isDevMode = CommonUtils.isDevMode();
// 主机名(京东云地址)
- String host = ElephantConstants.PROD_HOST_LOCAL;
+ String host = ElephantConstants.PROD_HOST_LOCAL_V6_JingDongYun;
if (isDevMode) {
- host = ElephantConstants.DEV_HOST_LOCAL;
+ host = ElephantConstants.DEV_HOST_LOCAL_V6_JingDongYun;
}
- host = "https://js.ele12.com/order-api";
// 最终接口地址
String url = host + uri;
+
+ DxhyInterfaceResponse dxhyInterfaceResponse = null;
+
// 封装大象v6调用类
- // TODO 注意调整这里
DxhyInterfaceRequest dxhyInterfaceRequest = new DxhyInterfaceRequest();
// 地址
dxhyInterfaceRequest.setRequestUrl(url);
@@ -374,7 +378,13 @@ public class ElephantUtils {
// 超时时间(毫秒值)
dxhyInterfaceRequest.setHttpTimeOut("100000");
// 流水号(拷贝的接口文档的)
- dxhyInterfaceRequest.setDataExchangeId("1617954341800234234234552");
+// dxhyInterfaceRequest.setDataExchangeId("1617954341800234234234552");
+ // 生成流水号
+ Snowflake snowflake = IdUtil.createSnowflake(1, 1);
+ long snowflakeId = snowflake.nextId();
+ String snowflakeIdStr = String.valueOf(snowflakeId);
+ dxhyInterfaceRequest.setDataExchangeId(snowflakeIdStr);
+
// appid
dxhyInterfaceRequest.setSecretId(secretId);
// appkey
@@ -385,15 +395,22 @@ public class ElephantUtils {
dxhyInterfaceRequest.setZipCode("0");
// 不加密
dxhyInterfaceRequest.setEncryptCode("0");
- // 大象v6调用方法(获取结果处理)
- DxhyInterfaceResponse dxhyInterfaceResponse = InvokeDxhyApi.dxhyInterfaceInvoke(dxhyInterfaceRequest);
- log.info("请求成功,结果{}",JSONUtil.toJsonStr(dxhyInterfaceResponse));
+
+ try {
+ // 大象v6调用方法(获取结果处理)
+ log.info("【销项】【大象工具类】调用V6接口,入参{}",JSONUtil.toJsonStr(dxhyInterfaceRequest));
+ dxhyInterfaceResponse = InvokeDxhyApi.dxhyInterfaceInvoke(dxhyInterfaceRequest);
+ log.info("【销项】【大象工具类】请求成功,结果{}",JSONUtil.toJsonStr(dxhyInterfaceResponse));
+ } catch (Exception e) {
+ log.error("【销项】【大象接口】调用HttpsUtilV6.Exception, url=" + url + ",request=" + JSONUtil.toJsonStr(dxhyInterfaceRequest), e);
+ }
return dxhyInterfaceResponse;
}
+
/**
* 大象请求 大象部署版 1.2.4 无token
*
diff --git a/pom.xml b/pom.xml
index e65148a..a5c7b8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,6 +252,8 @@
+
+
@@ -288,8 +290,14 @@
${java.version}
${java.version}
${project.build.sourceEncoding}
+
+
+ ${project.basedir}/lib
+
+
+