fix20230301

apps/view_xiaocx/view.py

@@ -645,6 +645,14 @@ def reply_consultation():
     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'])
 # @login_required
@@ -652,8 +660,10 @@ def collection_carrier():
     req_dict = request.get_json()
     id_list = req_dict.get("id_list")
     flag = req_dict.get("flag")  # 1地块，2楼宇，3厂房，4园区，5项目，6企业
-    token = request.headers["token"]
-    user_obj = verify_token(token)
+    mobile = request.headers["mobile"]
+    user_obj = get_user(mobile)
+    if not user_obj:
+        return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
 
     try:
         for _id in id_list:
@@ -684,8 +694,10 @@ def cancel_collection():
     req_dict = request.get_json()
     id_list = req_dict.get("id_list")
     flag = req_dict.get("flag")  # 1地块，2楼宇，3厂房，4园区，5项目，6企业
-    token = request.headers["token"]
-    user_obj = verify_token(token)
+    mobile = request.headers["mobile"]
+    user_obj = get_user(mobile)
+    if not user_obj:
+        return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
 
     try:
         for _id in id_list:
@@ -714,12 +726,15 @@ def cancel_collection():
 # @login_required
 def collection_list():
     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企业
-    token = request.headers["token"]
+    mobile = request.headers["mobile"]
+    user_obj = get_user(mobile)
+    if not user_obj:
+        return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
 
     try:
-        user_obj = verify_token(token)
+        # user_obj = verify_token(token)
 
         if flag == 1:
             obj_list = user_obj.user_land
@@ -798,53 +813,45 @@ def wechat_login():
     # 参数获取与校验
     req_dict = request.get_json()
     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)
     # 校验参数完整性
     if not all([code]):
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
 
-    # app_id = 'wx67c0a99d684274f8'
-    # app_secret = 'd89755bb5d2d3f85e97d0f08c30dbebc'
-
+    app_id = 'wx67c0a99d684274f8'
+    app_secret = 'd89755bb5d2d3f85e97d0f08c30dbebc'
+    data = {"code": code}
     # 获取token
-    # url = 'https://api.weixin.qq.com/cgi-bin/token'
-    # params = {
-    #     'appid': app_id,
-    #     'secret': app_secret,
-    #     '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
+    url = u'https://api.weixin.qq.com/cgi-bin/token'
+    params = {
+        'appid': app_id,
+        'secret': app_secret,
+        'grant_type': 'client_credential'
     }
 
-    headers = {
-        # "access_token": res['access_token']
-        "access_token": access_token
-    }
-
-    res1 = requests.post(url1, data=params1, headers=headers)
-    print(res1)
-
-
     try:
-        # user = User.query.filter_by(vxopenid=openid, vxunionid=unionid).first()
-        # if user:
-        #     # 若成功保存登录状态
-        #     token = create_token(user.id)
-        # return jsonify(code=RET.OK, msg="登录成功", data={"token": token, "flag": user.flag})
-        pass
-    except Exception as e:
-        current_app.logger.error(e)
-        return jsonify(code=RET.DBERR, msg="appid,secreat异常")
-
-    time = datetime.datetime.now()
-    current_app.logger.error(
-        '++++++++++++++++++++++++++++登录日志>>>{}:{}通过使用微信登录成功了！+++++++++++++++++++++++=++'.format(time, user))
-
-    # return jsonify(code=RET.USERERR, msg="登录成功", user_info=uinfo)
-    return jsonify(code=RET.USERERR, msg="授权成功")
+        res = requests.get(url, params=params).json()
+        # 获取电话号码
+        url1 = u"https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token={}".format(res['access_token'])
+        res1 = requests.post(url1, json=data).json()
+        if res1['errmsg'] == 'ok':
+            mobile = res1.phone_info["phoneNumber"]
+            user_obj = User.query.filter_by(mobile=mobile).first()
+            if user_obj:
+                user_info = {
+                    "flag": user_obj.flag,
+                    "mobile": user_obj.mobile
+                }
+            else:
+                user_obj = User(mobile=mobile, flag=1)
+                db.session.add(user_obj)
+                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="微信登录成功。")