Merge branch 'test' into 'master'

# Conflicts:
#   libs/es.py
#   search/views/topic.py

.gitignore

@@ -83,3 +83,6 @@ gaia/rpcd.json
 *.swp
 
 dbmw_deploy/config.dir/
+.idea/codeStyles/Project.xml
+.idea/misc.xml
+.idea/physical.iml
\ No newline at end of file

.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

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (physical1)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (venv)" project-jdk-type="Python SDK" />
   <component name="PyCharmProfessionalAdvertiser">
     <option name="shown" value="true" />
   </component>

.idea/physical.iml

@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.6 (physical1)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.6 (venv)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">

app_conf.xml

@@ -17,5 +17,6 @@
         <element value="search.views.contrast_similar"/>
         <element value="injection.data_sync.tasks"/>
         <element value="search.views.contrast_similar"/>
+        <!--<element value="majia..tasks.tasks"/>-->
     </config>
 </gm_rpcd_config>

injection/data_sync/tasks.py

 # -*- coding: UTF-8 -*-
-
+import logging
+import traceback
+import json
 from celery import shared_task
 from django.conf import settings
 from django.core import serializers
 from trans2es.type_info import get_type_info_map
 # from rpc.all import get_rpc_remote_invoker
 from libs.es import ESPerform
-import logging
-import traceback
 from libs.cache import redis_client
 from trans2es.models.face_user_contrast_similar import FaceUserContrastSimilar,UserSimilarScore
-import json
 from linucb.utils.register_user_tag import RegisterUserTag
 
 @shared_task

majia/__init__.py

+default_app_config = 'majia.apps.MaJiaApp'

majia/admin.py

+from django.contrib import admin
+
+# Register your models here.

majia/apps.py

+# coding=utf-8
+from __future__ import unicode_literals, print_function, absolute_import
+
+from django.apps import AppConfig
+
+
+class MaJiaApp(AppConfig):
+    name = 'majia'
+    label = 'majia'

majia/get_session.py

+import requests
+import time
+import datetime
+import random
+import traceback
+from django.conf import settings
+import logging
+
+DATABASES = settings.DATABASES
+
+# host = DATABASES['default']['HOST']
+#
+# user = DATABASES['default']['USER']
+#
+# port = DATABASES['default']['PORT']
+#
+# db = DATABASES['default']['NAME']
+#
+# passwd = DATABASES['default']['PASSWORD']
+
+auto_click_url = "http://earth.igengmei.com/api/v1/like"
+auto_reply_url = "http://earth.igengmei.com/api/v1/reply/create"
+auto_follow_url = "http://earth.igengmei.com/api/v1/follow"
+auto_urge_url = "http://earth.igengmei.com/api/v1/user/urge"
+
+
+def get_majia():
+    try:
+        data = open("/srv/apps/physical/majia/majia_email.txt")
+        list = []
+        for i in data:
+            list.append(i.strip('\n').strip(','))
+        maj = random.randint(1, len(list))
+        user_id = list[maj - 1]
+        return user_id
+
+    except:
+        logging.error("catch exception,get_majia:%s" % traceback.format_exc())
+        return None
+
+
+def get_cookies(user_id):
+    try:
+        with open("/srv/apps/physical/majia/user_session.txt", 'r') as f:
+            try:
+                data = f.readlines()
+            except:
+                data = None
+
+        list = []
+        for i in data:
+            list.append(i.strip('\n').split(","))
+
+        for i in list:
+
+            if user_id == i[0]:
+                return (i[1])
+    except:
+
+        return None
+
+
+def login():
+    try:
+        user_id = get_majia()
+
+        cookies = get_cookies(user_id)
+
+        if cookies is not None:
+            return {'sessionid': cookies}
+
+    except:
+
+        logging.error("catch exception,logins:%s" % traceback.format_exc())
+
+        return None
+
+
+def click(cookies_get, id):
+    try:
+        post_dict = {
+            'type': 0,
+            'id': id
+        }
+        response = requests.post(url=auto_click_url,
+                                 cookies=cookies_get,
+                                 data=post_dict)
+
+        logging.info("response.text:%s" % response.text)
+
+    except:
+
+        logging.error("catch exception,logins:%s" % traceback.format_exc())
+
+
+def reply(cookies_get, id, content):
+    try:
+        post_dict = {
+            'topic_id': id,
+            'content': content
+        }
+        response = requests.post(url=auto_reply_url,
+                                 cookies=cookies_get,
+                                 data=post_dict)
+
+        logging.info("response.text:%s" % response.text)
+
+    except:
+
+        logging.error("catch exception,logins:%s" % traceback.format_exc())
+
+
+def time_conv(minutest):
+    try:
+        now = datetime.datetime.now()
+        yes_time = now - datetime.timedelta(minutes=minutest)
+        print(yes_time)
+        return yes_time
+
+    except:
+        return None
+
+
+def get_comments():
+    try:
+        data = open("/srv/apps/physical/majia/guanshui.txt", "r")
+        list_guanshui = []
+        for i in data:
+            list_guanshui.append(i)
+        num1 = random.randint(0, 30)
+        num2 = random.randint(30, 70)
+        num3 = random.randint(70, len(list_guanshui))
+
+        comment1 = list_guanshui[num1 - 1]
+        comment2 = list_guanshui[num2 - 1]
+        comment3 = list_guanshui[num3 - 1]
+
+        comment_list = [comment1, comment2, comment3]
+        return comment_list
+
+    except:
+
+        return None

