general_clickbot_hhh

INNNews/run_sheet_2.py

@@ -22,7 +22,7 @@ def run_once(pport, dockername):
     db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/seo?charset=utf8mb4')
     lst = []
     
-    cursor = db.query('select term, domain from seo.selected_kw')
+    cursor = db.query('select term, domain from seo.selected_kw where client!="毛怪"')
     for c in cursor:
         lst.append([c['term'], c['domain']])
     

monitor/general_clickbot_hhh.py

@@ -101,14 +101,11 @@ def run_once(q):
     user_agent = rua()
     options = webdriver.ChromeOptions()
     options.add_argument('--headless')
-<<<<<<< HEAD
     options.add_argument('--remote-debugging-port=9222')
     options.add_experimental_option("debuggerAddress", f"127.0.0.1:{q[2]}")
-=======
-    options.add_argument("--no-sandbox")
-    options.add_argument("--disable-dev-shm-usage")
-###    options.add_argument("--proxy-server=socks5://192.168.192.156:1080")
-    options.add_argument("--proxy-server=socks5://192.168.192.119:1080")
+#    options.add_argument("--no-sandbox")
+#    options.add_argument("--disable-dev-shm-usage")
+#    options.add_argument("--proxy-server=socks5://192.168.192.119:1080")
 
 #    options.add_argument("start-maximized")
 #    options.add_argument('--remote-debugging-port='+str(q[2]))
@@ -116,7 +113,6 @@ def run_once(q):
 #    options.add_argument("--user-agent=" +user_agent)
 #    options.add_argument('--remote-debugging-port=9222')
 #    options.add_experimental_option("debuggerAddress", "127.0.0.1:{q[2]}")
->>>>>>> d38b39b4e07b1ed66eb4980b06240a2e31f3ac76
     options.add_argument("--user-agent=" +user_agent)
     options.add_argument("--incognito")