From 6d17cf2507ff6a4e3a551c0a44b87f11a86240ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E6=9C=A8?=
<4778256+qingmus@user.noreply.gitee.com>
Date: Tue, 29 Mar 2022 07:45:23 +0000
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20lombok=20=E7=89=88?=
=?UTF-8?q?=E6=9C=AC=E4=BF=AE=E5=A4=8D=20IllegalAccessError=20=E5=BC=82?=
=?UTF-8?q?=E5=B8=B8=20```=20[ERROR]=20Failed=20to=20execute=20goal=20org.?=
=?UTF-8?q?apache.maven.plugins:maven-compiler-plugin:3.1:compile=20(defau?=
=?UTF-8?q?lt-compile)=20on=20project=20jeepay-z-codegen:=20Fatal=20error?=
=?UTF-8?q?=20compiling:=20java.lang.IllegalAccessError:=20class=20lombok.?=
=?UTF-8?q?javac.apt.LombokProcessor=20(in=20unnamed=20module=20@0x122d6c2?=
=?UTF-8?q?2)=20cannot=20access=20class=20com.sun.tools.javac.processing.J?=
=?UTF-8?q?avacProcessingEnvironment=20(in=20module=20jdk.compiler)=20beca?=
=?UTF-8?q?use=20module=20jdk.compiler=20does=20not=20export=20com.sun.too?=
=?UTF-8?q?ls.javac.processing=20to=20unnamed=20module=20@0x122d6c22=20->?=
=?UTF-8?q?=20[Help=201]=20```?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jeepay-z-codegen/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jeepay-z-codegen/pom.xml b/jeepay-z-codegen/pom.xml
index 5c9e2d1..373e6ad 100644
--- a/jeepay-z-codegen/pom.xml
+++ b/jeepay-z-codegen/pom.xml
@@ -29,7 +29,7 @@
org.projectlombok
lombok
- 1.18.10
+ 1.18.22
true
--
Gitee
From 96a6a4f67084a995e2910509413966b9c02c9fc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B3=89?=
Date: Tue, 29 Mar 2022 15:55:00 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=AF=E6=8C=81=20JDK=2017=20=E7=BC=96?=
=?UTF-8?q?=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jeepay-payment/pom.xml | 6 ++++++
.../jeequan/jeepay/pay/channel/AbstractPaymentService.java | 2 --
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/jeepay-payment/pom.xml b/jeepay-payment/pom.xml
index a3ece86..50005ff 100644
--- a/jeepay-payment/pom.xml
+++ b/jeepay-payment/pom.xml
@@ -112,6 +112,12 @@
1.0.5
+
+ jakarta.activation
+ jakarta.activation-api
+ 1.2.2
+
+
diff --git a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractPaymentService.java b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractPaymentService.java
index 754b12b..76b39bf 100644
--- a/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractPaymentService.java
+++ b/jeepay-payment/src/main/java/com/jeequan/jeepay/pay/channel/AbstractPaymentService.java
@@ -22,8 +22,6 @@ import com.jeequan.jeepay.pay.util.ChannelCertConfigKitBean;
import com.jeequan.jeepay.service.impl.SysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
-import javax.jws.Oneway;
-
/*
* 支付接口抽象类
*
--
Gitee
From 5aeabbc53d897d23ba7730d5c989190d4de49e72 Mon Sep 17 00:00:00 2001
From: yhy
Date: Fri, 8 Apr 2022 15:16:17 +0000
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0docker=E6=9E=84=E5=BB=BA?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jeepay-manager/pom.xml | 5 +++++
jeepay-merchant/pom.xml | 5 +++++
jeepay-payment/pom.xml | 5 ++++-
pom.xml | 6 +++++-
push-to-docker.md | 31 +++++++++++++++++++++++++++++++
5 files changed, 50 insertions(+), 2 deletions(-)
create mode 100644 push-to-docker.md
diff --git a/jeepay-manager/pom.xml b/jeepay-manager/pom.xml
index 33a8499..e4bcae2 100644
--- a/jeepay-manager/pom.xml
+++ b/jeepay-manager/pom.xml
@@ -129,6 +129,11 @@
maven-resources-plugin
+
+ org.eclipse.jkube
+ kubernetes-maven-plugin
+
+
diff --git a/jeepay-merchant/pom.xml b/jeepay-merchant/pom.xml
index a83c8eb..63c5377 100644
--- a/jeepay-merchant/pom.xml
+++ b/jeepay-merchant/pom.xml
@@ -134,6 +134,11 @@
maven-resources-plugin
+
+ org.eclipse.jkube
+ kubernetes-maven-plugin
+
+
diff --git a/jeepay-payment/pom.xml b/jeepay-payment/pom.xml
index 50005ff..9f8a81f 100644
--- a/jeepay-payment/pom.xml
+++ b/jeepay-payment/pom.xml
@@ -146,7 +146,10 @@
maven-resources-plugin
-
+
+ com.google.cloud.tools
+ jib-maven-plugin
+
diff --git a/pom.xml b/pom.xml
index 08b2d2d..fff6eec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -202,7 +202,11 @@
-
+
+ com.google.cloud.tools
+ jib-maven-plugin
+ 3.2.1
+
diff --git a/push-to-docker.md b/push-to-docker.md
new file mode 100644
index 0000000..01e820b
--- /dev/null
+++ b/push-to-docker.md
@@ -0,0 +1,31 @@
+1. 编译
+```
+mvn install
+```
+2. 构建镜像及推送镜像（不需要docker环境）
+```
+export DOCKER_REGISTRY=registry.cn-beijing.aliyuncs.com
+export DOCKER_NAMESPACE=jeequan
+export DOCKER_IMAGE_TAG=v1.0-alpha
+export DOCKER_REGISTRY_USERNAME=username1
+export DOCKER_REGISTRY_PASSWORD=password1
+
+cd jeepay-payment
+mvn jib:build \
+ -Djib.to.image=$DOCKER_REGISTRY/$DOCKER_NAMESPACE/jeepay-payment:v1.0-alpha \
+ -Djib.to.auth.username=$DOCKER_REGISTRY_USERNAME \
+ -Djib.to.auth.password=$DOCKER_REGISTRY_PASSWORD
+
+cd ../jeepay-merchant
+mvn jib:build \
+ -Djib.to.image=$DOCKER_REGISTRY/$DOCKER_NAMESPACE/jeepay-merchant:v1.0-alpha \
+ -Djib.to.auth.username=$DOCKER_REGISTRY_USERNAME \
+ -Djib.to.auth.password=$DOCKER_REGISTRY_PASSWORD
+
+cd ../jeepay-manager
+mvn jib:build \
+ -Djib.to.image=$DOCKER_REGISTRY/$DOCKER_NAMESPACE/jeepay-manager:v1.0-alpha \
+ -Djib.to.auth.username=$DOCKER_REGISTRY_USERNAME \
+ -Djib.to.auth.password=$DOCKER_REGISTRY_PASSWORD
+```
+
--
Gitee
From 56e8b473f48cca95f5a331336e72c943828fa346 Mon Sep 17 00:00:00 2001
From: yhy
Date: Mon, 11 Apr 2022 08:14:28 +0000
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6?=
=?UTF-8?q?=E4=BE=9D=E8=B5=96=EF=BC=8C=E5=8F=8A=E4=BD=BF=E7=94=A8=E7=8E=AF?=
=?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E4=BC=A0=E9=80=92jvm=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=E5=92=8Cjava=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jeepay-manager/pom.xml | 11 +++++++++--
jeepay-merchant/pom.xml | 11 +++++++++--
jeepay-payment/pom.xml | 7 +++++++
3 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/jeepay-manager/pom.xml b/jeepay-manager/pom.xml
index e4bcae2..2305493 100644
--- a/jeepay-manager/pom.xml
+++ b/jeepay-manager/pom.xml
@@ -130,8 +130,15 @@
- org.eclipse.jkube
- kubernetes-maven-plugin
+ com.google.cloud.tools
+ jib-maven-plugin
+
+
+
+ sh,-c,java $JVM_OPTS -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file ) $JAVA_ARGS
+
+
+
diff --git a/jeepay-merchant/pom.xml b/jeepay-merchant/pom.xml
index 63c5377..cb7dbbb 100644
--- a/jeepay-merchant/pom.xml
+++ b/jeepay-merchant/pom.xml
@@ -135,8 +135,15 @@
- org.eclipse.jkube
- kubernetes-maven-plugin
+ com.google.cloud.tools
+ jib-maven-plugin
+
+
+
+ sh,-c,java $JVM_OPTS -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file ) $JAVA_ARGS
+
+
+
diff --git a/jeepay-payment/pom.xml b/jeepay-payment/pom.xml
index 9f8a81f..4fd63f0 100644
--- a/jeepay-payment/pom.xml
+++ b/jeepay-payment/pom.xml
@@ -149,6 +149,13 @@
com.google.cloud.tools
jib-maven-plugin
+
+
+
+ sh,-c,java $JVM_OPTS -cp $( cat /app/jib-classpath-file ) $( cat /app/jib-main-class-file ) $JAVA_ARGS
+
+
+
--
Gitee