diff --git a/pay-java-baidu/pom.xml b/pay-java-baidu/pom.xml
index 2aa2bda..ea4e52a 100644
--- a/pay-java-baidu/pom.xml
+++ b/pay-java-baidu/pom.xml
@@ -17,6 +17,11 @@
pay-java-common
+
+ org.junit.jupiter
+ junit-jupiter
+ test
+
diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java
similarity index 100%
rename from pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java
rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayConfigStorage.java
diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java
similarity index 97%
rename from pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java
rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java
index 3826166..47a7c8b 100644
--- a/pay-java-baidu/src/com/egzosn/pay/baidu/api/BaiduPayService.java
+++ b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/api/BaiduPayService.java
@@ -2,12 +2,6 @@ package com.egzosn.pay.baidu.api;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.egzosn.pay.baidu.bean.BaiduPayOrder;
-import com.egzosn.pay.baidu.bean.BaiduRefundOrder;
-import com.egzosn.pay.baidu.bean.BaiduTransactionType;
-import com.egzosn.pay.baidu.bean.type.AuditStatus;
-import com.egzosn.pay.baidu.util.Asserts;
-import com.egzosn.pay.baidu.util.NoNullMap;
import com.egzosn.pay.common.api.BasePayService;
import com.egzosn.pay.common.bean.*;
import com.egzosn.pay.common.http.HttpConfigStorage;
@@ -15,6 +9,12 @@ import com.egzosn.pay.common.http.UriVariables;
import com.egzosn.pay.common.util.DateUtils;
import com.egzosn.pay.common.util.sign.SignUtils;
import com.egzosn.pay.common.util.str.StringUtils;
+import com.egzosn.pay.baidu.bean.BaiduPayOrder;
+import com.egzosn.pay.baidu.bean.BaiduRefundOrder;
+import com.egzosn.pay.baidu.bean.BaiduTransactionType;
+import com.egzosn.pay.baidu.bean.type.AuditStatus;
+import com.egzosn.pay.baidu.util.Asserts;
+import com.egzosn.pay.baidu.util.NoNullMap;
import java.math.BigDecimal;
import java.util.Date;
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
-public class BaiduPayService extends BasePayService {
+public class BaiduPayService extends BasePayService {
public static final String APP_KEY = "appKey";
public static final String APP_ID = "appId";
public static final String DEAL_ID = "dealId";
@@ -43,11 +43,11 @@ public class BaiduPayService extends BasePayService {
public static final String RESPONSE_STATUS = "status";
- public BaiduPayService(BaiduPayConfigStorage payConfigStorage) {
+ public BaiduPayService(com.egzosn.pay.baidu.api.BaiduPayConfigStorage payConfigStorage) {
super(payConfigStorage);
}
- public BaiduPayService(BaiduPayConfigStorage payConfigStorage,
+ public BaiduPayService(com.egzosn.pay.baidu.api.BaiduPayConfigStorage payConfigStorage,
HttpConfigStorage configStorage) {
super(payConfigStorage, configStorage);
}
@@ -226,17 +226,20 @@ public class BaiduPayService extends BasePayService {
}
@Override
+ @Deprecated
public String buildRequest(Map orderInfo,
MethodType method) {
throw new UnsupportedOperationException("百度不支持PC支付");
}
@Override
+ @Deprecated
public String getQrPay(PayOrder order) {
throw new UnsupportedOperationException("百度不支持扫码付");
}
@Override
+ @Deprecated
public Map microPay(PayOrder order) {
throw new UnsupportedOperationException("百度不支持刷卡付");
}
@@ -247,6 +250,7 @@ public class BaiduPayService extends BasePayService {
}
@Override
+ @Deprecated
public Map close(String tradeNo, String outTradeNo) {
throw new UnsupportedOperationException("不支持该操作");
}
@@ -269,6 +273,7 @@ public class BaiduPayService extends BasePayService {
}
@Override
+ @Deprecated
public Map refund(RefundOrder refundOrder) {
throw new UnsupportedOperationException("请使用 " + getClass().getName() + "#refundUseBaidu");
}
diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduPayOrder.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduPayOrder.java
similarity index 100%
rename from pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduPayOrder.java
rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduPayOrder.java
diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java
similarity index 100%
rename from pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java
rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduRefundOrder.java
diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduTransactionType.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduTransactionType.java
similarity index 100%
rename from pay-java-baidu/src/com/egzosn/pay/baidu/bean/BaiduTransactionType.java
rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/BaiduTransactionType.java
diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/bean/type/AuditStatus.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/type/AuditStatus.java
similarity index 100%
rename from pay-java-baidu/src/com/egzosn/pay/baidu/bean/type/AuditStatus.java
rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/bean/type/AuditStatus.java
diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/package-info.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/package-info.java
similarity index 100%
rename from pay-java-baidu/src/com/egzosn/pay/baidu/package-info.java
rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/package-info.java
diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/util/Asserts.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/util/Asserts.java
similarity index 100%
rename from pay-java-baidu/src/com/egzosn/pay/baidu/util/Asserts.java
rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/util/Asserts.java
diff --git a/pay-java-baidu/src/com/egzosn/pay/baidu/util/NoNullMap.java b/pay-java-baidu/src/main/java/com/egzosn/pay/baidu/util/NoNullMap.java
similarity index 100%
rename from pay-java-baidu/src/com/egzosn/pay/baidu/util/NoNullMap.java
rename to pay-java-baidu/src/main/java/com/egzosn/pay/baidu/util/NoNullMap.java
diff --git a/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java b/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java
new file mode 100644
index 0000000..6f9b5c2
--- /dev/null
+++ b/pay-java-baidu/src/test/java/com/egzosn/pay/baidu/api/BaiduPayServiceTest.java
@@ -0,0 +1,24 @@
+package com.egzosn.pay.baidu.api;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Created by hocgin on 2019/11/24.
+ * email: hocgin@gmail.com
+ *
+ * @author hocgin
+ */
+public class BaiduPayServiceTest {
+
+ @Test
+ public void orderInfo() {
+ BaiduPayConfigStorage configStorage = new BaiduPayConfigStorage();
+ configStorage.setAppid("APP ID");
+ configStorage.setAppKey("APP KEY");
+ configStorage.setDealId("DEAL ID");
+ configStorage.setKeyPublic("KEY PUBLIC");
+
+ BaiduPayService payService = new BaiduPayService(configStorage);
+ // payService.refund()
+ }
+}
diff --git a/pom.xml b/pom.xml
index 5ae16b1..76479a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,6 +64,7 @@
1.2.17
1.2.58
3.3.1
+ 5.5.1
@@ -105,6 +106,12 @@
${zxing.version}
+
+ org.junit.jupiter
+ junit-jupiter
+ ${junit.version}
+
+