ttt

Controller/UserController.py

@@ -11,6 +11,7 @@
 @file: UserController.py
 @Contact: chanjunkai@163.com
 """
+from Model.models import Role
 import traceback,datetime
 
 import simplejson as json
@@ -788,30 +789,33 @@ class v2registerView(TemplateView):
         print('userID' + userID)
         tko = TokenObject()
         res = tko.generate(data={'userID': userID, 'lang': response.lang})
-        if tko.code == 0:
-            now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
-            user_qs.update(last_login=now_time, online=True, language=response.lang)
-            role_dict = ModelService.own_role(userID=userID)
-            res['rid'] = role_dict['rid']
-            res['roleName'] = role_dict['roleName']
-            res['permList'] = ModelService.own_permission(userID)
-            res['userID'] = userID
-            # 昵称，邮箱，电话，刷新，头像
-            user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
-            userIconPath = str(user_list[0]["userIconPath"])
-            if userIconPath and userIconPath.find('static/') != -1:
-                userIconPath = userIconPath.replace('static/', '').replace('\\', '/')
-                res['userIconUrl'] = SERVER_DOMAIN + '/account/getAvatar/' + userIconPath
-            else:
-                res['userIconUrl'] = ''
-            res['NickName'] = user_list[0]["NickName"]
-            res['username'] = user_list[0]["username"]
-            res['userEmail'] = user_list[0]["userEmail"]
-            res['phone'] = user_list[0]["phone"]
-            print(res)
-            return response.json(0, res)
+        device_user_query_set = Device_User.objects.get(userID=userID)
+        #增加角色
+        user_qs[0].role.add(Role.objects.get(rid=1))
+        # if device_user_query_set.role.all():
+        #     device_user_query_set.role.set([1])
+        # else:
+        #     role_user_query_set = Role.objects.get(rid=1)
+        #     device_user_query_set.role.add(role_user_query_set)
+        role_dict = ModelService.own_role(userID=userID)
+        res['rid'] = role_dict['rid']
+        res['roleName'] = role_dict['roleName']
+        res['permList'] = ModelService.own_permission(userID)
+        res['userID'] = userID
+        # 昵称，邮箱，电话，刷新，头像
+        user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
+        userIconPath = str(user_list[0]["userIconPath"])
+        if userIconPath and userIconPath.find('static/') != -1:
+            userIconPath = userIconPath.replace('static/', '').replace('\\', '/')
+            res['userIconUrl'] = SERVER_DOMAIN + '/account/getAvatar/' + userIconPath
         else:
-            return response.json(tko.code)
+            res['userIconUrl'] = ''
+        res['NickName'] = user_list[0]["NickName"]
+        res['username'] = user_list[0]["username"]
+        res['userEmail'] = user_list[0]["userEmail"]
+        res['phone'] = user_list[0]["phone"]
+        print(res)
+        return response.json(0, res)
 
     def do_email_register(self, email, password, authcode, response):
         data_valid = DataValid()

Controller/UserManger.py

@@ -407,48 +407,38 @@ class setUserValidView(View):
             return response.json(800)
 
     def UserValidUpdatePC(self, superID, eUserID, isValid, rid, response):
-        try:
-            super = Device_User.objects.filter(userID=superID)
-            eUser = Device_User.objects.filter(userID=eUserID)
-        except Exception as e:
-            errorInfo = traceback.format_exc()
-            print('查询数据库错误: %s' % errorInfo)
-            return response.json(500, repr(e))
-        else:
-            if not super:
-                return response.json(615)
-            if not eUser:
-                return response.json(616)
-            own_permission = ModelService.check_permission(userID=superID, permID=50)
-            if own_permission is True:
-                try:
-                    eUser.update(user_isValid=isValid)
-                    device_user_query_set = Device_User.objects.get(userID=eUserID)
-                    if device_user_query_set.role.all():
-                        device_user_query_set.role.set([rid])
-                    else:
-                        role_user_query_set = Role.objects.get(rid=rid)
-                        device_user_query_set.role.add(role_user_query_set)
-                except Exception as e:
-                    errorInfo = traceback.format_exc()
-                    print('更新数据库错误:%s' % errorInfo)
-                    return response.json(501, repr(e))
+        super = Device_User.objects.filter(userID=superID)
+        eUser = Device_User.objects.filter(userID=eUserID)
+        if not super.exists():
+            return response.json(615)
+        if not eUser.exists():
+            return response.json(616)
+        own_permission = ModelService.check_permission(userID=superID, permID=50)
+        if own_permission is True:
+            try:
+                eUser.update(user_isValid=isValid)
+                device_user_query_set = Device_User.objects.get(userID=eUserID)
+                if device_user_query_set.role.all():
+                    device_user_query_set.role.set([rid])
                 else:
-                    return response.json(0)
+                    role_user_query_set = Role.objects.get(rid=rid)
+                    device_user_query_set.role.add(role_user_query_set)
+            except Exception as e:
+                errorInfo = traceback.format_exc()
+                print('更新数据库错误:%s' % errorInfo)
+                return response.json(501, repr(e))
             else:
-                return response.json(602)
+                return response.json(0)
+        else:
+            return response.json(602)
+
 
     def UserValidUpdate(self, superID, eUserID, isValid, response):
-        try:
-            super = Device_User.objects.filter(userID=superID)
-            eUser = Device_User.objects.filter(userID=eUserID)
-        except Exception as e:
-            errorInfo = traceback.format_exc()
-            print('查询数据库错误: %s' % errorInfo)
-            return response.json(500, repr(e))
-        if not super:
+        super = Device_User.objects.filter(userID=superID)
+        eUser = Device_User.objects.filter(userID=eUserID)
+        if not super.exists():
             return response.json(113)
-        if not eUser:
+        if not eUser.exists():
             return response.json(113)
         if super[0].is_superuser != 100 or super[0].is_superuser == eUser[0].is_superuser:
             return response.json(602)