Browse Source

fix:perfectUserMore update icon bug

chenjunkai 6 years ago
parent
commit
385f0afaa6
1 changed files with 13 additions and 6 deletions
  1. 13 6
      Controller/UserManger.py

+ 13 - 6
Controller/UserManger.py

@@ -1,26 +1,23 @@
 #!/usr/bin/env python
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
-import datetime
 import os
 import os
 import traceback
 import traceback
 
 
 import simplejson as json
 import simplejson as json
-from django.core import serializers
 from django.core.files.storage import FileSystemStorage
 from django.core.files.storage import FileSystemStorage
 from django.http import HttpResponse
 from django.http import HttpResponse
-from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView, View
 from django.views.generic import TemplateView, View
 
 
-from Ansjer.config import SERVER_DOMAIN
 from Ansjer.config import BASE_DIR
 from Ansjer.config import BASE_DIR
+from Ansjer.config import SERVER_DOMAIN
 from Model.models import Role, Device_User
 from Model.models import Role, Device_User
+from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 from Service.ModelService import ModelService
-from Object.RedisObject import RedisObject
 
 
 
 
 # http://192.168.136.40:8077/account/showUserMore?token=test
 # http://192.168.136.40:8077/account/showUserMore?token=test
@@ -160,6 +157,14 @@ class perfectUserInfoView(TemplateView):
             return response.json(117, repr(e))
             return response.json(117, repr(e))
         else:
         else:
             res = CommonService.qs_to_dict(User)
             res = CommonService.qs_to_dict(User)
+            for k, v in enumerate(res["datas"]):
+                res['datas'][k]['fields'].pop('password')
+                userIconPath = res['datas'][k]['fields']['userIconPath']
+                if userIconPath:
+                    if userIconPath.find('static/') != -1:
+                        userIconPath = userIconPath.replace('static/', '').replace('\\', '/')
+                        userIconUrl = SERVER_DOMAIN + 'account/getAvatar/' + userIconPath
+                        res['datas'][k]['fields']['userIconUrl'] = userIconUrl
             return response.json(0, res)
             return response.json(0, res)
 
 
 
 
@@ -197,13 +202,15 @@ class getAvatarView(TemplateView):
 
 
 @csrf_exempt
 @csrf_exempt
 def delUserInterface(request):
 def delUserInterface(request):
+    response = ResponseObject()
     if request.method == 'POST':
     if request.method == 'POST':
         request_dict = request.POST
         request_dict = request.POST
     elif request.method == 'GET':
     elif request.method == 'GET':
         request_dict = request.GET
         request_dict = request.GET
+    else:
+        return response.json(404)
     token = request_dict.get('token', None)
     token = request_dict.get('token', None)
     delUserID = request_dict.get('delUserID', None)
     delUserID = request_dict.get('delUserID', None)
-    response = ResponseObject()
     if not token or not delUserID:
     if not token or not delUserID:
         return response.json(444, 'token,delUserID')
         return response.json(444, 'token,delUserID')
     tko = TokenObject(token)
     tko = TokenObject(token)