From 2bb8cee0879c0964e51bc4e308bc0c27c20f102b Mon Sep 17 00:00:00 2001 From: tomsun28 Date: Thu, 14 Apr 2022 20:52:08 +0800 Subject: [PATCH] [script]bugfix: zh garbled characters appear in window's bat script execution (#89) --- script/assembly/server/bin/shutdown.bat | 2 -- script/assembly/server/bin/startup.bat | 18 ++++++------------ 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/script/assembly/server/bin/shutdown.bat b/script/assembly/server/bin/shutdown.bat index 7459c15..5652f7b 100644 --- a/script/assembly/server/bin/shutdown.bat +++ b/script/assembly/server/bin/shutdown.bat @@ -2,11 +2,9 @@ @echo off setlocal enabledelayedexpansion -rem 项目名称 set SERVER_NAME="${project.artifactId}" -rem 应用的端口号 set SERVER_PORT=1157 echo Start shutdown HertzBeat %SERVER_NAME% diff --git a/script/assembly/server/bin/startup.bat b/script/assembly/server/bin/startup.bat index 3bec537..0f2ba8f 100644 --- a/script/assembly/server/bin/startup.bat +++ b/script/assembly/server/bin/startup.bat @@ -2,25 +2,21 @@ @echo off setlocal enabledelayedexpansion -rem 项目名称 set SERVER_NAME=${project.artifactId} -rem jar名称 set JAR_NAME=${project.build.finalName}.jar -rem 进入bin目录 +rem enter the bin directory cd /d %~dp0 -rem 返回到上一级项目根目录路径 + cd .. -rem 打印项目安装根目录绝对路径 + set DEPLOY_DIR=%~dp0.. echo %DEPLOY_DIR% -rem 外部配置文件绝对目录,如果是目录需要/结尾,也可以直接指定文件 -rem 如果指定的是目录,spring则会读取目录中的所有配置文件 + set CONF_DIR=%DEPLOY_DIR%\config echo %CONF_DIR% -rem 应用的端口号 set SERVER_PORT=1157 for /f "tokens=1-5" %%i in ('netstat -ano^|findstr "0.0.0.0:%SERVER_PORT%"') do ( @@ -29,8 +25,6 @@ for /f "tokens=1-5" %%i in ('netstat -ano^|findstr "0.0.0.0:%SERVER_PORT%"') do goto q ) - -rem 项目日志输出绝对路径 set LOGS_DIR=%DEPLOY_DIR%\logs rem JVM Configuration @@ -38,9 +32,9 @@ set JAVA_OPTS= -Duser.timezone=Asia/Shanghai set JAVA_MEM_OPTS= -server -XX:SurvivorRatio=6 -XX:+UseParallelGC -rem 加载外部log文件的配置 + set LOGGING_CONFIG=-Dlogging.config=%CONF_DIR%\logback-spring.xml -rem 注意配置文件目录最后的后缀需为 / 而不是 windows \ + set CONFIG_FILES= -Dlogging.path=%LOGS_DIR% %LOGGING_CONFIG% -Dspring.config.location=%CONF_DIR%/ echo Starting the %SERVER_NAME% ...