From 66fd6a71e5dd2b5da84f9387d7229b5bff7cab90 Mon Sep 17 00:00:00 2001
From: jasder <jasduaner@gmail.com>
Date: Mon, 7 Jun 2021 17:09:23 +0800
Subject: [PATCH] =?UTF-8?q?FIX=20=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=B8=BA=E7=94=A8=E6=88=B7=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=99=BB=E5=BD=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/users_controller.rb |  5 +++--
 app/forms/users/admin_create_user_form.rb  | 13 ++-----------
 app/views/admins/users/new.html.erb        | 11 +----------
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/app/controllers/admins/users_controller.rb b/app/controllers/admins/users_controller.rb
index 31946257..9327f659 100644
--- a/app/controllers/admins/users_controller.rb
+++ b/app/controllers/admins/users_controller.rb
@@ -68,6 +68,7 @@ class Admins::UsersController < Admins::BaseController
 
     user = User.new(create_params)
     user.type = 'User'
+    user.login = User.generate_login("p")
     ActiveRecord::Base.transaction do
       if user.save!
         UserExtension.create!(user_id: user.id)
@@ -103,10 +104,10 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def create_params
-    params.require(:user).permit(%i[login nickname gender mail phone location location_city password professional_certification])
+    params.require(:user).permit(%i[nickname gender mail phone location location_city password professional_certification])
   end
 
   def validate_create_params
-    create_params.slice(:login, :mail, :phone, :password)
+    create_params.slice(:mail, :phone, :password)
   end
 end
diff --git a/app/forms/users/admin_create_user_form.rb b/app/forms/users/admin_create_user_form.rb
index 06b9dc21..b57c317a 100644
--- a/app/forms/users/admin_create_user_form.rb
+++ b/app/forms/users/admin_create_user_form.rb
@@ -2,14 +2,13 @@ class Users::AdminCreateUserForm
   include ActiveModel::Model
 
   
-  attr_accessor :mail, :login, :phone, :password
+  attr_accessor :mail, :phone, :password
 
-  validates :login, presence: true
   validates :mail, presence: true, format: { with: CustomRegexp::EMAIL, message: "邮箱格式错误." }
   validates :phone, presence: true, format: { with: CustomRegexp::PHONE, message: "手机号格式错误" }
   validates :password, presence: true, length: { minimum: 8, maximum: 16 }, format: { with: CustomRegexp::PASSWORD, message: "8~16位密码，支持字母数字和符号" }
 
-  validate :check_login, :check_mail
+  validate :check_mail
 
   private
   def check_mail
@@ -20,13 +19,5 @@ class Users::AdminCreateUserForm
     end
   end
   
-  def check_login
-    return if login.blank?
-    if User.exists?(login: login)
-      raise "手机号 #{login} 已使用." 
-      errors.add(:login, :not_exist)
-    end
-  end
-
 end
 
diff --git a/app/views/admins/users/new.html.erb b/app/views/admins/users/new.html.erb
index 02e64a4e..e3c32f6b 100644
--- a/app/views/admins/users/new.html.erb
+++ b/app/views/admins/users/new.html.erb
@@ -10,18 +10,9 @@
      <%= f.error_notification %>
     <div class="form-group px-2">
       <div class="form-row">
-        <%= f.input :login, label: '登录名', required: true, wrapper_html: { class: 'col-md-3' }, input_html: {  class: 'col-md-11' } %>
-      </div>
-
-      <div class="form-row">
-        <%= f.input :nickname, label: '昵称', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-md-11' } %>
-      </div>
-
-      <div class="form-row">
-        <%= f.input :mail, as: :email, label: '邮箱地址', required: true, error_html: { id: 'password_error'}, wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
         <%= f.input :phone, as: :tel, label: '手机号', required: true, wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'off' } %>
+        <%= f.input :mail, as: :email, label: '邮箱地址', required: true, error_html: { id: 'password_error'}, wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
       </div>
-      
     </div>
 
     <div class="form-row">