tt

Controller/UserController.py

@@ -769,7 +769,7 @@ class v2registerView(TemplateView):
         try:
             users = Device_User.objects.create(
                 phone=phone,
-                password=password,
+                password=make_password(password),
                 userID=CommonService.getUserID(μs=False, setOTAID=True),
                 is_active=True,
                 user_isValid=True,
@@ -822,7 +822,7 @@ class v2registerView(TemplateView):
         try:
             users = Device_User.objects.create(
                 userEmail=email,
-                password=password,
+                password=make_password(password),
                 userID=CommonService.getUserID(μs=False, setOTAID=True),
                 is_active=True,
                 user_isValid=True,

Controller/UserManger.py

@@ -58,31 +58,22 @@ class showUserMoreView(TemplateView):
             return response.json(800)
 
     def showUserMore(self, userID, response):
-        try:
-            User = Device_User.objects.filter(userID=userID)
-        except Exception as e:
-            errorInfo = traceback.format_exc()
-            print('Query Database Error: %s' % errorInfo)
-            return response.json(500, repr(e))
-        else:
-            if User:
-                sqlJSON = serializers.serialize('json', User)
-                sqlList = json.loads(sqlJSON)
-                sqlDict = dict(zip(["datas"], [sqlList]))
-                for k, v in enumerate(sqlDict["datas"]):
-                    sqlDict['datas'][k]['fields'].pop('password')
-                    userIconPath = sqlDict['datas'][k]['fields']['userIconPath']
-                    if userIconPath:
-                        if userIconPath.find('static/') != -1:
-                            userIconPath = userIconPath.replace('static/', '').replace('\\', '/')
-                            userIconUrl = SERVER_DOMAIN + '/account/getAvatar/' + userIconPath
-                            sqlDict['datas'][k]['fields']['userIconUrl'] = userIconUrl
-                    if len(v['fields']['role']):
-                        roleName = ModelService.getRole(rid=v['fields']['role'][0])
-                        sqlDict["datas"][k]['fields']['rolename'] = roleName
-                return response.json(0, sqlDict)
-            else:
-                return response.json(113)
+        User = Device_User.objects.filter(userID=userID)
+        if not User.exists():
+            return response.json(113)
+        sqlDict = CommonService.qs_to_dict(User)
+        for k, v in enumerate(sqlDict["datas"]):
+            sqlDict['datas'][k]['fields'].pop('password')
+            userIconPath = sqlDict['datas'][k]['fields']['userIconPath']
+            if userIconPath:
+                if userIconPath.find('static/') != -1:
+                    userIconPath = userIconPath.replace('static/', '').replace('\\', '/')
+                    userIconUrl = SERVER_DOMAIN + '/account/getAvatar/' + userIconPath
+                    sqlDict['datas'][k]['fields']['userIconUrl'] = userIconUrl
+            if len(v['fields']['role']):
+                roleName = ModelService.getRole(rid=v['fields']['role'][0])
+                sqlDict["datas"][k]['fields']['rolename'] = roleName
+        return response.json(0, sqlDict)
 
 
 # http://192.168.136.40:8077/account/perfectUserInfo?token=test&content={"NickName":"333"}