From 072fe267bbe7df0364a3640d4ea0f4fd78362439 Mon Sep 17 00:00:00 2001 From: zhangjf Date: Sun, 22 Feb 2026 15:09:36 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E7=9A=84server-deploy=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 脚本已统一迁移到项目根目录scripts/ --- .../3.3.2/m2e-lastUpdated.properties | 4 +- .../3.11.0/m2e-lastUpdated.properties | 4 +- .../3.1.1/m2e-lastUpdated.properties | 4 +- .../3.1.1/m2e-lastUpdated.properties | 4 +- .../3.3.0/m2e-lastUpdated.properties | 4 +- .../3.3.1/m2e-lastUpdated.properties | 4 +- .../3.12.1/m2e-lastUpdated.properties | 4 +- .../3.1.2/m2e-lastUpdated.properties | 4 +- .../3.2.0/m2e-lastUpdated.properties | 4 +- server-deploy/assembly/assembly.xml | 63 ------------------- server-deploy/scripts/restart-all.sh | 10 --- server-deploy/scripts/restart.sh | 9 --- server-deploy/scripts/start-all.sh | 38 ----------- server-deploy/scripts/start.sh | 41 ------------ server-deploy/scripts/status-all.sh | 41 ------------ server-deploy/scripts/status.sh | 32 ---------- server-deploy/scripts/stop-all.sh | 37 ----------- server-deploy/scripts/stop.sh | 44 ------------- 18 files changed, 18 insertions(+), 333 deletions(-) delete mode 100644 server-deploy/assembly/assembly.xml delete mode 100644 server-deploy/scripts/restart-all.sh delete mode 100644 server-deploy/scripts/restart.sh delete mode 100644 server-deploy/scripts/start-all.sh delete mode 100644 server-deploy/scripts/start.sh delete mode 100644 server-deploy/scripts/status-all.sh delete mode 100644 server-deploy/scripts/status.sh delete mode 100644 server-deploy/scripts/stop-all.sh delete mode 100644 server-deploy/scripts/stop.sh diff --git a/.mvn/repository/org/apache/maven/plugins/maven-clean-plugin/3.3.2/m2e-lastUpdated.properties b/.mvn/repository/org/apache/maven/plugins/maven-clean-plugin/3.3.2/m2e-lastUpdated.properties index 3e3f266..bd9a01e 100644 --- a/.mvn/repository/org/apache/maven/plugins/maven-clean-plugin/3.3.2/m2e-lastUpdated.properties +++ b/.mvn/repository/org/apache/maven/plugins/maven-clean-plugin/3.3.2/m2e-lastUpdated.properties @@ -1,2 +1,2 @@ -#Sun Feb 22 13:58:28 CST 2026 -central|https\://repo1.maven.org/maven2|null=1771739908393 +#Sun Feb 22 14:41:27 CST 2026 +central|https\://repo1.maven.org/maven2|null=1771742487357 diff --git a/.mvn/repository/org/apache/maven/plugins/maven-compiler-plugin/3.11.0/m2e-lastUpdated.properties b/.mvn/repository/org/apache/maven/plugins/maven-compiler-plugin/3.11.0/m2e-lastUpdated.properties index 0bec93a..630c4d0 100644 --- a/.mvn/repository/org/apache/maven/plugins/maven-compiler-plugin/3.11.0/m2e-lastUpdated.properties +++ b/.mvn/repository/org/apache/maven/plugins/maven-compiler-plugin/3.11.0/m2e-lastUpdated.properties @@ -1,2 +1,2 @@ -#Sun Feb 22 13:58:28 CST 2026 -central|https\://repo1.maven.org/maven2|null=1771739908396 +#Sun Feb 22 14:41:27 CST 2026 +central|https\://repo1.maven.org/maven2|null=1771742487369 diff --git a/.mvn/repository/org/apache/maven/plugins/maven-deploy-plugin/3.1.1/m2e-lastUpdated.properties b/.mvn/repository/org/apache/maven/plugins/maven-deploy-plugin/3.1.1/m2e-lastUpdated.properties index b751229..c18a253 100644 --- a/.mvn/repository/org/apache/maven/plugins/maven-deploy-plugin/3.1.1/m2e-lastUpdated.properties +++ b/.mvn/repository/org/apache/maven/plugins/maven-deploy-plugin/3.1.1/m2e-lastUpdated.properties @@ -1,2 +1,2 @@ -#Sun Feb 22 13:58:28 CST 2026 -central|https\://repo1.maven.org/maven2|null=1771739908400 +#Sun Feb 22 14:41:27 CST 2026 +central|https\://repo1.maven.org/maven2|null=1771742487399 diff --git a/.mvn/repository/org/apache/maven/plugins/maven-install-plugin/3.1.1/m2e-lastUpdated.properties b/.mvn/repository/org/apache/maven/plugins/maven-install-plugin/3.1.1/m2e-lastUpdated.properties index b751229..c9cf2e7 100644 --- a/.mvn/repository/org/apache/maven/plugins/maven-install-plugin/3.1.1/m2e-lastUpdated.properties +++ b/.mvn/repository/org/apache/maven/plugins/maven-install-plugin/3.1.1/m2e-lastUpdated.properties @@ -1,2 +1,2 @@ -#Sun Feb 22 13:58:28 CST 2026 -central|https\://repo1.maven.org/maven2|null=1771739908400 +#Sun Feb 22 14:41:27 CST 2026 +central|https\://repo1.maven.org/maven2|null=1771742487396 diff --git a/.mvn/repository/org/apache/maven/plugins/maven-jar-plugin/3.3.0/m2e-lastUpdated.properties b/.mvn/repository/org/apache/maven/plugins/maven-jar-plugin/3.3.0/m2e-lastUpdated.properties index 37cd326..0b4624f 100644 --- a/.mvn/repository/org/apache/maven/plugins/maven-jar-plugin/3.3.0/m2e-lastUpdated.properties +++ b/.mvn/repository/org/apache/maven/plugins/maven-jar-plugin/3.3.0/m2e-lastUpdated.properties @@ -1,2 +1,2 @@ -#Sun Feb 22 13:58:28 CST 2026 -central|https\://repo1.maven.org/maven2|null=1771739908398 +#Sun Feb 22 14:41:27 CST 2026 +central|https\://repo1.maven.org/maven2|null=1771742487373 diff --git a/.mvn/repository/org/apache/maven/plugins/maven-resources-plugin/3.3.1/m2e-lastUpdated.properties b/.mvn/repository/org/apache/maven/plugins/maven-resources-plugin/3.3.1/m2e-lastUpdated.properties index 57cf7a6..aea8b81 100644 --- a/.mvn/repository/org/apache/maven/plugins/maven-resources-plugin/3.3.1/m2e-lastUpdated.properties +++ b/.mvn/repository/org/apache/maven/plugins/maven-resources-plugin/3.3.1/m2e-lastUpdated.properties @@ -1,2 +1,2 @@ -#Sun Feb 22 13:58:28 CST 2026 -central|https\://repo1.maven.org/maven2|null=1771739908394 +#Sun Feb 22 14:41:27 CST 2026 +central|https\://repo1.maven.org/maven2|null=1771742487363 diff --git a/.mvn/repository/org/apache/maven/plugins/maven-site-plugin/3.12.1/m2e-lastUpdated.properties b/.mvn/repository/org/apache/maven/plugins/maven-site-plugin/3.12.1/m2e-lastUpdated.properties index 2194835..2695045 100644 --- a/.mvn/repository/org/apache/maven/plugins/maven-site-plugin/3.12.1/m2e-lastUpdated.properties +++ b/.mvn/repository/org/apache/maven/plugins/maven-site-plugin/3.12.1/m2e-lastUpdated.properties @@ -1,2 +1,2 @@ -#Sun Feb 22 13:58:28 CST 2026 -central|https\://repo1.maven.org/maven2|null=1771739908401 +#Sun Feb 22 14:41:27 CST 2026 +central|https\://repo1.maven.org/maven2|null=1771742487400 diff --git a/.mvn/repository/org/apache/maven/plugins/maven-surefire-plugin/3.1.2/m2e-lastUpdated.properties b/.mvn/repository/org/apache/maven/plugins/maven-surefire-plugin/3.1.2/m2e-lastUpdated.properties index 0e88117..93a75af 100644 --- a/.mvn/repository/org/apache/maven/plugins/maven-surefire-plugin/3.1.2/m2e-lastUpdated.properties +++ b/.mvn/repository/org/apache/maven/plugins/maven-surefire-plugin/3.1.2/m2e-lastUpdated.properties @@ -1,2 +1,2 @@ -#Sun Feb 22 13:58:28 CST 2026 -central|https\://repo1.maven.org/maven2|null=1771739908397 +#Sun Feb 22 14:41:27 CST 2026 +central|https\://repo1.maven.org/maven2|null=1771742487372 diff --git a/.mvn/repository/org/springframework/boot/spring-boot-maven-plugin/3.2.0/m2e-lastUpdated.properties b/.mvn/repository/org/springframework/boot/spring-boot-maven-plugin/3.2.0/m2e-lastUpdated.properties index 37cd326..4b240ee 100644 --- a/.mvn/repository/org/springframework/boot/spring-boot-maven-plugin/3.2.0/m2e-lastUpdated.properties +++ b/.mvn/repository/org/springframework/boot/spring-boot-maven-plugin/3.2.0/m2e-lastUpdated.properties @@ -1,2 +1,2 @@ -#Sun Feb 22 13:58:28 CST 2026 -central|https\://repo1.maven.org/maven2|null=1771739908398 +#Sun Feb 22 14:41:27 CST 2026 +central|https\://repo1.maven.org/maven2|null=1771742487376 diff --git a/server-deploy/assembly/assembly.xml b/server-deploy/assembly/assembly.xml deleted file mode 100644 index f7b2de6..0000000 --- a/server-deploy/assembly/assembly.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - bin - - - tar.gz - - - true - - - - - src/main/scripts - bin - - *.sh - - 0755 - true - - - - - src/main/resources - conf - - application.yml - application-*.yml - logback-spring.xml - bootstrap.yml - *.properties - - 0644 - - - - - ${project.build.directory}/dependency - lib - - *.jar - - - ${project.artifactId}-${project.version}.jar - - 0644 - - - - - - - ${project.build.directory}/${project.artifactId}-${project.version}.jar - lib - ${project.artifactId}.jar - 0644 - - - - diff --git a/server-deploy/scripts/restart-all.sh b/server-deploy/scripts/restart-all.sh deleted file mode 100644 index 9f7b02b..0000000 --- a/server-deploy/scripts/restart-all.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# 一键重启所有服务 - -DEPLOY_HOME="/opt/fundplatform/deploy" - -${DEPLOY_HOME}/stop-all.sh -echo "" -echo "Waiting 10 seconds..." -sleep 10 -${DEPLOY_HOME}/start-all.sh diff --git a/server-deploy/scripts/restart.sh b/server-deploy/scripts/restart.sh deleted file mode 100644 index 57148fb..0000000 --- a/server-deploy/scripts/restart.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# 服务重启脚本 -# 用法: ./restart.sh [服务名称] - -SCRIPT_DIR=$(dirname "$(readlink -f "$0")") - -${SCRIPT_DIR}/stop.sh -sleep 3 -${SCRIPT_DIR}/start.sh diff --git a/server-deploy/scripts/start-all.sh b/server-deploy/scripts/start-all.sh deleted file mode 100644 index f99e23f..0000000 --- a/server-deploy/scripts/start-all.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/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 "==========================================" -${DEPLOY_HOME}/status.sh diff --git a/server-deploy/scripts/start.sh b/server-deploy/scripts/start.sh deleted file mode 100644 index e5cf7c2..0000000 --- a/server-deploy/scripts/start.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# 服务启动脚本 -# 用法: ./start.sh [服务名称] - -# 获取服务名称(从脚本所在目录推断) -SCRIPT_DIR=$(dirname "$(readlink -f "$0")") -APP_HOME=$(dirname "$SCRIPT_DIR") -APP_NAME=$(basename "$APP_HOME") - -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/server-deploy/scripts/status-all.sh b/server-deploy/scripts/status-all.sh deleted file mode 100644 index 0ba836d..0000000 --- a/server-deploy/scripts/status-all.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/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/server-deploy/scripts/status.sh b/server-deploy/scripts/status.sh deleted file mode 100644 index c64f4a2..0000000 --- a/server-deploy/scripts/status.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# 查看服务状态 -# 用法: ./status.sh [服务名称] - -# 获取服务名称(从脚本所在目录推断) -SCRIPT_DIR=$(dirname "$(readlink -f "$0")") -APP_HOME=$(dirname "$SCRIPT_DIR") -APP_NAME=$(basename "$APP_HOME}") - -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 "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 "Status: \033[31mSTOPPED\033[0m (stale PID file)" - rm -f $PID_FILE - fi -else - echo "Status: \033[31mSTOPPED\033[0m" -fi - -echo "==========================================" diff --git a/server-deploy/scripts/stop-all.sh b/server-deploy/scripts/stop-all.sh deleted file mode 100644 index 9b8a62b..0000000 --- a/server-deploy/scripts/stop-all.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/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/server-deploy/scripts/stop.sh b/server-deploy/scripts/stop.sh deleted file mode 100644 index c7327c6..0000000 --- a/server-deploy/scripts/stop.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -# 服务停止脚本 -# 用法: ./stop.sh [服务名称] - -# 获取服务名称(从脚本所在目录推断) -SCRIPT_DIR=$(dirname "$(readlink -f "$0")") -APP_HOME=$(dirname "$SCRIPT_DIR") -APP_NAME=$(basename "$APP_HOME") - -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"