From fdcfcc77a0db87954e0b026635d3ccdd9bc6cee8 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 7 Aug 2025 10:36:34 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=B3=A8=E5=86=8C=E6=97=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A1=AB=E5=86=99=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../certd-client/src/views/framework/register/index.vue  | 7 +++++++
 .../src/controller/user/login/register-controller.ts     | 9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/ui/certd-client/src/views/framework/register/index.vue b/packages/ui/certd-client/src/views/framework/register/index.vue
index 907020d3..714a5e19 100644
--- a/packages/ui/certd-client/src/views/framework/register/index.vue
+++ b/packages/ui/certd-client/src/views/framework/register/index.vue
@@ -32,6 +32,13 @@
         </a-tab-pane>
         <a-tab-pane key="email" tab="邮箱注册" :disabled="!settingsStore.sysPublic.emailRegisterEnabled">
           <template v-if="registerType === 'email'">
+            <a-form-item required has-feedback name="username" label="用户名">
+              <a-input v-model:value="formState.username" placeholder="用户名" size="large" autocomplete="off">
+                <template #prefix>
+                  <fs-icon icon="ion:person-outline"></fs-icon>
+                </template>
+              </a-input>
+            </a-form-item>
             <a-form-item required has-feedback name="email" label="邮箱">
               <a-input v-model:value="formState.email" placeholder="邮箱" size="large" autocomplete="off">
                 <template #prefix>
diff --git a/packages/ui/certd-server/src/controller/user/login/register-controller.ts b/packages/ui/certd-server/src/controller/user/login/register-controller.ts
index 7ad2bacf..cd3fd633 100644
--- a/packages/ui/certd-server/src/controller/user/login/register-controller.ts
+++ b/packages/ui/certd-server/src/controller/user/login/register-controller.ts
@@ -40,6 +40,10 @@ export class RegisterController extends BaseController {
       throw new Error('当前站点已禁止自助注册功能');
     }
 
+    if (!body.username && body.username in ["admin","certd"]) {
+      throw new Error('用户名不能为保留字');
+    }
+
     if (body.type === 'username') {
       if (sysPublicSettings.usernameRegisterEnabled === false) {
         throw new Error('当前站点已禁止用户名注册功能');
@@ -47,9 +51,7 @@ export class RegisterController extends BaseController {
       if (!body.username) {
         throw new Error('用户名不能为空');
       }
-      if (body.username in ["admin","certd"]) {
-        throw new Error('用户名不能为保留字');
-      }
+
       await this.codeService.checkCaptcha(body.randomStr, body.imgCode);
       const newUser = await this.userService.register(body.type, {
         username: body.username,
@@ -70,6 +72,7 @@ export class RegisterController extends BaseController {
         throwError: true,
       });
       const newUser = await this.userService.register(body.type, {
+        username: body.username,
         phoneCode: body.phoneCode,
         mobile: body.mobile,
         password: body.password,