推送

controller/LangArea.py

@@ -25,7 +25,6 @@ import time
 from object.TokenObject import TokenObject
 
 
-# http://127.0.0.1:8000/user/register?username=admin&password=admin
 class LangAreaView(TemplateView):
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
@@ -117,14 +116,18 @@ class LangAreaView(TemplateView):
         id = request_dict.get('id', None)
         type = request_dict.get('type', None)
         # key_list = LangKeyModel.objects.filter().values_list('word_key', flat=True)
-        en_qs = LangKeyModel.objects.filter(langvalmodel__la__id=9).values('word_key', 'langvalmodel__word_val')
+        en_qs = LangKeyModel.objects.filter(langvalmodel__la__id=20).values('word_key', 'langvalmodel__word_val')
         en_kv = {}
         for e in en_qs:
             en_kv[e['word_key']] = e['langvalmodel__word_val']
         res_qs = LangKeyModel.objects.filter(langvalmodel__la__id=id).values('word_key', 'langvalmodel__word_val')
         res = {}
         for r in res_qs:
-            res[r['word_key']] = r['langvalmodel__word_val'] if r['langvalmodel__word_val'] else en_kv[r['word_key']]
+            print(r['langvalmodel__word_val'])
+            if r['langvalmodel__word_val']:
+                res[r['word_key']] = r['langvalmodel__word_val']
+            elif en_kv[r['word_key']]:
+                res[r['word_key']] = en_kv[r['word_key']]
         content = ''
         if type == 'ios':
             for l in res:

controller/LangSet.py

@@ -25,7 +25,6 @@ import time
 from object.TokenObject import TokenObject
 
 
-# http://127.0.0.1:8000/user/register?username=admin&password=admin
 class LangSetView(TemplateView):
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'

controller/LangWord.py

@@ -25,7 +25,6 @@ import time
 from object.TokenObject import TokenObject
 
 
-# http://127.0.0.1:8000/user/register?username=admin&password=admin
 class LangWordView(TemplateView):
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'

controller/User.py

@@ -24,7 +24,6 @@ import time
 from object.TokenObject import TokenObject
 
 
-# http://127.0.0.1:8000/user/register?username=admin&password=admin
 class registerView(TemplateView):
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
@@ -57,7 +56,6 @@ class registerView(TemplateView):
             return response.json(444)
 
 
-# http://127.0.0.1:8000/user/login?username=admin&password=admin
 class loginView(TemplateView):
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'