diff --git a/fund-cust/src/main/assembly/assembly.xml b/assembly/assembly.xml similarity index 62% rename from fund-cust/src/main/assembly/assembly.xml rename to assembly/assembly.xml index 7a1390e..d9b7c7f 100644 --- a/fund-cust/src/main/assembly/assembly.xml +++ b/assembly/assembly.xml @@ -6,17 +6,21 @@ true - + - src/main/scripts + ${project.basedir}/../scripts bin - *.sh + start.sh + stop.sh + restart.sh + status.sh + env.properties 0755 - + src/main/resources conf @@ -25,8 +29,13 @@ application-*.yml logback-spring.xml bootstrap.yml - *.properties + bootstrap-*.yml + + + application-docker.yml + bootstrap-docker.yml + 0644 diff --git a/doc/单机部署文档.md b/doc/单机部署文档.md index 204c540..2701705 100644 --- a/doc/单机部署文档.md +++ b/doc/单机部署文档.md @@ -1,6 +1,6 @@ # 资金服务平台单机部署文档 -> 版本: v2.0 +> 版本: v2.1 > 更新日期: 2026-02-22 > 作者: zhangjf @@ -387,20 +387,47 @@ mvn clean package -DskipTests ``` fund-sys/ -├── bin/ # 脚本目录 -│ ├── start.sh # 启动脚本 +├── bin/ # 脚本目录（统一从项目根目录scripts引用） +│ ├── start.sh # 启动脚本（自动识别服务名） │ ├── stop.sh # 停止脚本 │ ├── restart.sh # 重启脚本 -│ └── status.sh # 状态查看脚本 +│ ├── status.sh # 状态查看脚本 +│ └── env.properties # 环境变量配置模板 ├── lib/ # 依赖JAR目录 │ └── fund-sys.jar # 服务JAR包（包含所有依赖） -└── conf/ # 配置文件目录 +└── conf/ # 配置文件目录（排除docker相关配置） ├── application.yml # 主配置文件 ├── application-*.yml # 环境配置文件 └── logback-spring.xml # 日志配置文件 ``` -#### 4.2.3 前端打包 +#### 4.2.3 Assembly打包配置 + +项目使用统一的Assembly配置，脚本统一管理在项目根目录： + +``` +fundplatform/ +├── assembly/ +│ └── assembly.xml # 统一的Assembly配置 +├── scripts/ # 统一的脚本目录 +│ ├── start.sh # 启动脚本（自动识别服务名） +│ ├── stop.sh # 停止脚本 +│ ├── restart.sh # 重启脚本 +│ ├── status.sh # 状态查看脚本 +│ ├── env.properties # 环境变量配置模板 +│ ├── start-all.sh # 一键启动所有服务 +│ ├── stop-all.sh # 一键停止所有服务 +│ ├── restart-all.sh # 一键重启所有服务 +│ └── status-all.sh # 查看所有服务状态 +└── ...各服务模块 +``` + +**Assembly配置特点：** +- 脚本从项目根目录 `scripts/` 引用，避免重复 +- 配置文件排除 `application-docker.yml` 等Docker相关配置 +- 脚本自动从目录名推断服务名称，无需硬编码 + +#### 4.2.4 前端打包 ```bash # 管理后台打包 @@ -456,11 +483,13 @@ tar -xzf fund-receipt.tar.gz -C /opt/fundplatform/deploy/ tar -xzf fund-report.tar.gz -C /opt/fundplatform/deploy/ tar -xzf fund-file.tar.gz -C /opt/fundplatform/deploy/ -# 上传一键管理脚本到deploy目录 -cp /opt/fundplatform/packages/start-all.sh /opt/fundplatform/deploy/ -cp /opt/fundplatform/packages/stop-all.sh /opt/fundplatform/deploy/ -cp /opt/fundplatform/packages/restart-all.sh /opt/fundplatform/deploy/ -cp /opt/fundplatform/packages/status.sh /opt/fundplatform/deploy/ +```bash +# 上传一键管理脚本到deploy目录（在解压服务包后执行） +# 一键管理脚本位于项目根目录scripts目录，需要单独上传 +cp scripts/start-all.sh /opt/fundplatform/deploy/ +cp scripts/stop-all.sh /opt/fundplatform/deploy/ +cp scripts/restart-all.sh /opt/fundplatform/deploy/ +cp scripts/status-all.sh /opt/fundplatform/deploy/ ``` ### 4.5 配置文件修改 diff --git a/fund-cust/pom.xml b/fund-cust/pom.xml index 977a257..2bad1b4 100644 --- a/fund-cust/pom.xml +++ b/fund-cust/pom.xml @@ -84,7 +84,7 @@ 3.6.0 - src/main/assembly/assembly.xml + ${project.basedir}/../assembly/assembly.xml ${project.artifactId} false diff --git a/fund-cust/src/main/scripts/restart.sh b/fund-cust/src/main/scripts/restart.sh deleted file mode 100755 index 3566bb8..0000000 --- a/fund-cust/src/main/scripts/restart.sh +++ /dev/null @@ -1,7 +0,0 @@ -#\!/bin/bash -# 服务重启脚本 -SCRIPT_DIR=$(dirname "$0") - -${SCRIPT_DIR}/stop.sh -sleep 3 -${SCRIPT_DIR}/start.sh diff --git a/fund-cust/src/main/scripts/start.sh b/fund-cust/src/main/scripts/start.sh deleted file mode 100755 index abbbccb..0000000 --- a/fund-cust/src/main/scripts/start.sh +++ /dev/null @@ -1,36 +0,0 @@ -#\!/bin/bash -# 服务启动脚本 -APP_NAME="fund-cust" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -LOG_HOME="/datacfs/applogs/${APP_NAME}" -JAR_FILE="${APP_HOME}/lib/${APP_NAME}.jar" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# JVM参数 -JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" - -# 日志参数 -LOG_OPTS="-Dlogging.file.path=${LOG_HOME} -DAPP_NAME=${APP_NAME}" - -# 配置文件路径 -CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml" - -# 检查是否已运行 -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is already running (PID: $PID)" - exit 1 - fi -fi - -# 创建日志目录 -mkdir -p ${LOG_HOME} - -# 启动服务 -echo "Starting ${APP_NAME}..." -nohup java $JAVA_OPTS $LOG_OPTS -jar $JAR_FILE $CONFIG_OPTS > /dev/null 2>&1 & - -# 保存PID -echo $\! > $PID_FILE -echo "${APP_NAME} started (PID: $(cat $PID_FILE))" diff --git a/fund-cust/src/main/scripts/status.sh b/fund-cust/src/main/scripts/status.sh deleted file mode 100755 index 617b873..0000000 --- a/fund-cust/src/main/scripts/status.sh +++ /dev/null @@ -1,25 +0,0 @@ -#\!/bin/bash -# 查看服务状态 -APP_NAME="fund-cust" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -echo "==========================================" -echo " Service: ${APP_NAME}" -echo "==========================================" - -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo -e "Status: \033[32mRUNNING\033[0m" - echo "PID: ${PID}" - ps -p $PID -o pid,ppid,%cpu,%mem,etime,cmd --no-headers 2>/dev/null - else - echo -e "Status: \033[31mSTOPPED\033[0m (stale PID file)" - rm -f $PID_FILE - fi -else - echo -e "Status: \033[31mSTOPPED\033[0m" -fi - -echo "==========================================" diff --git a/fund-cust/src/main/scripts/stop.sh b/fund-cust/src/main/scripts/stop.sh deleted file mode 100755 index 9d4bccd..0000000 --- a/fund-cust/src/main/scripts/stop.sh +++ /dev/null @@ -1,39 +0,0 @@ -#\!/bin/bash -# 服务停止脚本 -APP_NAME="fund-cust" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# 检查是否运行 -if [ \! -f "$PID_FILE" ]; then - echo "${APP_NAME} is not running" - exit 0 -fi - -PID=$(cat $PID_FILE) -if \! ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is not running" - rm -f $PID_FILE - exit 0 -fi - -# 停止服务 -echo "Stopping ${APP_NAME} (PID: $PID)..." -kill $PID - -# 等待停止 -for i in {1..30}; do - if \! ps -p $PID > /dev/null 2>&1; then - break - fi - sleep 1 -done - -# 强制停止 -if ps -p $PID > /dev/null 2>&1; then - echo "Force killing ${APP_NAME}..." - kill -9 $PID -fi - -rm -f $PID_FILE -echo "${APP_NAME} stopped" diff --git a/fund-exp/pom.xml b/fund-exp/pom.xml index a9be5e8..f7c53f7 100644 --- a/fund-exp/pom.xml +++ b/fund-exp/pom.xml @@ -76,7 +76,7 @@ 3.6.0 - src/main/assembly/assembly.xml + ${project.basedir}/../assembly/assembly.xml ${project.artifactId} false diff --git a/fund-exp/src/main/assembly/assembly.xml b/fund-exp/src/main/assembly/assembly.xml deleted file mode 100644 index 7a1390e..0000000 --- a/fund-exp/src/main/assembly/assembly.xml +++ /dev/null @@ -1,43 +0,0 @@ - - bin - - tar.gz - - true - - - - - src/main/scripts - bin - - *.sh - - 0755 - - - - - src/main/resources - conf - - application.yml - application-*.yml - logback-spring.xml - bootstrap.yml - *.properties - - 0644 - - - - - - - lib - true - runtime - 0644 - - - diff --git a/fund-exp/src/main/scripts/restart.sh b/fund-exp/src/main/scripts/restart.sh deleted file mode 100755 index 3566bb8..0000000 --- a/fund-exp/src/main/scripts/restart.sh +++ /dev/null @@ -1,7 +0,0 @@ -#\!/bin/bash -# 服务重启脚本 -SCRIPT_DIR=$(dirname "$0") - -${SCRIPT_DIR}/stop.sh -sleep 3 -${SCRIPT_DIR}/start.sh diff --git a/fund-exp/src/main/scripts/start.sh b/fund-exp/src/main/scripts/start.sh deleted file mode 100755 index ef8578f..0000000 --- a/fund-exp/src/main/scripts/start.sh +++ /dev/null @@ -1,36 +0,0 @@ -#\!/bin/bash -# 服务启动脚本 -APP_NAME="fund-exp" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -LOG_HOME="/datacfs/applogs/${APP_NAME}" -JAR_FILE="${APP_HOME}/lib/${APP_NAME}.jar" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# JVM参数 -JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" - -# 日志参数 -LOG_OPTS="-Dlogging.file.path=${LOG_HOME} -DAPP_NAME=${APP_NAME}" - -# 配置文件路径 -CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml" - -# 检查是否已运行 -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is already running (PID: $PID)" - exit 1 - fi -fi - -# 创建日志目录 -mkdir -p ${LOG_HOME} - -# 启动服务 -echo "Starting ${APP_NAME}..." -nohup java $JAVA_OPTS $LOG_OPTS -jar $JAR_FILE $CONFIG_OPTS > /dev/null 2>&1 & - -# 保存PID -echo $\! > $PID_FILE -echo "${APP_NAME} started (PID: $(cat $PID_FILE))" diff --git a/fund-exp/src/main/scripts/status.sh b/fund-exp/src/main/scripts/status.sh deleted file mode 100755 index 2f5b466..0000000 --- a/fund-exp/src/main/scripts/status.sh +++ /dev/null @@ -1,25 +0,0 @@ -#\!/bin/bash -# 查看服务状态 -APP_NAME="fund-exp" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -echo "==========================================" -echo " Service: ${APP_NAME}" -echo "==========================================" - -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo -e "Status: \033[32mRUNNING\033[0m" - echo "PID: ${PID}" - ps -p $PID -o pid,ppid,%cpu,%mem,etime,cmd --no-headers 2>/dev/null - else - echo -e "Status: \033[31mSTOPPED\033[0m (stale PID file)" - rm -f $PID_FILE - fi -else - echo -e "Status: \033[31mSTOPPED\033[0m" -fi - -echo "==========================================" diff --git a/fund-exp/src/main/scripts/stop.sh b/fund-exp/src/main/scripts/stop.sh deleted file mode 100755 index 022be58..0000000 --- a/fund-exp/src/main/scripts/stop.sh +++ /dev/null @@ -1,39 +0,0 @@ -#\!/bin/bash -# 服务停止脚本 -APP_NAME="fund-exp" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# 检查是否运行 -if [ \! -f "$PID_FILE" ]; then - echo "${APP_NAME} is not running" - exit 0 -fi - -PID=$(cat $PID_FILE) -if \! ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is not running" - rm -f $PID_FILE - exit 0 -fi - -# 停止服务 -echo "Stopping ${APP_NAME} (PID: $PID)..." -kill $PID - -# 等待停止 -for i in {1..30}; do - if \! ps -p $PID > /dev/null 2>&1; then - break - fi - sleep 1 -done - -# 强制停止 -if ps -p $PID > /dev/null 2>&1; then - echo "Force killing ${APP_NAME}..." - kill -9 $PID -fi - -rm -f $PID_FILE -echo "${APP_NAME} stopped" diff --git a/fund-file/pom.xml b/fund-file/pom.xml index 4aaf07a..726d6e9 100644 --- a/fund-file/pom.xml +++ b/fund-file/pom.xml @@ -82,7 +82,7 @@ 3.6.0 - src/main/assembly/assembly.xml + ${project.basedir}/../assembly/assembly.xml ${project.artifactId} false diff --git a/fund-file/src/main/assembly/assembly.xml b/fund-file/src/main/assembly/assembly.xml deleted file mode 100644 index 7a1390e..0000000 --- a/fund-file/src/main/assembly/assembly.xml +++ /dev/null @@ -1,43 +0,0 @@ - - bin - - tar.gz - - true - - - - - src/main/scripts - bin - - *.sh - - 0755 - - - - - src/main/resources - conf - - application.yml - application-*.yml - logback-spring.xml - bootstrap.yml - *.properties - - 0644 - - - - - - - lib - true - runtime - 0644 - - - diff --git a/fund-file/src/main/scripts/restart.sh b/fund-file/src/main/scripts/restart.sh deleted file mode 100755 index 3566bb8..0000000 --- a/fund-file/src/main/scripts/restart.sh +++ /dev/null @@ -1,7 +0,0 @@ -#\!/bin/bash -# 服务重启脚本 -SCRIPT_DIR=$(dirname "$0") - -${SCRIPT_DIR}/stop.sh -sleep 3 -${SCRIPT_DIR}/start.sh diff --git a/fund-file/src/main/scripts/start.sh b/fund-file/src/main/scripts/start.sh deleted file mode 100755 index 2ac8c3a..0000000 --- a/fund-file/src/main/scripts/start.sh +++ /dev/null @@ -1,36 +0,0 @@ -#\!/bin/bash -# 服务启动脚本 -APP_NAME="fund-file" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -LOG_HOME="/datacfs/applogs/${APP_NAME}" -JAR_FILE="${APP_HOME}/lib/${APP_NAME}.jar" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# JVM参数 -JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" - -# 日志参数 -LOG_OPTS="-Dlogging.file.path=${LOG_HOME} -DAPP_NAME=${APP_NAME}" - -# 配置文件路径 -CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml" - -# 检查是否已运行 -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is already running (PID: $PID)" - exit 1 - fi -fi - -# 创建日志目录 -mkdir -p ${LOG_HOME} - -# 启动服务 -echo "Starting ${APP_NAME}..." -nohup java $JAVA_OPTS $LOG_OPTS -jar $JAR_FILE $CONFIG_OPTS > /dev/null 2>&1 & - -# 保存PID -echo $\! > $PID_FILE -echo "${APP_NAME} started (PID: $(cat $PID_FILE))" diff --git a/fund-file/src/main/scripts/status.sh b/fund-file/src/main/scripts/status.sh deleted file mode 100755 index e15e698..0000000 --- a/fund-file/src/main/scripts/status.sh +++ /dev/null @@ -1,25 +0,0 @@ -#\!/bin/bash -# 查看服务状态 -APP_NAME="fund-file" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -echo "==========================================" -echo " Service: ${APP_NAME}" -echo "==========================================" - -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo -e "Status: \033[32mRUNNING\033[0m" - echo "PID: ${PID}" - ps -p $PID -o pid,ppid,%cpu,%mem,etime,cmd --no-headers 2>/dev/null - else - echo -e "Status: \033[31mSTOPPED\033[0m (stale PID file)" - rm -f $PID_FILE - fi -else - echo -e "Status: \033[31mSTOPPED\033[0m" -fi - -echo "==========================================" diff --git a/fund-file/src/main/scripts/stop.sh b/fund-file/src/main/scripts/stop.sh deleted file mode 100755 index b0c51e0..0000000 --- a/fund-file/src/main/scripts/stop.sh +++ /dev/null @@ -1,39 +0,0 @@ -#\!/bin/bash -# 服务停止脚本 -APP_NAME="fund-file" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# 检查是否运行 -if [ \! -f "$PID_FILE" ]; then - echo "${APP_NAME} is not running" - exit 0 -fi - -PID=$(cat $PID_FILE) -if \! ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is not running" - rm -f $PID_FILE - exit 0 -fi - -# 停止服务 -echo "Stopping ${APP_NAME} (PID: $PID)..." -kill $PID - -# 等待停止 -for i in {1..30}; do - if \! ps -p $PID > /dev/null 2>&1; then - break - fi - sleep 1 -done - -# 强制停止 -if ps -p $PID > /dev/null 2>&1; then - echo "Force killing ${APP_NAME}..." - kill -9 $PID -fi - -rm -f $PID_FILE -echo "${APP_NAME} stopped" diff --git a/fund-gateway/pom.xml b/fund-gateway/pom.xml index 94d39ec..0921e6e 100644 --- a/fund-gateway/pom.xml +++ b/fund-gateway/pom.xml @@ -87,7 +87,7 @@ 3.6.0 - src/main/assembly/assembly.xml + ${project.basedir}/../assembly/assembly.xml ${project.artifactId} false diff --git a/fund-gateway/src/main/assembly/assembly.xml b/fund-gateway/src/main/assembly/assembly.xml deleted file mode 100644 index 7a1390e..0000000 --- a/fund-gateway/src/main/assembly/assembly.xml +++ /dev/null @@ -1,43 +0,0 @@ - - bin - - tar.gz - - true - - - - - src/main/scripts - bin - - *.sh - - 0755 - - - - - src/main/resources - conf - - application.yml - application-*.yml - logback-spring.xml - bootstrap.yml - *.properties - - 0644 - - - - - - - lib - true - runtime - 0644 - - - diff --git a/fund-gateway/src/main/scripts/restart.sh b/fund-gateway/src/main/scripts/restart.sh deleted file mode 100755 index 3566bb8..0000000 --- a/fund-gateway/src/main/scripts/restart.sh +++ /dev/null @@ -1,7 +0,0 @@ -#\!/bin/bash -# 服务重启脚本 -SCRIPT_DIR=$(dirname "$0") - -${SCRIPT_DIR}/stop.sh -sleep 3 -${SCRIPT_DIR}/start.sh diff --git a/fund-gateway/src/main/scripts/start.sh b/fund-gateway/src/main/scripts/start.sh deleted file mode 100755 index 126f2e6..0000000 --- a/fund-gateway/src/main/scripts/start.sh +++ /dev/null @@ -1,36 +0,0 @@ -#\!/bin/bash -# 服务启动脚本 -APP_NAME="fund-gateway" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -LOG_HOME="/datacfs/applogs/${APP_NAME}" -JAR_FILE="${APP_HOME}/lib/${APP_NAME}.jar" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# JVM参数 -JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" - -# 日志参数 -LOG_OPTS="-Dlogging.file.path=${LOG_HOME} -DAPP_NAME=${APP_NAME}" - -# 配置文件路径 -CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml" - -# 检查是否已运行 -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is already running (PID: $PID)" - exit 1 - fi -fi - -# 创建日志目录 -mkdir -p ${LOG_HOME} - -# 启动服务 -echo "Starting ${APP_NAME}..." -nohup java $JAVA_OPTS $LOG_OPTS -jar $JAR_FILE $CONFIG_OPTS > /dev/null 2>&1 & - -# 保存PID -echo $\! > $PID_FILE -echo "${APP_NAME} started (PID: $(cat $PID_FILE))" diff --git a/fund-gateway/src/main/scripts/status.sh b/fund-gateway/src/main/scripts/status.sh deleted file mode 100755 index 329b2ac..0000000 --- a/fund-gateway/src/main/scripts/status.sh +++ /dev/null @@ -1,25 +0,0 @@ -#\!/bin/bash -# 查看服务状态 -APP_NAME="fund-gateway" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -echo "==========================================" -echo " Service: ${APP_NAME}" -echo "==========================================" - -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo -e "Status: \033[32mRUNNING\033[0m" - echo "PID: ${PID}" - ps -p $PID -o pid,ppid,%cpu,%mem,etime,cmd --no-headers 2>/dev/null - else - echo -e "Status: \033[31mSTOPPED\033[0m (stale PID file)" - rm -f $PID_FILE - fi -else - echo -e "Status: \033[31mSTOPPED\033[0m" -fi - -echo "==========================================" diff --git a/fund-gateway/src/main/scripts/stop.sh b/fund-gateway/src/main/scripts/stop.sh deleted file mode 100755 index 12c5500..0000000 --- a/fund-gateway/src/main/scripts/stop.sh +++ /dev/null @@ -1,39 +0,0 @@ -#\!/bin/bash -# 服务停止脚本 -APP_NAME="fund-gateway" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# 检查是否运行 -if [ \! -f "$PID_FILE" ]; then - echo "${APP_NAME} is not running" - exit 0 -fi - -PID=$(cat $PID_FILE) -if \! ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is not running" - rm -f $PID_FILE - exit 0 -fi - -# 停止服务 -echo "Stopping ${APP_NAME} (PID: $PID)..." -kill $PID - -# 等待停止 -for i in {1..30}; do - if \! ps -p $PID > /dev/null 2>&1; then - break - fi - sleep 1 -done - -# 强制停止 -if ps -p $PID > /dev/null 2>&1; then - echo "Force killing ${APP_NAME}..." - kill -9 $PID -fi - -rm -f $PID_FILE -echo "${APP_NAME} stopped" diff --git a/fund-proj/pom.xml b/fund-proj/pom.xml index cdc8cde..c0d2621 100644 --- a/fund-proj/pom.xml +++ b/fund-proj/pom.xml @@ -76,7 +76,7 @@ 3.6.0 - src/main/assembly/assembly.xml + ${project.basedir}/../assembly/assembly.xml ${project.artifactId} false diff --git a/fund-proj/src/main/assembly/assembly.xml b/fund-proj/src/main/assembly/assembly.xml deleted file mode 100644 index 7a1390e..0000000 --- a/fund-proj/src/main/assembly/assembly.xml +++ /dev/null @@ -1,43 +0,0 @@ - - bin - - tar.gz - - true - - - - - src/main/scripts - bin - - *.sh - - 0755 - - - - - src/main/resources - conf - - application.yml - application-*.yml - logback-spring.xml - bootstrap.yml - *.properties - - 0644 - - - - - - - lib - true - runtime - 0644 - - - diff --git a/fund-proj/src/main/scripts/restart.sh b/fund-proj/src/main/scripts/restart.sh deleted file mode 100755 index 3566bb8..0000000 --- a/fund-proj/src/main/scripts/restart.sh +++ /dev/null @@ -1,7 +0,0 @@ -#\!/bin/bash -# 服务重启脚本 -SCRIPT_DIR=$(dirname "$0") - -${SCRIPT_DIR}/stop.sh -sleep 3 -${SCRIPT_DIR}/start.sh diff --git a/fund-proj/src/main/scripts/start.sh b/fund-proj/src/main/scripts/start.sh deleted file mode 100755 index 6dfd484..0000000 --- a/fund-proj/src/main/scripts/start.sh +++ /dev/null @@ -1,36 +0,0 @@ -#\!/bin/bash -# 服务启动脚本 -APP_NAME="fund-proj" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -LOG_HOME="/datacfs/applogs/${APP_NAME}" -JAR_FILE="${APP_HOME}/lib/${APP_NAME}.jar" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# JVM参数 -JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" - -# 日志参数 -LOG_OPTS="-Dlogging.file.path=${LOG_HOME} -DAPP_NAME=${APP_NAME}" - -# 配置文件路径 -CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml" - -# 检查是否已运行 -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is already running (PID: $PID)" - exit 1 - fi -fi - -# 创建日志目录 -mkdir -p ${LOG_HOME} - -# 启动服务 -echo "Starting ${APP_NAME}..." -nohup java $JAVA_OPTS $LOG_OPTS -jar $JAR_FILE $CONFIG_OPTS > /dev/null 2>&1 & - -# 保存PID -echo $\! > $PID_FILE -echo "${APP_NAME} started (PID: $(cat $PID_FILE))" diff --git a/fund-proj/src/main/scripts/status.sh b/fund-proj/src/main/scripts/status.sh deleted file mode 100755 index 46d392e..0000000 --- a/fund-proj/src/main/scripts/status.sh +++ /dev/null @@ -1,25 +0,0 @@ -#\!/bin/bash -# 查看服务状态 -APP_NAME="fund-proj" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -echo "==========================================" -echo " Service: ${APP_NAME}" -echo "==========================================" - -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo -e "Status: \033[32mRUNNING\033[0m" - echo "PID: ${PID}" - ps -p $PID -o pid,ppid,%cpu,%mem,etime,cmd --no-headers 2>/dev/null - else - echo -e "Status: \033[31mSTOPPED\033[0m (stale PID file)" - rm -f $PID_FILE - fi -else - echo -e "Status: \033[31mSTOPPED\033[0m" -fi - -echo "==========================================" diff --git a/fund-proj/src/main/scripts/stop.sh b/fund-proj/src/main/scripts/stop.sh deleted file mode 100755 index b63515d..0000000 --- a/fund-proj/src/main/scripts/stop.sh +++ /dev/null @@ -1,39 +0,0 @@ -#\!/bin/bash -# 服务停止脚本 -APP_NAME="fund-proj" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# 检查是否运行 -if [ \! -f "$PID_FILE" ]; then - echo "${APP_NAME} is not running" - exit 0 -fi - -PID=$(cat $PID_FILE) -if \! ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is not running" - rm -f $PID_FILE - exit 0 -fi - -# 停止服务 -echo "Stopping ${APP_NAME} (PID: $PID)..." -kill $PID - -# 等待停止 -for i in {1..30}; do - if \! ps -p $PID > /dev/null 2>&1; then - break - fi - sleep 1 -done - -# 强制停止 -if ps -p $PID > /dev/null 2>&1; then - echo "Force killing ${APP_NAME}..." - kill -9 $PID -fi - -rm -f $PID_FILE -echo "${APP_NAME} stopped" diff --git a/fund-receipt/pom.xml b/fund-receipt/pom.xml index 773e25a..f5fbdb9 100644 --- a/fund-receipt/pom.xml +++ b/fund-receipt/pom.xml @@ -76,7 +76,7 @@ 3.6.0 - src/main/assembly/assembly.xml + ${project.basedir}/../assembly/assembly.xml ${project.artifactId} false diff --git a/fund-receipt/src/main/assembly/assembly.xml b/fund-receipt/src/main/assembly/assembly.xml deleted file mode 100644 index 7a1390e..0000000 --- a/fund-receipt/src/main/assembly/assembly.xml +++ /dev/null @@ -1,43 +0,0 @@ - - bin - - tar.gz - - true - - - - - src/main/scripts - bin - - *.sh - - 0755 - - - - - src/main/resources - conf - - application.yml - application-*.yml - logback-spring.xml - bootstrap.yml - *.properties - - 0644 - - - - - - - lib - true - runtime - 0644 - - - diff --git a/fund-receipt/src/main/scripts/restart.sh b/fund-receipt/src/main/scripts/restart.sh deleted file mode 100755 index 3566bb8..0000000 --- a/fund-receipt/src/main/scripts/restart.sh +++ /dev/null @@ -1,7 +0,0 @@ -#\!/bin/bash -# 服务重启脚本 -SCRIPT_DIR=$(dirname "$0") - -${SCRIPT_DIR}/stop.sh -sleep 3 -${SCRIPT_DIR}/start.sh diff --git a/fund-receipt/src/main/scripts/start.sh b/fund-receipt/src/main/scripts/start.sh deleted file mode 100755 index 4948290..0000000 --- a/fund-receipt/src/main/scripts/start.sh +++ /dev/null @@ -1,36 +0,0 @@ -#\!/bin/bash -# 服务启动脚本 -APP_NAME="fund-receipt" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -LOG_HOME="/datacfs/applogs/${APP_NAME}" -JAR_FILE="${APP_HOME}/lib/${APP_NAME}.jar" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# JVM参数 -JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" - -# 日志参数 -LOG_OPTS="-Dlogging.file.path=${LOG_HOME} -DAPP_NAME=${APP_NAME}" - -# 配置文件路径 -CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml" - -# 检查是否已运行 -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is already running (PID: $PID)" - exit 1 - fi -fi - -# 创建日志目录 -mkdir -p ${LOG_HOME} - -# 启动服务 -echo "Starting ${APP_NAME}..." -nohup java $JAVA_OPTS $LOG_OPTS -jar $JAR_FILE $CONFIG_OPTS > /dev/null 2>&1 & - -# 保存PID -echo $\! > $PID_FILE -echo "${APP_NAME} started (PID: $(cat $PID_FILE))" diff --git a/fund-receipt/src/main/scripts/status.sh b/fund-receipt/src/main/scripts/status.sh deleted file mode 100755 index ed5085e..0000000 --- a/fund-receipt/src/main/scripts/status.sh +++ /dev/null @@ -1,25 +0,0 @@ -#\!/bin/bash -# 查看服务状态 -APP_NAME="fund-receipt" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -echo "==========================================" -echo " Service: ${APP_NAME}" -echo "==========================================" - -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo -e "Status: \033[32mRUNNING\033[0m" - echo "PID: ${PID}" - ps -p $PID -o pid,ppid,%cpu,%mem,etime,cmd --no-headers 2>/dev/null - else - echo -e "Status: \033[31mSTOPPED\033[0m (stale PID file)" - rm -f $PID_FILE - fi -else - echo -e "Status: \033[31mSTOPPED\033[0m" -fi - -echo "==========================================" diff --git a/fund-receipt/src/main/scripts/stop.sh b/fund-receipt/src/main/scripts/stop.sh deleted file mode 100755 index 6e828d9..0000000 --- a/fund-receipt/src/main/scripts/stop.sh +++ /dev/null @@ -1,39 +0,0 @@ -#\!/bin/bash -# 服务停止脚本 -APP_NAME="fund-receipt" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# 检查是否运行 -if [ \! -f "$PID_FILE" ]; then - echo "${APP_NAME} is not running" - exit 0 -fi - -PID=$(cat $PID_FILE) -if \! ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is not running" - rm -f $PID_FILE - exit 0 -fi - -# 停止服务 -echo "Stopping ${APP_NAME} (PID: $PID)..." -kill $PID - -# 等待停止 -for i in {1..30}; do - if \! ps -p $PID > /dev/null 2>&1; then - break - fi - sleep 1 -done - -# 强制停止 -if ps -p $PID > /dev/null 2>&1; then - echo "Force killing ${APP_NAME}..." - kill -9 $PID -fi - -rm -f $PID_FILE -echo "${APP_NAME} stopped" diff --git a/fund-report/pom.xml b/fund-report/pom.xml index 260dccf..6e15b94 100644 --- a/fund-report/pom.xml +++ b/fund-report/pom.xml @@ -81,7 +81,7 @@ 3.6.0 - src/main/assembly/assembly.xml + ${project.basedir}/../assembly/assembly.xml ${project.artifactId} false diff --git a/fund-report/src/main/assembly/assembly.xml b/fund-report/src/main/assembly/assembly.xml deleted file mode 100644 index 7a1390e..0000000 --- a/fund-report/src/main/assembly/assembly.xml +++ /dev/null @@ -1,43 +0,0 @@ - - bin - - tar.gz - - true - - - - - src/main/scripts - bin - - *.sh - - 0755 - - - - - src/main/resources - conf - - application.yml - application-*.yml - logback-spring.xml - bootstrap.yml - *.properties - - 0644 - - - - - - - lib - true - runtime - 0644 - - - diff --git a/fund-report/src/main/scripts/restart.sh b/fund-report/src/main/scripts/restart.sh deleted file mode 100755 index 3566bb8..0000000 --- a/fund-report/src/main/scripts/restart.sh +++ /dev/null @@ -1,7 +0,0 @@ -#\!/bin/bash -# 服务重启脚本 -SCRIPT_DIR=$(dirname "$0") - -${SCRIPT_DIR}/stop.sh -sleep 3 -${SCRIPT_DIR}/start.sh diff --git a/fund-report/src/main/scripts/start.sh b/fund-report/src/main/scripts/start.sh deleted file mode 100755 index e523201..0000000 --- a/fund-report/src/main/scripts/start.sh +++ /dev/null @@ -1,36 +0,0 @@ -#\!/bin/bash -# 服务启动脚本 -APP_NAME="fund-report" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -LOG_HOME="/datacfs/applogs/${APP_NAME}" -JAR_FILE="${APP_HOME}/lib/${APP_NAME}.jar" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# JVM参数 -JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" - -# 日志参数 -LOG_OPTS="-Dlogging.file.path=${LOG_HOME} -DAPP_NAME=${APP_NAME}" - -# 配置文件路径 -CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml" - -# 检查是否已运行 -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is already running (PID: $PID)" - exit 1 - fi -fi - -# 创建日志目录 -mkdir -p ${LOG_HOME} - -# 启动服务 -echo "Starting ${APP_NAME}..." -nohup java $JAVA_OPTS $LOG_OPTS -jar $JAR_FILE $CONFIG_OPTS > /dev/null 2>&1 & - -# 保存PID -echo $\! > $PID_FILE -echo "${APP_NAME} started (PID: $(cat $PID_FILE))" diff --git a/fund-report/src/main/scripts/status.sh b/fund-report/src/main/scripts/status.sh deleted file mode 100755 index c9f0a03..0000000 --- a/fund-report/src/main/scripts/status.sh +++ /dev/null @@ -1,25 +0,0 @@ -#\!/bin/bash -# 查看服务状态 -APP_NAME="fund-report" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -echo "==========================================" -echo " Service: ${APP_NAME}" -echo "==========================================" - -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo -e "Status: \033[32mRUNNING\033[0m" - echo "PID: ${PID}" - ps -p $PID -o pid,ppid,%cpu,%mem,etime,cmd --no-headers 2>/dev/null - else - echo -e "Status: \033[31mSTOPPED\033[0m (stale PID file)" - rm -f $PID_FILE - fi -else - echo -e "Status: \033[31mSTOPPED\033[0m" -fi - -echo "==========================================" diff --git a/fund-report/src/main/scripts/stop.sh b/fund-report/src/main/scripts/stop.sh deleted file mode 100755 index a621827..0000000 --- a/fund-report/src/main/scripts/stop.sh +++ /dev/null @@ -1,39 +0,0 @@ -#\!/bin/bash -# 服务停止脚本 -APP_NAME="fund-report" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# 检查是否运行 -if [ \! -f "$PID_FILE" ]; then - echo "${APP_NAME} is not running" - exit 0 -fi - -PID=$(cat $PID_FILE) -if \! ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is not running" - rm -f $PID_FILE - exit 0 -fi - -# 停止服务 -echo "Stopping ${APP_NAME} (PID: $PID)..." -kill $PID - -# 等待停止 -for i in {1..30}; do - if \! ps -p $PID > /dev/null 2>&1; then - break - fi - sleep 1 -done - -# 强制停止 -if ps -p $PID > /dev/null 2>&1; then - echo "Force killing ${APP_NAME}..." - kill -9 $PID -fi - -rm -f $PID_FILE -echo "${APP_NAME} stopped" diff --git a/fund-req/pom.xml b/fund-req/pom.xml index d2bf30c..c780e5c 100644 --- a/fund-req/pom.xml +++ b/fund-req/pom.xml @@ -76,7 +76,7 @@ 3.6.0 - src/main/assembly/assembly.xml + ${project.basedir}/../assembly/assembly.xml ${project.artifactId} false diff --git a/fund-req/src/main/assembly/assembly.xml b/fund-req/src/main/assembly/assembly.xml deleted file mode 100644 index 7a1390e..0000000 --- a/fund-req/src/main/assembly/assembly.xml +++ /dev/null @@ -1,43 +0,0 @@ - - bin - - tar.gz - - true - - - - - src/main/scripts - bin - - *.sh - - 0755 - - - - - src/main/resources - conf - - application.yml - application-*.yml - logback-spring.xml - bootstrap.yml - *.properties - - 0644 - - - - - - - lib - true - runtime - 0644 - - - diff --git a/fund-req/src/main/scripts/restart.sh b/fund-req/src/main/scripts/restart.sh deleted file mode 100755 index 3566bb8..0000000 --- a/fund-req/src/main/scripts/restart.sh +++ /dev/null @@ -1,7 +0,0 @@ -#\!/bin/bash -# 服务重启脚本 -SCRIPT_DIR=$(dirname "$0") - -${SCRIPT_DIR}/stop.sh -sleep 3 -${SCRIPT_DIR}/start.sh diff --git a/fund-req/src/main/scripts/start.sh b/fund-req/src/main/scripts/start.sh deleted file mode 100755 index 253f253..0000000 --- a/fund-req/src/main/scripts/start.sh +++ /dev/null @@ -1,36 +0,0 @@ -#\!/bin/bash -# 服务启动脚本 -APP_NAME="fund-req" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -LOG_HOME="/datacfs/applogs/${APP_NAME}" -JAR_FILE="${APP_HOME}/lib/${APP_NAME}.jar" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# JVM参数 -JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" - -# 日志参数 -LOG_OPTS="-Dlogging.file.path=${LOG_HOME} -DAPP_NAME=${APP_NAME}" - -# 配置文件路径 -CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml" - -# 检查是否已运行 -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is already running (PID: $PID)" - exit 1 - fi -fi - -# 创建日志目录 -mkdir -p ${LOG_HOME} - -# 启动服务 -echo "Starting ${APP_NAME}..." -nohup java $JAVA_OPTS $LOG_OPTS -jar $JAR_FILE $CONFIG_OPTS > /dev/null 2>&1 & - -# 保存PID -echo $\! > $PID_FILE -echo "${APP_NAME} started (PID: $(cat $PID_FILE))" diff --git a/fund-req/src/main/scripts/status.sh b/fund-req/src/main/scripts/status.sh deleted file mode 100755 index 47b364c..0000000 --- a/fund-req/src/main/scripts/status.sh +++ /dev/null @@ -1,25 +0,0 @@ -#\!/bin/bash -# 查看服务状态 -APP_NAME="fund-req" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -echo "==========================================" -echo " Service: ${APP_NAME}" -echo "==========================================" - -if [ -f "$PID_FILE" ]; then - PID=$(cat $PID_FILE) - if ps -p $PID > /dev/null 2>&1; then - echo -e "Status: \033[32mRUNNING\033[0m" - echo "PID: ${PID}" - ps -p $PID -o pid,ppid,%cpu,%mem,etime,cmd --no-headers 2>/dev/null - else - echo -e "Status: \033[31mSTOPPED\033[0m (stale PID file)" - rm -f $PID_FILE - fi -else - echo -e "Status: \033[31mSTOPPED\033[0m" -fi - -echo "==========================================" diff --git a/fund-req/src/main/scripts/stop.sh b/fund-req/src/main/scripts/stop.sh deleted file mode 100755 index 0fabbae..0000000 --- a/fund-req/src/main/scripts/stop.sh +++ /dev/null @@ -1,39 +0,0 @@ -#\!/bin/bash -# 服务停止脚本 -APP_NAME="fund-req" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" -PID_FILE="${APP_HOME}/${APP_NAME}.pid" - -# 检查是否运行 -if [ \! -f "$PID_FILE" ]; then - echo "${APP_NAME} is not running" - exit 0 -fi - -PID=$(cat $PID_FILE) -if \! ps -p $PID > /dev/null 2>&1; then - echo "${APP_NAME} is not running" - rm -f $PID_FILE - exit 0 -fi - -# 停止服务 -echo "Stopping ${APP_NAME} (PID: $PID)..." -kill $PID - -# 等待停止 -for i in {1..30}; do - if \! ps -p $PID > /dev/null 2>&1; then - break - fi - sleep 1 -done - -# 强制停止 -if ps -p $PID > /dev/null 2>&1; then - echo "Force killing ${APP_NAME}..." - kill -9 $PID -fi - -rm -f $PID_FILE -echo "${APP_NAME} stopped" diff --git a/fund-sys/pom.xml b/fund-sys/pom.xml index 043f5eb..6ab6125 100644 --- a/fund-sys/pom.xml +++ b/fund-sys/pom.xml @@ -125,7 +125,7 @@ 3.6.0 - src/main/assembly/assembly.xml + ${project.basedir}/../assembly/assembly.xml ${project.artifactId} false diff --git a/fund-sys/src/main/assembly/assembly.xml b/fund-sys/src/main/assembly/assembly.xml deleted file mode 100644 index 7a1390e..0000000 --- a/fund-sys/src/main/assembly/assembly.xml +++ /dev/null @@ -1,43 +0,0 @@ - - bin - - tar.gz - - true - - - - - src/main/scripts - bin - - *.sh - - 0755 - - - - - src/main/resources - conf - - application.yml - application-*.yml - logback-spring.xml - bootstrap.yml - *.properties - - 0644 - - - - - - - lib - true - runtime - 0644 - - - diff --git a/scripts/env.properties b/scripts/env.properties new file mode 100644 index 0000000..53be5ba --- /dev/null +++ b/scripts/env.properties @@ -0,0 +1,22 @@ +# ============================================ +# 环境变量配置文件 +# 服务启动时会加载此文件 +# ============================================ + +# JVM参数配置 +# JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" + +# 数据库配置（可在配置文件中使用） +# MYSQL_HOST=localhost +# MYSQL_PORT=3306 + +# Redis配置 +# REDIS_HOST=localhost +# REDIS_PORT=6379 + +# Nacos配置 +# NACOS_HOST=localhost +# NACOS_PORT=8848 + +# 日志级别 +# LOG_LEVEL=INFO diff --git a/scripts/restart-all.sh b/scripts/restart-all.sh new file mode 100755 index 0000000..fe23247 --- /dev/null +++ b/scripts/restart-all.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# 一键重启所有服务 + +DEPLOY_HOME="/opt/fundplatform/deploy" + +# 停止所有服务 +if [ -f "${DEPLOY_HOME}/stop-all.sh" ]; then + ${DEPLOY_HOME}/stop-all.sh +fi + +echo "" +echo "Waiting 10 seconds..." +sleep 10 + +# 启动所有服务 +if [ -f "${DEPLOY_HOME}/start-all.sh" ]; then + ${DEPLOY_HOME}/start-all.sh +fi diff --git a/fund-sys/src/main/scripts/restart.sh b/scripts/restart.sh old mode 100644 new mode 100755 similarity index 65% rename from fund-sys/src/main/scripts/restart.sh rename to scripts/restart.sh index ad8a749..d94574f --- a/fund-sys/src/main/scripts/restart.sh +++ b/scripts/restart.sh @@ -1,6 +1,7 @@ #!/bin/bash # 服务重启脚本 -SCRIPT_DIR=$(dirname "$0") + +SCRIPT_DIR=$(dirname "$(readlink -f "$0")") ${SCRIPT_DIR}/stop.sh sleep 3 diff --git a/scripts/start-all.sh b/scripts/start-all.sh new file mode 100755 index 0000000..0b7bf85 --- /dev/null +++ b/scripts/start-all.sh @@ -0,0 +1,42 @@ +#!/bin/bash +# 一键启动所有服务 + +DEPLOY_HOME="/opt/fundplatform/deploy" + +# 服务启动顺序 +SERVICES=( + "fund-gateway" + "fund-sys" + "fund-cust" + "fund-proj" + "fund-req" + "fund-exp" + "fund-receipt" + "fund-report" + "fund-file" +) + +echo "==========================================" +echo " Starting all services..." +echo "==========================================" + +for service in "${SERVICES[@]}"; do + if [ -f "${DEPLOY_HOME}/${service}/bin/start.sh" ]; then + echo "" + echo "Starting ${service}..." + ${DEPLOY_HOME}/${service}/bin/start.sh + sleep 5 + else + echo "Warning: ${service}/bin/start.sh not found, skipping..." + fi +done + +echo "" +echo "==========================================" +echo " All services started" +echo "==========================================" + +# 显示状态 +if [ -f "${DEPLOY_HOME}/status.sh" ]; then + ${DEPLOY_HOME}/status.sh +fi diff --git a/fund-sys/src/main/scripts/start.sh b/scripts/start.sh old mode 100644 new mode 100755 similarity index 56% rename from fund-sys/src/main/scripts/start.sh rename to scripts/start.sh index 845dbbe..fab8df0 --- a/fund-sys/src/main/scripts/start.sh +++ b/scripts/start.sh @@ -1,13 +1,28 @@ #!/bin/bash # 服务启动脚本 -APP_NAME="fund-sys" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" +# 自动从目录名推断服务名称 + +# 获取脚本所在目录和服务名 +SCRIPT_DIR=$(dirname "$(readlink -f "$0")") +APP_HOME=$(dirname "$SCRIPT_DIR") +APP_NAME=$(basename "$APP_HOME") + +# 日志目录 LOG_HOME="/datacfs/applogs/${APP_NAME}" + +# JAR文件路径 JAR_FILE="${APP_HOME}/lib/${APP_NAME}.jar" + +# PID文件路径 PID_FILE="${APP_HOME}/${APP_NAME}.pid" -# JVM参数 -JAVA_OPTS="-Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200" +# 加载环境变量配置（如果存在） +if [ -f "${APP_HOME}/conf/env.properties" ]; then + source "${APP_HOME}/conf/env.properties" +fi + +# JVM参数（可通过环境变量覆盖） +JAVA_OPTS="${JAVA_OPTS:--Xms256m -Xmx512m -XX:+UseG1GC -XX:MaxGCPauseMillis=200}" # 日志参数 LOG_OPTS="-Dlogging.file.path=${LOG_HOME} -DAPP_NAME=${APP_NAME}" @@ -29,6 +44,10 @@ mkdir -p ${LOG_HOME} # 启动服务 echo "Starting ${APP_NAME}..." +echo " APP_HOME: ${APP_HOME}" +echo " LOG_HOME: ${LOG_HOME}" +echo " JAVA_OPTS: ${JAVA_OPTS}" + nohup java $JAVA_OPTS $LOG_OPTS -jar $JAR_FILE $CONFIG_OPTS > /dev/null 2>&1 & # 保存PID diff --git a/scripts/status-all.sh b/scripts/status-all.sh new file mode 100755 index 0000000..0ba836d --- /dev/null +++ b/scripts/status-all.sh @@ -0,0 +1,41 @@ +#!/bin/bash +# 查看所有服务状态 + +DEPLOY_HOME="/opt/fundplatform/deploy" + +SERVICES=( + "fund-gateway:8000" + "fund-sys:8100" + "fund-cust:8200" + "fund-proj:8300" + "fund-req:8400" + "fund-exp:8500" + "fund-receipt:8600" + "fund-report:8700" + "fund-file:8800" +) + +echo "==========================================" +echo " Service Status" +echo "==========================================" +printf "%-20s %-10s %-10s %s\n" "Service" "Port" "Status" "PID" +echo "------------------------------------------" + +for item in "${SERVICES[@]}"; do + service="${item%%:*}" + port="${item##*:}" + pid_file="${DEPLOY_HOME}/${service}/${service}.pid" + + if [ -f "$pid_file" ]; then + PID=$(cat $pid_file) + if ps -p $PID > /dev/null 2>&1; then + printf "%-20s %-10s \033[32m%-10s\033[0m %s\n" "$service" "$port" "RUNNING" "$PID" + else + printf "%-20s %-10s \033[31m%-10s\033[0m %s\n" "$service" "$port" "STOPPED" "-" + fi + else + printf "%-20s %-10s \033[31m%-10s\033[0m %s\n" "$service" "$port" "STOPPED" "-" + fi +done + +echo "==========================================" diff --git a/fund-sys/src/main/scripts/status.sh b/scripts/status.sh old mode 100644 new mode 100755 similarity index 72% rename from fund-sys/src/main/scripts/status.sh rename to scripts/status.sh index 78b156e..4a28efd --- a/fund-sys/src/main/scripts/status.sh +++ b/scripts/status.sh @@ -1,7 +1,13 @@ #!/bin/bash # 查看服务状态 -APP_NAME="fund-sys" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" +# 自动从目录名推断服务名称 + +# 获取脚本所在目录和服务名 +SCRIPT_DIR=$(dirname "$(readlink -f "$0")") +APP_HOME=$(dirname "$SCRIPT_DIR") +APP_NAME=$(basename "$APP_HOME") + +# PID文件路径 PID_FILE="${APP_HOME}/${APP_NAME}.pid" echo "==========================================" @@ -13,6 +19,8 @@ if [ -f "$PID_FILE" ]; then if ps -p $PID > /dev/null 2>&1; then echo -e "Status: \033[32mRUNNING\033[0m" echo "PID: ${PID}" + echo "Home: ${APP_HOME}" + echo "" # 显示进程信息 ps -p $PID -o pid,ppid,%cpu,%mem,etime,cmd --no-headers 2>/dev/null else diff --git a/scripts/stop-all.sh b/scripts/stop-all.sh new file mode 100755 index 0000000..9b8a62b --- /dev/null +++ b/scripts/stop-all.sh @@ -0,0 +1,37 @@ +#!/bin/bash +# 一键停止所有服务 + +DEPLOY_HOME="/opt/fundplatform/deploy" + +# 服务停止顺序（反向停止） +SERVICES=( + "fund-file" + "fund-report" + "fund-receipt" + "fund-exp" + "fund-req" + "fund-proj" + "fund-cust" + "fund-sys" + "fund-gateway" +) + +echo "==========================================" +echo " Stopping all services..." +echo "==========================================" + +for service in "${SERVICES[@]}"; do + if [ -f "${DEPLOY_HOME}/${service}/bin/stop.sh" ]; then + echo "" + echo "Stopping ${service}..." + ${DEPLOY_HOME}/${service}/bin/stop.sh + sleep 2 + else + echo "Warning: ${service}/bin/stop.sh not found, skipping..." + fi +done + +echo "" +echo "==========================================" +echo " All services stopped" +echo "==========================================" diff --git a/fund-sys/src/main/scripts/stop.sh b/scripts/stop.sh old mode 100644 new mode 100755 similarity index 75% rename from fund-sys/src/main/scripts/stop.sh rename to scripts/stop.sh index 5271a69..047a468 --- a/fund-sys/src/main/scripts/stop.sh +++ b/scripts/stop.sh @@ -1,7 +1,13 @@ #!/bin/bash # 服务停止脚本 -APP_NAME="fund-sys" -APP_HOME="$(cd "$(dirname "$0")/.." && pwd)" +# 自动从目录名推断服务名称 + +# 获取脚本所在目录和服务名 +SCRIPT_DIR=$(dirname "$(readlink -f "$0")") +APP_HOME=$(dirname "$SCRIPT_DIR") +APP_NAME=$(basename "$APP_HOME") + +# PID文件路径 PID_FILE="${APP_HOME}/${APP_NAME}.pid" # 检查是否运行