Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

5 years ago · d95a8e19cf
parent df0979bf0e 81e52b9e18
commit d95a8e19cf
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -48,7 +48,7 @@ class ApplicationController < ActionController::Base
 		# 考虑到安全参数问题，多一次查询，去掉Union
 		user = User.where(phone: login).first ||  User.where(mail: login).first
 		if type.to_i == 1 && !user.nil?
-			tip_exception("该手机号码或邮箱已被注册")
+			tip_exception(-2, "该手机号码或邮箱已被注册")
 		elsif type.to_i == 2 && user.nil?
 			tip_exception("该手机号码或邮箱未注册")
 		end