From fd6db2de2c44d9b7d48908d9b68bc1e6fdd54f9b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 06 四月 2023 11:30:57 +0800
Subject: [PATCH] !333 处理多余的角色删除操作，合并到insertUserRole Merge pull request !333 from Yjoioooo/5.X
---
script/bin/ry.sh | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/script/bin/ry.sh b/script/bin/ry.sh
index d6a9cf3..0cf5ce9 100644
--- a/script/bin/ry.sh
+++ b/script/bin/ry.sh
@@ -23,36 +23,36 @@
{
PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
- if [ x"$PID" != x"" ]; then
- echo "$AppName is running..."
- else
- nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 &
- echo "Start $AppName success..."
- fi
+ if [ x"$PID" != x"" ]; then
+ echo "$AppName is running..."
+ else
+ nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 &
+ echo "Start $AppName success..."
+ fi
}
function stop()
{
echo "Stop $AppName"
- PID=""
- query(){
- PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
- }
+ PID=""
+ query(){
+ PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
+ }
- query
- if [ x"$PID" != x"" ]; then
- kill -TERM $PID
- echo "$AppName (pid:$PID) exiting..."
- while [ x"$PID" != x"" ]
- do
- sleep 1
- query
- done
- echo "$AppName exited."
- else
- echo "$AppName already stopped."
- fi
+ query
+ if [ x"$PID" != x"" ]; then
+ kill -TERM $PID
+ echo "$AppName (pid:$PID) exiting..."
+ while [ x"$PID" != x"" ]
+ do
+ sleep 1
+ query
+ done
+ echo "$AppName exited."
+ else
+ echo "$AppName already stopped."
+ fi
}
function restart()
--
Gitblit v1.9.3