Commit 41d356e5 by dong

fix20230301

parent b6723c46
...@@ -645,6 +645,14 @@ def reply_consultation(): ...@@ -645,6 +645,14 @@ def reply_consultation():
return jsonify(code=RET.OK, msg='回复信息保存成功。') return jsonify(code=RET.OK, msg='回复信息保存成功。')
def get_user(mobile):
try:
user_obj = User.query.filter_by(mobile=mobile).first()
return user_obj
except Exception as e:
return None
# 收藏载体 # 收藏载体
@api_xiaocx.route('/CollectionCarrier', methods=['POST']) @api_xiaocx.route('/CollectionCarrier', methods=['POST'])
# @login_required # @login_required
...@@ -652,8 +660,10 @@ def collection_carrier(): ...@@ -652,8 +660,10 @@ def collection_carrier():
req_dict = request.get_json() req_dict = request.get_json()
id_list = req_dict.get("id_list") id_list = req_dict.get("id_list")
flag = req_dict.get("flag") # 1地块,2楼宇,3厂房,4园区,5项目,6企业 flag = req_dict.get("flag") # 1地块,2楼宇,3厂房,4园区,5项目,6企业
token = request.headers["token"] mobile = request.headers["mobile"]
user_obj = verify_token(token) user_obj = get_user(mobile)
if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
try: try:
for _id in id_list: for _id in id_list:
...@@ -684,8 +694,10 @@ def cancel_collection(): ...@@ -684,8 +694,10 @@ def cancel_collection():
req_dict = request.get_json() req_dict = request.get_json()
id_list = req_dict.get("id_list") id_list = req_dict.get("id_list")
flag = req_dict.get("flag") # 1地块,2楼宇,3厂房,4园区,5项目,6企业 flag = req_dict.get("flag") # 1地块,2楼宇,3厂房,4园区,5项目,6企业
token = request.headers["token"] mobile = request.headers["mobile"]
user_obj = verify_token(token) user_obj = get_user(mobile)
if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
try: try:
for _id in id_list: for _id in id_list:
...@@ -714,12 +726,15 @@ def cancel_collection(): ...@@ -714,12 +726,15 @@ def cancel_collection():
# @login_required # @login_required
def collection_list(): def collection_list():
req_dict = request.get_json() req_dict = request.get_json()
id_list = req_dict.get("id_list") # id_list = req_dict.get("id_list")
flag = req_dict.get("flag") # 1地块,2楼宇,3厂房,4园区,5项目,6企业 flag = req_dict.get("flag") # 1地块,2楼宇,3厂房,4园区,5项目,6企业
token = request.headers["token"] mobile = request.headers["mobile"]
user_obj = get_user(mobile)
if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
try: try:
user_obj = verify_token(token) # user_obj = verify_token(token)
if flag == 1: if flag == 1:
obj_list = user_obj.user_land obj_list = user_obj.user_land
...@@ -798,53 +813,45 @@ def wechat_login(): ...@@ -798,53 +813,45 @@ def wechat_login():
# 参数获取与校验 # 参数获取与校验
req_dict = request.get_json() req_dict = request.get_json()
code = req_dict.get('code') # 微信登录code code = req_dict.get('code') # 微信登录code
access_token = request.headers['access_token'] # 微信登录code # access_token = request.headers['access_token'] # 微信登录code
# res = {"access_token": access_token}
print(code) print(code)
# 校验参数完整性 # 校验参数完整性
if not all([code]): if not all([code]):
return jsonify(code=RET.PARAMERR, msg="参数不完整") return jsonify(code=RET.PARAMERR, msg="参数不完整")
# app_id = 'wx67c0a99d684274f8' app_id = 'wx67c0a99d684274f8'
# app_secret = 'd89755bb5d2d3f85e97d0f08c30dbebc' app_secret = 'd89755bb5d2d3f85e97d0f08c30dbebc'
data = {"code": code}
# 获取token # 获取token
# url = 'https://api.weixin.qq.com/cgi-bin/token' url = u'https://api.weixin.qq.com/cgi-bin/token'
# params = { params = {
# 'appid': app_id, 'appid': app_id,
# 'secret': app_secret, 'secret': app_secret,
# 'grant_type': 'client_credential' 'grant_type': 'client_credential'
# }
# res = requests.get(url, params=params).json()
# print(res['access_token'])
# 获取电话号码
url1 = 'https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token=ACCESS_TOKEN'
params1 = {
"code": code
}
headers = {
# "access_token": res['access_token']
"access_token": access_token
} }
res1 = requests.post(url1, data=params1, headers=headers)
print(res1)
try: try:
# user = User.query.filter_by(vxopenid=openid, vxunionid=unionid).first() res = requests.get(url, params=params).json()
# if user: # 获取电话号码
# # 若成功保存登录状态 url1 = u"https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token={}".format(res['access_token'])
# token = create_token(user.id) res1 = requests.post(url1, json=data).json()
# return jsonify(code=RET.OK, msg="登录成功", data={"token": token, "flag": user.flag}) if res1['errmsg'] == 'ok':
pass mobile = res1.phone_info["phoneNumber"]
except Exception as e: user_obj = User.query.filter_by(mobile=mobile).first()
current_app.logger.error(e) if user_obj:
return jsonify(code=RET.DBERR, msg="appid,secreat异常") user_info = {
"flag": user_obj.flag,
time = datetime.datetime.now() "mobile": user_obj.mobile
current_app.logger.error( }
'++++++++++++++++++++++++++++登录日志>>>{}:{}通过使用微信登录成功了!+++++++++++++++++++++++=++'.format(time, user)) else:
user_obj = User(mobile=mobile, flag=1)
# return jsonify(code=RET.USERERR, msg="登录成功", user_info=uinfo) db.session.add(user_obj)
return jsonify(code=RET.USERERR, msg="授权成功") db.session.commit()
user_info = {
"flag": 1,
"mobile": mobile
}
except Enterprise as e:
return jsonify(code=RET.DATAERR, msg="数据异常!")
return jsonify(code=RET.USERERR, data=user_info, msg="微信登录成功。")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment