优化单点登录

Controller/UserController.py

@@ -2364,10 +2364,11 @@ class v3LoginView(TemplateView):
         m_code = request_dict.get('mCode', None)
         lang = request_dict.get('lang', 'en')
         tz = request_dict.get('tz', None)
+        token_version = request_dict.get('tokenVersion', 'V1')
         tko = TokenObject()
         res = tko.generate(
             data={'userID': userID, 'lang': response.lang, 'user': users['username'], 'm_code': '123413243214',
-                  'appBundleId': app_bundle_id, 'tokenVal': token_val})
+                  'appBundleId': app_bundle_id, 'tokenVal': token_val, 'tokenVersion': token_version})
         if tko.code != 0:
             return response.json(tko.code)
         if all([app_bundle_id, app_type, push_type, token_val, m_code, tz]):

Object/TokenObject.py

@@ -35,6 +35,7 @@ class TokenObject:
             self.lang = res.get('lang', None)
             self.user = res.get('user', '')
             app_bundle_id = res.get('appBundleId', None)
+            token_version = res.get('tokenVersion', None)
             # 刷新登录时间
             # if self.userID:
             #     print(self.user)
@@ -53,7 +54,7 @@ class TokenObject:
                 return
             else:
                 if self.userID:
-                    if app_bundle_id:
+                    if app_bundle_id and token_version == 'V2':
                         redis_obj = RedisObject()
                         key = 'token_user_{}_{}'.format(self.userID, app_bundle_id)
                         redis_token = redis_obj.get_data(key)
@@ -108,7 +109,8 @@ class TokenObject:
                     'refresh_token': refresh_token,
                 }
             app_bundle_id = data.get('appBundleId', None)
-            if app_bundle_id:
+            token_version = data.get('tokenVersion', None)
+            if app_bundle_id and token_version == 'V2':
                 redis_obj = RedisObject()
                 key = 'token_user_{}_{}'.format(data['userID'], app_bundle_id)
                 LOGGER.info('写入新token：{}'.format(access_token))