From ac5d8f627f0fbd36c1d5ee8814a245b7858381a6 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 19 Jul 2019 18:02:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/accounts_controller.rb      | 4 ++--
 app/views/users/homepage_info.json.jbuilder | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index d81195598..5fa5357d9 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -35,7 +35,7 @@ class AccountsController < ApplicationController
       # 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
+        tip_exception(-2, "验证码已失效") if !verifi_code&.effective?
       end
 
       code = generate_identifier User, 8
@@ -91,7 +91,7 @@ class AccountsController < ApplicationController
         user = User.find_by_mail(email)     #这里有问题，应该是为email,而不是mail  6.13-hs
       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
+      tip_exception(-2, "验证码已失效") if !verifi_code&.effective?
 
       user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation]
       if user.save!
diff --git a/app/views/users/homepage_info.json.jbuilder b/app/views/users/homepage_info.json.jbuilder
index 3f985eab9..1621448f3 100644
--- a/app/views/users/homepage_info.json.jbuilder
+++ b/app/views/users/homepage_info.json.jbuilder
@@ -1,5 +1,5 @@
 json.id @user.id
-json.name @user.homepage_name
+json.name @user.full_name
 json.avatar_url url_to_avatar(@user)
 json.is_logged_user @user.logged_user?
 json.experience @user.experience