From 53e2f5e68ee1340287b53f7c65d90de8149f7367 Mon Sep 17 00:00:00 2001 From: wangzhibiao Date: Thu, 17 Sep 2026 10:50:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E7=BD=B2=EF=BC=9A?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=85=B1=E4=BA=AB=E8=AF=95=E7=94=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE=E5=B9=B6=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E9=87=8D=E5=90=AF=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi-admin/src/main/resources/application-druid.yml | 8 ++++---- deploy/restart-all.sh | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml b/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml index 1bc7a3855..a88c2b396 100644 --- a/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml +++ b/RuoYi-Vue/ruoyi-admin/src/main/resources/application-druid.yml @@ -16,10 +16,10 @@ spring: #url: jdbc:mysql://120.53.244.187:3306/sict_builder?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 #url: jdbc:mysql://83.102.67.232:3306/judge?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 #url: jdbc:mysql://127.0.0.1:3306/s_builder_kj?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8 - # Environment driven production-safe database config (QA overrides via env/args): - url: ${SPRING_DATASOURCE_DRUID_MASTER_URL:jdbc:kingbase8://localhost:54321/graph?currentSchema=public&useUnicode=true&characterEncoding=utf8} - username: ${SPRING_DATASOURCE_DRUID_MASTER_USERNAME:graph} - password: ${SPRING_DATASOURCE_DRUID_MASTER_PASSWORD:} + # Environment driven production-safe database config (defaults to shared trial training database): + url: ${SPRING_DATASOURCE_DRUID_MASTER_URL:jdbc:kingbase8://192.168.139.218:4321/training?currentSchema=public,sys_catalog&useUnicode=true&characterEncoding=utf8} + username: ${SPRING_DATASOURCE_DRUID_MASTER_USERNAME:kingbase} + password: ${SPRING_DATASOURCE_DRUID_MASTER_PASSWORD:sict123456} connectionInitSqls: ["SET search_path TO public, sys_catalog"] # prod env kingbase: diff --git a/deploy/restart-all.sh b/deploy/restart-all.sh index 712fa8271..788a5d8d3 100644 --- a/deploy/restart-all.sh +++ b/deploy/restart-all.sh @@ -78,7 +78,9 @@ nohup $JAVA_BIN -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=5 -Dfile.encoding=UTF-8 \ -jar "$JAR_PATH" \ --server.port=$SERVER_PORT \ - --spring.datasource.druid.master.url="$DB_URL" > "$LOG_PATH" 2>&1 & + --spring.datasource.druid.master.url="$DB_URL" \ + --spring.datasource.druid.master.username="${DB_USERNAME:-kingbase}" \ + --spring.datasource.druid.master.password="${DB_PASSWORD:-sict123456}" > "$LOG_PATH" 2>&1 & NEW_PID=$! echo $NEW_PID > "$PID_FILE" @@ -99,6 +101,7 @@ for i in {1..35}; do if ! kill -0 "$NEW_PID" 2>/dev/null; then echo "错误：后端进程在启动阶段提前退出，请检查 $LOG_PATH" + cat "$LOG_PATH" | tail -n 50 || true rm -f "$PID_FILE" exit 1 fi