Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Controller/SysMsg.py

@@ -15,7 +15,7 @@ import time
 
 from django.views.generic.base import View
 
-from Model.models import SysMsgModel, FeedBackModel, UserExtendModel, SysMassModel
+from Model.models import SysMsgModel, FeedBackModel, SysMassModel, UserExModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.ModelService import ModelService
@@ -86,7 +86,7 @@ class SysMsgView(View):
             app_list = app_str.split(',')
             region = region_str.split(',')
             nowTime = int(time.time())
-            ue_filter = UserExtendModel.objects.filter()
+            ue_filter = UserExModel.objects.filter()
             if app_list:
                 ue_filter = ue_filter.filter(appBundleId__in=app_list)
             if region:

Controller/UserController.py

@@ -27,7 +27,7 @@ from ratelimit.decorators import ratelimit
 
 from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN, APNS_CONFIG, JPUSH_CONFIG, FCM_CONFIG
 from Controller.CheckUserData import DataValid, date_handler, RandomStr
-from Model.models import Device_User, Role, SysMsgModel, UidPushModel, UidSetModel, UserExtendModel
+from Model.models import Device_User, Role, SysMsgModel, UidPushModel, UserOauth2Model, UserExModel
 from Object.AWS.SesClassObject import SesClassObject
 from Object.AliSmsObject import AliSmsObject
 from Object.RedisObject import RedisObject
@@ -517,14 +517,14 @@ class refreshTokenView(TemplateView):
             if tko.code == 0:
                 # 更新用户扩展信息语言
                 try:
-                    user_extend_qs = UserExtendModel.objects.filter(userID_id=userID)
-                    if user_extend_qs.exists():
+                    user_ex_qs = UserExModel.objects.filter(userID_id=userID)
+                    if user_ex_qs.exists():
                         nowTime = int(time.time())
                         update_dict = {
                             'updTime': nowTime,
                             'region': lang
                         }
-                        user_extend_qs.update(**update_dict)
+                        user_ex_qs.update(**update_dict)
                 except Exception as e:
                     pass
                 # # #
@@ -1307,15 +1307,15 @@ class InitInfoView(View):
                 UidPushModel.objects.filter(userID_id=userID, m_code=m_code, uid_set__detect_status=1).update(
                     **update_dict)
             if appBundleId:
-                user_extend_qs = UserExtendModel.objects.filter(userID_id=userID)
-                if user_extend_qs.exists():
+                user_ex_qs = UserExModel.objects.filter(userID_id=userID)
+                if user_ex_qs.exists():
                     update_dict = {
                         'updTime': nowTime,
                         'appBundleId': appBundleId,
                         'region': lang
                         # 'is_cn':
                     }
-                    user_extend_qs.update(**update_dict)
+                    user_ex_qs.update(**update_dict)
                 else:
                     create_dict = {
                         'addTime': nowTime,
@@ -1324,7 +1324,7 @@ class InitInfoView(View):
                         'userID_id': userID,
                         'region': lang
                     }
-                    UserExtendModel.objects.create(**create_dict)
+                    UserExModel.objects.create(**create_dict)
         res = {
             'usmsg': sm_count
         }
@@ -1441,7 +1441,7 @@ class wxAuthSignView(TemplateView):
                 access_token = res_json['access_token']
                 openid = res_json['openid']
                 if access_token and openid:
-                    user_extend_qs = UserExtendModel.objects.filter(authOpenID=openid, authType=1)
+                    user_extend_qs = UserOauth2Model.objects.filter(authOpenID=openid, authType=1)
                     if user_extend_qs.exists():
                         # 如果用户绑定过则直接登录
                         userID = user_extend_qs[0].userID_id
@@ -1511,10 +1511,9 @@ class wxAuthSignView(TemplateView):
             )
 
             nowTime = int(time.time())
