diff --git a/pom.xml b/pom.xml index d84379e4f..1cf738cd5 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.7.7 UTF-8 UTF-8 - 1.8 + 17 3.1.1 1.12.0 2.1.0 @@ -206,7 +206,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.1 + 3.10.1 ${java.version} ${java.version} @@ -241,4 +241,4 @@ - \ No newline at end of file + diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 60d3a723f..aadc88886 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -45,8 +45,9 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j + 8.0.33 @@ -74,7 +75,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.1.1.RELEASE + 3.1.1 true @@ -131,4 +132,4 @@ ${project.artifactId} - \ No newline at end of file + diff --git a/ry.sh b/ry.sh index d6a9cf33a..19a2092a3 100644 --- a/ry.sh +++ b/ry.sh @@ -1,11 +1,11 @@ #!/bin/sh # ./ry.sh start 启动 stop 停止 restart 重启 status 状态 AppName=ruoyi-admin.jar +AppJar="ruoyi-admin/target/${AppName}" # 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:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDetails " APP_HOME=`pwd` -LOG_PATH=$APP_HOME/logs/$AppName.log if [ "$1" = "" ]; then @@ -26,7 +26,7 @@ function start() if [ x"$PID" != x"" ]; then echo "$AppName is running..." else - nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 & + nohup java $JVM_OPTS -jar ${AppJar} > /dev/null 2>&1 & echo "Start $AppName success..." fi }