diff --git a/yxt-db-pg/01xxljob-yn-test.sh b/yxt-db-pg/01xxljob-yn-test.sh index e03eb92..80a5919 100644 --- a/yxt-db-pg/01xxljob-yn-test.sh +++ b/yxt-db-pg/01xxljob-yn-test.sh @@ -5,7 +5,7 @@ set -e echoPrefix="\033[36m+" echoSuffix="\033[0m" -logPath=/home/www/deploy/xxl-job/logs +logPath=/data/logs/xxl-job/xxl-job.log dirPath=/home/www/deploy/xxl-job/ serverName=xxl_job_test @@ -13,7 +13,7 @@ cmd=$1 profiles=${2:-"yxt-pg-yn-test"} #------------------------------------------------------------------- -JAVA_MEM_OPTS=" -DappName=${serverName} -server -Xmx2g -Xms2g" +JAVA_MEM_OPTS=" -DappName=${serverName} -server -Xmx1g -Xms1g" DATABASE_OPTS=" -Ddatabase.codeset=ISO-8859-1 -Ddatabase.logging=false" JAVA_OPTS_EXT=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dapplication.codeset=UTF-8 -Dfile.encoding=UTF-8 -Duser.timezone=Asia/Shanghai" #------------------------------------------------------------------- @@ -23,8 +23,8 @@ startServer() { if [ -z $pid ];then echo -e "$echoPrefix cd $dirPath $echoSuffix" cd $dirPath - echo -e "$echoPrefix java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./xxl-job-admin-2.3.0.jar --spring.profiles.active=global,$profiles --server.port=8000 >>/dev/null 2>&1 & $echoSuffix" - java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar ./xxl-job-admin-2.3.0.jar --spring.profiles.active=global,$profiles --server.port=8000 >>/dev/null 2>&1 & + echo -e "$echoPrefix java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar bin/xxl-job-admin-mysql-2.3.0.jar --spring.config.location=conf/ --spring.profiles.active=global,$profiles --server.port=8000 >>/dev/null 2>&1 & $echoSuffix" + java $JAVA_MEM_OPTS $DATABASE_OPTS $JAVA_OPTS_EXT -jar bin/xxl-job-admin-mysql-2.3.0.jar --spring.config.location=conf/ --spring.profiles.active=global,$profiles --server.port=8000 >>/dev/null 2>&1 & echo "$serverName 启动成功!" else echo "$serverName 正在运行..." @@ -57,8 +57,11 @@ logs() { } pid=`ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}'` -# 操作参数: restart start stop kill log logs -if [ "$cmd" == "restart" ];then +# 操作参数: deploy restart start stop kill log logs +if [ "$cmd" == "deploy" ];then + bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/00base/03xxljob.sh) pull + restartServer $pid +elif [ "$cmd" == "restart" ];then restartServer $pid elif [ "$cmd" == "start" ];then startServer $pid @@ -68,9 +71,9 @@ elif [ "$cmd" == "log" ] || [ "$cmd" == "logs" ];then logs else if [ -z $pid ];then - echo "$serverName 未运行 | 输入操作参数: restart start stop kill log logs" + echo "$serverName 未运行 | 输入操作参数: deploy restart start stop kill log logs" else - echo "输入操作参数: restart start stop kill log logs" + echo "输入操作参数: deploy restart start stop kill log logs" echo "pid=$pid | $serverName 正在运行... | 查看日志: tail -F $logPath -n 100" fi fi