Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复了重复运行./run.sh start 问题

Browse Source
This commit is contained in:
lizhifeng 2022-04-19 22:07:36 +08:00
parent f05464ec79
commit 0d85eecb06
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/run.sh
View File

@ -35,13 +35,15 @@ EXECUTABLE=ruoyi.sh
case "$1" in
start)
exec "$PRGDIR"/"$EXECUTABLE" start "$@"
echo "Starting Ruoyi ... "
exec "$PRGDIR"/"$EXECUTABLE" start "$@"
;;
stop)
echo "Stoping Ruoyi ... "
exec "$PRGDIR"/"$EXECUTABLE" stop "$@"
echo "Stoping Ruoyi"
;;
*)

16
bin/ruoyi.sh
View File

@ -76,9 +76,10 @@ fi
# 设置 -pidfile
test ".$RUOYI_PID" = . && RUOYI_PID="$RUOYI_BASE/logs/ruoyi.pid"
LOGBACK="-Dlogback.configurationFile=file:$RUOYI_BASE/ruoyi-admin/src/main/resources/logback.xml"
RUOYI_CMD="nohup $JAVA_BIN -jar $RUOYI_BASE/ruoyi-admin/target/ruoyi-admin.jar $JAVA_OPTS >/dev/null 2>&1 &"
echo $RUOYI_PID
RUOYI_CMD="nohup $JAVA_BIN -jar $RUOYI_BASE/ruoyi-admin/target/ruoyi-admin.jar $LOGBACK $JAVA_OPTS >/dev/null 2>&1 &"
#echo $RUOYI_HOME $RUOYI_BASE $LOGBACK
#echo $PRG $RUOYI_BASE $JAVA_OPTS $JAVA_BIN $RUOYI_PID $RUOYI_CMD
touch "$RUOYI_PID"
@ -89,9 +90,16 @@ touch "$RUOYI_PID"
if [ "$1" = "start" ] ; then
eval exec "$RUOYI_CMD"
if [ ! -z "$RUOYI_PID" ]; then
PID=`cat $RUOYI_PID`
ps -p $PID >/dev/null 2>&1
if [ $? -eq 0 ] ; then
echo "RuoYi appears to still be running with PID $PID. Start aborted."
echo "If the following process is not a RuoYi process, remove the PID file and try again:"
exit 1
elif [ ! -z "$RUOYI_PID" ]; then
eval exec "$RUOYI_CMD"
echo $! > "$RUOYI_PID"
#exit 1
fi
elif [ "$1" = "stop" ] ; then