From 4019b7939a232342a6f82d024cae0b2274ed6e7c Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Thu, 7 Aug 2025 18:52:20 +0800
Subject: [PATCH] chore:

---
 .../src/views/framework/register/index.vue    |  2 +-
 .../user/login/register-controller.ts         |  3 ++-
 .../sys/authority/service/user-service.ts     | 20 ++++++++++++-------
 3 files changed, 16 insertions(+), 9 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 714a5e196..38602cf67 100644
--- a/packages/ui/certd-client/src/views/framework/register/index.vue
+++ b/packages/ui/certd-client/src/views/framework/register/index.vue
@@ -32,7 +32,7 @@
         </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-form-item required has-feedback name="username" label="用户名" :rules="rules.username">
               <a-input v-model:value="formState.username" placeholder="用户名" size="large" autocomplete="off">
                 <template #prefix>
                   <fs-icon icon="ion:person-outline"></fs-icon>
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 cd3fd6337..579bcef42 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,7 +40,7 @@ export class RegisterController extends BaseController {
       throw new Error('当前站点已禁止自助注册功能');
     }
 
-    if (!body.username && body.username in ["admin","certd"]) {
+    if (body.username && ["admin","certd"].includes(body.username) ) {
       throw new Error('用户名不能为保留字');
     }
 
@@ -90,6 +90,7 @@ export class RegisterController extends BaseController {
         throwError: true,
       });
       const newUser = await this.userService.register(body.type, {
+        username: body.username,
         email: body.email,
         password: body.password,
       } as any);
diff --git a/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts b/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts
index 3298d4778..c0d4358ed 100644
--- a/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts
+++ b/packages/ui/certd-server/src/modules/sys/authority/service/user-service.ts
@@ -175,25 +175,26 @@ export class UserService extends BaseService<UserEntity> {
     if (!user.password) {
       user.password = simpleNanoId();
     }
-    if (!user.username) {
-      user.username = 'user_' + simpleNanoId();
-    }
 
-    if (type === 'username') {
+
+    if (user.username) {
       const username = user.username;
       const old = await this.findOne([{ username: username }, { mobile: username }, { email: username }]);
       if (old != null) {
         throw new CommonException('用户名已被注册');
       }
-    } else if (type === 'mobile') {
+    }
+
+    if (user.mobile) {
       const mobile = user.mobile;
 
-      user.nickName = mobile.substring(0, 3) + '****' + mobile.substring(7);
+      user.nickName = user.username || mobile.substring(0, 3) + '****' + mobile.substring(7);
       const old = await this.findOne([{ username: mobile }, { mobile: mobile }, { email: mobile }]);
       if (old != null) {
         throw new CommonException('手机号已被注册');
       }
-    } else if (type === 'email') {
+    }
+    if (user.email) {
       const email = user.email;
       const old = await this.findOne([{ username: email }, { mobile: email }, { email: email }]);
       if (old != null) {
@@ -201,6 +202,11 @@ export class UserService extends BaseService<UserEntity> {
       }
     }
 
+
+    if (!user.username) {
+      user.username = 'user_' + simpleNanoId();
+    }
+
     let newUser: UserEntity = UserEntity.of({
       username: user.username,
       password: user.password,