update

README.MD

@@ -12,14 +12,14 @@ ${crawler}:         哪款爬虫，如: youtube / kanyikan / weixinzhishu
 ${strategy}:        爬虫策略，如: 定向爬虫策略 / 小时榜爬虫策略 / 热榜爬虫策略
 ${oss_endpoint}:    OSS网关，内网: inner / 外网: out / 香港: hk
 ${env}:             爬虫运行环境，正式环境: prod / 测试环境: dev
-${machine}:         爬虫运行机器，阿里云服务器: aliyun / macpro / macair / local
+${machine}:         爬虫运行机器，阿里云服务器: aliyun_hk / aliyun / macpro / macair / local
 ${nohup_dir}:       nohup日志存储路径，如: ./youtube/nohup.log
 ```
 
 ### 已上线爬虫运行命令示例
 ```
 youtube定向榜运行命令: 
-sh ./main/main.sh ./youtube/youtube_main/run_youtube_follow.py --log_type="follow" --crawler="youtube" --strategy="定向爬虫策略" --oss_endpoint="hk" --env="prod" --machine="aliyun" ./youtube/nohup.log
+sh ./main/main.sh ./youtube/youtube_main/run_youtube_follow.py --log_type="follow" --crawler="youtube" --strategy="定向爬虫策略" --oss_endpoint="hk" --env="dev" --machine="aliyun_hk" ./youtube/nohup.log
 youtube定向榜杀进程命令: 
 ps aux | grep run_youtube | grep Python | grep -v grep | awk '{print $2}' | xargs kill -9
 ```

common/translate.py

@@ -22,7 +22,7 @@ class Translate:
         chrome_options.add_argument("--no-sandbox")
 
         # driver初始化
-        if machine == 'aliyun':
+        if machine == 'aliyun' or machine == 'aliyun_hk':
             driver = webdriver.Chrome(desired_capabilities=ca, options=chrome_options)
         elif machine == 'macpro':
             driver = webdriver.Chrome(desired_capabilities=ca, options=chrome_options, service=Service('/Users/lieyunye/Downloads/chromedriver_v86/chromedriver'))
@@ -72,7 +72,7 @@ class Translate:
         chrome_options.add_argument("--no-sandbox")
 
         # driver初始化
-        if machine == 'aliyun':
+        if machine == 'aliyun' or machine == 'aliyun_hk':
             driver = webdriver.Chrome(desired_capabilities=ca, options=chrome_options)
         elif machine == 'macpro':
             driver = webdriver.Chrome(desired_capabilities=ca, options=chrome_options, service=Service('/Users/lieyunye/Downloads/chromedriver_v86/chromedriver'))

main/main.sh

@@ -11,7 +11,7 @@ crawler=$3      # 哪款爬虫，如: youtube / kanyikan / weixinzhishu
 strategy=$4     # 爬虫策略，如: 定向爬虫策略 / 小时榜爬虫策略 / 热榜爬虫策略
 oss_endpoint=$5 # OSS网关，内网: inner / 外网: out / 香港: hk
 env=$6          # 爬虫运行环境，正式环境: prod / 测试环境: dev
-machine=$7      # 爬虫运行机器，阿里云服务器: aliyun / macpro / macair / local
+machine=$7      # 爬虫运行机器，阿里云服务器: aliyun_hk / aliyun / macpro / macair / local
 nohup_dir=$8    # nohup日志存储路径，如: ./youtube/nohup.log
 
 echo "开始"
@@ -26,6 +26,10 @@ elif [ ${machine} = "macair" ];then
   profile_path=./base_profile
   node_path=/usr/local/bin/node
   python=python3
+elif [ ${machine} = "aliyun_hk" ];then
+  piaoquan_crawler_dir=/root/piaoquan_crawler/
+  profile_path=/etc/profile
+  python=python
 elif [ ${machine} = "aliyun" ];then
   piaoquan_crawler_dir=/data5/wangkun/piaoquan_crawler/
   profile_path=/etc/profile
@@ -51,18 +55,17 @@ grep_str=run_${crawler##*=}
 ps aux | grep ${grep_str} | grep Python | grep -v grep | awk '{print $2}' | xargs kill -9
 echo "$(date "+%Y-%m-%d %H:%M:%S") 进程已杀死！"
 
-if [ ${oss_endpoint} = "hk" ];then
-  echo "$(date "+%Y-%m-%d %H:%M:%S") 正在更新代码..."
-  cd /root/piaoquan_crawler/ && git pull origin master --force && rm -f /root/piaoquan_crawler/main/nohup.log && rm -f /root/piaoquan_crawler/${nohup_dir}
-  echo "$(date "+%Y-%m-%d %H:%M:%S") 代码更新完成！"
-else
-  echo "$(date "+%Y-%m-%d %H:%M:%S") 正在更新代码..."
-  cd ${piaoquan_crawler_dir} && git pull origin master --force && rm -f ${piaoquan_crawler_dir}main/nohup.log && rm -f ${piaoquan_crawler_dir}${nohup_dir}
-  #echo ${piaoquan_crawler_dir}
-  echo "$(date "+%Y-%m-%d %H:%M:%S") 代码更新完成！"
-fi
 
-if [ ${machine} != "aliyun" ];then
+echo "$(date "+%Y-%m-%d %H:%M:%S") 正在更新代码..."
+cd ${piaoquan_crawler_dir} && git pull origin master --force && rm -f ${piaoquan_crawler_dir}main/nohup.log && rm -f ${piaoquan_crawler_dir}${nohup_dir}
+echo "$(date "+%Y-%m-%d %H:%M:%S") 代码更新完成！"
+
+
+if [ ${machine} = "aliyun" ];then
+  echo "无需重启Appium及adb服务"
+elif [ ${machine} = "aliyun_hk" ];then
+  echo "无需重启Appium及adb服务"
+else
   echo "$(date "+%Y-%m-%d %H:%M:%S") 正在重启Appium..."
   ps aux | grep Appium.app | grep -v grep | awk '{print $2}' | xargs kill -9
   nohup ${node_path} /Applications/Appium.app/Contents/Resources/app/node_modules/appium/build/lib/main.js >>./nohup.log 2>&1 &
@@ -72,8 +75,6 @@ if [ ${machine} != "aliyun" ];then
   adb kill-server
   adb start-server
   echo "$(date "+%Y-%m-%d %H:%M:%S") 重启adb完毕!"
-else
-  echo "无需重启Appium及adb服务"
 fi
 
 echo "$(date "+%Y-%m-%d %H:%M:%S") 正在重启服务..."

youtube/youtube_follow/youtube_follow.py

@@ -38,7 +38,7 @@ class Follow:
         :param log_type: 日志
         :param crawler: 哪款爬虫
         :param out_user_id: 站外用户 UID
-        :param machine: 部署机器，阿里云填写 aliyun，线下分别填写 macpro，macair，local
+        :param machine: 部署机器，阿里云填写 aliyun / aliyun_hk，线下分别填写 macpro，macair，local
         :return: browse_id
         """
         try:
@@ -53,7 +53,7 @@ class Follow:
             chrome_options.add_argument("--no-sandbox")
 
             # driver初始化
-            if machine == 'aliyun':
+            if machine == 'aliyun' or machine == 'aliyun_hk':
                 driver = webdriver.Chrome(desired_capabilities=ca, options=chrome_options)
             elif machine == 'macpro':
                 driver = webdriver.Chrome(desired_capabilities=ca, options=chrome_options, service=Service('/Users/lieyunye/Downloads/chromedriver_v86/chromedriver'))
@@ -377,7 +377,7 @@ class Follow:
         :param crawler: 哪款爬虫
         :param sheetid: 飞书表
         :param env: 正式环境:prod，测试环境:dev
-        :param machine: 部署机器，阿里云填写 aliyun，线下分别填写 macpro，macair，local
+        :param machine: 部署机器，阿里云填写 aliyun，aliyun_hk ，线下分别填写 macpro，macair，local
         :return: user_list
         """
         user_sheet = Feishu.get_values_batch(log_type, crawler, sheetid)