majia/guanshui.txt

+照片色调很好看
+用的什么调色工具呀
+立马去get同款
+我一个一看就会，动手就废的girl
+为什么我拍不出来你的效果？
+Po主用的什么拍照软件
+这个好，学习了
+真的是元气满满
+很帅气！
+这样好显气质！
+好可爱啊，完全没有抵抗力了。
+莫名好感中
+满分颜值
+超酷！
+马住回看
+请问发色是啥
+请问是什么app拍的啊
+滤镜要怎么选？
+卖萌打滚求翻牌
+有没有常用自拍姿势教程
+拍照技术满分
+日常夸奖博主
+日常勾搭
+背景是在哪里？
+照片构图很好看
+主要还是看颜值
+你长得很像明星
+支持一下
+转需留存
+拍照表情很自然
+风格很好
+这里是哪里呀？
+种草了！
+搭配小技巧get！
+怎么都学不会的路过
+太好了，新手学习了
+一直支持，只求被翻牌！
+好喜欢这种风格
+好看，在哪儿买的
+衣好有气质哦
+这个我也会
+拍照pose求出教程
+小姐姐，作图app是啥
+终于更新了
+搭配的好好看
+求同款
+日常催更
+get√
+什么时候更新啊
+果然只要瘦怎么都好看。
+不错的哈哈
+同款达不到楼主的效果
+喜欢你的搭配
+我拍出来为什么感觉比本人丑很多？
+能多发点全身正面照吗？想看整体效果
+这个真的很真实了
+大圆脸合适吗？
+成功引起了我的注意！
+感觉很少女~
+不错，继续加油
+好看的人做什么都好看
+都是人才！！！！
+道理我都懂，就差一个脸！
+不赞我良心都过意不去啊
+爱你哟~
+用手机可以拍出来吗？
+使用相机拍的还是手机
+我觉得很赞
+颜色搭配很舒服
+小姐姐有戴美瞳吗
+看见这个帖心情变好了
+不管怎么样先收藏了
+更新更新更新
+你和我朋友长得有点像
+你的风格我都很喜欢
+好看
+我要有你这条件还需要啥拍照技术
+太美了！
+被圈粉了……
+美而不作，我喜欢
+楼主真的real真实了。
+持续等更新
+楼主加油，照片拍的不错，非常值得推荐。
+大家花呗还了吗？
+来啦来啦来啦来啦来啦
+画面太治愈了
+楼主辛苦啦
+不错，跟着学习一下
+心动，我要去试试
+满满的干货，收藏好下次用
+新技能get√
+感觉不错mark一下
+适合自己的才是最重要的
+羡慕一下作者的颜
+Omaga太好看了吧~
+这张拍的不错
+这个特效挺可爱的
+翻我翻我~
+这样很显脸小
+关注啦

majia/models.py

+from django.db import models
+
+# Create your models here.

majia/tasks.py

