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

gen_seo2.py

@@ -1,28 +1,24 @@
-# import redis
-import time
 import traceback
-# import json
-from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
-import time
-import os
-from selenium.webdriver.support.ui import WebDriverWait
-from selenium.webdriver.support import expected_conditions as EC
 import dataset
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.chrome.service import Service
 import json
-import random
-import time
 import redis
 import sys
-import codecs
 import random
 import os
 import time
+<<<<<<< HEAD
 from userAgentRandomizer import userAgents
 
+=======
+import requests
+#import pymysql
+
+#pymysql.install_as_MySQLdb()
+>>>>>>> 60aab8b5861808a3b1359bbffc1117b5d72236d4
 driver = None
 
 db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/seo?charset=utf8mb4')

test_ip.py

@@ -24,11 +24,8 @@ def re_get_webdriver():
         print('quit....')
         driver = None
     try:
-<<<<<<< HEAD
         s = Service('/root/driver/chromedriver102')
-=======
         #s = Service('/root/driver/chromedriver')
->>>>>>> 74e6d014f895aed8af2d3b229efb941e56630b4b
         options = webdriver.ChromeOptions()
         options.add_argument("--no-sandbox")
         options.add_argument("--disable-dev-shm-usage")
@@ -47,7 +44,7 @@ def re_get_webdriver():
         options.add_argument('--proxy-server=%s' % proxy)
         print('使用代理ip', change_ip)
         #driver.delete_all_cookies()
-        driver = webdriver.Chrome(service=s, options=options)
+        driver = webdriver.Chrome(options=options,service=s)
         driver.set_window_size(1400, 1000)
     except:
         traceback.print_exc()
@@ -64,6 +61,6 @@ def run_once():
     print(ip_address)
     driver.quit()
 
-os.system('docker container restart tiny6')
+#os.system('docker container restart tiny6')
 time.sleep(1)
 run_once()