diff --git a/08luolai/05wms83-prod.sh b/08luolai/05wms83-prod.sh index 46a91cc..7137474 100644 --- a/08luolai/05wms83-prod.sh +++ b/08luolai/05wms83-prod.sh @@ -193,8 +193,8 @@ logs() { } deployYvanUI() { - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/00base/01yvan-ext.sh) pull - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/00base/02yvan-ext-mobile.sh) pull + bash <(curl -s http://git.galaxis.yvanui.com/lizw/jztd-deploy/raw/branch/master/00base/01yvan-ext.sh) pull + bash <(curl -s http://git.galaxis.yvanui.com/lizw/jztd-deploy/raw/branch/master/00base/02yvan-ext-mobile.sh) pull } pid=`ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}'` @@ -202,7 +202,6 @@ pid=`ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}'` if [ "$cmd" == "pull" ];then deployYvanUI deployPull - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/08luolai/11wms83-job-prod.sh) pull if [ -z $pid ];then echo "$serverName 未运行 | 输入操作参数: pull build deploy restart start stop kill log logs" fi @@ -210,21 +209,16 @@ elif [ "$cmd" == "build" ];then deployYvanUI deployPull buildCode - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/08luolai/11wms83-job-prod.sh) build echo "###--代码构建完成--------------------------------------------------------------------------###" elif [ "$cmd" == "deploy" ];then deployYvanUI deployServer $pid - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/08luolai/11wms83-job-prod.sh) deploy elif [ "$cmd" == "restart" ];then restartServer $pid - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/08luolai/11wms83-job-prod.sh) restart elif [ "$cmd" == "start" ];then startServer $pid - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/08luolai/11wms83-job-prod.sh) start elif [ "$cmd" == "stop" ] || [ "$cmd" == "kill" ];then stopServer $pid - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/08luolai/11wms83-job-prod.sh) stop elif [ "$cmd" == "log" ] || [ "$cmd" == "logs" ];then logs else diff --git a/08luolai/08wms83-test.sh b/08luolai/08wms83-test.sh index d2955ad..cbd58a8 100644 --- a/08luolai/08wms83-test.sh +++ b/08luolai/08wms83-test.sh @@ -193,8 +193,8 @@ logs() { } deployYvanUI() { - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/00base/01yvan-ext.sh) pull - bash <(curl -s http://git.yvanui.com/projects/jztd-deploy/raw/master/00base/02yvan-ext-mobile.sh) pull + bash <(curl -s http://git.galaxis.yvanui.com/lizw/jztd-deploy/raw/branch/master/00base/01yvan-ext.sh) pull + bash <(curl -s http://git.galaxis.yvanui.com/lizw/jztd-deploy/raw/branch/master/00base/02yvan-ext-mobile.sh) pull } pid=`ps -ef | grep "DappName=${serverName}" | grep -v 'grep' | awk '{print $2}'`