Merge remote-tracking branch 'origin/master'

# Conflicts:
#	monitor/general_clickbot_hhh.py

monitor/general_clickbot_hhh.py

@@ -27,6 +27,10 @@ table=db['general_log']
 
 
 driver = None
+headers = {
+        "Authorization": "Bearer " + "6SDULL1Ebklduc6TFxa97AFto5Sj21kyJ30CxiLiSoi",
+        "Content-Type": "application/x-www-form-urlencoded"
+}
 
 
 def rua():
@@ -69,6 +73,8 @@ def process_query(qs):
     idx=1
     ranking=-1
     print('搜尋結果數量',len(elmts))
+    if len(elmts) <=0:
+        send_msg('network failed...')
 #    driver.save_screenshot('c:/tmp/test.png')
 
     for elmt in elmts:
@@ -96,7 +102,7 @@ def run_once(q):
     options = webdriver.ChromeOptions()
     options.add_argument('--headless')
     options.add_argument('--remote-debugging-port=9222')
-    options.add_experimental_option("debuggerAddress", f"127.0.0.1:{q[2]}")
+    options.add_experimental_option("debuggerAddress", "127.0.0.1:{q[2]}")
     options.add_argument("--user-agent=" +user_agent)
     options.add_argument("--incognito")
 
@@ -109,23 +115,7 @@ def run_once(q):
     process_query(q)
     time.sleep(3)
     driver.quit()
-
-
-#for c in lst:
-#while True:
-#    try:
-#        c=random.choice(lst)
-#    except:
-#        traceback.print_exc()
-#    sleepint=random.randint(320,520)
-#    time.sleep(sleepint)
-
-class JParams(object):
-
-  def get(self, kw,domain,port):
-    print(kw)
-    print(domain)
-    run_once( (kw,domain,port)   )
+    sys.exit()
 
 
 if __name__ == '__main__':

monitor/hhh3.py

@@ -0,0 +1,84 @@
+import sys
+import codecs
+import traceback
+import requests
+import re
+import pandas as pd
+import random
+import urllib
+import json
+import gspread
+import datetime
+from gspread_pandas import Spread, Client
+from oauth2client.service_account import ServiceAccountCredentials
+import os
+import redis
+import time
+import fire
+import dataset
+
+
+db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/seo?charset=utf8mb4')
+lst=[]
+cursor = db.query('SELECT query FROM seo.hhh_gsc_imp where position >=2.5 and position <=8.5 order by rand();')
+
+for c in cursor:
+    lst.append([c['query']])
+
+
+def run_once(pport, dockername):
+    global lst
+#    seeds=['室內 設計','室內設計','客廳 裝潢','裝潢','房間 設計','台北','台北 設計','台北 室內','台北  室內 設計','電視 牆','電視','裝潢 設計','裝潢 室內','室內 設計 費用','設計 費用','居家 空間 設計','居家 設計','居家 空間','空間 設計','衣魚','玄關設計','房間佈置','量子電視','小坪數裝潢','踢腳板','清潔劑','班傑明油漆','冰箱除臭']
+#    lst=[['衣櫃設計'],['磁磚尺寸'],['幸福空間設計'],['養魚風水'],['房間風水'],['衣魚'],['冰箱除臭'],['大腸鏡檢查費用'],['房間佈置'],['潮濕蟲漂白水'],['小坪數裝潢'],['幸福空間'],['衣櫃設計'],['門對門'],['玄關設計'],['幸福空間'],['幸福空間'],['衣魚有害嗎'],['幸福空間'],['幸福空間 稅']]
+#    lst=[['衣櫃設計'],['磁磚尺寸'],['幸福空間設計'],['養魚風水'],['房間風水'],['衣魚'],['冰箱除臭'],['大腸鏡檢查費用'],['房間佈置'],['潮濕蟲漂白水'],['小坪數裝潢'],['幸福空間'],['衣櫃設計'],['門對門'],['玄關設計'],['幸福空間'],['幸福空間'],['衣魚有害嗎'],['幸福空間'],['幸福空間 稅']]
+
+#    for s in seeds:
+#        lst.append([s+' 幸福'])
+#        lst.append([s+' 幸福空間'])
+#       lst.append([s+' 幸福 空間'])
+
+#    lst = [['幸福空間'],['開運植物  幸福空間'],['幸福 文化美藏'],['三井牙醫  幸福空間'],['現代混搭 幸福空間'],['簡單的事 幸福空間'],['古典風雅 幸福空間'],['木藝 幸福空間']]
+#    lst = [['幸福空間'],['開運植物  幸福空間'],['幸福 文化美藏'],['三井牙醫  幸福空間'],['現代混搭 幸福空間'],['簡單的事 幸福空間'],['古典風雅 幸福空間'],['木藝 幸福空間']]
+
+
+#    cursor = db.query('SELECT * FROM hhh.seo_designer order by rand() limit 40')
+
+    obj = random.choice(lst)
+    print(obj)
+    kw = obj[0]
+    domain = 'hhh.com.tw'
+    print(kw,domain)
+
+    s = f'python3 general_clickbot_hhh.py get --kw="{kw}" --domain="{domain}" --port={str(pport)}'
+
+    intval = os.system(f'python3 general_clickbot_hhh.py get --kw="{kw}" --domain="{domain}" --port="{str(pport)}"')
+    
+    print('執行genetal_clickbot')
+
+    if intval == -1:
+        print('-1')
+        sys.exit()
+
+
+class JParams(object):
+    
+    def get(self, port=9222):
+        while True:
+            try:
+                os.system('docker container restart tiny4')
+                os.system('docker container restart tiny5')
+                os.system('docker container restart tiny6')
+                time.sleep(1)
+                run_once(9934, 'tiny4')
+                run_once(9935, 'tiny5')
+                run_once(9936, 'tiny6')
+                time.sleep(20)
+
+            except:
+                os.system('docker container restart tiny4')
+                time.sleep(15)
+
+
+if __name__ == '__main__':
+    fire.Fire(JParams)
+