+# -*- coding: UTF-8 -*-
+
+import pymysql
+import random
+import threading
+import traceback
+import logging
+from celery import shared_task
+from django.conf import settings
+from majia.get_session import get_comments, click, login, reply
+# from majia.get_session import host, user, passwd, db
+
+exec_count = 0
+
+def auto_click(pk_list):
+
+    logging.info("get----------------------:%s"%pk_list)
+    # exec_count = 0
+    # try:
+    #     pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
+    #     cursor = pc.cursor()
+    #     cursor.execute(
+    #         "SELECT id,user_id FROM topic WHERE id  in  " + str(
+    #             tuple(pk_list)) + "  and user_id in (select user_id from user_extra  where is_shadow = 0)")
+    #     data = cursor.fetchall()
+    #     topic_id_list = list(data)
+    #     logging.info("Database version : %s " % topic_id_list)
+    #     pc.close()
+    #     exec_count = 0
+    #     if topic_id_list:
+    #
+    #         def fun_timer():
+    #             cookies = login()
+    #             if cookies:
+    #                 click(cookies, topic_id_list[0])
+    #
+    #             global timer
+    #             global exec_count
+    #
+    #             exec_count += 1
+    #             if exec_count == 1:
+    #                 # sleep_time = random.randint(300, 540)
+    #                 sleep_time = 30
+    #                 timer = threading.Timer(sleep_time, fun_timer)
+    #                 timer.start()
+    #
+    #             if exec_count == 2:
+    #                 # sleep_time = random.randint(1000, 1900)
+    #                 sleep_time = 50
+    #                 timer = threading.Timer(sleep_time, fun_timer)
+    #                 timer.start()
+    #
+    #         sleep_time = random.randint(300, 540)
+    #         timer = threading.Timer(10, fun_timer)  # 首次启动
+    #         timer.start()
+    #
+    #     else:
+    #         pass
+    # except:
+    #     logging.error("catch exception,main:%s" % traceback.format_exc())
+
+
+def auto_reply(pk_list):
+
+    logging.info("get----------------------:%s"%pk_list)
+
+    # exec_count = 0
+    # try:
+    #     pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
+    #     cursor = pc.cursor()
+    #     cursor.execute(
+    #         "SELECT id,user_id FROM topic WHERE id in  " + str(
+    #             tuple(pk_list)) + " and user_id in (select user_id from user_extra  where is_shadow = 0)")
+    #     data = cursor.fetchall()
+    #     topic_id_list = list(data)
+    #     logging.info("Database version : %s " % topic_id_list)
+    #     pc.close()
+    #     exec_count = 0
+    #     if topic_id_list:
+    #
+    #         def fun_comment():
+    #             cookies = login()
+    #             if cookies:
+    #                 comment_content = get_comments()
+    #                 comment = comment_content[0]
+    #                 reply(cookies, topic_id_list[0], comment)
+    #
+    #             global timer
+    #             global exec_count
+    #
+    #             exec_count += 1
+    #             if exec_count == 1:
+    #                 sleep_time = random.randint(300, 540)
+    #                 sleep_time = 30
+    #                 timer = threading.Timer(sleep_time, fun_comment)
+    #                 timer.start()
+    #
+    #             if exec_count == 2:
+    #                 sleep_time = random.randint(1000, 1900)
+    #                 sleep_time = 30
+    #                 timer = threading.Timer(sleep_time, fun_comment)
+    #                 timer.start()
+    #
+    #         sleep_time = random.randint(300, 540)
+    #         timer = threading.Timer(10, fun_comment)  # 首次启动
+    #         timer.start()
+    #
+    #
+    # except:
+    #     logging.error("catch exception,main:%s" % traceback.format_exc())
+
+
+@shared_task
+def auto_majia_effect(pk_list):
+    auto_click(pk_list)
+    auto_reply(pk_list)

majia/tests.py

+from django.test import TestCase
+
+# Create your tests here.

majia/views.py

+from django.shortcuts import render
+
+# Create your views here.

physical/celery_task_router.py

 # coding=utf-8                                                                           
 from __future__ import unicode_literals, print_function, absolute_import
-
-import itertools
-
 from django.conf import settings
+import itertools
 import logging
 
 
@@ -11,7 +9,10 @@ class CeleryTaskRouter(object):
     queue_task_map = {
         "tapir-alpha": [
             'injection.data_sync.tasks.write_to_es',
-        ]
+        ],
+        "majia-alpha": [
+            'majia.tasks.auto_majia_effect',
+        ],
     }
 
     # Map[TaskName, QueueName]

physical/settings.py

@@ -10,8 +10,5 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.10/ref/settings/
 """
 
-import os
 from .log_settings import *
-from datetime import timedelta
-from celery.schedules import crontab
 from .settings_local import *

physical/settings_local.py.template

@@ -48,6 +48,7 @@ INSTALLED_APPS = (
     'trans2es',
     'search',
     'injection.data_sync',
+    'majia',
 )
 
 CELERYBEAT_SCHEDULE = {
@@ -57,6 +58,7 @@ CELERYBEAT_SCHEDULE = {
         'args': ()
     },
 }
+
 """
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',

search/views/topic.py

@@ -342,9 +342,9 @@ def topic_detail_page_recommend(device_id="", user_id=-1, topic_id=-1, topic_pic
         redis_client.expire(redis_key, 60 * 60 * 24)
 
         result_list = []
-        # logging.warning("topic_tag_result:%s" % str(topic_tag_result))
-        # logging.warning("topic_user_result:%s" % str(topic_user_result))
-        # logging.warning("result:%s" % str(result))
+        logging.warning("topic_tag_result:%s" % str(topic_tag_result))
+        logging.warning("topic_user_result:%s" % str(topic_user_result))
+        logging.warning("result:%s" % str(result))
         recommend_topic_ids_list = list()
         recommend_topic_ids_list.extend(topic_tag_result)
         recommend_topic_ids_list.extend(topic_user_result)