From 3c80635d5fed2dbd09d29c5b40a7dd6d6018689a Mon Sep 17 00:00:00 2001
From: youngS <ly_1301b@163.com>
Date: Tue, 14 Sep 2021 13:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E5=BC=80=E5=90=AF=E5=85=B3=E9=97=AD=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fir_client/src/components/FirLogin.vue        |  5 ++--
 .../components/user/FirUserProfileInfo.vue    |  4 +--
 fir_ser/api/views/login.py                    |  8 ++++--
 fir_ser/api/views/thirdlogin.py               | 27 ++++++++++---------
 fir_ser/config.py                             |  4 +++
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/fir_client/src/components/FirLogin.vue b/fir_client/src/components/FirLogin.vue
index 4604b78..c23ad93 100644
--- a/fir_client/src/components/FirLogin.vue
+++ b/fir_client/src/components/FirLogin.vue
@@ -72,11 +72,12 @@
                     <el-link :underline="false" @click="$router.push({name: 'FirResetPwd'})" plain>忘记密码</el-link>
                 </el-form-item>
 
-                <div class="other-way">
+                <div class="other-way" v-if="allow_ways.third && JSON.stringify(allow_ways.third).indexOf('true')!==-1">
                     <hr>
                     <span class="info">或使用以下账户登录</span>
 
                     <el-popover
+                            v-if="allow_ways.third && allow_ways.third.wxp"
                             placement="top"
                             trigger="manual"
                             title="微信扫码关注公众号登录"
@@ -115,7 +116,7 @@
                 },
                 cptch: {"cptch_image": '', "cptch_key": '', "length": 8},
                 activeName: 'username',
-                allow_ways: {},
+                allow_ways: {'third':{}},
                 rutitle: '',
                 rctitle: '',
                 register_enable: false,
diff --git a/fir_client/src/components/user/FirUserProfileInfo.vue b/fir_client/src/components/user/FirUserProfileInfo.vue
index dd20e05..1024ea6 100644
--- a/fir_client/src/components/user/FirUserProfileInfo.vue
+++ b/fir_client/src/components/user/FirUserProfileInfo.vue
@@ -247,10 +247,10 @@
                 </el-row>
             </el-form-item>
 
-            <div class="other-way">
+            <div class="other-way" v-if="userinfo && userinfo.login_type && userinfo.login_type.third && JSON.stringify(userinfo.login_type.third).indexOf('true')!==-1">
                 <hr>
                 <span class="info">绑定第三方账户</span>
-                <el-row :gutter="20">
+                <el-row :gutter="20" v-if="userinfo.login_type.third && userinfo.login_type.third.wxp">
                     <el-col :span="6" :offset="6">
                         <el-popover
                                 placement="top"
diff --git a/fir_ser/api/views/login.py b/fir_ser/api/views/login.py
index 9f3efc0..a67662d 100644
--- a/fir_ser/api/views/login.py
+++ b/fir_ser/api/views/login.py
@@ -739,13 +739,17 @@ class WeChatLoginView(APIView):
 
     def get(self, request):
         ret = BaseResponse()
-        code, qr_info = make_wx_login_qrcode()
-        return wx_qr_code_response(ret, code, qr_info)
+        if get_login_type().get('third', '').get('wxp'):
+            code, qr_info = make_wx_login_qrcode()
+            return wx_qr_code_response(ret, code, qr_info)
+        return Response(ret.dict)
 
 
 class WeChatLoginCheckView(APIView):
     def post(self, request):
         ret = BaseResponse()
+        if not get_login_type().get('third', '').get('wxp'):
+            return Response(ret.dict)
         ticket = request.data.get("ticket")
         if ticket:
             wx_ticket_data = get_wx_ticket_login_info_cache(ticket)
diff --git a/fir_ser/api/views/thirdlogin.py b/fir_ser/api/views/thirdlogin.py
index 9e8a7b8..c195f03 100644
--- a/fir_ser/api/views/thirdlogin.py
+++ b/fir_ser/api/views/thirdlogin.py
@@ -17,6 +17,7 @@ from api.utils.mp.wechat import check_signature, WxMsgCrypt, get_userinfo_from_o
 from api.utils.response import BaseResponse
 from api.utils.serializer import ThirdWxSerializer
 from api.utils.storage.caches import set_wx_ticket_login_info_cache
+from api.views.login import get_login_type
 
 logger = logging.getLogger(__name__)
 
@@ -155,23 +156,25 @@ class ThirdWxAccount(APIView):
 
     def get(self, request):
         res = BaseResponse()
-        # wx_open_id = request.query_params.get("openid", None)
-        wx_obj_lists = ThirdWeChatUserInfo.objects.filter(user_id=request.user)
-        # if wx_open_id:
-        #     wx_obj_lists = wx_obj_lists.filter(openid=wx_open_id)
-        page_obj = PageNumber()
-        info_serializer = page_obj.paginate_queryset(queryset=wx_obj_lists.order_by("-subscribe_time"),
-                                                     request=request,
-                                                     view=self)
-        wx_user_info = ThirdWxSerializer(info_serializer, many=True, )
-        res.data = wx_user_info.data
-        res.count = wx_obj_lists.count()
+
+        if get_login_type().get('third', '').get('wxp'):
+            # wx_open_id = request.query_params.get("openid", None)
+            wx_obj_lists = ThirdWeChatUserInfo.objects.filter(user_id=request.user)
+            # if wx_open_id:
+            #     wx_obj_lists = wx_obj_lists.filter(openid=wx_open_id)
+            page_obj = PageNumber()
+            info_serializer = page_obj.paginate_queryset(queryset=wx_obj_lists.order_by("-subscribe_time"),
+                                                         request=request,
+                                                         view=self)
+            wx_user_info = ThirdWxSerializer(info_serializer, many=True, )
+            res.data = wx_user_info.data
+            res.count = wx_obj_lists.count()
 
         return Response(res.dict)
 
     def delete(self, request):
         openid = request.query_params.get("openid")
         user_id = request.query_params.get("user_id")
-        if openid and user_id:
+        if get_login_type().get('third', '').get('wxp') and openid and user_id:
             ThirdWeChatUserInfo.objects.filter(user_id_id=user_id, openid=openid).delete()
         return self.get(request)
diff --git a/fir_ser/config.py b/fir_ser/config.py
index 9d4d0bf..42c8b52 100644
--- a/fir_ser/config.py
+++ b/fir_ser/config.py
@@ -64,6 +64,7 @@ class CACHECONF(object):
     password = ''
 
 
+# 微信公众号登录配置
 class THIRDLOGINCONF(object):
     wx_official = {
         'name': 'wx_official',
@@ -107,6 +108,9 @@ class AUTHCONF(object):
             'sms': True,  # 短信登录
             'email': True,  # 邮件登录
             'up': False,  # 密码登录
+            'third': {
+                'wxp': False  # 微信公众号登录，需要在 THIRDLOGINCONF 配置好微信公众号登录
+            },
         }
     }