From b14bafa0c25d3d43fbe1d4465de020f922f436c5 Mon Sep 17 00:00:00 2001
From: lixiaofang <550859704@qq.com>
Date: Mon, 22 Apr 2019 16:55:49 +0800
Subject: [PATCH] add
---
.idea/codeStyles/Project.xml | 24 ++++++++++++++++++++++++
majia/tasks.py | 5 +++--
physical/celery_task_router.py | 6 +++---
3 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 565c3479..6d799a05 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -24,5 +24,29 @@
<option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
</formatting-settings>
</DBN-SQL>
+ <DBN-PSQL>
+ <case-options enabled="false">
+ <option name="KEYWORD_CASE" value="lower" />
+ <option name="FUNCTION_CASE" value="lower" />
+ <option name="PARAMETER_CASE" value="lower" />
+ <option name="DATATYPE_CASE" value="lower" />
+ <option name="OBJECT_CASE" value="preserve" />
+ </case-options>
+ <formatting-settings enabled="false" />
+ </DBN-PSQL>
+ <DBN-SQL>
+ <case-options enabled="false">
+ <option name="KEYWORD_CASE" value="lower" />
+ <option name="FUNCTION_CASE" value="lower" />
+ <option name="PARAMETER_CASE" value="lower" />
+ <option name="DATATYPE_CASE" value="lower" />
+ <option name="OBJECT_CASE" value="preserve" />
+ </case-options>
+ <formatting-settings enabled="false">
+ <option name="STATEMENT_SPACING" value="one_line" />
+ <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
+ <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
+ </formatting-settings>
+ </DBN-SQL>
</code_scheme>
</component>
\ No newline at end of file
diff --git a/majia/tasks.py b/majia/tasks.py
index a3fcc2a8..8ec8eea3 100644
--- a/majia/tasks.py
+++ b/majia/tasks.py
@@ -3,9 +3,9 @@ import traceback
import logging
from celery import shared_task
-
login_url = "http://earth.igengmei.com/api/account/login_pwd"
+
def index_first():
try:
r1 = requests.get(login_url)
@@ -16,9 +16,10 @@ def index_first():
return None
+
@shared_task(name="majia.tasks.get_cook")
def get_cook():
- data = open("srv/apps/physical/majia/majia_email.txt","r")
+ data = open("srv/apps/physical/majia/majia_email.txt", "r")
list = []
dicts = {}
diff --git a/physical/celery_task_router.py b/physical/celery_task_router.py
index 375581ea..b7c23edd 100644
--- a/physical/celery_task_router.py
+++ b/physical/celery_task_router.py
@@ -4,20 +4,20 @@ from django.conf import settings
import itertools
import logging
+
class CeleryTaskRouter(object):
queue_task_map = {
"tapir-alpha": [
'injection.data_sync.tasks.write_to_es',
],
"majia-alpha": [
- 'injection.data_sync.auto_instant_click.auto_click',
+ 'majia.auto_instant_click.auto_click',
],
"majia-alpha": [
- 'injection.data_sync.auto_instant_click.auto_reply',
+ 'majia.auto_instant_click.auto_reply',
]
}
-
# Map[TaskName, QueueName]
task_queue_map = dict(itertools.chain.from_iterable(
[(task, queue) for task in task_list]
--
2.18.0