Merge branch 'test' of git.wanmeizhensuo.com:alpha/physical into test

.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">

majia/__init__.py

+from .get_session import *
\ No newline at end of file

majia/auto_instant_click.py

 # -*- coding: UTF-8 -*-
-import requests
-import time
-import datetime
+
 import pymysql
 import random
-import pandas as pd
+import threading
 import traceback
-from log_settings import *
 import logging
 from django.conf import settings
-from get_session import get_comments, get_cookies, click, time_conv, login, reply
-
+from majia import get_comments, get_cookies, click, time_conv, login, reply
+from majia import host,user,passwd,db
 
 @shared_task
 def auto_click(pk_list):
@@ -49,7 +46,7 @@ def auto_click(pk_list):
                     timer.start()
 
             sleep_time = random.randint(300, 540)
-            timer = threading.Timer(10, fun_comment)  # 首次启动
+            timer = threading.Timer(10, fun_timer)  # 首次启动
             timer.start()
 
             sleep_time = random.randint(300, 540)

majia/get_session.py

@@ -3,13 +3,26 @@ import time
 import datetime
 import random
 import traceback
+from django.conf import settings
 
+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/cybertron/majia_email.txt")
@@ -62,7 +75,7 @@ def login():
         return None
 
 
-def click(cookies_get,id):
+def click(cookies_get, id):
     try:
         post_dict = {
             'type': 0,