Merge pull request #469 from fizzgate/master

sync master
This commit is contained in:
dxfeng10
2023-02-24 11:22:05 +08:00
committed by GitHub

View File

@@ -109,9 +109,9 @@ start() {
rm -f ${PID_FILE} rm -f ${PID_FILE}
if [[ ${PARAM_2} == "f" ]] if [[ ${PARAM_2} == "f" ]]
then then
${JAVA_CMD} -jar ${JAVA_OPTS} -Dfile.encoding=UTF-8 -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} ${APP_DEP_DIR}/${APP_NAME} ${JAVA_CMD} ${JAVA_OPTS} -Dfile.encoding=UTF-8 -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} -jar ${APP_DEP_DIR}/${APP_NAME}
else else
${JAVA_CMD} -jar ${JAVA_OPTS} -Dfile.encoding=UTF-8 -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} ${APP_DEP_DIR}/${APP_NAME} > ${APP_LOG_DIR}/${APP_NAME}.log 2>&1 & ${JAVA_CMD} ${JAVA_OPTS} -Dfile.encoding=UTF-8 -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} -jar ${APP_DEP_DIR}/${APP_NAME} > /dev/null 2>&1 &
fi fi
echo $! > ${PID_FILE} echo $! > ${PID_FILE}
fi fi