Skip to content

Commit a37dc48

Browse files
committed
升级版本v1.14.0
1 parent 19f7115 commit a37dc48

File tree

12 files changed

+133
-26
lines changed

12 files changed

+133
-26
lines changed

.env

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# ui项目的根路径
2+
UI_BASE_DIR=/Users/dingzhiwei/work/idea_wk/gitee_wk

Dockerfile

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ COPY ./docs/settings.xml /root/.m2/settings.xml
1616

1717
RUN mvn clean package -Dmaven.test.skip=true -Ptest
1818

19-
20-
# 以下为运行容器 切换 JDK 请修改后面的 17 到对应版本
21-
FROM mcr.microsoft.com/java/jre:17-zulu-alpine
19+
# 以下为运行容器 切换 JDK 到对应版本
20+
# jdk8对应:mcr.microsoft.com/java/jre:8-zulu-alpine
21+
# jdk17对应:mcr.microsoft.com/java/jre:17-zulu-alpine
22+
FROM mcr.microsoft.com/java/jre:8-zulu-alpine
2223

2324
ARG PLATFORM=$PLATFORM
2425

docker-compose.yml

+12-11
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ services:
1717
hostname: mysql
1818
container_name: jeepay-mysql
1919
# amd64 平台
20-
image: mysql/mysql-server:latest
21-
#image: mysql:8
20+
#image: mysql/mysql-server:latest
21+
image: mysql:8
2222
environment:
23+
LANG: C.UTF-8
2324
MYSQL_ROOT_PASSWORD: "rootroot"
2425
MYSQL_DATABASE: "jeepaydb"
2526
MYSQL_USER: "jeepay"
@@ -131,8 +132,8 @@ services:
131132
- mysql
132133
- redis
133134
- activemq
134-
- rabbitmq
135-
- rocketmq-broker
135+
# - rabbitmq
136+
# - rocketmq-broker
136137
networks:
137138
jeepay:
138139
ipv4_address: 172.20.0.21
@@ -155,8 +156,8 @@ services:
155156
- mysql
156157
- redis
157158
- activemq
158-
- rabbitmq
159-
- rocketmq-broker
159+
# - rabbitmq
160+
# - rocketmq-broker
160161
networks:
161162
jeepay:
162163
ipv4_address: 172.20.0.22
@@ -179,8 +180,8 @@ services:
179180
- mysql
180181
- redis
181182
- activemq
182-
- rabbitmq
183-
- rocketmq-broker
183+
# - rabbitmq
184+
# - rocketmq-broker
184185
networks:
185186
jeepay:
186187
ipv4_address: 172.20.0.23
@@ -189,7 +190,7 @@ services:
189190
- ./conf/merchant/application.yml:/workspace/application.yml
190191
ui-payment:
191192
build:
192-
context: ./jeepay-ui
193+
context: ${UI_BASE_DIR}/jeepay-ui
193194
dockerfile: Dockerfile
194195
args:
195196
PLATFORM: cashier
@@ -207,7 +208,7 @@ services:
207208
ipv4_address: 172.20.0.31
208209
ui-manager:
209210
build:
210-
context: ./jeepay-ui
211+
context: ${UI_BASE_DIR}/jeepay-ui
211212
dockerfile: Dockerfile
212213
args:
213214
PLATFORM: manager
@@ -225,7 +226,7 @@ services:
225226
ipv4_address: 172.20.0.32
226227
ui-merchant:
227228
build:
228-
context: ./jeepay-ui
229+
context: ${UI_BASE_DIR}/jeepay-ui
229230
dockerfile: Dockerfile
230231
args:
231232
PLATFORM: merchant

docker/activemq/activemq.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<!--
3838
The <broker> element is used to configure the ActiveMQ broker.
3939
-->
40-
<broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}">
40+
<broker xmlns="http://activemq.apache.org/schema/core" brokerName="localhost" dataDirectory="${activemq.data}" schedulerSupport="true">
4141

4242
<destinationPolicy>
4343
<policyMap>

docker/build-docker-starter.sh

