拙政园领导登录短信通知王帅

Controller/AccountController.py

@@ -199,7 +199,7 @@ def send_code():
         return jsonify(PHONE_NOT_VALID_ERROR)
 
     sms = SMSService()
-    result = sms.phoneSendCode(phone, 92065, '灰兔智能')
+    result = sms.phoneSendCode(phone, 520391, '灰兔智能')
     logger.info(result)
 
     agent_log = AgentLogRecord()
@@ -215,109 +215,6 @@ def send_code():
     return jsonify(BASE_RESPONSE().to_dict())
 
 
-# @route_account.route('/login', methods=['GET', 'POST'])
-def login():
-    token = request.headers.get('token')
-    cur_ip = request.remote_addr
-    json_data = request.get_json()
-
-    data = {}
-    phone = json_data['phone'] if 'phone' in json_data else None
-    code = json_data['code'] if 'code' in json_data else None
-
-    # test
-    if phone == '18896812809' and code == '1234':
-        test_agent_info = AgentAccount.query.filter_by(id=1).first()
-        g.user = test_agent_info
-        data['token'] = test_agent_info.access_token
-        data['user_name'] = test_agent_info.user_name
-        data['phone'] = test_agent_info.phone
-        data['level'] = test_agent_info.level
-        data['spot_info'] = AgentService.get_spot_info(test_agent_info)
-        return jsonify(BASE_RESPONSE(data=data).to_dict())
-
-    if token:
-        # token登录
-        user_info = AgentService.check_agent_token(token)
-        if user_info == 1:
-            return jsonify(TOKEN_NOT_VALID_ERROR)
-        if user_info == 2:
-            return jsonify(TOKEN_EXPIRE_ERROR)
-
-        # 判断该账号是否已被删除
-        if user_info.status == ACCOUNT_STATUS['delete']:
-            return jsonify(ACCOUNT_ALREADY_DELETE_ERROR)
-
-        salt = AgentService.gene_salt()
-        new_token = "%s#%s" % (AgentService.gene_agent_code(user_info, salt), user_info.id)
-        user_info.access_token = new_token
-        user_info.salt = salt
-        user_info.last_login = datetime.datetime.now()
-        user_info.expire_time = datetime.datetime.now() + datetime.timedelta(days=7)
-        user_info.updated_at = datetime.datetime.now()
-        db.session.add(user_info)
-
-        agent_log = AgentLogRecord()
-        agent_log.phone = user_info.phone
-        agent_log.ip = cur_ip
-        agent_log.last_login = user_info.last_login
-        agent_log.login_type = LOGIN_TYPE['token_login']
-        agent_log.created_at = datetime.datetime.now()
-        agent_log.updated_at = datetime.datetime.now()
-        db.session.add(agent_log)
-        db.session.commit()
-
-        data['token'] = new_token
-        data['user_name'] = user_info.user_name
-        data['phone'] = user_info.phone
-        data['level'] = user_info.level
-        data['spot_info'] = AgentService.get_spot_info(user_info)
-        return jsonify(BASE_RESPONSE(data=data).to_dict())
-    elif phone and code:
-        # 验证码登录
-        # 判断验证码是否正确
-        sms = SMSService()
-        res = sms.verificate(phone, code)
-        if res == -1:
-            return jsonify(VERIFICATION_CODE_INVALID_ERROR)
-        elif res == -2:
-            return jsonify(VERIFICATION_CODE_ERROR)
-
-        agent_info = AgentAccount.query.filter_by(phone=phone, status=ACCOUNT_STATUS['on_use']).first()
-        if not agent_info:
-            return jsonify(USER_NOT_EXIST)
-
-        salt = AgentService.gene_salt()
-        new_token = "%s#%s" % (AgentService.gene_agent_code(agent_info, salt), agent_info.id)
-        agent_token = new_token
-        agent_info.access_token = agent_token
-        agent_info.salt = salt
-        agent_info.last_login = datetime.datetime.now()
-        agent_info.expire_time = datetime.datetime.now() + datetime.timedelta(days=7)
-        agent_info.updated_at = datetime.datetime.now()
-        db.session.add(agent_info)
-
-        agent_log = AgentLogRecord()
-        agent_log.phone = agent_info.phone
-        agent_log.ip = cur_ip
-        agent_log.last_login = agent_info.last_login
-        agent_log.login_type = LOGIN_TYPE['code_login']
-        agent_log.created_at = datetime.datetime.now()
-        agent_log.updated_at = datetime.datetime.now()
-        db.session.add(agent_log)
-        db.session.commit()
-
-        data['token'] = new_token
-        data['user_name'] = agent_info.user_name
-        data['phone'] = agent_info.phone
-        data['level'] = agent_info.level
-        data['spot_info'] = AgentService.get_spot_info(agent_info)
-
-        return jsonify(BASE_RESPONSE(data=data).to_dict())
-    else:
-        return jsonify(LOGIN_ERROR)
-
-
 @route_account.route('/login', methods=['GET', 'POST'])
 def login():
     token = request.headers.get('token')
