From 9820d2f020c2d6e68b97dbbed6d4fdb681af5806 Mon Sep 17 00:00:00 2001
From: Toyas <toyasovo@gmail.com>
Date: Sat, 18 Apr 2026 21:02:03 +0800
Subject: [PATCH] fix(admin): Correct admin initialization and password salt
 compatibility

---
 .../video/admin/service/impl/AdminUserInitService.java    | 2 +-
 .../video/admin/service/impl/AdminUserServiceImpl.java    | 4 ++--
 .../video/admin/service/impl/PasswordServiceImpl.java     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/AdminUserInitService.java b/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/AdminUserInitService.java
index 62f208b..6f31bff 100644
--- a/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/AdminUserInitService.java
+++ b/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/AdminUserInitService.java
@@ -49,7 +49,7 @@ public class AdminUserInitService implements ApplicationRunner {
         adminUser.setRealName("系统管理员");
         adminUser.setEmail("admin@example.com");
         adminUser.setStatus(1); // 正常状态
-        adminUser.setSalt(null);
+        adminUser.setSalt(passwordService.generateSalt());
         adminUser.setCreatedBy("system");
         adminUser.setUpdatedBy("system");
         adminUser.setCreateTime(LocalDateTime.now());
diff --git a/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/AdminUserServiceImpl.java b/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/AdminUserServiceImpl.java
index 59d9d32..ac0f798 100644
--- a/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/AdminUserServiceImpl.java
+++ b/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/AdminUserServiceImpl.java
@@ -221,7 +221,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
         } else {
             // 不更新密码
             adminUser.setPassword(null);
-            adminUser.setSalt(null); // 同时不更新盐值
+            adminUser.setSalt(""); // 使用空串兼容非空字段约束
         }
 
         adminUser.setUpdatedBy(operator);
@@ -307,4 +307,4 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
 
         return Result.success();
     }
-}
\ No newline at end of file
+}
diff --git a/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/PasswordServiceImpl.java b/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/PasswordServiceImpl.java
index 9daa0c8..a601a84 100644
--- a/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/PasswordServiceImpl.java
+++ b/backend/video-admin/src/main/java/com/nuaa/video/admin/service/impl/PasswordServiceImpl.java
@@ -20,7 +20,7 @@ public class PasswordServiceImpl implements PasswordService {
 
     @Override
     public String generateSalt() {
-        // BCrypt已包含盐值，此方法不再需要
+        // 兼容历史表结构，salt 字段仍要求非空
         return "";
     }
 
@@ -44,7 +44,7 @@ public class PasswordServiceImpl implements PasswordService {
     public void setPassword(AdminUser user, String rawPassword) {
         // 直接使用BCrypt加密密码
         user.setPassword(passwordEncoder.encode(rawPassword));
-        // 不再需要设置盐值
-        user.setSalt(null);
+        // BCrypt 已内置盐值，这里仅写入空串以兼容非空字段约束
+        user.setSalt(generateSalt());
     }
-}
\ No newline at end of file
+}