+104
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
#!/bin/sh
2+
set -o errexit
3+
4+
# 版本
5+
VERSION=latest
6+
# DockerHub 用户名前缀 / 私有镜像仓库,需要提前登陆好,编译完成后会自动上传
7+
DOCKER_NAMESPACE=registry.cn-beijing.aliyuncs.com/jiquankeji
8+
# 容器名字前缀
9+
IMAGE_NAME=jeepay
10+
# buildx toolkit 名称
11+
BUILDER=${IMAGE_NAME}-builder
12+
# 平台
13+
PLATFORM=linux/amd64,linux/arm64
14+
# 后端 Maven 依赖缓存
15+
BACKEND_DEPS_IMAGE_NAME=${DOCKER_NAMESPACE}/${IMAGE_NAME}-deps:$VERSION
16+
FRONTEND_DEPS_IMAGE_NAME=${DOCKER_NAMESPACE}/${IMAGE_NAME}-ui-deps:$VERSION
17+
18+
UI_FOLDER=./private-jeepay-ui
19+
20+
TARGET=$1
21+
HAS_DEPS=$2
22+
ECHO_NAME=$3
23+
24+
docker_buildx() {
25+
build_path=$1
26+
build_name=$2
27+
build_file=$3
28+
build_arg=""
29+
30+
for i in "$@"; do
31+
if [ "$i" = "$build_path" ] || [ "$i" = "$build_name" ] || [ "$i" = "$build_file" ]; then
32+
continue
33+
fi
34+
build_arg="$build_arg --build-arg $i"
35+
done
36+
37+
if [ "$ECHO_NAME" = "name" ]; then
38+
echo "${IMAGE_NAME}-${build_name}"
39+
else
40+
CMD="docker buildx build ${build_path} -f ${build_file} --platform ${PLATFORM} ${build_arg} -t ${DOCKER_NAMESPACE}/${IMAGE_NAME}-${build_name}:$VERSION --push"
41+
echo "$CMD"
42+
eval "$CMD"
43+
fi
44+
}
45+
46+
build_backend() {
47+
48+
echo "== 项目后端"
49+
if [ "$HAS_DEPS" = "deps" ]; then
50+
docker_buildx . deps docs/Dockerfile
51+
fi
52+
53+
docker_buildx . payment Dockerfile PORT=9216 PLATFORM=payment IMAGES="$BACKEND_DEPS_IMAGE_NAME"
54+
55+
docker_buildx . manager Dockerfile PORT=9217 PLATFORM=manager IMAGES="$BACKEND_DEPS_IMAGE_NAME"
56+
57+
docker_buildx . merchant Dockerfile PORT=9218 PLATFORM=merchant IMAGES="$BACKEND_DEPS_IMAGE_NAME"
58+
59+
}
60+
61+
build_frontend() {
62+
63+
rm -rf ${UI_FOLDER}
64+
git clone https://gitee.com/jeequan/jeepay-ui.git ${UI_FOLDER}
65+
66+
echo "== 项目前端"
67+
68+
if [ "$HAS_DEPS" = "deps" ]; then
69+
docker_buildx ${UI_FOLDER} ui-deps "${UI_FOLDER}/Dockerfile-deps"
70+
fi
71+
72+
docker_buildx ${UI_FOLDER} ui-payment "${UI_FOLDER}/Dockerfile" PLATFORM=cashier IMAGES="$FRONTEND_DEPS_IMAGE_NAME"
73+
74+
docker_buildx ${UI_FOLDER} ui-manager "${UI_FOLDER}/Dockerfile" PLATFORM=manager IMAGES="$FRONTEND_DEPS_IMAGE_NAME"
75+
76+
docker_buildx ${UI_FOLDER} ui-merchant "${UI_FOLDER}/Dockerfile" PLATFORM=merchant IMAGES="$FRONTEND_DEPS_IMAGE_NAME"
77+
78+
}
79+
80+
build_deps() {
81+
echo "== 项目依赖环境编译"
82+
83+
docker_buildx ./docker/activemq activemq ./docker/activemq/Dockerfile
84+
}
85+
86+
if [ "$TARGET" != "" ]; then
87+
docker buildx rm ${BUILDER} || true
88+
89+
docker buildx create --use --name ${BUILDER} --platform linux/arm64,linux/amd64
90+
fi
91+
92+
if [ "$TARGET" = "backend" ] || [ "$TARGET" = "all" ]; then
93+
build_backend
94+
fi
95+
96+
if [ "$TARGET" = "frontend" ] || [ "$TARGET" = "all" ]; then
97+
build_frontend
98+
fi
99+
100+
if [ "$TARGET" = "all" ]; then
101+
build_deps
102+
else
103+
echo "./build-docker.sh [backend|frontend|all] [deps] [name]"
104+
fi

