wangkun 2 years ago
parent
commit
9b53edbb32
2 changed files with 2 additions and 5 deletions
  1. 0 3
      .idea/.gitignore
  2. 2 2
      zongjiao.sh

+ 0 - 3
.idea/.gitignore

@@ -1,3 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml

+ 2 - 2
zongjiao.sh

@@ -2,12 +2,12 @@
 echo "开始"
 echo "$(date "+%Y-%m-%d %H:%M:%S") 正在杀进程..."
 # shellcheck disable=SC2009
-# ps aux | grep run_zongjiao | grep -v grep | awk '{print $2}' | xargs kill -9
+# ps aux | grep run_zongjiao
 ps aux | grep run_zongjiao.py | grep -v grep | awk '{print $2}' | xargs kill -9
 echo "$(date "+%Y-%m-%d %H:%M:%S") 进程已杀死!"
 
 echo "$(date "+%Y-%m-%d %H:%M:%S") 正在更新代码..."
-cd /root/piaoquan_crawler/crawler_zongjiao && git pull origin master --force
+cd /data5/wangkun/crawler_zongjiao/ && git pull origin master --force
 echo "$(date "+%Y-%m-%d %H:%M:%S") 代码更新完成!"
 
 echo "$(date "+%Y-%m-%d %H:%M:%S") 正在重启服务..."