update alipay-sdk lib.remove jsp.change some package

Javen205 · Aug 16, 2017 · 1ef302b · 1ef302b
1 parent bdf6348
commit 1ef302b
Show file tree

Hide file tree

Showing 38 changed files with 18 additions and 1,057 deletions.
diff --git a/doc/img/wxpay.gif b/doc/img/wxpay.gif
diff --git a/doc/img/wxsubpay.gif b/doc/img/wxsubpay.gif
diff --git a/libs/alipay-sdk-java20170411150054.jar b/libs/alipay-sdk-java20170411150054.jar
diff --git a/libs/alipay-sdk-java20170725114550.jar b/libs/alipay-sdk-java20170725114550.jar
diff --git a/pom.xml b/pom.xml
@@ -54,7 +54,7 @@
 			<artifactId>alipay-sdk-java</artifactId>
 			<version>java20170411150054</version>
 			<scope>system</scope>
-			<systemPath>${project.basedir}/libs/alipay-sdk-java20170411150054.jar</systemPath>
+			<systemPath>${project.basedir}/libs/alipay-sdk-java20170725114550.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>

diff --git a/src/main/java/com/jpay/util/HttpKit.java → src/main/java/com/jpay/ext/kit/HttpKit.java b/src/main/java/com/jpay/util/HttpKit.java → src/main/java/com/jpay/ext/kit/HttpKit.java
@@ -1,4 +1,4 @@
-package com.jpay.util;
+package com.jpay.ext.kit;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -25,8 +25,6 @@
 import javax.net.ssl.X509TrustManager;
 import javax.servlet.http.HttpServletRequest;
 
-import com.jpay.ext.kit.StrKit;
-
 /**
  * HttpKit
  */

diff --git a/src/main/java/com/jpay/util/IpKit.java → src/main/java/com/jpay/ext/kit/IpKit.java b/src/main/java/com/jpay/util/IpKit.java → src/main/java/com/jpay/ext/kit/IpKit.java
@@ -3,7 +3,7 @@
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  */
-package com.jpay.util;
+package com.jpay.ext.kit;
 
 import javax.servlet.http.HttpServletRequest;
 

diff --git a/src/main/java/com/jpay/util/PaymentKit.java → ...ain/java/com/jpay/ext/kit/PaymentKit.java b/src/main/java/com/jpay/util/PaymentKit.java → ...ain/java/com/jpay/ext/kit/PaymentKit.java
@@ -1,4 +1,4 @@
-package com.jpay.util;
+package com.jpay.ext.kit;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -7,8 +7,8 @@
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
-import com.jpay.ext.kit.HashKit;
-import com.jpay.ext.kit.StrKit;
+import com.jpay.util.Charsets;
+import com.jpay.util.XmlHelper;
 import com.jpay.weixin.api.WxPayApiConfigKit;
 
 /**

diff --git a/src/main/java/com/jpay/util/HttpUtils.java b/src/main/java/com/jpay/util/HttpUtils.java
@@ -310,6 +310,7 @@ public String postSSL(String url, String data, String certPath, String certPass)
 
 				sslContext.init(kms, null, new SecureRandom());
 
+				@SuppressWarnings("deprecation")
 				okhttp3.OkHttpClient httpsClient = new okhttp3.OkHttpClient()
 						.newBuilder()
 						.connectTimeout(10, TimeUnit.SECONDS)

diff --git a/src/main/java/com/jpay/weixin/api/WxPayApi.java b/src/main/java/com/jpay/weixin/api/WxPayApi.java
@@ -3,8 +3,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.jpay.ext.kit.PaymentKit;
 import com.jpay.util.HttpUtils;
-import com.jpay.util.PaymentKit;
 /**
  * 
  * @author Javen
@@ -57,13 +57,15 @@ public class WxPayApi {
 	private WxPayApi() {}
 	/**
 	 * 交易类型枚举
-	 * @author Javen
-	 * 2017年4月15日
-	 * JSAPI--公众号支付、NATIVE--原生扫码支付、APP--app支付，统一下单接口trade_type的传参可参考这里
-	 * MICROPAY--刷卡支付，刷卡支付有单独的支付接口，不调用统一下单接口
+	 * 统一下单接口trade_type的传参可参考这里
+	 * JSAPI--公众号支付、小程序支付
+	 * NATIVE--原生扫码支付
+	 * APP--APP支付
+	 * MWEB--WAP支付
+	 * MICROPAY--刷卡支付,刷卡支付有单独的支付接口，不调用统一下单接口
 	 */
 	public static enum TradeType {
-		JSAPI, NATIVE, APP, WAP , MICROPAY
+		JSAPI,NATIVE,APP,WAP,MICROPAY,MWEB
 	}
 
 

diff --git a/src/main/java/com/jpay/weixin/api/WxPayApiConfig.java b/src/main/java/com/jpay/weixin/api/WxPayApiConfig.java
@@ -4,8 +4,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.jpay.ext.kit.PaymentKit;
 import com.jpay.ext.kit.StrKit;
-import com.jpay.util.PaymentKit;
 import com.jpay.weixin.api.WxPayApi.TradeType;
 /**
  * @Email [email protected]

diff --git a/src/main/java/com/jpay/weixin/api/hb/ReadHbModle.java b/src/main/java/com/jpay/weixin/api/hb/ReadHbModle.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 
 import com.jpay.ext.kit.StrKit;
-import com.jpay.util.PaymentKit;
+import com.jpay.ext.kit.PaymentKit;
 import com.jpay.weixin.api.WxPayApiConfig.PayModel;
 /**
  * @Email [email protected]

diff --git a/src/main/java/com/jpay/weixin/api/hb/RedHbApi.java b/src/main/java/com/jpay/weixin/api/hb/RedHbApi.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 
 import com.jpay.util.HttpUtils;
-import com.jpay.util.PaymentKit;
+import com.jpay.ext.kit.PaymentKit;
 
 /**
  * 微信红包

diff --git a/src/main/webapp/MP_verify_lvKCYtYMh7d9PmMu.txt b/src/main/webapp/MP_verify_lvKCYtYMh7d9PmMu.txt
diff --git a/src/main/webapp/error/404.jsp b/src/main/webapp/error/404.jsp
diff --git a/src/main/webapp/error/500.jsp b/src/main/webapp/error/500.jsp
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
diff --git a/src/main/webapp/onqrpay.jsp b/src/main/webapp/onqrpay.jsp