From 046a4916c2ebe16efdf3fd8c48d0b7d4fd86476f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 21 Aug 2019 14:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=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    | 2 +-
 app/controllers/application_controller.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 2524c53d8..e62dcf6ed 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -38,7 +38,7 @@ class AccountsController < ApplicationController
         return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
       end
 
-      code = generate_identifier User, 8
+      code = generate_identifier User, 8, pre
       login = pre + code
       @user = User.new(admin: false, login: login, mail: email, phone: phone, type: "User")
       @user.password = params[:password]
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e7b4bdac6..54c07d1c1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -396,10 +396,10 @@ class ApplicationController < ActionController::Base
 	end
 
 	# 随机生成字符
-	def generate_identifier(container, num)
+	def generate_identifier(container, num, pre='')
 		code = DCODES.sample(num).join
 		if container == User
-			while container.exists?(login: code) do
+			while container.exists?(login: pre+code) do
 				code = DCODES.sample(num).join
 			end
 		else