From a45f3d282fdd301251e1453196e245d49ec526af Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Wed, 31 Jul 2019 15:11:55 +0800
Subject: [PATCH] add verify phone vaild type to get verification code api

---
 app/controllers/accounts_controller.rb          | 6 ++++--
 app/controllers/application_controller.rb       | 4 ++--
 app/services/private_messages/create_service.rb | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index d1357d43f..e60e37bce 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -160,7 +160,7 @@ class AccountsController < ApplicationController
 
   # 发送验证码
   # params[:login]  手机号或者邮箱号
-  # params[:type]为事件通知类型 1：用户注册注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱 # 如果有新的继续后面加
+  # params[:type]为事件通知类型 1：用户注册注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验收手机号有效 # 如果有新的继续后面加
   # 发送验证码：send_type 1：注册手机验证码 2：找回密码手机验证码 3：找回密码邮箱验证码 4：绑定手机 5：绑定邮箱
   # 6：手机验证码登录 7：邮箱验证码登录 8：邮箱注册验证码 9: 验收手机号有效
   def get_verification_code
@@ -200,7 +200,7 @@ class AccountsController < ApplicationController
     session[:user_id] = nil
   end
 
-  # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱 # 如果有新的继续后面加
+  # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验证手机号是否有效 # 如果有新的继续后面加
   # login_type 1：手机类型 2：邮箱类型
   def verify_type login_type, type
     case type
@@ -212,6 +212,8 @@ class AccountsController < ApplicationController
       login_type == 1 ? 4 : tip_exception('请填写正确的手机号')
     when 4
       login_type == 1 ? tip_exception('请填写正确的邮箱') : 5
+    when 5
+      login_type == 1 ? 9 : tip_exception('请填写正确的手机号')
     end
   end
 
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index c76ca51a7..4c82051d0 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -64,10 +64,10 @@ class ApplicationController < ActionController::Base
 
 	# 发送及记录激活码
 	# 发送验证码：type 1：注册手机验证码 2：找回密码手机验证码 3：找回密码邮箱验证码 4：绑定手机 5：绑定邮箱
-	# 6：手机验证码登录 7：邮箱验证码登录 8：邮箱注册验证码
+	# 6：手机验证码登录 7：邮箱验证码登录 8：邮箱注册验证码 9：验证手机号有效
 	def check_verification_code(code, send_type, value)
 		case send_type
-		when 1, 2, 4
+		when 1, 2, 4, 9
 			# 手机类型的发送
 			sigle_para = {phone: value}
 			status = Educoder::Sms.send(mobile: value, code: code)
diff --git a/app/services/private_messages/create_service.rb b/app/services/private_messages/create_service.rb
index 560f1a540..88f3a084f 100644
--- a/app/services/private_messages/create_service.rb
+++ b/app/services/private_messages/create_service.rb
@@ -3,7 +3,7 @@ class PrivateMessages::CreateService < ApplicationService
 
   attr_reader :sender, :receiver, :params
 
-  def initialize(sender, receiver, **params)
+  def initialize(sender, receiver, params)
     @sender   = sender
     @receiver = receiver
     @params   = params