From d264723d4c4bcbc1f37395a52024eb3fcf7239cc Mon Sep 17 00:00:00 2001 From: egzosn Date: Mon, 18 Oct 2021 21:11:11 +0800 Subject: [PATCH] 2.14.3-b --- README.md | 5 +-- pay-java-baidu/pom.xml | 8 ++--- .../pay/baidu/api/BaiduPayServiceTest.java | 12 +++---- pay-java-common/pom.xml | 2 +- pay-java-demo/pom.xml | 31 +++++++------------ pay-java-fuiou/pom.xml | 2 +- pay-java-payoneer/pom.xml | 2 +- pay-java-paypal/pom.xml | 2 +- pay-java-union/pom.xml | 2 +- pay-java-wx-youdian/pom.xml | 2 +- pay-java-wx/pom.xml | 2 +- pay-java-yiji/pom.xml | 2 +- pom.xml | 15 ++++----- 13 files changed, 37 insertions(+), 50 deletions(-) diff --git a/README.md b/README.md index 8387ad3..33e6d9d 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,10 @@ 4. 简单快速完成支付模块的开发 5. 支持多种支付类型多支付账户扩展 -### 本项目包含 3 个部分： +### 本项目包含 4 个部分： 1. pay-java-common 公共lib,支付核心与规范定义 + 2. pay-java-web-support web支持包，目前已实现回调相关 2. pay-java-demo 具体的支付demo 3. pay-java-* 具体的支付实现库 @@ -21,7 +22,7 @@ com.egzosn {module-name} - 2.14.3 + 2.14.3-b ``` diff --git a/pay-java-baidu/pom.xml b/pay-java-baidu/pom.xml index 0939ce4..4fd5363 100644 --- a/pay-java-baidu/pom.xml +++ b/pay-java-baidu/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 pay-java-baidu @@ -17,11 +17,7 @@ pay-java-common - - org.junit.jupiter - junit-jupiter - test - + 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 index 6f9b5c2..43f31a1 100644 --- 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 @@ -1,7 +1,5 @@ package com.egzosn.pay.baidu.api; -import org.junit.jupiter.api.Test; - /** * Created by hocgin on 2019/11/24. * email: hocgin@gmail.com @@ -9,16 +7,16 @@ import org.junit.jupiter.api.Test; * @author hocgin */ public class BaiduPayServiceTest { - - @Test - public void orderInfo() { + + + public static void main(String[] args) { 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/pay-java-common/pom.xml b/pay-java-common/pom.xml index 6bddee0..5ea672b 100644 --- a/pay-java-common/pom.xml +++ b/pay-java-common/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 jar diff --git a/pay-java-demo/pom.xml b/pay-java-demo/pom.xml index 6ad2995..769a561 100644 --- a/pay-java-demo/pom.xml +++ b/pay-java-demo/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 war @@ -16,9 +16,9 @@ 4.3.4.RELEASE 4.10 4.3.6.Final + 4.0.1 - @@ -31,11 +31,7 @@ pay-java-wx ${pay.version} - - com.egzosn - pay-java-web-support - ${pay.version} - + com.egzosn pay-java-ali @@ -63,20 +59,10 @@ ${pay.version} - - javax.servlet - javax.servlet-api - provided - 3.1.0 + com.egzosn + pay-java-web-support - - javax.servlet - jsp-api - 2.0 - provided - - org.springframework @@ -87,7 +73,12 @@ - + + javax.servlet + javax.servlet-api + provided + ${servlet-api.version} + com.fasterxml.jackson.core jackson-databind diff --git a/pay-java-fuiou/pom.xml b/pay-java-fuiou/pom.xml index cfc08fc..e8dc77d 100644 --- a/pay-java-fuiou/pom.xml +++ b/pay-java-fuiou/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 pay-java-fuiou diff --git a/pay-java-payoneer/pom.xml b/pay-java-payoneer/pom.xml index 26784ed..89b6f58 100644 --- a/pay-java-payoneer/pom.xml +++ b/pay-java-payoneer/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 pay-java-payoneer diff --git a/pay-java-paypal/pom.xml b/pay-java-paypal/pom.xml index 2a042ca..5ec9d96 100644 --- a/pay-java-paypal/pom.xml +++ b/pay-java-paypal/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 diff --git a/pay-java-union/pom.xml b/pay-java-union/pom.xml index 9bf99b8..7c6eaca 100644 --- a/pay-java-union/pom.xml +++ b/pay-java-union/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 diff --git a/pay-java-wx-youdian/pom.xml b/pay-java-wx-youdian/pom.xml index c92c64b..228e9b1 100644 --- a/pay-java-wx-youdian/pom.xml +++ b/pay-java-wx-youdian/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 pay-java-wx-youdian diff --git a/pay-java-wx/pom.xml b/pay-java-wx/pom.xml index d48f95c..f636f1a 100644 --- a/pay-java-wx/pom.xml +++ b/pay-java-wx/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 pay-java-wx diff --git a/pay-java-yiji/pom.xml b/pay-java-yiji/pom.xml index 4ce9397..d8abf2e 100644 --- a/pay-java-yiji/pom.xml +++ b/pay-java-yiji/pom.xml @@ -5,7 +5,7 @@ pay-java-parent com.egzosn - 2.14.3 + 2.14.3-b 4.0.0 diff --git a/pom.xml b/pom.xml index 63391c0..4b558b7 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.egzosn pay-java-parent pom - 2.14.3 + 2.14.3-b Pay Java - Parent Pay Java Parent @@ -70,12 +70,12 @@ - 2.14.3 + 2.14.3-b 4.5.4 1.2.17 1.2.73 3.3.1 - 5.5.1 + 4.0.1 @@ -107,7 +107,6 @@ - org.slf4j @@ -122,10 +121,12 @@ core ${zxing.version} + - org.junit.jupiter - junit-jupiter - ${junit.version} + javax.servlet + javax.servlet-api + provided + ${servlet-api.version}