WFC/build.wfc
2
0
Fork 0
Code Activity

feat: support debug setting, support load extenal i18n messages

Browse Source
This commit is contained in:
zhangsz
2025-01-20 21:06:28 +08:00
parent 691ef2a66c
commit c31cd7a906
6 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -50,6 +50,7 @@ build/docker/mysql/db/*.sql
build/docker/mysql/db/upgrade/*/*.sql
build/docker/wfc/*/jar/*.jar
build/docker/wfc/*/*/jar/*.jar
build/docker/conf/default/i18n/*.properties
# Logs
logs

6
bin/copy.sh
View File

@@ -5,6 +5,7 @@ BERootDir=${GitRootDir}/be.wfc
FERootDir=${GitRootDir}/fe.wfc
FEUserRootDir=${GitRootDir}/fe.wfc.user
BuildRootDir=${GitRootDir}/build.wfc
I18nResourcesDir=${BERootDir}/wfc-common/wfc-common-core/src/main/resources
WFCWorkDir=/opt/wfc
BuildDockerDir=${BuildRootDir}/build/docker
@@ -37,6 +38,11 @@ rm -rf ${BuildDockerDir}/nginx/html/dist/u/*
cp -rf ${FEUserRootDir}/dist/* ${BuildDockerDir}/nginx/html/dist/u/
echo "done"
# copy i18n message resuorces
echo -n "Begin copy i18n message resources ... "
cp -rf ${I18nResourcesDir}/i18n/* ${BuildDockerDir}/conf/default/i18n/
echo "done"
# copy jar
echo -n "Begin copy wfc-gateway ... "
cp ${BERootDir}/wfc-gateway/target/wfc-gateway.jar ${BuildDockerDir}/wfc/gateway/jar

2
build/bin/wfcsetup.sh
View File

@@ -76,7 +76,7 @@ case "$1" in
# 如果conf目录下不存在相应的文件，则拷贝
if [ ! -f "$conf_dir/$filename" ]; then
cp "$file" "$conf_dir/"
cp -rf "$file" "$conf_dir/"
fi
done
done

16
build/docker/compose/docker-compose-debug.yml
View File

@@ -17,7 +17,7 @@ services:
- NACOS_SERVER_NAME=${NACOS_SERVER_NAME}
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/home/nacos/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/home/nacos/conf/
volumes:
- ./nacos/logs/:/home/nacos/logs
- ./nacos/conf/application.yml:/home/nacos/conf/application.yml
@@ -106,7 +106,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- GATEWAY_SERVER_PORT=${GATEWAY_SERVER_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:${GATEWAY_SERVER_PORT}/actuator/health || exit 1"]
interval: 30s
@@ -141,7 +141,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- AUTH_SERVER_PORT=${AUTH_SERVER_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:${AUTH_SERVER_PORT}/actuator/health || exit 1"]
interval: 30s
@@ -177,7 +177,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_SYSTEM_PORT=${WFC_SYSTEM_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005 # 调试参数
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:${WFC_SYSTEM_PORT}/actuator/health || exit 1"]
@@ -214,7 +214,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_USER_PORT=${WFC_USER_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- JAVA_TOOL_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5006 # 调试参数
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:${WFC_USER_PORT}/actuator/health || exit 1"]
@@ -248,7 +248,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_FILE_PORT=${WFC_FILE_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
restart: ${RESTART_OPTION}
wfc-modules-job:
@@ -276,7 +276,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_JOB_PORT=${WFC_JOB_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
restart: ${RESTART_OPTION}
wfc-modules-payment:
@@ -307,7 +307,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_PAYMENT_PORT=${WFC_PAYMENT_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
restart: ${RESTART_OPTION}
wfc-nginx:

16
build/docker/compose/docker-compose.yml
View File

@@ -17,7 +17,7 @@ services:
- NACOS_SERVER_NAME=${NACOS_SERVER_NAME}
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/home/nacos/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/home/nacos/conf/
volumes:
- ./nacos/logs/:/home/nacos/logs
- ./nacos/conf/application.yml:/home/nacos/conf/application.yml
@@ -106,7 +106,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- GATEWAY_SERVER_PORT=${GATEWAY_SERVER_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:${GATEWAY_SERVER_PORT}/actuator/health || exit 1"]
interval: 30s
@@ -141,7 +141,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- AUTH_SERVER_PORT=${AUTH_SERVER_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:${AUTH_SERVER_PORT}/actuator/health || exit 1"]
interval: 30s
@@ -176,7 +176,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_SYSTEM_PORT=${WFC_SYSTEM_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:${WFC_SYSTEM_PORT}/actuator/health || exit 1"]
interval: 30s
@@ -211,7 +211,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_USER_PORT=${WFC_USER_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
healthcheck:
test: ["CMD-SHELL", "curl -f http://localhost:${WFC_USER_PORT}/actuator/health || exit 1"]
interval: 30s
@@ -244,7 +244,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_FILE_PORT=${WFC_FILE_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
restart: ${RESTART_OPTION}
wfc-modules-job:
@@ -272,7 +272,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_JOB_PORT=${WFC_JOB_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
restart: ${RESTART_OPTION}
wfc-modules-payment:
@@ -303,7 +303,7 @@ services:
- NACOS_SERVER_IP=${NACOS_SERVER_IP}
- NACOS_SERVER_PORT=${NACOS_SERVER_PORT}
- WFC_PAYMENT_PORT=${WFC_PAYMENT_PORT}
- SPRING_CONFIG_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
- SPRING_CONFIG_ADDITIONAL_LOCATION=optional:classpath:/,optional:file:/opt/wfc/conf/
restart: ${RESTART_OPTION}
wfc-nginx:

2
build/docker/java/dockerfile
View File

@@ -5,7 +5,7 @@ WORKDIR /opt/wfc
# 设置环境变量
ENV JVM_OPTS="-Xms128m -Xmx512m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m"
ENV JAVA_OPTS="--spring.config.location=optional:classpath:/,optional:file:/opt/wfc/conf/application.yml"
ENV JAVA_OPTS="--spring.config.additional_location=optional:classpath:/,optional:file:/opt/wfc/conf/application.yml"
ENV JAR_FILE="app.jar"
# 使用 sh -c 解析环境变量