Forráskód Böngészése

Merge branch 'master' of http://git.choozmo.com:3000/choozmo/kw_tools

root 2 éve
szülő
commit
1904cf8d78
1 módosított fájl, 20 hozzáadás és 0 törlés
  1. 20 0
      INNNews/general_clickbot_proxy.py

+ 20 - 0
INNNews/general_clickbot_proxy.py

@@ -105,6 +105,7 @@ def run_once(q):
     options.add_experimental_option("debuggerAddress", "127.0.0.1:9922")
     # options.add_argument("--user-agent=" +user_agent)
     options.add_argument("--incognito")
+<<<<<<< HEAD
     r = redis.Redis(host='db.ptt.cx', port=6379, db=2,password='choozmo9')
     data=r.get('google_proxy')
     jstext=data.decode('utf-8')
@@ -115,6 +116,21 @@ def run_once(q):
     options.add_argument('--proxy-server=socks5://192.53.174.202:8180')
     driver = webdriver.Chrome(
     options=options,service=s)
+=======
+    if 'sorry' in driver.current_url:
+        r = redis.Redis(host='db.ptt.cx', port=6379, db=2,password='choozmo9')
+        data=r.get('google_proxy')
+        jstext=data.decode('utf-8')
+        jsobj=json.loads(jstext)
+        print('Free proxy',jsobj)
+        proxy=random.choice(jsobj)
+        change_ip_list = ['--proxy-server=%s' % proxy,"--proxy-server=socks5://127.0.0.1:9050","--proxy-server=socks5://192.53.174.202:8180"]
+        change_ip = random.choice(change_ip_list)
+        options.add_argument(change_ip)
+        print('使用代理ip',change_ip)
+        
+    driver = webdriver.Chrome(options=options,service=s)
+>>>>>>> 28b37f8f0a95c485aaf3da04362d35694cb233c9
 
     driver.delete_all_cookies()
     driver.set_window_size(1400,1000)
@@ -136,9 +152,13 @@ def run_once(q):
 class JParams(object):
 
   def get(self, kw,domain,port):
+<<<<<<< HEAD
     os.system('docker container restart tiny1')
     time.sleep(1)
     run_once( ('台北 禮儀 社','sctt.com.tw','tiny1')   )
+=======
+    run_once( (kw,domain,port) )
+>>>>>>> 28b37f8f0a95c485aaf3da04362d35694cb233c9
 
 
 if __name__ == '__main__':