@@ -352,12 +249,17 @@ def login():
         if user_info.status == ACCOUNT_STATUS['delete']:
             return jsonify(ACCOUNT_ALREADY_DELETE_ERROR)
 
+        if user_info.phone in ('13913505018', '15952417966', '13912636952', '18051909777'):
+            sms = SMSService()
+            result = sms.phoneSendCodeWithContent('18913573855', 934619, [user_info.phone], '灰兔智能')
+            logger.info(result)
+
         salt = AgentService.gene_salt()
         new_token = "%s#%s" % (AgentService.gene_agent_code(user_info, salt), user_info.id)
         user_info.access_token = new_token
         user_info.salt = salt
         user_info.last_login = datetime.datetime.now()
-        user_info.expire_time = datetime.datetime.now() + datetime.timedelta(days=7)
+        user_info.expire_time = datetime.datetime.now() + datetime.timedelta(days=1)
         user_info.updated_at = datetime.datetime.now()
         db.session.add(user_info)
 
@@ -392,13 +294,18 @@ def login():
             if not agent_info:
                 return jsonify(USER_NOT_EXIST)
 
+            if agent_info.phone in ('13913505018', '15952417966', '13912636952', '18051909777'):
+                sms = SMSService()
+                result = sms.phoneSendCodeWithContent('18913573855', 934619, [agent_info.phone], '灰兔智能')
+                logger.info(result)
+
             salt = AgentService.gene_salt()
             new_token = "%s#%s" % (AgentService.gene_agent_code(agent_info, salt), agent_info.id)
             agent_token = new_token
             agent_info.access_token = agent_token
             agent_info.salt = salt
             agent_info.last_login = datetime.datetime.now()
-            agent_info.expire_time = datetime.datetime.now() + datetime.timedelta(days=7)
+            agent_info.expire_time = datetime.datetime.now() + datetime.timedelta(days=1)
             agent_info.updated_at = datetime.datetime.now()
             db.session.add(agent_info)
 
@@ -432,13 +339,18 @@ def login():
             if agent_info.password != AgentService.gene_pwd(code, agent_info.salt_pwd):
                 return jsonify(BASE_RESPONSE(error_code=-1, error_message='手机号或密码错误').to_dict())
 
+            if agent_info.phone in ('13913505018', '15952417966', '13912636952', '18051909777'):
+                sms = SMSService()
+                result = sms.phoneSendCodeWithContent('18913573855', 934619, [agent_info.phone], '灰兔智能')
+                logger.info(result)
+
             salt = AgentService.gene_salt()
             new_token = "%s#%s" % (AgentService.gene_agent_code(agent_info, salt), agent_info.id)
             agent_token = new_token
             agent_info.access_token = agent_token
             agent_info.salt = salt
             agent_info.last_login = datetime.datetime.now()
-            agent_info.expire_time = datetime.datetime.now() + datetime.timedelta(days=7)
+            agent_info.expire_time = datetime.datetime.now() + datetime.timedelta(days=1)
             agent_info.updated_at = datetime.datetime.now()
             db.session.add(agent_info)