push-to-docker.md docker/push-to-docker.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@ mvn install
66
```
77
export DOCKER_REGISTRY=registry.cn-beijing.aliyuncs.com
88
export DOCKER_NAMESPACE=jeequan
9-
export DOCKER_IMAGE_TAG=v1.0-alpha
9+
export DOCKER_IMAGE_TAG=v1.14.0-alpha
1010
export DOCKER_REGISTRY_USERNAME=username1
1111
export DOCKER_REGISTRY_PASSWORD=password1
1212
1313
cd jeepay-payment
1414
mvn jib:build \
15-
-Djib.to.image=$DOCKER_REGISTRY/$DOCKER_NAMESPACE/jeepay-payment:v1.0-alpha \
15+
-Djib.to.image=$DOCKER_REGISTRY/$DOCKER_NAMESPACE/jeepay-payment:$DOCKER_IMAGE_TAG \
1616
-Djib.to.auth.username=$DOCKER_REGISTRY_USERNAME \
1717
-Djib.to.auth.password=$DOCKER_REGISTRY_PASSWORD
1818
1919
cd ../jeepay-merchant
2020
mvn jib:build \
21-
-Djib.to.image=$DOCKER_REGISTRY/$DOCKER_NAMESPACE/jeepay-merchant:v1.0-alpha \
21+
-Djib.to.image=$DOCKER_REGISTRY/$DOCKER_NAMESPACE/jeepay-merchant:$DOCKER_IMAGE_TAG \
2222
-Djib.to.auth.username=$DOCKER_REGISTRY_USERNAME \
2323
-Djib.to.auth.password=$DOCKER_REGISTRY_PASSWORD
2424
2525
cd ../jeepay-manager
2626
mvn jib:build \
27-
-Djib.to.image=$DOCKER_REGISTRY/$DOCKER_NAMESPACE/jeepay-manager:v1.0-alpha \
27+
-Djib.to.image=$DOCKER_REGISTRY/$DOCKER_NAMESPACE/jeepay-manager:$DOCKER_IMAGE_TAG \
2828
-Djib.to.auth.username=$DOCKER_REGISTRY_USERNAME \
2929
-Djib.to.auth.password=$DOCKER_REGISTRY_PASSWORD
3030
```

docs/sql/patch.sql

+2-2
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ VALUES ('wxpay', '微信支付官方', 1, 1, 2,
251251
'[{"wayCode": "WX_APP"}, {"wayCode": "WX_H5"}, {"wayCode": "WX_NATIVE"}, {"wayCode": "WX_JSAPI"}, {"wayCode": "WX_BAR"}, {"wayCode": "WX_LITE"}]',
252252
'http://jeequan.oss-cn-beijing.aliyuncs.com/jeepay/img/wxpay.png', '#04BE02', 1, '微信官方通道');
253253

254+
## -- ++++ [v1.13.0] ===> [v1.14.0] ++++
254255
-- 日志请求参数、响应参数长度修改
255256
alter table t_sys_log modify `opt_req_param` TEXT DEFAULT NULL COMMENT '操作请求参数';
256-
alter table t_sys_log modify `opt_res_info` TEXT DEFAULT NULL COMMENT '操作响应结果';
257-
257+
alter table t_sys_log modify `opt_res_info` TEXT DEFAULT NULL COMMENT '操作响应结果';

jeepay-manager/src/main/resources/banner.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
/ /_/ // __/ __/ /_/ / /_/ / /_/ /
55
\____/ \___/\___/ .___/\__,_/\__, /
66
/_/ /____/
7-
:: Jeepay :: (v1.13.0.RELEASE)
7+
:: Jeepay :: (v1.14.0.RELEASE)
88
适合互联网企业使用的开源支付系统 : https://www.jeequan.com

jeepay-merchant/src/main/resources/banner.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
/ /_/ // __/ __/ /_/ / /_/ / /_/ /
55
\____/ \___/\___/ .___/\__,_/\__, /
66
/_/ /____/
7-
:: Jeepay :: (v1.13.0.RELEASE)
7+
:: Jeepay :: (v1.14.0.RELEASE)
88
适合互联网企业使用的开源支付系统 : https://www.jeequan.com

jeepay-payment/src/main/resources/banner.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
/ /_/ // __/ __/ /_/ / /_/ / /_/ /
55
\____/ \___/\___/ .___/\__,_/\__, /
66
/_/ /____/
7-
:: Jeepay :: (v1.13.0.RELEASE)
7+
:: Jeepay :: (v1.14.0.RELEASE)
88
适合互联网企业使用的开源支付系统 : https://www.jeequan.com

jeepay-ui

Submodule jeepay-ui deleted from e20d7f8

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<!-- 配置属性声明, 支持自定义参数 -->
3737
<properties>
3838

39-
<isys.version>1.13.0</isys.version> <!-- 指定当前[项目]版本号 -->
39+
<isys.version>1.14.0</isys.version> <!-- 指定当前[项目]版本号 -->
4040

4141
<java.version>1.8</java.version> <!-- 指定java版本号 -->
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <!-- 项目构建输出编码 -->

0 commit comments

Comments
 (0)