From 92821cfd87f691fb052b57523b7eb1b643ae4efb Mon Sep 17 00:00:00 2001 From: lovelyzhang Date: Mon, 2 Jan 2017 22:57:19 +0800 Subject: [PATCH 1/2] zy: add verify code --- app/controllers/users_controller.rb | 44 ++++++ app/mailers/user_mailer.rb | 9 ++ app/views/login/init.html.erb | 8 +- .../user_mailer/send_verify_code.html.erb | 25 +++ app/views/users/changepasswd.html.erb | 82 ++++++++++ app/views/users/edit.html.erb | 146 +++++++++--------- app/views/users/forgetpasswd.html.erb | 22 +++ config/application.rb | 10 ++ config/environments/development.rb | 11 ++ config/routes.rb | 2 + db/development.sqlite3 | Bin 40960 -> 40960 bytes ...20170102130110_add_verify_code_to_users.rb | 5 + db/schema.rb | 3 +- test/mailers/previews/user_mailer_preview.rb | 4 + test/mailers/user_mailer_test.rb | 7 + 15 files changed, 300 insertions(+), 78 deletions(-) create mode 100644 app/mailers/user_mailer.rb create mode 100644 app/views/user_mailer/send_verify_code.html.erb create mode 100644 app/views/users/changepasswd.html.erb create mode 100644 app/views/users/forgetpasswd.html.erb create mode 100644 db/migrate/20170102130110_add_verify_code_to_users.rb create mode 100644 test/mailers/previews/user_mailer_preview.rb create mode 100644 test/mailers/user_mailer_test.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 74b46d2..10e093a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -29,6 +29,39 @@ class UsersController < ApplicationController end + def forgetpasswd + useremail = params[:email] + if useremail + @user = User.find_by(email: useremail) + if !@user.nil? + # send_code @user + flash[:success] = "验证码已发送至您的邮箱" + redirect_to changepasswd_path(email: @user.email) + else + flash[:danger] = "用户不存在" + render 'forgetpasswd' + end + else + render 'forgetpasswd' + end + end + + def changepasswd + if request.get? + user_email = params[:email] + if user_email + @user = User.find_by(email: user_email) + if !@user.nil? + render 'changepasswd' + end + end + else + render html: "hello" + end + + end + + private def user_params @@ -36,4 +69,15 @@ class UsersController < ApplicationController :password_confirmation) end + def send_code user + verify_code = rand(999999).to_s + result = UserMailer.send_verify_code(user.email, verify_code).deliver_now + p result + User.transaction do + user.verify_code = verify_code + user.save + end + + end + end diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb new file mode 100644 index 0000000..bf1e057 --- /dev/null +++ b/app/mailers/user_mailer.rb @@ -0,0 +1,9 @@ +class UserMailer < ApplicationMailer + default from: "zy_lovestar@163.com" + + def send_verify_code mail_address, code + @verify_code = code + mail(to: mail_address, subject: "验证码") + end + +end diff --git a/app/views/login/init.html.erb b/app/views/login/init.html.erb index 3a5f294..d21febf 100644 --- a/app/views/login/init.html.erb +++ b/app/views/login/init.html.erb @@ -8,8 +8,8 @@ <%= form_tag(controller: "login", action: "login", method: "post") do %>
-
@@ -22,9 +22,9 @@ type="password">
- 忘记密码？ + 忘记密码？
- +
<% end %> diff --git a/app/views/user_mailer/send_verify_code.html.erb b/app/views/user_mailer/send_verify_code.html.erb new file mode 100644 index 0000000..1d07ece --- /dev/null +++ b/app/views/user_mailer/send_verify_code.html.erb @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + +
+ 您的验证码是: <%= @verify_code %> +
+ + + diff --git a/app/views/users/changepasswd.html.erb b/app/views/users/changepasswd.html.erb new file mode 100644 index 0000000..efe2b45 --- /dev/null +++ b/app/views/users/changepasswd.html.erb @@ -0,0 +1,82 @@ +<% provide(:title, '忘记密码') %> +<% provide(:body_class, 'login2') %> + +
+ + + <%= form_for @user, url: {action: "changepasswd"} do |f| %> + <%= render 'shared/error_messages', object: f.object %> + +
+
+ + <%= text_field_tag("verif_code", class: 'form-control', placeholder: "请输入邮箱验证码") %> +
+
+ +
+
+ + <%= f.email_field :email, class: 'form-control', placeholder: "请输入邮箱" %> +
+
+ +
+
+ + <%= f.password_field :password, class: 'form-control', placeholder: "请输入密码" %> +
+
+ +
+
+ + <%= f.password_field :password_confirmation, class: 'form-control', placeholder: "请再次输入密码" %> +
+
+ + <%= f.submit "重置密码", class: "btn btn-primary btn-block" %> + <% end %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb index a33533e..23a14d4 100644 --- a/app/views/users/edit.html.erb +++ b/app/views/users/edit.html.erb @@ -2,33 +2,33 @@
-
+
- <%= render 'layouts/nav' %> + <%= render 'layouts/nav' %> -
-
-
-
- 个人设置 + +
+
+
+ 个人设置 +
-
-
-
-
- 用户图像 -
-
-
-
- - -
-
-
-
+
+
+
+ 用户图像 +
+
+
+
+ + +
+
+
+
选择照片 @@ -39,70 +39,70 @@ - 清除照片 - + 清除照片 + +
-
-
-
-
- 基本信息 -
-
-
- -
- -
+
+
+
+ 基本信息
- -
- -
- +
+
+ +
+ +
-
- -
- -
- +
+ +
+ +
-
-
- -
- + +
+ +
+ +
-
-
-
- - +
+ +
+ +
-
+
+
+ + +
+
+ +
-
- -
+ +
\ No newline at end of file diff --git a/app/views/users/forgetpasswd.html.erb b/app/views/users/forgetpasswd.html.erb new file mode 100644 index 0000000..28f254e --- /dev/null +++ b/app/views/users/forgetpasswd.html.erb @@ -0,0 +1,22 @@ +<% provide(:title, '忘记密码') %> +<% provide(:body_class, 'login2') %> + + \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index 94d17ee..161bf35 100644 --- a/config/application.rb +++ b/config/application.rb @@ -12,5 +12,15 @@ module GuorenPro # Application configuration should go into files in config/initializers # -- all .rb files in that directory are automatically loaded. config.time_zone = 'Beijing' + config.action_mailer.delivery_method = :smtp + config.action_mailer.raise_delivery_errors = true + config.action_mailer.smtp_settings = { + :address => "smtp.163.com", + :port => 25, + :user_name => "zy_lovestar@163.com", + :password => "zy_lovestar+=*", + :authentication => "plain", + :enable_starttls_auto => true + } end end diff --git a/config/environments/development.rb b/config/environments/development.rb index 6f71970..3ad1cba 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -51,4 +51,15 @@ Rails.application.configure do # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. config.file_watcher = ActiveSupport::EventedFileUpdateChecker + + config.action_mailer.delivery_method = :smtp + config.action_mailer.raise_delivery_errors = true + config.action_mailer.smtp_settings = { + :address => "smtp.163.com", + :port => 25, + :user_name => "zy_lovestar@163.com", + :password => "zy_lovestar+=*", + :authentication => "plain", + :enable_starttls_auto => true + } end diff --git a/config/routes.rb b/config/routes.rb index 183882f..fbb0f4c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -8,6 +8,8 @@ Rails.application.routes.draw do get '/signup', to: 'users#new' get '/profile', to: 'users#edit' + get '/forgetpasswd', to: 'users#forgetpasswd' + get '/changepasswd', to: 'users#changepasswd' get '/main', to: 'main#show' get '/activity', to: 'main#activity' diff --git a/db/development.sqlite3 b/db/development.sqlite3 index 1068a89870c76e4cab6d72f98327310c43a1cc69..a6f22eb95a1a1d583df9b2e46451d3fb9769cb16 100644 GIT binary patch delta 444 zcmZoTz|?SnX@ayM9|Hpe7ZAe$`$QdMc|Hc+XI#A8vJ9LYYz%z=`PTBz+MM z&YO%(jJlf@xu1%#d}ZMOx>-=*H9t2eBeOVTX>n>%G1Ddk76lF_z77U{Z@vzoYz?1E zqXQE!gS@dn&{>X-jjWPS_bhliq37w^WmT2&Ir(L&#U+VFlhfmM>dkcx40R2R6by~6 z3{0&|%=C;+jE#)VjSLKtWDHHMOilGnEKSTUOjV2$RSXSOe3QJ*^a~uljLNdYQ$tJ4 z^^)`h%t{UPj4HCrOY;2_o!kopN|STL(z3FXz08b^0-U2jTm_tB(=eA zn;ag$R*IY7ih=(f{~i8Q{5$xU@lWAz;xFKjf%t^Pk|~%D;%epTCAblRu2#8EB9JP@53Hun@B*BdRv;&Cd0E6#zc^ Bah3o8 delta 193 zcmZoTz|?SnX@ayM7Xt$W2*Uu|L>*&!E(YCaT)f<}44j;941E9j*7DBf@#0qGO5nQ1 z>Bc3#Sy12v$7VOqn~Y2hESnX%pNg=2W8nV=6n?|c#lgrd&RJTVT2#ErfJK3gk>8tv z-y109$UoUTey0Q%zYhcdJN`TTr}%g9FXNxW-^5?QAII+lRAInB*(ZMoP=zxC|84#g i{9E}K@%QuB@MrRe@jLUs1FBHxpKMUizS*mOn*sordNDBo diff --git a/db/migrate/20170102130110_add_verify_code_to_users.rb b/db/migrate/20170102130110_add_verify_code_to_users.rb new file mode 100644 index 0000000..96081e2 --- /dev/null +++ b/db/migrate/20170102130110_add_verify_code_to_users.rb @@ -0,0 +1,5 @@ +class AddVerifyCodeToUsers < ActiveRecord::Migration[5.0] + def change + add_column :users, :verify_code, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 3ead5e8..00bcd1b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20161227034933) do +ActiveRecord::Schema.define(version: 20170102130110) do create_table "comments", force: :cascade do |t| t.string "content" @@ -54,6 +54,7 @@ ActiveRecord::Schema.define(version: 20161227034933) do t.datetime "created_at", null: false t.datetime "updated_at", null: false t.string "password_digest" + t.string "verify_code" end end diff --git a/test/mailers/previews/user_mailer_preview.rb b/test/mailers/previews/user_mailer_preview.rb new file mode 100644 index 0000000..957e12b --- /dev/null +++ b/test/mailers/previews/user_mailer_preview.rb @@ -0,0 +1,4 @@ +# Preview all emails at http://localhost:3000/rails/mailers/user_mailer +class UserMailerPreview < ActionMailer::Preview + +end diff --git a/test/mailers/user_mailer_test.rb b/test/mailers/user_mailer_test.rb new file mode 100644 index 0000000..67a1629 --- /dev/null +++ b/test/mailers/user_mailer_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UserMailerTest < ActionMailer::TestCase + # test "the truth" do + # assert true + # end +end From d20cb8ec8356fd683fd2499a7ea461309d7b97e2 Mon Sep 17 00:00:00 2001 From: lovelyzhang Date: Thu, 5 Jan 2017 22:07:22 +0800 Subject: [PATCH 2/2] zy: add mail send code to change password --- app/controllers/users_controller.rb | 32 +++++++++++- app/mailers/application_mailer.rb | 2 +- app/mailers/user_mailer.rb | 2 +- app/views/users/changepasswd.html.erb | 71 +++++++------------------- code.bak | 33 ++++++++++++ config/application.rb | 4 +- config/environments/development.rb | 4 +- config/routes.rb | 1 + db/development.sqlite3 | Bin 40960 -> 40960 bytes 9 files changed, 88 insertions(+), 61 deletions(-) create mode 100644 code.bak diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 10e093a..6636045 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -34,7 +34,7 @@ class UsersController < ApplicationController if useremail @user = User.find_by(email: useremail) if !@user.nil? - # send_code @user + send_code @user flash[:success] = "验证码已发送至您的邮箱" redirect_to changepasswd_path(email: @user.email) else @@ -53,10 +53,21 @@ class UsersController < ApplicationController @user = User.find_by(email: user_email) if !@user.nil? render 'changepasswd' + else + flash[:danger] = "用户不存在" + redirect_to login_path end + else + redirect_to login_path end else - render html: "hello" + result = check_change_params(params[:email], params[:verify_code], params[:password], params[:password_confirm]) + if result + flash[:success]="密码更新成功" + else + flash[:danger]="密码更新失败" + end + redirect_to login_path end end @@ -77,7 +88,24 @@ class UsersController < ApplicationController user.verify_code = verify_code user.save end + end + def check_change_params(email, verify_code, password, password_confirmation) + if password != password_confirmation + return false + end + user = User.find_by(email: email) + if user.nil? + return false + end + if user.verify_code != verify_code + return false + end + hold = Hash.new + hold[:password] = password + hold[:password_confirmation] = password_confirmation + user.update_attributes(hold) + return true end end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 286b223..0937a52 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base - default from: 'from@example.com' + default from: "ucasguoren@163.com" layout 'mailer' end diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index bf1e057..afb5a78 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -1,5 +1,5 @@ class UserMailer < ApplicationMailer - default from: "zy_lovestar@163.com" + default from: "ucasguoren@163.com" def send_verify_code mail_address, code @verify_code = code diff --git a/app/views/users/changepasswd.html.erb b/app/views/users/changepasswd.html.erb index efe2b45..243d518 100644 --- a/app/views/users/changepasswd.html.erb +++ b/app/views/users/changepasswd.html.erb @@ -4,79 +4,44 @@ \ No newline at end of file diff --git a/code.bak b/code.bak new file mode 100644 index 0000000..b1c3dd6 --- /dev/null +++ b/code.bak @@ -0,0 +1,33 @@ + <%= form_for @user, url: {action: "changepasswd"} do |f| %> + <%= render 'shared/error_messages', object: f.object %> + +
+
+ + +
+
+ +
+
+ + <%= f.email_field :email, class: 'form-control', placeholder: "请输入邮箱" %> +
+
+ +
+
+ + <%= f.password_field :password, class: 'form-control', placeholder: "请输入密码" %> +
+
+ +
+
+ + <%= f.password_field :password_confirmation, class: 'form-control', placeholder: "请再次输入密码" %> +
+
+ + <%= f.submit "重置密码", class: "btn btn-primary btn-block" %> + <% end %> \ No newline at end of file diff --git a/config/application.rb b/config/application.rb index 161bf35..e9f87de 100644 --- a/config/application.rb +++ b/config/application.rb @@ -17,8 +17,8 @@ module GuorenPro config.action_mailer.smtp_settings = { :address => "smtp.163.com", :port => 25, - :user_name => "zy_lovestar@163.com", - :password => "zy_lovestar+=*", + :user_name => "ucasguoren@163.com", + :password => "ucas123", :authentication => "plain", :enable_starttls_auto => true } diff --git a/config/environments/development.rb b/config/environments/development.rb index 3ad1cba..cc257de 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -57,8 +57,8 @@ Rails.application.configure do config.action_mailer.smtp_settings = { :address => "smtp.163.com", :port => 25, - :user_name => "zy_lovestar@163.com", - :password => "zy_lovestar+=*", + :user_name => "ucasguoren@163.com", + :password => "ucas123", :authentication => "plain", :enable_starttls_auto => true } diff --git a/config/routes.rb b/config/routes.rb index fbb0f4c..374c6e7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -10,6 +10,7 @@ Rails.application.routes.draw do get '/profile', to: 'users#edit' get '/forgetpasswd', to: 'users#forgetpasswd' get '/changepasswd', to: 'users#changepasswd' + post '/changepasswd', to: 'users#changepasswd' get '/main', to: 'main#show' get '/activity', to: 'main#activity' diff --git a/db/development.sqlite3 b/db/development.sqlite3 index a6f22eb95a1a1d583df9b2e46451d3fb9769cb16..8bc8f0b8e219b871576bb1de89d9a09f4f09d02e 100644 GIT binary patch delta 682 zcma))&1w@-7>4J}Kya|hX*ZU(N(8eJ?0Eivvg%kDhJqAJ#R^hqPG&-d>6Dp<{%n%c zl{;OC3lUn>3(z3AFwm`6&>Kj^8xXfn6-3eq?ml?F!+GBGp6-d=J+Yt7f!XJm7s2fN z$8TW?z+(#@_ogOa!sHRSV9mI|_x(ZtX!x#g6NKeF!t;n<#iY(?oeB>r#-ticG!;br zo0Kifa^R^2zrz7MEw20muU~YWE3QeCB--50q3v7)$%e_&^{q7D&TSVs)1aM4S#Ez= zC{30QE!e6Y_NJD1E1keDTdjktU+B7Sb!PDC>F`zm>+A0S43VLj8)+C;0SX0;P!w}6 znnt3KM4|GYY_)DMj1@IhYRY9($Fc|=Fhq)ha1nPnKHEB%mS|5R!Kpg`c)yTjij6;X zM*heTKOcR2^WxwVn6Rp=zB`i9Fxm+?m9eBm=+L0pXhL|zL{lQEqj-#3(Vy@*DfUMz z`b{VkbhOsL$cS0F2bOWJ5=@`UCD(;5kC7}Yki{d^yWXqz|J6Fc1a-5A^^K^|KK$>kqT_FAos21TX>+ zvj$M|4pTB9F*7SPhmnwaZq(*ZB}M#Yhy|_GBQv@T0}B7IWjRcIkQV&wLn34DYyUt