Browse Source

添加bat脚本执行应用

RuoYi 4 years ago
parent
commit
c105a63c8b
3 changed files with 170 additions and 86 deletions
  1. 13 0
      ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
  2. 67 0
      ry.bat
  3. 90 86
      ry.sh

+ 13 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -60,6 +60,19 @@ public class BaseController
     }
     }
 
 
     /**
     /**
+     * 设置请求排序数据
+     */
+    protected void startOrderBy()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.orderBy(orderBy);
+        }
+    }
+
+    /**
      * 响应请求分页数据
      * 响应请求分页数据
      */
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @SuppressWarnings({ "rawtypes", "unchecked" })

+ 67 - 0
ry.bat

@@ -0,0 +1,67 @@
+@echo off
+
+rem jar平级目录
+set AppName=ruoyi-admin.jar
+
+rem JVM参数
+set JVM_OPTS="-Dname=%AppName%  -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
+
+
+ECHO. 
+	ECHO.  [1] 启动%AppName%
+	ECHO.  [2] 关闭%AppName%
+	ECHO.  [3] 重启%AppName%
+	ECHO.  [4] 启动状态 %AppName%
+	ECHO.  [5] 退 出 
+ECHO. 
+
+ECHO.请输入选择项目的序号:
+set /p ID=
+	IF "%id%"=="1" GOTO start 
+	IF "%id%"=="2" GOTO stop 
+	IF "%id%"=="3" GOTO restart 
+	IF "%id%"=="4" GOTO status
+	IF "%id%"=="5" EXIT
+PAUSE 
+:start
+    for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
+		set pid=%%a
+		set image_name=%%b
+	)
+	if  defined pid (
+		echo %%is running 
+		PAUSE 
+	) 
+
+start javaw -jar %JAVA_OPTS% ruoyi-admin.jar
+
+echo  starting……
+echo  Start %AppName% success...
+goto:eof
+
+rem 函数stop通过jps命令查找pid并结束进程
+:stop
+	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
+		set pid=%%a
+		set image_name=%%b
+	)
+	if not defined pid (echo process %AppName% does not exists) else (
+		echo prepare to kill %image_name%
+		echo start kill %pid% ...
+		rem 根据进程ID,kill进程
+		taskkill /f /pid %pid%
+	)
+goto:eof
+:restart
+	call :stop
+    call :start
+goto:eof
+:status
+	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
+		set pid=%%a
+		set image_name=%%b
+	)
+	if not defined pid (echo process %AppName% is dead ) else (
+		echo %image_name% is running
+	)
+goto:eof

+ 90 - 86
ry.sh

@@ -1,86 +1,90 @@
-#!/bin/bash
+#!/bin/sh
-
+# author ruoyi
-AppName=ruoyi-admin.jar
+# ./ry.sh start 启动
-
+# ./ry.sh stop 停止
-#JVM参数
+# ./ry.sh restart 重启
-JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
+# ./ry.sh start 状态
-APP_HOME=`pwd`
+AppName=ruoyi-admin.jar
-LOG_PATH=$APP_HOME/logs/$AppName.log
+
-
+# JVM参数
-if [ "$1" = "" ];
+JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512M -Xmx512M -XX:PermSize=256M -XX:MaxPermSize=512M -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps  -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC"
-then
+APP_HOME=`pwd`
-    echo -e "\033[0;31m 未输入操作名 \033[0m  \033[0;34m {start|stop|restart|status} \033[0m"
+LOG_PATH=$APP_HOME/logs/$AppName.log
-    exit 1
+
-fi
+if [ "$1" = "" ];
-
+then
-if [ "$AppName" = "" ];
+    echo -e "\033[0;31m 未输入操作名 \033[0m  \033[0;34m {start|stop|restart|status} \033[0m"
-then
+    exit 1
-    echo -e "\033[0;31m 未输入应用名 \033[0m"
+fi
-    exit 1
+
-fi
+if [ "$AppName" = "" ];
-
+then
-function start()
+    echo -e "\033[0;31m 未输入应用名 \033[0m"
-{
+    exit 1
-    PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
+fi
-
+
-	if [ x"$PID" != x"" ]; then
+function start()
-	    echo "$AppName is running..."
+{
-	else
+    PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
-		nohup java -jar  $JVM_OPTS target/$AppName > /dev/null 2>&1 &
+
-		echo "Start $AppName success..."
+	if [ x"$PID" != x"" ]; then
-	fi
+	    echo "$AppName is running..."
-}
+	else
-
+		nohup java -jar  $JVM_OPTS target/$AppName > /dev/null 2>&1 &
-function stop()
+		echo "Start $AppName success..."
-{
+	fi
-    echo "Stop $AppName"
+}
-	
+
-	PID=""
+function stop()
-	query(){
+{
-		PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
+    echo "Stop $AppName"
-	}
+	
-
+	PID=""
-	query
+	query(){
-	if [ x"$PID" != x"" ]; then
+		PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
-		kill -TERM $PID
+	}
-		echo "$AppName (pid:$PID) exiting..."
+
-		while [ x"$PID" != x"" ]
+	query
-		do
+	if [ x"$PID" != x"" ]; then
-			sleep 1
+		kill -TERM $PID
-			query
+		echo "$AppName (pid:$PID) exiting..."
-		done
+		while [ x"$PID" != x"" ]
-		echo "$AppName exited."
+		do
-	else
+			sleep 1
-		echo "$AppName already stopped."
+			query
-	fi
+		done
-}
+		echo "$AppName exited."
-
+	else
-function restart()
+		echo "$AppName already stopped."
-{
+	fi
-    stop
+}
-    sleep 2
+
-    start
+function restart()
-}
+{
-
+    stop
-function status()
+    sleep 2
-{
+    start
-    PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l`
+}
-    if [ $PID != 0 ];then
+
-        echo "$AppName is running..."
+function status()
-    else
+{
-        echo "$AppName is not running..."
+    PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l`
-    fi
+    if [ $PID != 0 ];then
-}
+        echo "$AppName is running..."
-
+    else
-case $1 in
+        echo "$AppName is not running..."
-    start)
+    fi
-    start;;
+}
-    stop)
+
-    stop;;
+case $1 in
-    restart)
+    start)
-    restart;;
+    start;;
-    status)
+    stop)
-    status;;
+    stop;;
-    *)
+    restart)
-
+    restart;;
-esac
+    status)
+    status;;
+    *)
+
+esac