Skip to content

V
vest
Commit b3f07036 authored by 李小芳's avatar 李小芳
Browse files
Options

Merge branch 'hkx/feature/rpc-method-header' into 'test' 

Hkx/feature/rpc method header

See merge request !17
parents 45321f83 1877d5da
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 357 additions and 98 deletions
Dockerfile
View file @ b3f07036
...@@ -37,7 +37,7 @@ RUN apk add --no-cache --virtual .build-deps \ ...@@ -37,7 +37,7 @@ RUN apk add --no-cache --virtual .build-deps \
\ \
# 取消ssh第一次链接的确认 # 取消ssh第一次链接的确认
&& echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config \ && echo "StrictHostKeyChecking no" >> /etc/ssh/ssh_config \
&& apk add --no-cache mariadb-connector-c-dev libxml2-dev libxslt-dev librdkafka-dev \ && apk add --no-cache build-base mariadb-connector-c-dev libxml2-dev libxslt-dev librdkafka-dev libexecinfo libexecinfo-dev snappy snappy-dev \
&& pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \ && pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/requirements.txt \
&& mkdir -p /data/log/vest/app && mkdir -p /data/log/vest/app
......
click/views/click_fun.py
View file @ b3f07036
...@@ -5,35 +5,52 @@ import logging ...@@ -5,35 +5,52 @@ import logging
from libs.cache import redis_client from libs.cache import redis_client
import json import json
from moment.views.send_email import send_email_tome from moment.views.send_email import send_email_tome
import datetime
def click(card_info): def click(card_info):
try: try:
rpc_invoker = get_rpc_invoker() today = datetime.datetime.now()
rpc_invoker['qa/irrigation/create_answer_vote'](user_id=card_info['current_user_id'], str_today = str(today.year) + str(today.month) + str(today.day)
answer_id=card_info['card_id']).unwrap() key = "auto_vest_one_user_action_answer:" + str(card_info['card_id'])
key = "auto_vest_one_user_action:" + str(card_info['card_id']) redis_data = redis_client.hget(key, str_today)
redis_data = redis_client.get(key)
if redis_data: if redis_data:
redis_data = json.loads(redis_data) redis_data = json.loads(str(redis_data, encoding="utf8"))
click_num = int(redis_data.get("click")) + 1 click_num = int(redis_data.get("click")) + 1
redis_data['click'] = click_num redis_data['click'] = click_num
redis_client.set(key, json.dumps(redis_data)) redis_client.hset(key, str_today, json.dumps(redis_data))
else: else:
##代表还没有存储或者是已经过去一天了 需要清掉数据 从新的一天开始
redis_client.delete(key)
redis_data = {"click": 1, "follow": 0, "comment": 0} redis_data = {"click": 1, "follow": 0, "comment": 0}
redis_client.set(key, json.dumps(redis_data)) redis_client.hset(key, str_today, json.dumps(redis_data))
redis_client.expire(key, time=24 * 60 * 60)
logging.info("get redis_data:%s" % redis_data) logging.info("get action:click,card_id:%s,redis_data:%s" % (card_info['card_id'], redis_data))
click_num = redis_data["click"]
values = list(redis_data.values()) if click_num > 12:
s = [True for i in values if i > 10] logging.info("今天已经消费到最大次数了，不能再消费")
if len(s) > 0: return True, False
send_email_tome(str(redis_data) + str(card_info)) else:
rpc_invoker = get_rpc_invoker()
try:
status = rpc_invoker['qa/irrigation/create_answer_vote'](user_id=card_info['current_user_id'],
answer_id=card_info['card_id']).unwrap()
return True logging.info("get_card_info:%s,create_answer_vote:%s" % (card_info, status))
error = status.get('error', 1)
if error == 0:
return True, True
else:
send_email_tome(str(card_info) + str(status))
return False, True
except:
logging_exception()
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return False, True
except: except:
logging_exception() logging_exception()
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return False return False, False
comment/views/auto_comment.py
View file @ b3f07036
...@@ -62,6 +62,7 @@ def auto_comment_user(card_info, after_day=False): ...@@ -62,6 +62,7 @@ def auto_comment_user(card_info, after_day=False):
if card_info['type'] == "get_write_answer_userinfo": if card_info['type'] == "get_write_answer_userinfo":
repeat_time = 0 repeat_time = 0
card_info['have_comment_number'] = 0 card_info['have_comment_number'] = 0
get_time, time_region = get_content_time_by_create_time(create_time, content_level, get_time, time_region = get_content_time_by_create_time(create_time, content_level,
action_type="comment", action_type="comment",
after_day=after_day, after_day=after_day,
......
comment/views/comment_fun.py
View file @ b3f07036
...@@ -5,36 +5,160 @@ import logging ...@@ -5,36 +5,160 @@ import logging
from libs.cache import redis_client from libs.cache import redis_client
import json import json
from moment.views.send_email import send_email_tome from moment.views.send_email import send_email_tome
import datetime
from moment.views.process_time import get_vest_userid_and_comment
def comment(card_info): def comment(card_info):
"""
在这里需要判断是帖子下发评论还是问答还是日记下发
:param card_info:
:return:
"""
try: try:
rpc_invoker = get_rpc_invoker() if card_info['card_status'] == 'tractate':
rpc_invoker['qa/irrigation/create_answer_reply'](user_id=card_info['current_user_id'], today = datetime.datetime.now()
answer_id=card_info['card_id'], str_today = str(today.year) + str(today.month) + str(today.day)
content=card_info['comment_content']).unwrap() key = "auto_vest_one_user_action_tractate:" + str(card_info['card_id'])
#### redis_data = redis_client.hget(key, str_today)
key = "auto_vest_one_user_action:" + str(card_info['card_id'])
redis_data = redis_client.get(key) if redis_data:
if redis_data: redis_data = json.loads(str(redis_data, encoding="utf8"))
redis_data = json.loads(redis_data) click_num = int(redis_data.get("comment")) + 1
click_num = int(redis_data.get("comment")) + 1 redis_data['comment'] = click_num
redis_data['comment'] = click_num redis_client.hset(key, str_today, json.dumps(redis_data))
redis_client.set(key, json.dumps(redis_data)) else:
##代表还没有存储或者是已经过去一天了 需要清掉数据 从新的一天开始
redis_client.delete(key)
redis_data = {"comment": 1}
redis_client.hset(key, str_today, json.dumps(redis_data))
logging.info("get action:comment,card_id:%s,redis_data:%s" % (card_info['card_id'], redis_data))
comment_num = redis_data["comment"]
if comment_num > 12:
logging.info("今天已经消费到最大次数了，不能再消费")
else:
try:
rpc_invoker = get_rpc_invoker()
status = rpc_invoker['qa/irrigation/create_answer_reply'](user_id=card_info['current_user_id'],
answer_id=card_info['card_id'],
content=card_info[
'comment_content']).unwrap()
logging.info("get_card_info:%s,have_answer_reply:%s" % (card_info, status))
error = status.get('error', 1)
if error == 0 and comment_num <= 11:
return True, True
elif error == 0 and comment_num > 11:
return True, False
else:
send_email_tome(str(card_info) + str(status))
return False, False
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return False, False
elif card_info['card_status'] == 'diary':
today = datetime.datetime.now()
str_today = str(today.year) + str(today.month) + str(today.day)
key = "auto_vest_one_user_action_diary:" + str(card_info['card_id'])
redis_data = redis_client.hget(key, str_today)
if redis_data:
redis_data = json.loads(str(redis_data, encoding="utf8"))
click_num = int(redis_data.get("comment")) + 1
redis_data['comment'] = click_num
redis_client.hset(key, str_today, json.dumps(redis_data))
else:
redis_client.delete(key)
redis_data = {"comment": 1}
redis_client.hset(key, str_today, json.dumps(redis_data))
logging.info("get action:comment,card_id:%s,redis_data:%s" % (card_info['card_id'], redis_data))
comment_num = redis_data["comment"]
if comment_num > 12:
logging.info("今天已经消费到最大次数了，不能再消费")
else:
try:
rpc_invoker = get_rpc_invoker()
status = rpc_invoker['qa/irrigation/create_answer_reply'](user_id=card_info['current_user_id'],
answer_id=card_info['card_id'],
content=card_info[
'comment_content']).unwrap()
logging.info("get_card_info:%s,have_answer_reply:%s" % (card_info, status))
error = status.get('error', 1)
if error == 0:
return True
else:
send_email_tome(str(card_info) + str(status))
return False
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return False
else: else:
redis_data = {"click": 0, "follow": 0, "comment": 1} today = datetime.datetime.now()
redis_client.set(key, json.dumps(redis_data)) str_today = str(today.year) + str(today.month) + str(today.day)
redis_client.expire(key, time=24 * 60 * 60) key = "auto_vest_one_user_action_answer:" + str(card_info['card_id'])
redis_data = redis_client.hget(key, str_today)
if redis_data:
redis_data = json.loads(str(redis_data, encoding="utf8"))
click_num = int(redis_data.get("comment")) + 1
redis_data['comment'] = click_num
redis_client.hset(key, str_today, json.dumps(redis_data))
else:
redis_client.delete(key)
redis_data = {"click": 0, "follow": 0, "comment": 1}
redis_client.hset(key, str_today, json.dumps(redis_data))
logging.info("get action:comment,card_id:%s,redis_data:%s" % (card_info['card_id'], redis_data))
comment_num = redis_data["comment"]
###判断一下如果评论为空就重新拿一个
if not card_info['comment_content']:
comment = get_vest_userid_and_comment(need_comment_num=1, tag_names=card_info['tag_names'])[0]
card_info['comment_content'] = comment
logging.info("get redis_data:%s" % redis_data) ##在这里加一个判断 如果当前的评论的user_id和评论内容已经在这个评论下了就不再下发给同一个回答ID
else:
key = 'have_reply_answer_comment:' + str(card_info['card_id'])
redis_data = redis_client.hget(key, card_info['current_user_id'])
if redis_data:
datas = json.loads(redis_data, encoding="utf-8")
if card_info['comment_content'] in datas:
logging.info("当前评论和当前的用户已经存在了")
pass
else:
datas.append(card_info['comment_content'])
redis_client.hset(key, card_info['current_user_id'], json.dumps(datas))
else:
conent = [card_info['comment_content']]
redis_client.hset(key, card_info['current_user_id'], json.dumps(conent))
values = list(redis_data.values()) if comment_num > 12:
s = [True for i in values if i > 10] logging.info("今天已经消费到最大次数了，不能再消费")
if len(s) > 0: return True, False
send_email_tome(str(redis_data) + str(card_info))
return True else:
rpc_invoker = get_rpc_invoker()
try:
status = rpc_invoker['qa/irrigation/create_answer_reply'](user_id=card_info['current_user_id'],
answer_id=card_info['card_id'],
content=card_info[
'comment_content']).unwrap()
logging.info("get_card_info:%s,have_answer_reply:%s" % (card_info, status))
error = status.get('error', 1)
if error == 0:
return True, True
else:
send_email_tome(str(card_info) + str(status))
return False, True
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return False, True
except: except:
logging_exception() logging_exception()
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return False return False, False
follow/views/auto_follow.py
View file @ b3f07036
...@@ -93,6 +93,7 @@ def auto_follow_user(card_info, after_day=False): ...@@ -93,6 +93,7 @@ def auto_follow_user(card_info, after_day=False):
card_info['current_push_time'] = card_info['all_push_time'][0] card_info['current_push_time'] = card_info['all_push_time'][0]
save_data_to_kafka(card_info) # 存储数据 save_data_to_kafka(card_info) # 存储数据
logging.info("get-------follow---------------card_info:%s" % card_info)
except: except:
logging_exception() logging_exception()
......
follow/views/follow_fun.py
View file @ b3f07036
...@@ -5,34 +5,50 @@ import logging ...@@ -5,34 +5,50 @@ import logging
from libs.cache import redis_client from libs.cache import redis_client
import json import json
from moment.views.send_email import send_email_tome from moment.views.send_email import send_email_tome
import datetime
def follow(card_info): def follow(card_info):
try: try:
rpc_invoker = get_rpc_invoker() today = datetime.datetime.now()
rpc_invoker['api/irrigation/user_add_follow'](follow_user_id=card_info['current_user_id'], str_today = str(today.year) + str(today.month) + str(today.day)
followed_user_id=card_info['card_user_id']).unwrap() key = "auto_vest_one_user_action_answer:" + str(card_info['card_id'])
redis_data = redis_client.hget(key, str_today)
key = "auto_vest_one_user_action:" + str(card_info['card_id'])
redis_data = redis_client.get(key)
if redis_data: if redis_data:
redis_data = json.loads(redis_data) redis_data = json.loads(str(redis_data, encoding="utf8"))
click_num = int(redis_data.get("follow")) + 1 click_num = int(redis_data.get("follow")) + 1
redis_data['follow'] = click_num redis_data['follow'] = click_num
redis_client.set(key, json.dumps(redis_data)) redis_client.hset(key, str_today, json.dumps(redis_data))
else: else:
redis_client.delete(key)
redis_data = {"click": 0, "follow": 1, "comment": 0} redis_data = {"click": 0, "follow": 1, "comment": 0}
redis_client.set(key, json.dumps(redis_data)) redis_client.hset(key, str_today, json.dumps(redis_data))
redis_client.expire(key, time=24 * 60 * 60)
logging.info("get action:follow,card_id:%s,redis_data:%s" % (card_info['card_id'], redis_data))
follow_num = redis_data["follow"]
logging.info("get redis_data:%s" % redis_data) if follow_num > 11:
values = list(redis_data.values()) logging.info("今天已经消费到最大次数了，不能再消费")
s = [True for i in values if i > 10] return True, False
if len(s) > 0:
send_email_tome(str(redis_data) + str(card_info)) else:
rpc_invoker = get_rpc_invoker()
try:
status = rpc_invoker['api/irrigation/user_add_follow'](follow_user_id=card_info['current_user_id'],
followed_user_id=card_info[
'card_user_id']).unwrap()
logging.info("get_card_info:%s,user_add_follow:%s" % (card_info, status))
return True error = status.get('error', 1)
if error == 0:
return True, True
else:
send_email_tome(str(card_info) + str(status))
return False, True
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return False, True
except: except:
logging_exception() logging_exception()
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return False return False, False
moment/views/consum.py
View file @ b3f07036
This diff is collapsed.
moment/views/irrigation.py
View file @ b3f07036
...@@ -14,6 +14,16 @@ from libs.error import logging_exception ...@@ -14,6 +14,16 @@ from libs.error import logging_exception
@bind('vest/moment/vest_irrigation') @bind('vest/moment/vest_irrigation')
def vest_irrigation(card_id=0, card_type=None, card_user_id=None, create_time="", content_level=0, tag_names=[]): def vest_irrigation(card_id=0, card_type=None, card_user_id=None, create_time="", content_level=0, tag_names=[]):
"""
在这里把后端传的数据存进卡夫卡 日记和帖子只需要发评论不需要点赞和关注
:param card_id:
:param card_type:
:param card_user_id:
:param create_time:
:param content_level:
:param tag_names:
:return:
"""
try: try:
producer = KafkaProducer(bootstrap_servers=settings.KAFKA_BROKER_LIST) producer = KafkaProducer(bootstrap_servers=settings.KAFKA_BROKER_LIST)
...@@ -32,6 +42,7 @@ def vest_irrigation(card_id=0, card_type=None, card_user_id=None, create_time="" ...@@ -32,6 +42,7 @@ def vest_irrigation(card_id=0, card_type=None, card_user_id=None, create_time=""
comment_msg_dict = { comment_msg_dict = {
"card_id": card_id, "card_id": card_id,
"card_type": "auto_vest", "card_type": "auto_vest",
'card_status': card_type,
"create_time": create_time, "create_time": create_time,
"content_level": content_level, "content_level": content_level,
"tag_names": tag_names, "tag_names": tag_names,
...@@ -43,32 +54,35 @@ def vest_irrigation(card_id=0, card_type=None, card_user_id=None, create_time="" ...@@ -43,32 +54,35 @@ def vest_irrigation(card_id=0, card_type=None, card_user_id=None, create_time=""
logging.info("get comment_msg_dict:%s" % comment_msg_dict) logging.info("get comment_msg_dict:%s" % comment_msg_dict)
producer.send(topic, json.dumps(comment_msg_dict).encode()) producer.send(topic, json.dumps(comment_msg_dict).encode())
follow_msg_dict = { if card_type == 'answer':
"card_id": card_id, follow_msg_dict = {
"card_type": "auto_vest", "card_id": card_id,
"create_time": create_time, "card_type": "auto_vest",
"content_level": content_level, 'card_status': card_type,
"tag_names": tag_names, "create_time": create_time,
"type": "get_write_answer_userinfo", "content_level": content_level,
"current_push_time": create_time, "tag_names": tag_names,
'action_type': 'follow', "type": "get_write_answer_userinfo",
'card_user_id': card_user_id "current_push_time": create_time,
'action_type': 'follow',
'card_user_id': card_user_id
} }
producer.send(topic, json.dumps(follow_msg_dict).encode()) producer.send(topic, json.dumps(follow_msg_dict).encode())
click_msg_dict = { click_msg_dict = {
"card_id": card_id, "card_id": card_id,
"card_type": "auto_vest", "card_type": "auto_vest",
"create_time": create_time, 'card_status': card_type,
"content_level": content_level, "create_time": create_time,
"tag_names": tag_names, "content_level": content_level,
"type": "get_write_answer_userinfo", "tag_names": tag_names,
"current_push_time": create_time, "type": "get_write_answer_userinfo",
'action_type': 'click' "current_push_time": create_time,
'action_type': 'click'
} }
producer.send(topic, json.dumps(click_msg_dict).encode()) producer.send(topic, json.dumps(click_msg_dict).encode())
producer.close() producer.close()
......
moment/views/process_time.py
View file @ b3f07036
...@@ -17,6 +17,18 @@ from bs4 import BeautifulSoup ...@@ -17,6 +17,18 @@ from bs4 import BeautifulSoup
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
producer = KafkaProducer(bootstrap_servers=settings.KAFKA_BROKER_LIST) producer = KafkaProducer(bootstrap_servers=settings.KAFKA_BROKER_LIST)
db_mimas_eagle = pymysql.connect(host=settings.HOST, port=settings.PORT, user=settings.USER,
password=settings.PASSWORD,
db=settings.NAME)
mimas_cursor = db_mimas_eagle.cursor()
db_zhengxing_eagle = pymysql.connect(host=settings.HOST1, port=settings.PORT, user=settings.USER1,
password=settings.PASSWORD1,
db=settings.NAME1)
zhengxing_cursor = db_zhengxing_eagle.cursor()
def strTimeProp(start, end, prop, frmt): def strTimeProp(start, end, prop, frmt):
stime = time.mktime(time.strptime(start, frmt)) stime = time.mktime(time.strptime(start, frmt))
...@@ -30,10 +42,10 @@ def randomDate(create_time, frmt='%Y-%m-%d %H:%M:%S', action_type=None): ...@@ -30,10 +42,10 @@ def randomDate(create_time, frmt='%Y-%m-%d %H:%M:%S', action_type=None):
action_num = random.randint(1, 3) action_num = random.randint(1, 3)
if action_type == "comment": if action_type == "comment":
action_num = random.randint(0, 1) action_num = random.randint(1, 2)
start = str(create_time + datetime.timedelta(hours=2)) start = str(create_time + datetime.timedelta(minutes=30))
end = str(create_time + datetime.timedelta(hours=4)) end = str(create_time + datetime.timedelta(hours=2))
random_times = [randomDate_six_one(start, end, frmt) for _ in range(action_num)] random_times = [randomDate_six_one(start, end, frmt) for _ in range(action_num)]
have_sort_times = sorted(random_times, key=lambda date: get_list(date)) have_sort_times = sorted(random_times, key=lambda date: get_list(date))
...@@ -60,20 +72,20 @@ def get_one_six_days_random_time(frmt='%Y-%m-%d %H:%M:%S', num_days=0, action_ty ...@@ -60,20 +72,20 @@ def get_one_six_days_random_time(frmt='%Y-%m-%d %H:%M:%S', num_days=0, action_ty
action_num = random.randint(5, 10) action_num = random.randint(5, 10)
if num_days <= 15 and num_days > 1 and action_type in ("follow", "click") and int(content_level) < 3: if num_days <= 15 and num_days > 1 and action_type in ("follow", "click") and int(content_level) < 3:
action_num = random.randint(0, 1) action_num = random.randint(1, 2)
if num_days <= 15 and num_days > 1 and action_type in ("follow") and int(content_level) >= 3: if num_days <= 15 and num_days > 1 and action_type in ("follow") and int(content_level) >= 3:
action_num = random.randint(0, 5) action_num = random.randint(1, 5)
if num_days == 1 and action_type in ("click") and int(content_level) >= 3: if num_days == 1 and action_type in ("click") and int(content_level) >= 3:
action_num = random.randint(6, 12) action_num = random.randint(6, 12)
if num_days <= 15 and num_days > 1 and action_type in ("click") and int(content_level) >= 3: if num_days <= 15 and num_days > 1 and action_type in ("click") and int(content_level) >= 3:
action_num = random.randint(0, 6) action_num = random.randint(1, 6)
if num_days >= 1 and num_days <= 6 and action_type in ("comment"): if num_days >= 1 and num_days <= 6 and action_type in ("comment"):
if int(content_level) <= 3: if int(content_level) <= 3:
action_num = random.randint(0, 1) action_num = random.randint(1, 2)
else: else:
action_num = random.randint(2, 4) action_num = random.randint(2, 4)
...@@ -104,24 +116,24 @@ def get_ten_last_days_random_time(num_days=None, frmt='%Y-%m-%d %H:%M:%S', conte ...@@ -104,24 +116,24 @@ def get_ten_last_days_random_time(num_days=None, frmt='%Y-%m-%d %H:%M:%S', conte
lastday = datetime.datetime(now.year, now.month, now.day, 23, 0, 0) lastday = datetime.datetime(now.year, now.month, now.day, 23, 0, 0)
add_number = 0 add_number = 0
if num_days > 15 and action_type in ("follow"): if num_days > 15 and action_type in ("follow"):
action_num = random.randint(0, 2) action_num = random.randint(1, 2)
add_number = 10 add_number = 10
elif num_days > 15 and action_type in ("click"): elif num_days > 15 and action_type in ("click"):
if content_level < 3: if content_level < 3:
action_num = random.randint(0, 1) action_num = random.randint(1, 2)
add_number = 6 add_number = 6
else: else:
action_num = random.randint(0, 2) action_num = random.randint(1, 2)
add_number = 5 add_number = 5
elif num_days > 6 and action_type in ("comment"): elif num_days > 6 and action_type in ("comment"):
if content_level <= 3: if content_level <= 3:
action_num = random.randint(0, 1) action_num = 1
add_number = 10 add_number = 10
else: else:
action_num = random.randint(0, 2) action_num = random.randint(1, 2)
add_number = 10 add_number = 10
else: else:
...@@ -147,7 +159,10 @@ def get_ten_last_days_random_time(num_days=None, frmt='%Y-%m-%d %H:%M:%S', conte ...@@ -147,7 +159,10 @@ def get_ten_last_days_random_time(num_days=None, frmt='%Y-%m-%d %H:%M:%S', conte
def get_content_time_by_create_time(create_time="", content_level=0, action_type=None, after_day=False, card_info=None, def get_content_time_by_create_time(create_time="", content_level=0, action_type=None, after_day=False, card_info=None,
repeat_time=0): repeat_time=0):
try: try:
###在这个地方需要重新判断一下星级
content_level = get_current_card_content_level(card_info)
card_info['content_level'] = content_level
##
card_info['type'] = 'have_get_push_time' card_info['type'] = 'have_get_push_time'
card_info['have_comment_number'] = 0 card_info['have_comment_number'] = 0
now = datetime.datetime.now() now = datetime.datetime.now()
...@@ -193,6 +208,10 @@ def get_content_time_by_create_time(create_time="", content_level=0, action_type ...@@ -193,6 +208,10 @@ def get_content_time_by_create_time(create_time="", content_level=0, action_type
def get_click_follow_time_by_create_time(create_time="", content_level=0, action_type=None, after_day=False, def get_click_follow_time_by_create_time(create_time="", content_level=0, action_type=None, after_day=False,
card_info=None, repeat_time=0): card_info=None, repeat_time=0):
try: try:
######在这个地方需要重新判断一下星级
content_level = get_current_card_content_level(card_info)
card_info['content_level'] = content_level
####
card_info['have_click_number'] = 0 card_info['have_click_number'] = 0
card_info['have_follow_number'] = 0 card_info['have_follow_number'] = 0
now = datetime.datetime.now() now = datetime.datetime.now()
...@@ -296,17 +315,76 @@ def get_vest_userid_and_comment(need_comment_num=0, tag_names=[], card_id=0): ...@@ -296,17 +315,76 @@ def get_vest_userid_and_comment(need_comment_num=0, tag_names=[], card_id=0):
for item in tag_names: for item in tag_names:
if item in all_keys_name: if item in all_keys_name:
service_closure_tags = redis_client.hget(redis_key, item) service_closure_tags = redis_client.hget(redis_key, item)
closure_tags = json.loads(service_closure_tags) closure_tags = json.loads(str(service_closure_tags, encoding="utf-8"))
all_comment_list.extend(closure_tags) all_comment_list.extend(closure_tags)
if all_comment_list: if all_comment_list:
content = random.sample(all_comment_list, need_comment_num) content = random.sample(all_comment_list, need_comment_num)
else: else:
content = None content = []
else: else:
content = None content = []
return content return content
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return [] return []
def judge_offset_partition_have_consum(card_info=None, offset=0, partition=0):
"""
根据当前的offset和分区去判断数据是否已经被消费
:param offset:
:param partition:
:return:
"""
try:
##先判断是不是2019-12-29的
create_time = card_info['create_time']
datetime_create_time = datetime.datetime.strptime(create_time, '%Y-%m-%d %H:%M:%S')
str_data = str(datetime_create_time.year) + str(datetime_create_time.month) + str(datetime_create_time.day)
if str_data in ['20191229', '20191230']:
logging.info("该日期的数据已经被删除啦")
return False
redis_list_data = 0
key = "irrigation_partition_offset_have_consum:" + str(partition)
redis_data = redis_client.get(key)
if offset < int(redis_data):
return False
redis_client.set(key, offset)
return True
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return False
def get_current_card_content_level(card_info=[]):
try:
# 判断当前卡片的等级
if card_info['card_status'] == 'answer':
sql = 'select level from api_answer where id = %s ' % (card_info['card_id'])
mimas_cursor.execute(sql)
data = list(mimas_cursor.fetchall())
if card_info['card_status'] == 'tractate':
sql = 'select content_level from api_tractate where id = %s ' % (card_info['card_id'])
mimas_cursor.execute(sql)
data = list(mimas_cursor.fetchall())
if card_info['card_status'] == 'diary':
sql = 'select content_level from api_diary where id = %s ' % (card_info['card_id'])
zhengxing_cursor.execute(sql)
data = list(zhengxing_cursor.fetchall())
if len(data) > 0:
if data[0][0]:
return int(data[0][0])
else:
return 0
else:
return 0
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return 0
moment/views/save_data.py
View file @ b3f07036
This diff is collapsed.
moment/views/send_email.py
View file @ b3f07036
...@@ -24,3 +24,4 @@ def send_email_tome(stat_data): ...@@ -24,3 +24,4 @@ def send_email_tome(stat_data):
# server.quit() # server.quit()
except Exception: except Exception:
logging.error("catch exception,main:%s" % traceback.format_exc()) logging.error("catch exception,main:%s" % traceback.format_exc())
requirements.txt
View file @ b3f07036
...@@ -19,8 +19,10 @@ urllib3==1.24.1 ...@@ -19,8 +19,10 @@ urllib3==1.24.1
git+ssh://git@git.wanmeizhensuo.com/backend/helios.git@v0.7.2 git+ssh://git@git.wanmeizhensuo.com/backend/helios.git@v0.7.2
virtualenv==15.1.0 virtualenv==15.1.0
gevent==1.2.1 gevent==1.2.1
git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@v0.2.2 git+ssh://git@git.wanmeizhensuo.com/backend/gm-rpcd.git@v0.2.3
jieba==0.39 jieba==0.39
gunicorn==19.7.1 gunicorn==19.7.1
wheel==0.24.0 wheel==0.24.0
bs4==0.0.1 bs4==0.0.1
\ No newline at end of file python-snappy==0.5.4
lz4==2.2.1
vest/settings_local.py
View file @ b3f07036
...@@ -20,6 +20,12 @@ PASSWORD = 'Gengmei1' ...@@ -20,6 +20,12 @@ PASSWORD = 'Gengmei1'
HOST = 'bj-cdb-6slgqwlc.sql.tencentcdb.com' HOST = 'bj-cdb-6slgqwlc.sql.tencentcdb.com'
PORT = 62120 PORT = 62120
ENGINE1 = 'django.db.backends.mysql', # 设置为mysql数据库
NAME1 = 'zhengxing_test'
USER1 = 'work'
PASSWORD1 = 'Gengmei1'
HOST1 = 'bj-cdb-6slgqwlc.sql.tencentcdb.com'
OPTIONS = { OPTIONS = {
"init_command": "SET foreign_key_checks = 0;", "init_command": "SET foreign_key_checks = 0;",
"charset": "utf8mb4", # 为了支持emoji表情 "charset": "utf8mb4", # 为了支持emoji表情
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment