Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

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']

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