修改cookies登录

amazingcoderpro · amazingcoderpro · commit 875276a606df · 2019-05-05T14:26:10.000+08:00
diff --git a/task_service/config/config.yaml b/task_service/config/config.yaml
@@ -34,6 +34,7 @@ system:
     screenshots_force: 0            # 是否强制在异常时截图，默认为false,代表只有在无头环境下才截图, 开发人员可以选择打开，更改为1即可
     screenshots_dir: screenshots    # 截图保存目录
     screenshots_keep: 5             # 默认保存最近5天的截图
+    force_display: 0                # 是否强制显示浏览器界面，默认为否
 
 support:
     captcha_in_api: "http://2captcha.com/in.php"
diff --git a/task_service/config/config_test.yaml b/task_service/config/config_test.yaml
@@ -34,6 +34,7 @@ system:
     screenshots_force: 1            # 是否强制在异常时截图，默认为false,代表只有在无头环境下才截图, 开发人员可以选择打开，更改为1即可
     screenshots_dir: screenshots    # 截图保存目录
     screenshots_keep: 10             # 默认保存最近15天的截图
+    force_display: 0                # 是否强制显示浏览器界面，默认为否
 
 support:
     captcha_in_api: "http://2captcha.com/in.php"
diff --git a/task_service/executor/facebook/base_actions.py b/task_service/executor/facebook/base_actions.py
@@ -27,7 +27,7 @@ def __init__(self, account_info, finger_print={},
         self.password = account_info.get("password", "")
         self.gender = account_info.get("gender", 1)
         self.phone_number = account_info.get("phone_number", "")
-        self.cookies = account_info.get("cookies", "")
+        self.cookies = account_info.get("configure", {}).get("cookies", "")
         self.start_url = start_url
         self.fb_exp = None
         super(FacebookActions, self).__init__(finger_print=finger_print, headless=headless)
diff --git a/task_service/start_worker.py b/task_service/start_worker.py
@@ -68,21 +68,44 @@
     import subprocess
     env = "pro"
     save_log = True
+    queue_names = "default"
+    concurrent = 4
     input_env = input("Please input execute environment(pro/test):")
     if input_env and input_env in ["pro", 'test']:
         env = input_env
     else:
-        print("use default env: pro")
+        print("use default env: {}".format(env))
 
-    is_log_file = input("is save log to file(yes/no):")
+    queue_names_input = input("Please input queue name(separate multiples with commas):")
+    if queue_names_input:
+        queue_names = queue_names_input
+        queue_names = queue_names.replace(' ', '')
+    else:
+        print("use default queue: {}".format(queue_names))
+
+    concurrent_input = input("Please input concurrent numbers(default:4):")
+    try:
+        concurrent = int(concurrent_input)
+    except:
+        print("use default concurrent: {}".format(concurrent))
+
+    is_log_file = input("Is save log to file(yes/no):")
     if is_log_file and is_log_file in ["yes", 'no']:
         if "no" in is_log_file:
             save_log = False
+            print("don't save log in file")
+        else:
+            print("Save log in file")
+    else:
+        print("Save log in file")
 
     if save_log:
-        subprocess.call("celery -A start_worker -Q default,China,American,Japan worker -l info -c 4 -Ofair -f logs/celery_{}.log -env {}".format(
-            datetime.datetime.now().strftime("%Y-%m-%d_%H_%M_%S"), env), shell=True)
+        celery_cmd = "celery -A start_worker -Q {} worker -l info -c {} -Ofair -f logs/celery_{}.log -env {}".format(
+            queue_names, concurrent, datetime.datetime.now().strftime("%Y-%m-%d_%H_%M_%S"), env)
     else:
-        subprocess.call(
-            "celery -A start_worker -Q default,China,American,Japan worker -l info -c 4 -Ofair -env {}".format(env), shell=True)
+        celery_cmd = "celery -A start_worker -Q {} worker -l info -c {} -Ofair -env {}".format(
+            queue_names, concurrent, env)
+
+    print("Celery cmd: {}".format(celery_cmd))
+    subprocess.call(celery_cmd, shell=True)
 
diff --git a/task_service/tasks/processor.py b/task_service/tasks/processor.py
@@ -6,7 +6,7 @@
 import datetime
 from start_worker import app
 from db import JobOpt, Job, Task, TaskCategory, Agent, TaskAccountGroup, Account, Scheduler, FingerPrint, Area
-from config import logger, get_environment
+from config import logger, get_environment, get_system_args
 from db.basic import ScopedSession
 from sqlalchemy import and_
 
@@ -124,10 +124,14 @@ def send_task_2_worker(task_id):
 
             active_browser = db_scoped_session.query(FingerPrint.value).filter(FingerPrint.id == active_browser_id).first()
 
+            if get_system_args()["force_display"] == 0:
+                headless = True if get_environment() == 'pro' else False
+            else:
+                headless = False
             # 构建任务执行必备参数
             inputs = {
                 'system': {
-                    'headless': True if get_environment() == 'pro' else False
+                    'headless': headless
                 },
                 'task': {
                     'task_id': task_id,
