chenjunkai 6 жил өмнө
parent
commit
463f1c99cf

+ 4 - 4
Controller/UserController.py

@@ -397,7 +397,7 @@ class ForgetPwdView(TemplateView):
                 reset_pwd = redisObj.get_data(key=userID + '_email_reset_pwd')
                 reset_pwd = redisObj.get_data(key=userID + '_email_reset_pwd')
                 if reset_pwd is False:
                 if reset_pwd is False:
                     tko = TokenObject()
                     tko = TokenObject()
-                    rest = tko.generate(data={'userID': userID,'username':userName})
+                    rest = tko.generate(data={'userID': userID,'user':userName})
                     token = rest['access_token']
                     token = rest['access_token']
                     reset_pwd = CommonService.RandomStr(6)
                     reset_pwd = CommonService.RandomStr(6)
                     send_data = TemplateService.email_message(type='forget', language='en')
                     send_data = TemplateService.email_message(type='forget', language='en')
@@ -687,7 +687,7 @@ class v2registerView(TemplateView):
         print('userID' + userID)
         print('userID' + userID)
         tko = TokenObject()
         tko = TokenObject()
         user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
         user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
-        res = tko.generate(data={'userID': userID, 'lang': response.lang, 'username': user_list[0]["username"]})
+        res = tko.generate(data={'userID': userID, 'lang': response.lang, 'user': user_list[0]["username"]})
         # 增加角色
         # 增加角色
         user_qs[0].role.add(Role.objects.get(rid=1))
         user_qs[0].role.add(Role.objects.get(rid=1))
         role_dict = ModelService.own_role(userID=userID)
         role_dict = ModelService.own_role(userID=userID)
@@ -926,7 +926,7 @@ class v2resetPwdByCodeView(TemplateView):
         print('userID' + userID)
         print('userID' + userID)
         tko = TokenObject()
         tko = TokenObject()
         user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
         user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
-        res = tko.generate(data={'userID': userID, 'lang': response.lang, 'username': user_list[0]["username"]})
+        res = tko.generate(data={'userID': userID, 'lang': response.lang, 'user': user_list[0]["username"]})
         # 增加角色
         # 增加角色
         user_qs[0].role.add(Role.objects.get(rid=1))
         user_qs[0].role.add(Role.objects.get(rid=1))
         role_dict = ModelService.own_role(userID=userID)
         role_dict = ModelService.own_role(userID=userID)
@@ -1026,7 +1026,7 @@ class v2LoginView(TemplateView):
         userID = role_qs[0]['userID']
         userID = role_qs[0]['userID']
         tko = TokenObject()
         tko = TokenObject()
         user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
         user_list = user_qs.values("NickName", "userIconUrl", "userIconPath", "username", "userEmail", "phone")
-        res = tko.generate(data={'userID': userID, 'lang': response.lang, 'username': user_list[0]["username"]})
+        res = tko.generate(data={'userID': userID, 'lang': response.lang, 'user': user_list[0]["username"]})
         if tko.code == 0:
         if tko.code == 0:
             now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
             now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
             user_qs.update(last_login=now_time, online=True, language=response.lang)
             user_qs.update(last_login=now_time, online=True, language=response.lang)

+ 2 - 1
Object/TokenObject.py

@@ -21,7 +21,7 @@ class TokenObject:
 
 
     def __init__(self, token=None):
     def __init__(self, token=None):
         if token == 'local':
         if token == 'local':
-            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VybmFtZSI6IjEzODAwMTM4MDAxIiwiZXhwIjoxNTQ3NjA4NDg0fQ.i-zPz6fCXJKws3o3cETYms0Sgw3fkdfe8HuB-929AyY'
+            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJleHAiOjE1NDc2MjA2ODR9.mwqBOK0v0C4ww4hSiXIVmJGpxQLeIW92J1cxYquFxUg'
         if token == 'test':
         if token == 'test':
             token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTE1NjQyNjIzMzc5Mzk1MTM4MDAxMzgwMDEiLCJsYW5nIjoiZW4iLCJleHAiOjE1NDcwMTMzMjV9.4Q-hqqihFClYKCIoUd16ZZe2FRvpElmio6P25Qpg26Q'
             token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTE1NjQyNjIzMzc5Mzk1MTM4MDAxMzgwMDEiLCJsYW5nIjoiZW4iLCJleHAiOjE1NDcwMTMzMjV9.4Q-hqqihFClYKCIoUd16ZZe2FRvpElmio6P25Qpg26Q'
         self.token = token
         self.token = token
@@ -37,6 +37,7 @@ class TokenObject:
     def valid(self):
     def valid(self):
         try:
         try:
             res = jwt.decode(self.token, OAUTH_ACCESS_TOKEN_SECRET, algorithms='HS256')
             res = jwt.decode(self.token, OAUTH_ACCESS_TOKEN_SECRET, algorithms='HS256')
+            print(res)
             self.userID = res.get('userID', None)
             self.userID = res.get('userID', None)
             self.lang = res.get('lang', None)
             self.lang = res.get('lang', None)
             self.user = res.get('user', '')
             self.user = res.get('user', '')