add

vest/request/auto_request.py

@@ -7,6 +7,7 @@ import logging
 import json
 import redis
 import smtplib
+from libs.cache import redis_client
 from email.mime.text import MIMEText
 from email.utils import formataddr
 from physical.settings_local import DATABASES
@@ -101,20 +102,9 @@ def get_majia():
 
 def get_cookies(user_id):
     try:
-        with open("/srv/apps/physical/vest/data/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])
+        session_key = "majia_login_session"
+        data = redis_client.hget(session_key, user_id)
+        return data
     except:
 
         return None

vest/request/auto_user_id.py

@@ -2,6 +2,8 @@ import pymysql
 import traceback
 import logging
 from vest.request.auto_request import host, user, db, passwd
+from libs.cache import redis_client
+import json
 
 
 def get_data():
@@ -34,12 +36,14 @@ def get_data():
 def auto_user_id():
     try:
         data = get_data()
-        print(data)
-        file = open("/srv/apps/physical/vest/data/user_id.txt", "w")
+        # print(data)
+        # file = open("/srv/apps/physical/vest/data/user_id.txt", "w")
+        #
+        # if data:
+        #     for i in data:
+        #         file.write(str(i[0]))
+        #         file.write("\n")
+        redis_client.set("get_user_id_data", data)
 
-        if data:
-            for i in data:
-                file.write(str(i[0]))
-                file.write("\n")
     except:
         logging.error("index_first:%s" % traceback.format_exc())

vest/request/get_session.py

 import requests
 import traceback
 import logging
+<<<<<<< HEAD
 import json
+=======
+>>>>>>> sentry
 from libs.cache import redis_client
 
 login_url = "http://earth.iyanzhi.com/api/account/login_pwd"
@@ -57,7 +60,6 @@ def get_cook():
 
 def get_session():
     try:
-
         session_key = "majia_login_session"
         dicts = get_cook()
         for key, value in dicts.items():