Browse Source

Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

chanjunkai 5 years ago
parent
commit
4777730080
1 changed files with 13 additions and 4 deletions
  1. 13 4
      Controller/AppSetController.py

+ 13 - 4
Controller/AppSetController.py

@@ -11,6 +11,7 @@
 @file: AppSetController.py
 @Contact: chanjunkai@163.com
 """
+from Ansjer.config import SERVER_TYPE
 from Model.models import AppSetModel
 from django.views.generic.base import View
 from Object.RedisObject import RedisObject
@@ -58,7 +59,12 @@ class AppSetView(View):
         if not appBundleId:
             return response.json(444,'appBundleId')
         redis = RedisObject()
-        redis_value = redis.get_data(key=appBundleId)
+
+        if SERVER_TYPE != "Ansjer.formal_settings":
+            key_id= "www"+appBundleId
+        else:
+            key_id = "test" + appBundleId
+        redis_value = redis.get_data(key=key_id)
         if redis_value == False:
             print('添加到缓存')
             # 查数据库
@@ -68,8 +74,7 @@ class AppSetView(View):
                 sm_qs = sm_qs.values("content")
                 # 添加到缓存,缓存时间为3600秒------指的是一个钟后再次访问,就会刷新缓存一次
                 content_json_str = list(sm_qs)[0]['content'].replace("'", '"')
-                redis.del_data(key=appBundleId)
-                redis.set_data(key=appBundleId, val=content_json_str, expire=20)
+                redis.set_data(key=key_id, val=content_json_str, expire=3600)
                 # 返回固定值
                 return response.json(0, json.loads(list(sm_qs)[0]['content']))
             else:
@@ -129,7 +134,11 @@ class AppSetView(View):
         nowTime = int(time.time())
         sm_qs = AppSetModel.objects.filter(appBundleId=appBundleId)
         redis = RedisObject()
-        redis.del_data(key=appBundleId)
+        if SERVER_TYPE != "Ansjer.formal_settings":
+            key_id= "www"+appBundleId
+        else:
+            key_id = "test" + appBundleId
+        redis.del_data(key=key_id)
         if sm_qs.exists():
             sm_qs.update(content=content, updTime=nowTime)
             return response.json(0)