refactor: 将conf目录加入classpath,移除spring.config.location参数
- start.sh: - ClassPath改为 lib/*:conf - 移除CONFIG_OPTS参数 - Spring Boot自动从classpath加载配置文件 优势: - 启动命令更简洁 - 配置文件作为classpath资源自动加载 - 符合Spring Boot标准做法
This commit is contained in:
parent
2184dce6a8
commit
1f30315a2f
@ -43,12 +43,12 @@ if [ -z "$MAIN_CLASS" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 5. ClassPath(lib目录所有jar,包括主JAR和依赖)
|
# 5. ClassPath(lib目录所有jar + conf目录)
|
||||||
if [ ! -d "${APP_HOME}/lib" ]; then
|
if [ ! -d "${APP_HOME}/lib" ]; then
|
||||||
echo "Error: lib directory not found: ${APP_HOME}/lib"
|
echo "Error: lib directory not found: ${APP_HOME}/lib"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
CLASSPATH="${APP_HOME}/lib/*"
|
CLASSPATH="${APP_HOME}/lib/*:${APP_HOME}/conf"
|
||||||
|
|
||||||
# 6. 日志目录(使用INSTANCE_NAME区分不同实例)
|
# 6. 日志目录(使用INSTANCE_NAME区分不同实例)
|
||||||
LOG_HOME="/datacfs/applogs/${INSTANCE_NAME}"
|
LOG_HOME="/datacfs/applogs/${INSTANCE_NAME}"
|
||||||
@ -72,9 +72,6 @@ if [ -n "${TENANT_ID}" ]; then
|
|||||||
TENANT_OPTS="-DTENANT_ID=${TENANT_ID}"
|
TENANT_OPTS="-DTENANT_ID=${TENANT_ID}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 配置文件路径
|
|
||||||
CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml"
|
|
||||||
|
|
||||||
# 检查是否已运行
|
# 检查是否已运行
|
||||||
if [ -f "$PID_FILE" ]; then
|
if [ -f "$PID_FILE" ]; then
|
||||||
PID=$(cat $PID_FILE)
|
PID=$(cat $PID_FILE)
|
||||||
@ -100,8 +97,8 @@ if [ -n "${TENANT_ID}" ]; then
|
|||||||
echo " TENANT_ID: ${TENANT_ID}"
|
echo " TENANT_ID: ${TENANT_ID}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 启动命令:java -cp lib/* MainClass
|
# 启动命令:java -cp lib/*:conf MainClass
|
||||||
nohup java $JAVA_OPTS $LOG_OPTS $TENANT_OPTS -cp "$CLASSPATH" $MAIN_CLASS $CONFIG_OPTS > /dev/null 2>&1 &
|
nohup java $JAVA_OPTS $LOG_OPTS $TENANT_OPTS -cp "$CLASSPATH" $MAIN_CLASS > /dev/null 2>&1 &
|
||||||
|
|
||||||
# 保存PID
|
# 保存PID
|
||||||
echo $! > $PID_FILE
|
echo $! > $PID_FILE
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user