fix20220308

apps/view_user/view.py

@@ -12,7 +12,7 @@ from flask_mail import Mail, Message
 from flask import g, current_app, request, jsonify, session
 from flask import g, current_app, request, jsonify, session
 from apps.view_user import api_user
 from apps.view_user import api_user
 from apps import creat_app
 from apps import creat_app
-from apps.utils.send_phone_info import send_code_new
+from apps.utils.send_phone_info import send_code_new, send_code
 from apps.utils.response_code import RET
 from apps.utils.response_code import RET
 from apps import db, constants, redis_store
 from apps import db, constants, redis_store
 from apps.models import *
 from apps.models import *
@@ -33,6 +33,7 @@ def send_phone_code():
     # 获取请求参数，转化字典
     # 获取请求参数，转化字典
     req_dict = request.get_json()
     req_dict = request.get_json()
     mobile = req_dict.get('mobile')  # 手机号
     mobile = req_dict.get('mobile')  # 手机号
+    sms_type = req_dict.get('sms_type')  # 验证码类型  1是登录验证码，2是绑定手机号验证码
     # 校验参数完整性
     # 校验参数完整性
     if not all([mobile]):
     if not all([mobile]):
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
@@ -51,7 +52,12 @@ def send_phone_code():
 
 
     # 生成短信验证码
     # 生成短信验证码
     sms_code = "%06d" % random.randint(0, 999999)
     sms_code = "%06d" % random.randint(0, 999999)
+    data = ''
+    if sms_type == 1:
         data = send_code_new(mobile, sms_code)
         data = send_code_new(mobile, sms_code)
+    if sms_type == 2:
+        data = send_code(mobile, sms_code)
+
     # print(data)
     # print(data)
     if data['Message'] == 'OK':
     if data['Message'] == 'OK':
         # 保存真实的短信验证码
         # 保存真实的短信验证码
@@ -415,7 +421,7 @@ def login_byvx():
         if user:
         if user:
             # 若成功保存登录状态
             # 若成功保存登录状态
             token = create_token(user.id)
             token = create_token(user.id)
-            return jsonify(code=RET.OK, msg="登录成功", token=token, flag=user.flag)
+            return jsonify(code=RET.OK, msg="登录成功", data={"token": token, "flag": user.flag})
     except Exception as e:
     except Exception as e:
         current_app.logger.error(e)
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="appid,secreat异常")
         return jsonify(code=RET.DBERR, msg="appid,secreat异常")
@@ -426,6 +432,7 @@ def login_byvx():
 
 
     return jsonify(code=RET.USERERR, msg="授权成功", user_info=uinfo)
     return jsonify(code=RET.USERERR, msg="授权成功", user_info=uinfo)
 
 
+
 # vx登陆后绑定手机号
 # vx登陆后绑定手机号
 @api_user.route("/Binding", methods=["POST"])
 @api_user.route("/Binding", methods=["POST"])
 def binding():
 def binding():
@@ -490,8 +497,7 @@ def binding():
 
 
     # 若成功保存登录状态
     # 若成功保存登录状态
     token = create_token(user.id)
     token = create_token(user.id)
-    return jsonify(code=RET.OK, msg="绑定成功，登录成功", token=token, flag=user.flag)
-
+    return jsonify(code=RET.OK, msg="绑定成功，登录成功", data={"token": token, "flag": user.flag})
 
 
 # # 异步邮箱发送信息
 # # 异步邮箱发送信息
 # def send_async_email(mail, app, msg):
 # def send_async_email(mail, app, msg):