modify

search/views/topic.py

@@ -36,7 +36,7 @@ def home_recommend(session_id="",user_id=-1,offset=0,size=10):
         unread_topic_id_list = list()
         have_read_topic_id_tuple = set()
 
-        if len(redis_val_dict)>0 and offset>0 and user_id>0 and offset==(last_offset_num+1):
+        if len(redis_val_dict)>0 and offset>0 and user_id>0 and offset==last_offset_num:
             topic_id_list = redis_val_dict[b"unread_topic_id"] + topic_id_list
             have_read_topic_id_tuple = set(redis_val_dict[b"have_read_topic_id"])
         for item in topic_id_list:
@@ -61,7 +61,7 @@ def home_recommend(session_id="",user_id=-1,offset=0,size=10):
             redis_dict = {
                 "unread_topic_id":json.dumps(unread_topic_id_list),
                 "have_read_topic_id":json.dumps(list(have_read_topic_id_tuple)),
-                "last_offset_num":offset
+                "last_offset_num":offset+size
             }
             redis_client.hmset(redis_key,redis_dict)
             # 每个session key保存15分钟
@@ -89,7 +89,7 @@ def home_query(session_id="",user_id=-1,query="",offset=0,size=10):
             user_id=-1
         if not isinstance(session_id,str):
             session_id = ""
-        redis_key = "physical:home_query" + ":user_id:" + str(user_id) + ":session_id:" + session_id
+        redis_key = "physical:home_query" + ":user_id:" + str(user_id) + ":session_id:" + session_id + ":query:" + str(query).encode("utf-8")
         redis_val_dict = redis_client.hgetall(redis_key)
         last_offset_num = redis_val_dict["last_offset_num"] if "last_offset_num" in redis_val_dict else -1
 
@@ -100,7 +100,7 @@ def home_query(session_id="",user_id=-1,query="",offset=0,size=10):
         unread_topic_id_list = list()
         have_read_topic_id_tuple = set()
 
-        if len(redis_val_dict)>0 and offset>0 and user_id>0 and offset==(last_offset_num+1):
+        if len(redis_val_dict)>0 and offset>0 and user_id>0 and offset==last_offset_num:
             topic_id_list = json.loads(redis_val_dict[b"unread_topic_id"]) + topic_id_list
             have_read_topic_id_tuple = set(json.loads(redis_val_dict[b"have_read_topic_id"]))
         for item in topic_id_list:
@@ -125,7 +125,7 @@ def home_query(session_id="",user_id=-1,query="",offset=0,size=10):
             redis_dict = {
                 "unread_topic_id":json.dumps(unread_topic_id_list),
                 "have_read_topic_id":json.dumps(list(have_read_topic_id_tuple)),
-                "last_offset_num":offset
+                "last_offset_num":offset+size
             }
             redis_client.hmset(redis_key,redis_dict)
             # 每个session key保存15分钟