-            UserExtendModel.objects.create(
+            UserOauth2Model.objects.create(
                 addTime=nowTime,
                 updTime=nowTime,
-                appBundleId=appBundleId,
                 userID_id=users.userID,
                 authType=1,
                 authOpenID=openid
@@ -1580,20 +1579,19 @@ class wxPerfectView(TemplateView):
                     access_token = res_json['access_token']
                     openid = res_json['openid']
                     if access_token and openid:
-                        user_has_bind = UserExtendModel.objects.filter(authOpenID=openid)
+                        user_has_bind = UserOauth2Model.objects.filter(authOpenID=openid)
                         if user_has_bind.exists():
-                            user_extend_qs = UserExtendModel.objects. \
-                                filter(userID_id=userID, authType=1, appBundleId=appBundleID)
-                            if user_extend_qs.exists():
-                                user_extend_qs.update(authOpenID=openid)
+                            user_oauth2_qs = UserOauth2Model.objects. \
+                                filter(userID_id=userID, authType=1)
+                            if user_oauth2_qs.exists():
+                                user_oauth2_qs.update(authOpenID=openid)
                                 return response.json(0)
                             else:
                                 try:
                                     nowTime = int(time.time())
-                                    UserExtendModel.objects.create(
+                                    UserOauth2Model.objects.create(
                                         addTime=nowTime,
                                         updTime=nowTime,
-                                        appBundleId=appBundleID,
                                         userID_id=userID,
                                         authType=1,
                                         authOpenID=openid)
@@ -1962,14 +1960,14 @@ class UnbundingWXView(TemplateView):
         tko = TokenObject(token)
         if tko.code == 0:
             userID = tko.userID
-            user_extend_qs = UserExtendModel.objects.filter(
+            user_oauth2_qs = UserOauth2Model.objects.filter(
                 ~Q(authOpenID='') & Q(userID_id=userID) & Q(authType=auth_type))
-            if user_extend_qs.exists():
+            if user_oauth2_qs.exists():
                 user_qs = Device_User.objects.filter(phone='', userEmail='', userID=userID)
                 if user_qs.exists():
                     return response.json(17)
                 else:
-                    user_extend_qs.update(authOpenID='', authType=0)
+                    user_oauth2_qs.update(authOpenID='', authType=0)
                     return response.json(0)
             else:
                 return response.json(173)

Model/models.py

@@ -708,12 +708,10 @@ class UidPushModel(models.Model):
 
 
 # oauth2 第三方登录补全信息
-class UserExtendModel(models.Model):
+class UserExModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='自增id')
     userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
     appBundleId = models.CharField(default='', max_length=32, verbose_name=u'appID')
-    authType = models.SmallIntegerField(default=0, verbose_name=0)  # 授权类型 0 非授权，1 微信授权
-    authOpenID = models.CharField(default='', max_length=64, verbose_name='唯一标记')  # 绑定唯一标记
     region = models.CharField(default='', max_length=16, verbose_name='区域语言')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
@@ -721,11 +719,28 @@ class UserExtendModel(models.Model):
     # {'cn': '简体中文', 'tc': '繁体中文', 'fr': '法文', 'ru': '俄文', 'es': '西班牙文', 'pl': '波兰文', 'ja': '日文', 'de': '德文', 'en': '英文'}
 
     class Meta:
-        db_table = 'user_extend'
+        db_table = 'user_ex'
         verbose_name = '用户扩展信息表'
         verbose_name_plural = verbose_name
         ordering = ('-id',)
 
+# oauth2 第三方登录补全信息
+class UserOauth2Model(models.Model):
+    id = models.AutoField(primary_key=True, verbose_name='自增id')
+    userID = models.ForeignKey(Device_User, to_field='userID', on_delete=models.CASCADE)
+    authType = models.SmallIntegerField(default=0, verbose_name=0)  # 授权类型 0 非授权，1 微信授权
+    authOpenID = models.CharField(default='', max_length=64, verbose_name='唯一标记')  # 绑定唯一标记
+    addTime = models.IntegerField(verbose_name='添加时间', default=0)
+    updTime = models.IntegerField(verbose_name='更新时间', default=0)
+
+    # {'cn': '简体中文', 'tc': '繁体中文', 'fr': '法文', 'ru': '俄文', 'es': '西班牙文', 'pl': '波兰文', 'ja': '日文', 'de': '德文', 'en': '英文'}
+
+    class Meta:
+        db_table = 'user_oauth2'
+        verbose_name = '用户oauth2关联'
+        verbose_name_plural = verbose_name
+        ordering = ('-id',)
+
 
 class SysMassModel(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键自增id')