diff --git a/scripts/start.sh b/scripts/start.sh index faef310..614945c 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -43,12 +43,12 @@ if [ -z "$MAIN_CLASS" ]; then exit 1 fi -# 5. ClassPath(lib目录所有jar,包括主JAR和依赖) +# 5. ClassPath(lib目录所有jar + conf目录) if [ ! -d "${APP_HOME}/lib" ]; then echo "Error: lib directory not found: ${APP_HOME}/lib" exit 1 fi -CLASSPATH="${APP_HOME}/lib/*" +CLASSPATH="${APP_HOME}/lib/*:${APP_HOME}/conf" # 6. 日志目录(使用INSTANCE_NAME区分不同实例) LOG_HOME="/datacfs/applogs/${INSTANCE_NAME}" @@ -72,9 +72,6 @@ if [ -n "${TENANT_ID}" ]; then TENANT_OPTS="-DTENANT_ID=${TENANT_ID}" fi -# 配置文件路径 -CONFIG_OPTS="--spring.config.location=${APP_HOME}/conf/application.yml" - # 检查是否已运行 if [ -f "$PID_FILE" ]; then PID=$(cat $PID_FILE) @@ -100,8 +97,8 @@ if [ -n "${TENANT_ID}" ]; then echo " TENANT_ID: ${TENANT_ID}" fi -# 启动命令:java -cp lib/* MainClass -nohup java $JAVA_OPTS $LOG_OPTS $TENANT_OPTS -cp "$CLASSPATH" $MAIN_CLASS $CONFIG_OPTS > /dev/null 2>&1 & +# 启动命令:java -cp lib/*:conf MainClass +nohup java $JAVA_OPTS $LOG_OPTS $TENANT_OPTS -cp "$CLASSPATH" $MAIN_CLASS > /dev/null 2>&1 & # 保存PID echo $! > $PID_FILE