登录注册和忘记密码的返回状态调整

app/controllers/accounts_controller.rb

@@ -31,10 +31,11 @@ class AccountsController < ApplicationController
         verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
       end
       uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
-      check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
-      # todo 上线前请删除
-      if !check_code && code != "513231"
-        tip_exception("验证码无效")
+      # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
+      # todo 上线前请删除万能验证码"513231"
+      if code != "513231"
+        tip_exception(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
+        tip_exception(-2, "验证码已失效") if (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60
       end
 
       code = generate_identifier User, 8
@@ -88,10 +89,8 @@ class AccountsController < ApplicationController
         verifi_code = VerificationCode.where(email: email, code: code, code_type: 3).last
         user = User.find_by_mail(email)     #这里有问题，应该是为email,而不是mail  6.13-hs
       end
-      check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
-      unless check_code
-        tip_exception("验证码无效")
-      end
+      tip_exception(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
+      tip_exception(-2, "验证码已失效") if (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60
 
       user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation]
       if user.save!

app/models/user.rb

@@ -509,10 +509,10 @@ class User < ApplicationRecord
 
     if user
       # user is already in local database
-      raise("账号已被注销，请联系管理员") if user.locked?
-      raise("密码错误") unless user.check_password?(password)
+      raise Educoder::TipException.new(-2, "违反平台使用规范，账号已被锁定") if user.locked?
+      raise Educoder::TipException.new(-2, "错误的账号或密码") unless user.check_password?(password)
     else
-      raise("账号未注册")
+      raise Educoder::TipException.new(-2, "错误的账号或密码")
     end
 
     user