From ed30212ddc37b3320d42fa101f8740d0fda0f0b3 Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Sat, 23 Dec 2023 12:29:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8Java21=E7=9A=84=E6=96=B0?=
 =?UTF-8?q?=E7=89=B9=E6=80=A7=EF=BC=9A=E5=88=86=E4=BB=A3ZGC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ry.bat => script/bin/ry.bat | 25 +++++++++----------
 ry.sh => script/bin/ry.sh   | 48 ++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 36 deletions(-)
 rename ry.bat => script/bin/ry.bat (70%)
 rename ry.sh => script/bin/ry.sh (61%)

diff --git a/ry.bat b/script/bin/ry.bat
similarity index 70%
rename from ry.bat
rename to script/bin/ry.bat
index ac1e437..d214af4 100644
--- a/ry.bat
+++ b/script/bin/ry.bat
@@ -1,21 +1,22 @@
+rem 使用者应根据自身平台编码自行转换 防止乱码 例如 win使用gbk编码
 @echo off
 
-rem jarƽ��Ŀ¼
+rem jar平级目录
 set AppName=ruoyi-admin.jar
 
-rem JVM����
-set JVM_OPTS="-Dname=%AppName%  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
+rem JVM参数
+set JVM_OPTS="-Dname=%AppName%  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC"
 
 
 ECHO.
-	ECHO.  [1] ����%AppName%
-	ECHO.  [2] �ر�%AppName%
-	ECHO.  [3] ����%AppName%
-	ECHO.  [4] ����״̬ %AppName%
-	ECHO.  [5] �� ��
+	ECHO.  [1] 启动%AppName%
+	ECHO.  [2] 关闭%AppName%
+	ECHO.  [3] 重启%AppName%
+	ECHO.  [4] 启动状态 %AppName%
+	ECHO.  [5] 退 出
 ECHO.
 
-ECHO.������ѡ����Ŀ�����:
+ECHO.请输入选择项目的序号:
 set /p ID=
 	IF "%id%"=="1" GOTO start
 	IF "%id%"=="2" GOTO stop
@@ -35,11 +36,11 @@ PAUSE
 
 start javaw %JVM_OPTS% -jar %AppName%
 
-echo  starting����
+echo  starting……
 echo  Start %AppName% success...
 goto:eof
 
-rem ����stopͨ��jps�������pid����������
+rem 函数stop通过jps命令查找pid并结束进程
 :stop
 	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
 		set pid=%%a
@@ -48,7 +49,7 @@ rem 
 	if not defined pid (echo process %AppName% does not exists) else (
 		echo prepare to kill %image_name%
 		echo start kill %pid% ...
-		rem ���ݽ���ID��kill����
+		rem 根据进程ID，kill进程
 		taskkill /f /pid %pid%
 	)
 goto:eof
diff --git a/ry.sh b/script/bin/ry.sh
similarity index 61%
rename from ry.sh
rename to script/bin/ry.sh
index d6a9cf3..0df25e7 100644
--- a/ry.sh
+++ b/script/bin/ry.sh
@@ -3,7 +3,7 @@
 AppName=ruoyi-admin.jar
 
 # JVM参数
-JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
+JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC"
 APP_HOME=`pwd`
 LOG_PATH=$APP_HOME/logs/$AppName.log
 
@@ -23,36 +23,36 @@ function start()
 {
     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()