tests/rpc_key_test.py

@@ -3,15 +3,22 @@ import time
 import schedule
 import traceback
 
-s1={'ip':'192.168.192.199','names':['poi1','poi2','poi3','poi4']} #MBA_HOME
+#s1={'ip':'192.168.192.199','names':['poi1','poi2','poi3','poi4']} #MBA_HOME
+s1={'ip':'192.168.192.199','names':['poi1']} #MBA_HOME
+
 #s2={'ip':'192.168.192.58','names':['poi1','poi2','poi3']} #RDP_HOME
-s3={'ip':'192.168.192.146','names':['poi1','poi2']} #TOSHIBA
+#s3={'ip':'192.168.192.146','names':['poi1','poi2']} #TOSHIBA
+s3={'ip':'192.168.192.146','names':['poi1']} #TOSHIBA
+
 s4={'ip':'192.168.192.45','names':['poi1','poi2','poi3']} #public1
 #s5={'ip':'192.168.192.156','names':['seo1','seo2']} #32g
-s5={'ip':'192.168.192.156','names':['poi1','poi2','poi3','poi4','poi5','poi6']} #32g
+s5={'ip':'192.168.192.156','names':['poi1']} #32g
+#s5={'ip':'192.168.192.156','names':['poi1','poi2','poi3','poi4','poi5','poi6']} #32g
+
 #s5={'ip':'192.168.192.156','names':['hhhclick1','hhhclick2','seo1','seo2']}
 #s6={'ip':'192.168.192.9','names':['poi1','poi2','poi3','poi4','poi5','poi6','poi7','poi8','poi9','poi10','poi11','poi12','poi13','poi14','poi15','poi16']} #64G
-s6={'ip':'192.168.192.9','names':['poi1','poi2','poi3','poi4','poi5']} #64G
+#s6={'ip':'192.168.192.9','names':['poi1','poi2','poi3','poi4','poi5']} #64G
+s6={'ip':'192.168.192.9','names':['poi1']} #64G
 
 s7={'ip':'192.168.192.139','names':['poi1','poi2','poi3','poi4','poi5','poi6','poi7','poi8','poi9','poi10','poi11','poi12','poi13','poi14','poi15','poi16']} #alston1
 s8={'ip':'192.168.192.43','names':['poi1','poi2','poi3','poi4','poi5','poi6','poi7','poi8','poi9','poi10','poi11','poi12','poi13','poi14','poi15','poi16']} #alston2