diff --git a/boot-service/pom.xml b/boot-service/pom.xml
index 27ccedd..312b3a9 100644
--- a/boot-service/pom.xml
+++ b/boot-service/pom.xml
@@ -43,7 +43,7 @@
com.alibaba
druid
- 1.1.5
+ ${druid-version}
mysql
@@ -86,18 +86,18 @@
org.apache.poi
poi
- 3.14
+ ${poi-verison}
org.apache.poi
poi-ooxml
- 3.14
+ ${poi-verison}
org.apache.httpcomponents
httpclient
- 4.5.1
+ ${httpclient-version}
@@ -109,24 +109,16 @@
dom4j
dom4j
- 1.6.1
org.jdom
- jdom
- 2.0.2
+ jdom2
com.alipay.sdk
alipay
- 1.0
-
-
-
- commons-httpclient
- commons-httpclient
- 3.1
+ ${alipay-version}
\ No newline at end of file
diff --git a/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java b/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java
index 88fc0a1..f0bb56d 100644
--- a/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java
+++ b/boot-service/src/main/java/com/xwbing/service/other/WxPayService.java
@@ -3,10 +3,10 @@ package com.xwbing.service.other;
import com.xwbing.domain.entity.pay.wxpay.*;
import com.xwbing.exception.BusinessException;
import com.xwbing.exception.PayException;
-import com.xwbing.util.payWxpay.ClientCustomSSL;
-import com.xwbing.util.payWxpay.RandomKit;
-import com.xwbing.util.payWxpay.WxSignKit;
-import com.xwbing.util.payWxpay.XmlUtil;
+import com.xwbing.util.wxpay.ClientCustomSSL;
+import com.xwbing.util.wxpay.RandomKit;
+import com.xwbing.util.wxpay.WxSignKit;
+import com.xwbing.util.wxpay.XmlUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpStatus;
diff --git a/boot-service/src/main/java/com/xwbing/util/payWxpay/ClientCustomSSL.java b/boot-service/src/main/java/com/xwbing/util/wxpay/ClientCustomSSL.java
similarity index 99%
rename from boot-service/src/main/java/com/xwbing/util/payWxpay/ClientCustomSSL.java
rename to boot-service/src/main/java/com/xwbing/util/wxpay/ClientCustomSSL.java
index 98721a9..1c1846b 100644
--- a/boot-service/src/main/java/com/xwbing/util/payWxpay/ClientCustomSSL.java
+++ b/boot-service/src/main/java/com/xwbing/util/wxpay/ClientCustomSSL.java
@@ -24,7 +24,7 @@
* .
*
*/
-package com.xwbing.util.payWxpay;
+package com.xwbing.util.wxpay;
import com.xwbing.exception.BusinessException;
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
diff --git a/boot-service/src/main/java/com/xwbing/util/payWxpay/MD5Signature.java b/boot-service/src/main/java/com/xwbing/util/wxpay/MD5Signature.java
similarity index 98%
rename from boot-service/src/main/java/com/xwbing/util/payWxpay/MD5Signature.java
rename to boot-service/src/main/java/com/xwbing/util/wxpay/MD5Signature.java
index 43068eb..fd06fe7 100644
--- a/boot-service/src/main/java/com/xwbing/util/payWxpay/MD5Signature.java
+++ b/boot-service/src/main/java/com/xwbing/util/wxpay/MD5Signature.java
@@ -1,7 +1,7 @@
/**
*
*/
-package com.xwbing.util.payWxpay;
+package com.xwbing.util.wxpay;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/boot-service/src/main/java/com/xwbing/util/payWxpay/Md5Encrypt.java b/boot-service/src/main/java/com/xwbing/util/wxpay/Md5Encrypt.java
similarity index 98%
rename from boot-service/src/main/java/com/xwbing/util/payWxpay/Md5Encrypt.java
rename to boot-service/src/main/java/com/xwbing/util/wxpay/Md5Encrypt.java
index b00ea62..767ffc2 100644
--- a/boot-service/src/main/java/com/xwbing/util/payWxpay/Md5Encrypt.java
+++ b/boot-service/src/main/java/com/xwbing/util/wxpay/Md5Encrypt.java
@@ -1,4 +1,4 @@
-package com.xwbing.util.payWxpay;
+package com.xwbing.util.wxpay;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
diff --git a/boot-service/src/main/java/com/xwbing/util/payWxpay/RandomKit.java b/boot-service/src/main/java/com/xwbing/util/wxpay/RandomKit.java
similarity index 96%
rename from boot-service/src/main/java/com/xwbing/util/payWxpay/RandomKit.java
rename to boot-service/src/main/java/com/xwbing/util/wxpay/RandomKit.java
index fda3a9a..31fdd46 100644
--- a/boot-service/src/main/java/com/xwbing/util/payWxpay/RandomKit.java
+++ b/boot-service/src/main/java/com/xwbing/util/wxpay/RandomKit.java
@@ -1,4 +1,4 @@
-package com.xwbing.util.payWxpay;
+package com.xwbing.util.wxpay;
import java.util.Random;
diff --git a/boot-service/src/main/java/com/xwbing/util/payWxpay/SHA1.java b/boot-service/src/main/java/com/xwbing/util/wxpay/SHA1.java
similarity index 99%
rename from boot-service/src/main/java/com/xwbing/util/payWxpay/SHA1.java
rename to boot-service/src/main/java/com/xwbing/util/wxpay/SHA1.java
index f101ef5..2ee55d4 100644
--- a/boot-service/src/main/java/com/xwbing/util/payWxpay/SHA1.java
+++ b/boot-service/src/main/java/com/xwbing/util/wxpay/SHA1.java
@@ -1,4 +1,4 @@
-package com.xwbing.util.payWxpay;
+package com.xwbing.util.wxpay;
import java.security.MessageDigest;
diff --git a/boot-service/src/main/java/com/xwbing/util/payWxpay/WxSignKit.java b/boot-service/src/main/java/com/xwbing/util/wxpay/WxSignKit.java
similarity index 98%
rename from boot-service/src/main/java/com/xwbing/util/payWxpay/WxSignKit.java
rename to boot-service/src/main/java/com/xwbing/util/wxpay/WxSignKit.java
index f459646..9a7b740 100644
--- a/boot-service/src/main/java/com/xwbing/util/payWxpay/WxSignKit.java
+++ b/boot-service/src/main/java/com/xwbing/util/wxpay/WxSignKit.java
@@ -1,4 +1,4 @@
-package com.xwbing.util.payWxpay;
+package com.xwbing.util.wxpay;
import java.util.*;
import java.util.logging.Logger;
diff --git a/boot-service/src/main/java/com/xwbing/util/payWxpay/XmlUtil.java b/boot-service/src/main/java/com/xwbing/util/wxpay/XmlUtil.java
similarity index 79%
rename from boot-service/src/main/java/com/xwbing/util/payWxpay/XmlUtil.java
rename to boot-service/src/main/java/com/xwbing/util/wxpay/XmlUtil.java
index d5cd0ed..9cbb98e 100644
--- a/boot-service/src/main/java/com/xwbing/util/payWxpay/XmlUtil.java
+++ b/boot-service/src/main/java/com/xwbing/util/wxpay/XmlUtil.java
@@ -1,4 +1,4 @@
-package com.xwbing.util.payWxpay;
+package com.xwbing.util.wxpay;
import org.jdom2.Document;
import org.jdom2.Element;
@@ -14,23 +14,23 @@ import java.util.List;
import java.util.Map;
/**
- * jdom2 XmlUtil
+ * jdom2 XmlUtil
*/
public class XmlUtil {
/**
* xml解析成map
+ *
* @param strxml
* @return
* @throws JDOMException
* @throws IOException
*/
- public static Map doXMLParse(String strxml)
- throws JDOMException, IOException {
+ public static Map doXMLParse(String strxml) throws JDOMException, IOException {
if (null == strxml || "".equals(strxml)) {
return null;
}
strxml = strxml.replaceFirst("encoding=\".*\"", "encoding=\"UTF-8\"");
- Map m = new HashMap();
+ Map m = new HashMap<>();
InputStream in = new ByteArrayInputStream(strxml.getBytes("UTF-8"));
SAXBuilder builder = new SAXBuilder();
Document doc = builder.build(in);
@@ -38,9 +38,9 @@ public class XmlUtil {
List list = root.getChildren();
Iterator it = list.iterator();
while (it.hasNext()) {
- Element e = (Element) it.next();
+ Element e = it.next();
String k = e.getName();
- String v = "";
+ String v;
List children = e.getChildren();
if (children.isEmpty()) {
v = e.getTextNormalize();
@@ -51,22 +51,24 @@ public class XmlUtil {
}
return m;
}
+
/**
* 获取子结点的xml
+ *
* @param children
* @return String
*/
public static String getChildrenText(List children) {
StringBuffer sb = new StringBuffer();
- if(!children.isEmpty()) {
+ if (!children.isEmpty()) {
Iterator it = children.iterator();
- while(it.hasNext()) {
+ while (it.hasNext()) {
Element e = (Element) it.next();
String name = e.getName();
String value = e.getTextNormalize();
List list = e.getChildren();
sb.append("<" + name + ">");
- if(!list.isEmpty()) {
+ if (!list.isEmpty()) {
sb.append(XmlUtil.getChildrenText(list));
}
sb.append(value);
@@ -83,7 +85,7 @@ public class XmlUtil {
* @param return_msg
* @return
*/
- public static String setXML(String return_code, String return_msg){
+ public static String setXML(String return_code, String return_msg) {
return "";
@@ -91,11 +93,11 @@ public class XmlUtil {
public static void main(String[] args) {
- String ff="";
+ String ff = "";
try {
- Map sf= XmlUtil.doXMLParse(ff);
+ Map sf = XmlUtil.doXMLParse(ff);
for (String s : sf.keySet()) {
- System.out.println(s+",value:"+sf.get(s));
+ System.out.println(s + ",value:" + sf.get(s));
}
} catch (JDOMException e) {
e.printStackTrace();
diff --git a/pom.xml b/pom.xml
index 29275aa..6e6f2d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,10 @@
1.2.20
1.45
2.2
+ 1.0
+ 1.1.5
+ 3.14
+ 4.5.1
true
2.4.0