From 3284fe22cb72dd6ee768b8d338df10365384e993 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 1 Sep 2021 15:26:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/apps/ability/views.py | 2 +- server/apps/system/views.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index a447c4f..54f86ae 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -667,7 +667,7 @@ def import_cma2(filename, path): data['xmxh'] = sheet['e'+str(i)].value defaultv['xmxh'] = data['xmxh'] else: - data['xmxh'] = defaultv['xmxh'] + data['xmxh'] = defaultv.get('xmxh', None) if sheet['f'+str(i)].value: data['xmmc'] = sheet['f'+str(i)].value defaultv['xmmc'] = data['xmmc'] diff --git a/server/apps/system/views.py b/server/apps/system/views.py index ed86900..a0b353d 100644 --- a/server/apps/system/views.py +++ b/server/apps/system/views.py @@ -360,6 +360,7 @@ class UserViewSet(PageOrNot, ModelViewSet): UserThird.objects.filter(user=request.user, type='wx_mp').delete() return Response() + class WXMPlogin(APIView): authentication_classes=[] permission_classes=[] @@ -372,7 +373,9 @@ class WXMPlogin(APIView): info = requests.get('https://api.weixin.qq.com/sns/jscode2session?appid='+settings.WX_APPID+'&secret='+settings.WX_APPSECRET+'&js_code=' + code+'&grant_type=authorization_code').content.decode('utf-8') info = json.loads(info) - openid = info['openid'] + openid = info.get('openid', None) + if not openid: + Response('微信id获取失败', status=status.HTTP_400_BAD_REQUEST) session_key = info['session_key'] try: user = UserThird.objects.get(openid=openid,type='wx_mp').user