zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
shilixia 2021-09-06 15:34:17 +08:00
parent 8cbbad1357 3284fe22cb
commit 8e62f6f8d3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/apps/ability/views.py
View File

@ -667,7 +667,7 @@ def import_cma2(filename, path):
data['xmxh'] = sheet['e'+str(i)].value data['xmxh'] = sheet['e'+str(i)].value
defaultv['xmxh'] = data['xmxh'] defaultv['xmxh'] = data['xmxh']
else: else:
data['xmxh'] = defaultv['xmxh'] data['xmxh'] = defaultv.get('xmxh', None)
if sheet['f'+str(i)].value: if sheet['f'+str(i)].value:
data['xmmc'] = sheet['f'+str(i)].value data['xmmc'] = sheet['f'+str(i)].value
defaultv['xmmc'] = data['xmmc'] defaultv['xmmc'] = data['xmmc']

5
server/apps/system/views.py
View File

@ -360,6 +360,7 @@ class UserViewSet(PageOrNot, ModelViewSet):
UserThird.objects.filter(user=request.user, type='wx_mp').delete() UserThird.objects.filter(user=request.user, type='wx_mp').delete()
return Response() return Response()
class WXMPlogin(APIView): class WXMPlogin(APIView):
authentication_classes=[] authentication_classes=[]
permission_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=' + 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') code+'&grant_type=authorization_code').content.decode('utf-8')
info = json.loads(info) 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'] session_key = info['session_key']
try: try:
user = UserThird.objects.get(openid=openid,type='wx_mp').user user = UserThird.objects.get(openid=openid,type='wx_mp').user