From 89913c0d26fe99a00b443eb08c6db5db9001b58c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Sun, 31 Aug 2025 21:01:54 +0800
Subject: [PATCH 01/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E"=E9=82=80=E8=AF=B7?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD"=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.新增"邀请功能"开关
2.i18n本地化
3.修复侧边栏权限同步问题
---
 controller/misc.go                            |   1 +
 controller/user.go                            |  79 ++++++++---
 model/main.go                                 |   2 +
 model/option.go                               |   2 +
 model/user.go                                 |  25 ++--
 setting/operation_setting/general_setting.go  |   2 +
 .../personal/cards/NotificationSettings.jsx   |   2 +-
 web/src/components/topup/index.jsx            | 125 ++++++++++++++----
 web/src/helpers/utils.jsx                     |  21 +--
 web/src/hooks/common/useUserPermissions.js    |   6 +-
 web/src/i18n/locales/en.json                  |   4 +-
 .../Setting/Operation/SettingsGeneral.jsx     |  31 ++++-
 12 files changed, 230 insertions(+), 70 deletions(-)

diff --git a/controller/misc.go b/controller/misc.go
index 875142ffbf04..90a10373d95c 100644
--- a/controller/misc.go
+++ b/controller/misc.go
@@ -63,6 +63,7 @@ func GetStatus(c *gin.Context) {
 		"turnstile_site_key":          common.TurnstileSiteKey,
 		"top_up_link":                 common.TopUpLink,
 		"docs_link":                   operation_setting.GetGeneralSetting().DocsLink,
+		"invitation_enabled":          operation_setting.GetGeneralSetting().InvitationEnabled,
 		"quota_per_unit":              common.QuotaPerUnit,
 		"display_in_currency":         common.DisplayInCurrencyEnabled,
 		"enable_batch_update":         common.BatchUpdateEnabled,
diff --git a/controller/user.go b/controller/user.go
index 982329cec0de..03208b19404f 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -10,6 +10,7 @@ import (
 	"one-api/logger"
 	"one-api/model"
 	"one-api/setting"
+	"one-api/setting/operation_setting"
 	"strconv"
 	"strings"
 	"sync"
@@ -375,6 +376,16 @@ type TransferAffQuotaRequest struct {
 }
 
 func TransferAffQuota(c *gin.Context) {
+	// 检查邀请功能是否启用
+	generalSetting := operation_setting.GetGeneralSetting()
+	if !generalSetting.InvitationEnabled {
+		c.JSON(http.StatusOK, gin.H{
+			"success": false,
+			"message": "邀请功能已被管理员禁用",
+		})
+		return
+	}
+
 	id := c.GetInt("id")
 	user, err := model.GetUserById(id, true)
 	if err != nil {
@@ -401,6 +412,16 @@ func TransferAffQuota(c *gin.Context) {
 }
 
 func GetAffCode(c *gin.Context) {
+	// 检查邀请功能是否启用
+	generalSetting := operation_setting.GetGeneralSetting()
+	if !generalSetting.InvitationEnabled {
+		c.JSON(http.StatusOK, gin.H{
+			"success": false,
+			"message": "邀请功能已被管理员禁用",
+		})
+		return
+	}
+
 	id := c.GetInt("id")
 	user, err := model.GetUserById(id, true)
 	if err != nil {
@@ -444,26 +465,26 @@ func GetSelf(c *gin.Context) {
 
 	// 构建响应数据，包含用户信息和权限
 	responseData := map[string]interface{}{
-		"id":                user.Id,
-		"username":          user.Username,
-		"display_name":      user.DisplayName,
-		"role":              user.Role,
-		"status":            user.Status,
-		"email":             user.Email,
-		"group":             user.Group,
-		"quota":             user.Quota,
-		"used_quota":        user.UsedQuota,
-		"request_count":     user.RequestCount,
-		"aff_code":          user.AffCode,
-		"aff_count":         user.AffCount,
-		"aff_quota":         user.AffQuota,
+		"id":               user.Id,
+		"username":         user.Username,
+		"display_name":     user.DisplayName,
+		"role":             user.Role,
+		"status":           user.Status,
+		"email":            user.Email,
+		"group":            user.Group,
+		"quota":            user.Quota,
+		"used_quota":       user.UsedQuota,
+		"request_count":    user.RequestCount,
+		"aff_code":         user.AffCode,
+		"aff_count":        user.AffCount,
+		"aff_quota":        user.AffQuota,
 		"aff_history_quota": user.AffHistoryQuota,
-		"inviter_id":        user.InviterId,
-		"linux_do_id":       user.LinuxDOId,
-		"setting":           user.Setting,
-		"stripe_customer":   user.StripeCustomer,
-		"sidebar_modules":   userSetting.SidebarModules, // 正确提取sidebar_modules字段
-		"permissions":       permissions,                // 新增权限字段
+		"inviter_id":       user.InviterId,
+		"linux_do_id":      user.LinuxDOId,
+		"setting":          user.Setting,
+		"stripe_customer":  user.StripeCustomer,
+		"sidebar_modules":  userSetting.SidebarModules, // 正确提取sidebar_modules字段
+		"permissions":      permissions,                 // 新增权限字段
 	}
 
 	c.JSON(http.StatusOK, gin.H{
@@ -564,6 +585,8 @@ func generateDefaultSidebarConfig(userRole int) string {
 	return string(configBytes)
 }
 
+
+
 func GetUserModels(c *gin.Context) {
 	id, err := strconv.Atoi(c.Param("id"))
 	if err != nil {
@@ -949,6 +972,15 @@ func ManageUser(c *gin.Context) {
 			return
 		}
 		user.Role = common.RoleAdminUser
+
+		// 同步更新用户的sidebar_modules配置
+		currentSetting := user.GetSetting()
+		newSidebarConfig := model.GenerateDefaultSidebarConfigForRole(user.Role)
+		if newSidebarConfig != "" {
+			currentSetting.SidebarModules = newSidebarConfig
+			user.SetSetting(currentSetting)
+			common.SysLog(fmt.Sprintf("用户 %s 提升为管理员，已同步更新边栏配置", user.Username))
+		}
 	case "demote":
 		if user.Role == common.RoleRootUser {
 			c.JSON(http.StatusOK, gin.H{
@@ -965,6 +997,15 @@ func ManageUser(c *gin.Context) {
 			return
 		}
 		user.Role = common.RoleCommonUser
+
+		// 同步更新用户的sidebar_modules配置
+		currentSetting := user.GetSetting()
+		newSidebarConfig := model.GenerateDefaultSidebarConfigForRole(user.Role)
+		if newSidebarConfig != "" {
+			currentSetting.SidebarModules = newSidebarConfig
+			user.SetSetting(currentSetting)
+			common.SysLog(fmt.Sprintf("用户 %s 降级为普通用户，已同步更新边栏配置", user.Username))
+		}
 	}
 
 	if err := user.Update(false); err != nil {
diff --git a/model/main.go b/model/main.go
index 1a38d371b847..6900a0451958 100644
--- a/model/main.go
+++ b/model/main.go
@@ -114,6 +114,8 @@ func CheckSetup() {
 	}
 }
 
+
+
 func chooseDB(envName string, isLog bool) (*gorm.DB, error) {
 	defer func() {
 		initCol()
diff --git a/model/option.go b/model/option.go
index ceecff658f5e..9f44ae828d6a 100644
--- a/model/option.go
+++ b/model/option.go
@@ -159,6 +159,8 @@ func loadOptionsFromDatabase() {
 	}
 }
 
+
+
 func SyncOptions(frequency int) {
 	for {
 		time.Sleep(time.Duration(frequency) * time.Second)
diff --git a/model/user.go b/model/user.go
index ea0584c5a05a..d1efb15be798 100644
--- a/model/user.go
+++ b/model/user.go
@@ -7,6 +7,7 @@ import (
 	"one-api/common"
 	"one-api/dto"
 	"one-api/logger"
+	"one-api/setting/operation_setting"
 	"strconv"
 	"strings"
 
@@ -92,7 +93,7 @@ func (user *User) SetSetting(setting dto.UserSetting) {
 }
 
 // 根据用户角色生成默认的边栏配置
-func generateDefaultSidebarConfigForRole(userRole int) string {
+func GenerateDefaultSidebarConfigForRole(userRole int) string {
 	defaultConfig := map[string]interface{}{}
 
 	// 聊天区域 - 所有用户都可以访问
@@ -400,7 +401,7 @@ func (user *User) Insert(inviterId int) error {
 	var createdUser User
 	if err := DB.Where("username = ?", user.Username).First(&createdUser).Error; err == nil {
 		// 生成基于角色的默认边栏配置
-		defaultSidebarConfig := generateDefaultSidebarConfigForRole(createdUser.Role)
+		defaultSidebarConfig := GenerateDefaultSidebarConfigForRole(createdUser.Role)
 		if defaultSidebarConfig != "" {
 			currentSetting := createdUser.GetSetting()
 			currentSetting.SidebarModules = defaultSidebarConfig
@@ -414,14 +415,18 @@ func (user *User) Insert(inviterId int) error {
 		RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("新用户注册赠送 %s", logger.LogQuota(common.QuotaForNewUser)))
 	}
 	if inviterId != 0 {
-		if common.QuotaForInvitee > 0 {
-			_ = IncreaseUserQuota(user.Id, common.QuotaForInvitee, true)
-			RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("使用邀请码赠送 %s", logger.LogQuota(common.QuotaForInvitee)))
-		}
-		if common.QuotaForInviter > 0 {
-			//_ = IncreaseUserQuota(inviterId, common.QuotaForInviter)
-			RecordLog(inviterId, LogTypeSystem, fmt.Sprintf("邀请用户赠送 %s", logger.LogQuota(common.QuotaForInviter)))
-			_ = inviteUser(inviterId)
+		// 检查邀请功能是否启用
+		generalSetting := operation_setting.GetGeneralSetting()
+		if generalSetting.InvitationEnabled {
+			if common.QuotaForInvitee > 0 {
+				_ = IncreaseUserQuota(user.Id, common.QuotaForInvitee, true)
+				RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("使用邀请码赠送 %s", logger.LogQuota(common.QuotaForInvitee)))
+			}
+			if common.QuotaForInviter > 0 {
+				//_ = IncreaseUserQuota(inviterId, common.QuotaForInviter)
+				RecordLog(inviterId, LogTypeSystem, fmt.Sprintf("邀请用户赠送 %s", logger.LogQuota(common.QuotaForInviter)))
+				_ = inviteUser(inviterId)
+			}
 		}
 	}
 	return nil
diff --git a/setting/operation_setting/general_setting.go b/setting/operation_setting/general_setting.go
index ae0c436ecefd..fc9190f4d1cf 100644
--- a/setting/operation_setting/general_setting.go
+++ b/setting/operation_setting/general_setting.go
@@ -6,6 +6,7 @@ type GeneralSetting struct {
 	DocsLink            string `json:"docs_link"`
 	PingIntervalEnabled bool   `json:"ping_interval_enabled"`
 	PingIntervalSeconds int    `json:"ping_interval_seconds"`
+	InvitationEnabled   bool   `json:"invitation_enabled"`
 }
 
 // 默认配置
@@ -13,6 +14,7 @@ var generalSetting = GeneralSetting{
 	DocsLink:            "https://docs.newapi.pro",
 	PingIntervalEnabled: false,
 	PingIntervalSeconds: 60,
+	InvitationEnabled:   true,
 }
 
 func init() {
diff --git a/web/src/components/settings/personal/cards/NotificationSettings.jsx b/web/src/components/settings/personal/cards/NotificationSettings.jsx
index 0b097eaff232..68ddab51a3b4 100644
--- a/web/src/components/settings/personal/cards/NotificationSettings.jsx
+++ b/web/src/components/settings/personal/cards/NotificationSettings.jsx
@@ -664,7 +664,7 @@ const NotificationSettings = ({
                         color: 'var(--semi-color-text-2)',
                       }}
                     >
-                      {t('您可以个性化设置侧边栏的要显示功能')}
+                      {t('您可以个性化设置侧边栏要显示的功能')}
                     </Typography.Text>
                   </div>
                   {/* 边栏设置功能区域容器 */}
diff --git a/web/src/components/topup/index.jsx b/web/src/components/topup/index.jsx
index 929a47e39b04..32d7dfae4bf1 100644
--- a/web/src/components/topup/index.jsx
+++ b/web/src/components/topup/index.jsx
@@ -60,6 +60,8 @@ const TopUp = () => {
   const [enableStripeTopUp, setEnableStripeTopUp] = useState(
     statusState?.status?.enable_stripe_topup || false,
   );
+  const [invitationEnabled, setInvitationEnabled] = useState(false); // 初始为false，避免闪烁
+  const [invitationConfigLoaded, setInvitationConfigLoaded] = useState(false); // 添加配置加载状态
   const [statusLoading, setStatusLoading] = useState(true);
 
   const [isSubmitting, setIsSubmitting] = useState(false);
@@ -359,6 +361,44 @@ const TopUp = () => {
     }
   };
 
+  // 获取邀请功能配置状态
+  const getInvitationConfig = async () => {
+    try {
+      const res = await API.get('/api/status');
+      const { success, data } = res.data;
+      if (success) {
+        //console.log('从status接口获取到的邀请功能配置:', data.invitation_enabled);
+        const enabled = data.invitation_enabled === true;
+        //console.log('邀请功能状态:', enabled);
+        setInvitationEnabled(enabled);
+        setInvitationConfigLoaded(true);
+        // 只有在邀请功能启用时才获取邀请链接
+        if (enabled && !affFetchedRef.current) {
+          affFetchedRef.current = true;
+          getAffLink();
+        }
+      } else {
+        // API调用失败，使用后端默认值（true）
+        //console.log('status接口调用失败，使用默认值true');
+        setInvitationEnabled(true);
+        setInvitationConfigLoaded(true);
+        if (!affFetchedRef.current) {
+          affFetchedRef.current = true;
+          getAffLink();
+        }
+      }
+    } catch (error) {
+      //console.error('获取邀请功能配置失败:', error);
+      // 出错时使用后端默认值（true）
+      setInvitationEnabled(true);
+      setInvitationConfigLoaded(true);
+      if (!affFetchedRef.current) {
+        affFetchedRef.current = true;
+        getAffLink();
+      }
+    }
+  };
+
   // 划转邀请额度
   const transfer = async () => {
     if (transferAmount < getQuotaPerUnit()) {
@@ -389,18 +429,55 @@ const TopUp = () => {
       getUserQuota().then();
     }
     setTransferAmount(getQuotaPerUnit());
-  }, []);
+    getInvitationConfig().then();
 
-  useEffect(() => {
-    if (affFetchedRef.current) return;
-    affFetchedRef.current = true;
-    getAffLink().then();
-  }, []);
+    let payMethods = localStorage.getItem('pay_methods');
+    try {
+      payMethods = JSON.parse(payMethods);
+      if (payMethods && payMethods.length > 0) {
+        // 检查name和type是否为空
+        payMethods = payMethods.filter((method) => {
+          return method.name && method.type;
+        });
+        // 如果没有color，则设置默认颜色
+        payMethods = payMethods.map((method) => {
+          if (!method.color) {
+            if (method.type === 'alipay') {
+              method.color = 'rgba(var(--semi-blue-5), 1)';
+            } else if (method.type === 'wxpay') {
+              method.color = 'rgba(var(--semi-green-5), 1)';
+            } else if (method.type === 'stripe') {
+              method.color = 'rgba(var(--semi-purple-5), 1)';
+            } else {
+              method.color = 'rgba(var(--semi-primary-5), 1)';
+            }
+          }
+          return method;
+        });
+      } else {
+        payMethods = [];
+      }
 
-  // 在 statusState 可用时获取充值信息
-  useEffect(() => {
-    getTopupInfo().then();
-  }, []);
+      // 如果启用了 Stripe 支付，添加到支付方法列表
+      if (statusState?.status?.enable_stripe_topup) {
+        const hasStripe = payMethods.some((method) => method.type === 'stripe');
+        if (!hasStripe) {
+          payMethods.push({
+            name: 'Stripe',
+            type: 'stripe',
+            color: 'rgba(var(--semi-purple-5), 1)',
+          });
+        }
+      }
+
+      setPayMethods(payMethods);
+    } catch (e) {
+      console.log(e);
+      showError(t('支付方式配置错误, 请联系管理员'));
+    }
+  }, [statusState?.status?.enable_stripe_topup]);
+
+  // 移除独立的getAffLink调用，现在由getInvitationConfig统一处理
 
   useEffect(() => {
     if (statusState?.status) {
@@ -537,9 +614,9 @@ const TopUp = () => {
 
       {/* 用户信息头部 */}
       <div className='space-y-6'>
-        <div className='grid grid-cols-1 lg:grid-cols-12 gap-6'>
+        <div className={`grid grid-cols-1 gap-6 ${invitationConfigLoaded && invitationEnabled ? 'lg:grid-cols-12' : 'lg:grid-cols-1'}`}>
           {/* 左侧充值区域 */}
-          <div className='lg:col-span-7 space-y-6 w-full'>
+          <div className={`space-y-6 w-full ${invitationConfigLoaded && invitationEnabled ? 'lg:col-span-7' : 'lg:col-span-1 max-w-2xl mx-auto'}`}>
             <RechargeCard
               t={t}
               enableOnlineTopUp={enableOnlineTopUp}
@@ -574,17 +651,19 @@ const TopUp = () => {
             />
           </div>
 
-          {/* 右侧信息区域 */}
-          <div className='lg:col-span-5'>
-            <InvitationCard
-              t={t}
-              userState={userState}
-              renderQuota={renderQuota}
-              setOpenTransfer={setOpenTransfer}
-              affLink={affLink}
-              handleAffLinkClick={handleAffLinkClick}
-            />
-          </div>
+          {/* 右侧信息区域 - 仅在配置加载完成且邀请功能启用时显示 */}
+          {invitationConfigLoaded && invitationEnabled && (
+            <div className='lg:col-span-5'>
+              <InvitationCard
+                t={t}
+                userState={userState}
+                renderQuota={renderQuota}
+                setOpenTransfer={setOpenTransfer}
+                affLink={affLink}
+                handleAffLinkClick={handleAffLinkClick}
+              />
+            </div>
+          )}
         </div>
       </div>
     </div>
diff --git a/web/src/helpers/utils.jsx b/web/src/helpers/utils.jsx
index e446ea69d370..e7c4a126d1e2 100644
--- a/web/src/helpers/utils.jsx
+++ b/web/src/helpers/utils.jsx
@@ -294,16 +294,17 @@ export function setPromptShown(id) {
 export function compareObjects(oldObject, newObject) {
   const changedProperties = [];
 
-  // 比较两个对象的属性
-  for (const key in oldObject) {
-    if (oldObject.hasOwnProperty(key) && newObject.hasOwnProperty(key)) {
-      if (oldObject[key] !== newObject[key]) {
-        changedProperties.push({
-          key: key,
-          oldValue: oldObject[key],
-          newValue: newObject[key],
-        });
-      }
+  // 获取两个对象的所有键
+  const allKeys = new Set([...Object.keys(oldObject), ...Object.keys(newObject)]);
+
+  // 比较所有键的值
+  for (const key of allKeys) {
+    if (oldObject[key] !== newObject[key]) {
+      changedProperties.push({
+        key: key,
+        oldValue: oldObject[key],
+        newValue: newObject[key],
+      });
     }
   }
 
diff --git a/web/src/hooks/common/useUserPermissions.js b/web/src/hooks/common/useUserPermissions.js
index 8d57f972ef49..1428fcc2da5c 100644
--- a/web/src/hooks/common/useUserPermissions.js
+++ b/web/src/hooks/common/useUserPermissions.js
@@ -37,14 +37,14 @@ export const useUserPermissions = () => {
       if (res.data.success) {
         const userPermissions = res.data.data.permissions;
         setPermissions(userPermissions);
-        console.log('用户权限加载成功:', userPermissions);
+        //console.log('用户权限加载成功:', userPermissions);
       } else {
         setError(res.data.message || '获取权限失败');
-        console.error('获取权限失败:', res.data.message);
+        //console.error('获取权限失败:', res.data.message);
       }
     } catch (error) {
       setError('网络错误，请重试');
-      console.error('加载用户权限异常:', error);
+      //console.error('加载用户权限异常:', error);
     } finally {
       setLoading(false);
     }
diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index c86fb0e7f608..8d520b72bb3d 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -2011,7 +2011,7 @@
   "为一个 JSON 文本，键为模型名称，值为倍率，例如：{\"gpt-4o-realtime\": 2}": "A JSON text with model name as key and ratio as value, e.g.: {\"gpt-4o-realtime\": 2}",
   "顶栏管理": "Header Management",
   "控制顶栏模块显示状态，全局生效": "Control header module display status, global effect",
-  "用户主页，展示系统信息": "User homepage, displaying system information",
+  "系统主页": "System homepage",
   "用户控制面板，管理账户": "User control panel for account management",
   "模型广场": "Model Marketplace",
   "模型定价，需要登录访问": "Model pricing, requires login to access",
@@ -2062,7 +2062,7 @@
   "系统设置": "System Settings",
   "系统参数配置": "System parameter configuration",
   "边栏设置": "Sidebar Settings",
-  "您可以个性化设置侧边栏的要显示功能": "You can customize the sidebar functions to display",
+  "您可以个性化设置侧边栏要显示的功能": "You can customize the sidebar functions to display",
   "保存边栏设置": "Save Sidebar Settings",
   "侧边栏设置保存成功": "Sidebar settings saved successfully",
   "需要登录访问": "Require Login",
diff --git a/web/src/pages/Setting/Operation/SettingsGeneral.jsx b/web/src/pages/Setting/Operation/SettingsGeneral.jsx
index 5af750ec39f0..29e9b7348845 100644
--- a/web/src/pages/Setting/Operation/SettingsGeneral.jsx
+++ b/web/src/pages/Setting/Operation/SettingsGeneral.jsx
@@ -43,6 +43,7 @@ export default function GeneralSettings(props) {
     DefaultCollapseSidebar: false,
     DemoSiteEnabled: false,
     SelfUseModeEnabled: false,
+    'general_setting.invitation_enabled': true,
   });
   const refForm = useRef();
   const [inputsRow, setInputsRow] = useState(inputs);
@@ -89,12 +90,27 @@ export default function GeneralSettings(props) {
   }
 
   useEffect(() => {
-    const currentInputs = {};
+    // 从初始 inputs 开始，确保保留所有默认值
+    const currentInputs = { ...inputs };
+
+    // 用 props.options 中的值覆盖对应的键
     for (let key in props.options) {
       if (Object.keys(inputs).includes(key)) {
-        currentInputs[key] = props.options[key];
+        let value = props.options[key];
+        // 对于布尔类型的字段，需要进行字符串到布尔值的转换
+        if (typeof inputs[key] === 'boolean') {
+          if (typeof value === 'string') {
+            value = value === 'true';
+          } else if (typeof value === 'boolean') {
+            value = value;
+          } else {
+            value = inputs[key]; // 保持默认值
+          }
+        }
+        currentInputs[key] = value;
       }
     }
+
     setInputs(currentInputs);
     setInputsRow(structuredClone(currentInputs));
     refForm.current.setValues(currentInputs);
@@ -218,6 +234,17 @@ export default function GeneralSettings(props) {
                   onChange={handleFieldChange('SelfUseModeEnabled')}
                 />
               </Col>
+              <Col xs={24} sm={12} md={8} lg={8} xl={8}>
+                <Form.Switch
+                  field={'general_setting.invitation_enabled'}
+                  label={t('邀请功能')}
+                  extraText={t('关闭后：不在启用邀请奖励功能')}
+                  size='default'
+                  checkedText='｜'
+                  uncheckedText='〇'
+                  onChange={handleFieldChange('general_setting.invitation_enabled')}
+                />
+              </Col>
             </Row>
             <Row>
               <Button size='default' onClick={onSubmit}>

From 872db7686e159023711db9b27f71aad6ae6e665e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Mon, 1 Sep 2025 07:49:09 +0800
Subject: [PATCH 02/18] =?UTF-8?q?=E6=96=B0=E5=A2=9E"=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.新增分组管理功能
2.修复登录页面样式错位，统一主页和登录页面风格
---
 controller/user.go                            |   5 +
 controller/user_group.go                      | 284 +++++++++++++++++
 model/main.go                                 |   8 +
 model/user.go                                 |  55 ++++
 model/user_group.go                           | 124 ++++++++
 router/api-router.go                          |   9 +
 web/src/components/auth/AuthPageLayout.jsx    |  39 +++
 web/src/components/auth/LoginForm.jsx         |  16 +-
 .../components/auth/PasswordResetConfirm.jsx  |  16 +-
 web/src/components/auth/PasswordResetForm.jsx |  16 +-
 web/src/components/auth/RegisterForm.jsx      |  16 +-
 web/src/components/layout/Footer.jsx          |   2 +-
 .../layout/headerbar/LanguageSelector.jsx     |   4 +-
 .../personal/components/UserInfoHeader.jsx    |   4 +-
 .../components/table/users/UsersActions.jsx   |  87 ++++-
 web/src/components/table/users/index.jsx      |   6 +-
 .../table/users/modals/AddUserModal.jsx       |  39 ++-
 .../table/users/modals/EditUserGroupModal.jsx | 221 +++++++++++++
 .../users/modals/UserGroupManagement.jsx      | 298 ++++++++++++++++++
 web/src/helpers/api.js                        |  34 +-
 web/src/helpers/render.jsx                    |  10 +-
 web/src/i18n/locales/en.json                  |  52 ++-
 web/src/pages/Home/index.jsx                  |   2 +-
 .../Operation/SettingsSidebarModulesAdmin.jsx | 124 +++++++-
 .../Personal/SettingsSidebarModulesUser.jsx   |   4 +-
 25 files changed, 1384 insertions(+), 91 deletions(-)
 create mode 100644 controller/user_group.go
 create mode 100644 model/user_group.go
 create mode 100644 web/src/components/auth/AuthPageLayout.jsx
 create mode 100644 web/src/components/table/users/modals/EditUserGroupModal.jsx
 create mode 100644 web/src/components/table/users/modals/UserGroupManagement.jsx

diff --git a/controller/user.go b/controller/user.go
index 03208b19404f..8e43fe0e39a2 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -865,6 +865,10 @@ func CreateUser(c *gin.Context) {
 	if user.DisplayName == "" {
 		user.DisplayName = user.Username
 	}
+	// 如果没有指定分组，设置为默认分组
+	if user.Group == "" {
+		user.Group = "default"
+	}
 	myRole := c.GetInt("role")
 	if user.Role >= myRole {
 		c.JSON(http.StatusOK, gin.H{
@@ -879,6 +883,7 @@ func CreateUser(c *gin.Context) {
 		Password:    user.Password,
 		DisplayName: user.DisplayName,
 		Role:        user.Role, // 保持管理员设置的角色
+		Group:       user.Group, // 保持管理员设置的分组
 	}
 	if err := cleanUser.Insert(0); err != nil {
 		common.ApiError(c, err)
diff --git a/controller/user_group.go b/controller/user_group.go
new file mode 100644
index 000000000000..4d7b77dac033
--- /dev/null
+++ b/controller/user_group.go
@@ -0,0 +1,284 @@
+package controller
+
+import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+
+	"one-api/common"
+	"one-api/model"
+	"one-api/setting"
+	"one-api/setting/ratio_setting"
+
+	"github.com/gin-gonic/gin"
+)
+
+// GetAllUserGroups 获取用户分组列表
+func GetAllUserGroups(c *gin.Context) {
+	groups, err := model.GetAllUserGroups()
+	if err != nil {
+		common.ApiError(c, err)
+		return
+	}
+	common.ApiSuccess(c, groups)
+}
+
+// CreateUserGroup 创建新的用户分组
+func CreateUserGroup(c *gin.Context) {
+	var g model.UserGroup
+	if err := c.ShouldBindJSON(&g); err != nil {
+		common.ApiError(c, err)
+		return
+	}
+	if g.Name == "" {
+		common.ApiErrorMsg(c, "分组名称不能为空")
+		return
+	}
+	if g.Ratio < 0 {
+		common.ApiErrorMsg(c, "分组倍率不能小于0")
+		return
+	}
+	if g.Ratio == 0 {
+		g.Ratio = 1.0 // 默认倍率为1.0
+	}
+
+	// 创建前检查名称
+	if dup, err := model.IsUserGroupNameDuplicated(0, g.Name); err != nil {
+		common.ApiError(c, err)
+		return
+	} else if dup {
+		common.ApiErrorMsg(c, "分组名称已存在")
+		return
+	}
+
+	if err := g.Insert(); err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 同步到分组倍率设置
+	if err := syncGroupToRatioSetting(g.Name, g.Ratio, true); err != nil {
+		common.SysLog("同步分组到倍率设置失败: " + err.Error())
+	}
+
+	// 同步到用户可选分组
+	if err := syncGroupToUserUsableGroups(g.Name, g.Description, true); err != nil {
+		common.SysLog("同步分组到用户可选分组失败: " + err.Error())
+	}
+
+	// 同步到充值分组倍率
+	if err := syncGroupToTopupRatio(g.Name, g.Ratio, true); err != nil {
+		common.SysLog("同步分组到充值倍率设置失败: " + err.Error())
+	}
+
+	common.ApiSuccess(c, &g)
+}
+
+// UpdateUserGroup 更新用户分组
+func UpdateUserGroup(c *gin.Context) {
+	var g model.UserGroup
+	if err := c.ShouldBindJSON(&g); err != nil {
+		common.ApiError(c, err)
+		return
+	}
+	if g.Id == 0 {
+		common.ApiErrorMsg(c, "缺少分组 ID")
+		return
+	}
+	if g.Ratio < 0 {
+		common.ApiErrorMsg(c, "分组倍率不能小于0")
+		return
+	}
+
+	// 获取原分组信息
+	oldGroup, err := model.GetUserGroupById(g.Id)
+	if err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 名称冲突检查
+	if dup, err := model.IsUserGroupNameDuplicated(g.Id, g.Name); err != nil {
+		common.ApiError(c, err)
+		return
+	} else if dup {
+		common.ApiErrorMsg(c, "分组名称已存在")
+		return
+	}
+
+	if err := g.Update(); err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 如果名称发生变化，需要更新相关设置和用户数据
+	if oldGroup.Name != g.Name {
+		common.SysLog(fmt.Sprintf("检测到分组名称变化: '%s' -> '%s'", oldGroup.Name, g.Name))
+
+		// 更新所有使用旧分组名的用户
+		if err := model.UpdateUsersGroupName(oldGroup.Name, g.Name); err != nil {
+			common.SysLog("更新用户分组名称失败: " + err.Error())
+			common.ApiErrorMsg(c, "更新用户分组名称失败: "+err.Error())
+			return
+		}
+
+		// 从旧设置中移除
+		if err := syncGroupToRatioSetting(oldGroup.Name, 0, false); err != nil {
+			common.SysLog("从倍率设置中移除旧分组失败: " + err.Error())
+		}
+		if err := syncGroupToUserUsableGroups(oldGroup.Name, "", false); err != nil {
+			common.SysLog("从用户可选分组中移除旧分组失败: " + err.Error())
+		}
+		if err := syncGroupToTopupRatio(oldGroup.Name, 0, false); err != nil {
+			common.SysLog("从充值倍率设置中移除旧分组失败: " + err.Error())
+		}
+	}
+
+	// 同步到分组倍率设置
+	if err := syncGroupToRatioSetting(g.Name, g.Ratio, true); err != nil {
+		common.SysLog("同步分组到倍率设置失败: " + err.Error())
+	}
+
+	// 同步到用户可选分组
+	if err := syncGroupToUserUsableGroups(g.Name, g.Description, true); err != nil {
+		common.SysLog("同步分组到用户可选分组失败: " + err.Error())
+	}
+
+	// 同步到充值分组倍率
+	if err := syncGroupToTopupRatio(g.Name, g.Ratio, true); err != nil {
+		common.SysLog("同步分组到充值倍率设置失败: " + err.Error())
+	}
+
+	common.ApiSuccess(c, &g)
+}
+
+// DeleteUserGroup 删除用户分组
+func DeleteUserGroup(c *gin.Context) {
+	id, err := strconv.Atoi(c.Param("id"))
+	if err != nil {
+		common.ApiErrorMsg(c, "无效的分组 ID")
+		return
+	}
+
+	group, err := model.GetUserGroupById(id)
+	if err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 检查是否有用户正在使用此分组
+	if inUse, err := model.IsUserGroupInUse(group.Name); err != nil {
+		common.ApiError(c, err)
+		return
+	} else if inUse {
+		common.ApiErrorMsg(c, "该分组正在被用户使用，无法删除")
+		return
+	}
+
+	// 不允许删除默认分组
+	if group.Name == "default" || group.Name == "vip" || group.Name == "svip" {
+		common.ApiErrorMsg(c, "不能删除系统默认分组")
+		return
+	}
+
+	if err := group.Delete(); err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 从分组倍率设置中移除
+	if err := syncGroupToRatioSetting(group.Name, 0, false); err != nil {
+		common.SysLog("从倍率设置中移除分组失败: " + err.Error())
+	}
+
+	// 从用户可选分组中移除
+	if err := syncGroupToUserUsableGroups(group.Name, "", false); err != nil {
+		common.SysLog("从用户可选分组中移除分组失败: " + err.Error())
+	}
+
+	// 从充值分组倍率中移除
+	if err := syncGroupToTopupRatio(group.Name, 0, false); err != nil {
+		common.SysLog("从充值倍率设置中移除分组失败: " + err.Error())
+	}
+
+	common.ApiSuccess(c, nil)
+}
+
+// syncGroupToRatioSetting 同步分组到倍率设置
+func syncGroupToRatioSetting(groupName string, ratio float64, add bool) error {
+	groupRatio := ratio_setting.GetGroupRatioCopy()
+	
+	if add {
+		groupRatio[groupName] = ratio
+	} else {
+		delete(groupRatio, groupName)
+	}
+
+	jsonBytes, err := json.Marshal(groupRatio)
+	if err != nil {
+		return err
+	}
+
+	// 更新到数据库
+	if err := model.UpdateOption("GroupRatio", string(jsonBytes)); err != nil {
+		return err
+	}
+
+	// 更新内存中的设置
+	return ratio_setting.UpdateGroupRatioByJSONString(string(jsonBytes))
+}
+
+// syncGroupToUserUsableGroups 同步分组到用户可选分组
+func syncGroupToUserUsableGroups(groupName, description string, add bool) error {
+	userUsableGroups := setting.GetUserUsableGroupsCopy()
+
+	if add {
+		if description == "" {
+			description = groupName + "分组"
+		}
+		userUsableGroups[groupName] = description
+	} else {
+		delete(userUsableGroups, groupName)
+	}
+
+	jsonBytes, err := json.Marshal(userUsableGroups)
+	if err != nil {
+		return err
+	}
+
+	// 更新到数据库
+	if err := model.UpdateOption("UserUsableGroups", string(jsonBytes)); err != nil {
+		return err
+	}
+
+	// 更新内存中的设置
+	return setting.UpdateUserUsableGroupsByJSONString(string(jsonBytes))
+}
+
+// syncGroupToTopupRatio 同步分组到充值倍率设置
+func syncGroupToTopupRatio(groupName string, ratio float64, add bool) error {
+	// 获取当前充值分组倍率的副本
+	topupGroupRatio := make(map[string]float64)
+	for k, v := range common.TopupGroupRatio {
+		topupGroupRatio[k] = v
+	}
+
+	if add {
+		topupGroupRatio[groupName] = ratio
+	} else {
+		delete(topupGroupRatio, groupName)
+	}
+
+	jsonBytes, err := json.Marshal(topupGroupRatio)
+	if err != nil {
+		return err
+	}
+
+	// 更新到数据库
+	if err := model.UpdateOption("TopupGroupRatio", string(jsonBytes)); err != nil {
+		return err
+	}
+
+	// 更新内存中的设置
+	return common.UpdateTopupGroupRatioByJSONString(string(jsonBytes))
+}
diff --git a/model/main.go b/model/main.go
index 6900a0451958..686e22e340ba 100644
--- a/model/main.go
+++ b/model/main.go
@@ -264,6 +264,7 @@ func migrateDB() error {
 		&Model{},
 		&Vendor{},
 		&PrefillGroup{},
+		&UserGroup{},
 		&Setup{},
 		&TwoFA{},
 		&TwoFABackupCode{},
@@ -271,6 +272,12 @@ func migrateDB() error {
 	if err != nil {
 		return err
 	}
+
+	// 初始化默认用户分组
+	if err := InitDefaultUserGroups(); err != nil {
+		common.SysLog("初始化默认用户分组失败: " + err.Error())
+	}
+
 	return nil
 }
 
@@ -296,6 +303,7 @@ func migrateDBFast() error {
 		{&Model{}, "Model"},
 		{&Vendor{}, "Vendor"},
 		{&PrefillGroup{}, "PrefillGroup"},
+		{&UserGroup{}, "UserGroup"},
 		{&Setup{}, "Setup"},
 		{&TwoFA{}, "TwoFA"},
 		{&TwoFABackupCode{}, "TwoFABackupCode"},
diff --git a/model/user.go b/model/user.go
index d1efb15be798..16dd64d519a5 100644
--- a/model/user.go
+++ b/model/user.go
@@ -920,3 +920,58 @@ func RootUserExists() bool {
 	}
 	return true
 }
+
+// UpdateUsersGroupName 更新所有使用指定分组名的用户的分组名称
+func UpdateUsersGroupName(oldGroupName, newGroupName string) error {
+	if oldGroupName == "" || newGroupName == "" {
+		return errors.New("分组名称不能为空")
+	}
+
+	common.SysLog(fmt.Sprintf("开始更新用户分组名称: '%s' -> '%s'", oldGroupName, newGroupName))
+
+	// 先查询有多少用户使用旧分组名
+	var count int64
+	if err := DB.Model(&User{}).Where(commonGroupCol+" = ?", oldGroupName).Count(&count).Error; err != nil {
+		common.SysLog(fmt.Sprintf("查询使用分组 '%s' 的用户数量失败: %s", oldGroupName, err.Error()))
+		return err
+	}
+	common.SysLog(fmt.Sprintf("找到 %d 个用户使用分组 '%s'", count, oldGroupName))
+
+	// 使用事务确保数据一致性
+	tx := DB.Begin()
+	if tx.Error != nil {
+		return tx.Error
+	}
+
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	// 更新所有使用旧分组名的用户
+	result := tx.Model(&User{}).Where(commonGroupCol+" = ?", oldGroupName).Update(commonGroupCol, newGroupName)
+	if result.Error != nil {
+		tx.Rollback()
+		common.SysLog(fmt.Sprintf("更新用户分组名称失败: %s", result.Error.Error()))
+		return result.Error
+	}
+
+	// 提交事务
+	if err := tx.Commit().Error; err != nil {
+		common.SysLog(fmt.Sprintf("提交事务失败: %s", err.Error()))
+		return err
+	}
+
+	common.SysLog(fmt.Sprintf("成功更新 %d 个用户的分组名称从 '%s' 到 '%s'", result.RowsAffected, oldGroupName, newGroupName))
+
+	// 验证更新结果
+	var newCount int64
+	if err := DB.Model(&User{}).Where(commonGroupCol+" = ?", newGroupName).Count(&newCount).Error; err != nil {
+		common.SysLog(fmt.Sprintf("验证更新结果失败: %s", err.Error()))
+	} else {
+		common.SysLog(fmt.Sprintf("验证: 现在有 %d 个用户使用分组 '%s'", newCount, newGroupName))
+	}
+
+	return nil
+}
diff --git a/model/user_group.go b/model/user_group.go
new file mode 100644
index 000000000000..b63ae5e7459c
--- /dev/null
+++ b/model/user_group.go
@@ -0,0 +1,124 @@
+package model
+
+import (
+	"one-api/common"
+	"gorm.io/gorm"
+)
+
+type UserGroup struct {
+	Id          int            `json:"id"`
+	Name        string         `json:"name" gorm:"size:64;not null;uniqueIndex:uk_user_group_name,where:deleted_at IS NULL"`
+	Description string         `json:"description,omitempty" gorm:"type:varchar(255)"`
+	Ratio       float64        `json:"ratio" gorm:"type:decimal(10,4);default:1.0"`
+	CreatedTime int64          `json:"created_time" gorm:"bigint"`
+	UpdatedTime int64          `json:"updated_time" gorm:"bigint"`
+	DeletedAt   gorm.DeletedAt `json:"-" gorm:"index"`
+}
+
+// Insert 创建新的用户分组
+func (g *UserGroup) Insert() error {
+	now := common.GetTimestamp()
+	g.CreatedTime = now
+	g.UpdatedTime = now
+	return DB.Create(g).Error
+}
+
+// Update 更新用户分组
+func (g *UserGroup) Update() error {
+	g.UpdatedTime = common.GetTimestamp()
+	return DB.Model(g).Updates(g).Error
+}
+
+// Delete 软删除用户分组
+func (g *UserGroup) Delete() error {
+	return DB.Delete(g).Error
+}
+
+// GetAllUserGroups 获取所有用户分组
+func GetAllUserGroups() ([]*UserGroup, error) {
+	var groups []*UserGroup
+	err := DB.Order("created_time desc").Find(&groups).Error
+	return groups, err
+}
+
+// GetUserGroupById 根据ID获取用户分组
+func GetUserGroupById(id int) (*UserGroup, error) {
+	var group UserGroup
+	err := DB.First(&group, id).Error
+	if err != nil {
+		return nil, err
+	}
+	return &group, nil
+}
+
+// GetUserGroupByName 根据名称获取用户分组
+func GetUserGroupByName(name string) (*UserGroup, error) {
+	var group UserGroup
+	err := DB.Where("name = ?", name).First(&group).Error
+	if err != nil {
+		return nil, err
+	}
+	return &group, nil
+}
+
+// IsUserGroupNameDuplicated 检查用户分组名称是否重复
+func IsUserGroupNameDuplicated(id int, name string) (bool, error) {
+	var count int64
+	query := DB.Model(&UserGroup{}).Where("name = ?", name)
+	if id != 0 {
+		query = query.Where("id != ?", id)
+	}
+	err := query.Count(&count).Error
+	return count > 0, err
+}
+
+// IsUserGroupInUse 检查用户分组是否正在被使用
+func IsUserGroupInUse(name string) (bool, error) {
+	var count int64
+	err := DB.Model(&User{}).Where("`group` = ?", name).Count(&count).Error
+	return count > 0, err
+}
+
+// GetUserGroupNames 获取所有用户分组名称
+func GetUserGroupNames() ([]string, error) {
+	var names []string
+	err := DB.Model(&UserGroup{}).Pluck("name", &names).Error
+	return names, err
+}
+
+// InitDefaultUserGroups 初始化默认用户分组
+func InitDefaultUserGroups() error {
+	// 检查是否已经存在默认分组
+	var count int64
+	DB.Model(&UserGroup{}).Count(&count)
+	if count > 0 {
+		return nil // 已经有分组了，不需要初始化
+	}
+
+	// 创建默认分组
+	defaultGroups := []*UserGroup{
+		{
+			Name:        "default",
+			Description: "默认分组",
+			Ratio:       1.0,
+		},
+		{
+			Name:        "vip",
+			Description: "VIP分组",
+			Ratio:       1.0,
+		},
+		{
+			Name:        "svip",
+			Description: "SVIP分组",
+			Ratio:       1.0,
+		},
+	}
+
+	for _, group := range defaultGroups {
+		if err := group.Insert(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/router/api-router.go b/router/api-router.go
index e16d06628955..9b10f7f58e9a 100644
--- a/router/api-router.go
+++ b/router/api-router.go
@@ -201,6 +201,15 @@ func SetApiRouter(router *gin.Engine) {
 			prefillGroupRoute.DELETE("/:id", controller.DeletePrefillGroup)
 		}
 
+		userGroupRoute := apiRouter.Group("/user_group")
+		userGroupRoute.Use(middleware.AdminAuth())
+		{
+			userGroupRoute.GET("/", controller.GetAllUserGroups)
+			userGroupRoute.POST("/", controller.CreateUserGroup)
+			userGroupRoute.PUT("/", controller.UpdateUserGroup)
+			userGroupRoute.DELETE("/:id", controller.DeleteUserGroup)
+		}
+
 		mjRoute := apiRouter.Group("/mj")
 		mjRoute.GET("/self", middleware.UserAuth(), controller.GetUserMidjourney)
 		mjRoute.GET("/", middleware.AdminAuth(), controller.GetAllMidjourney)
diff --git a/web/src/components/auth/AuthPageLayout.jsx b/web/src/components/auth/AuthPageLayout.jsx
new file mode 100644
index 000000000000..b2c027c73d68
--- /dev/null
+++ b/web/src/components/auth/AuthPageLayout.jsx
@@ -0,0 +1,39 @@
+/*
+Copyright (C) 2025 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+
+import React from 'react';
+
+const AuthPageLayout = ({ children }) => {
+  return (
+    <div className='relative overflow-hidden bg-gray-100 min-h-full flex items-center justify-center pt-16 pb-8'>
+      {/* 背景模糊晕染球 */}
+      <div
+        className='blur-ball blur-ball-indigo'
+        style={{ top: '-80px', right: '-80px', transform: 'none' }}
+      />
+      <div
+        className='blur-ball blur-ball-teal'
+        style={{ top: '50%', left: '-120px' }}
+      />
+      {children}
+    </div>
+  );
+};
+
+export default AuthPageLayout;
diff --git a/web/src/components/auth/LoginForm.jsx b/web/src/components/auth/LoginForm.jsx
index 32087ab02484..8714aeaae3d2 100644
--- a/web/src/components/auth/LoginForm.jsx
+++ b/web/src/components/auth/LoginForm.jsx
@@ -45,6 +45,7 @@ import WeChatIcon from '../common/logo/WeChatIcon';
 import LinuxDoIcon from '../common/logo/LinuxDoIcon';
 import TwoFAVerification from './TwoFAVerification';
 import { useTranslation } from 'react-i18next';
+import AuthPageLayout from './AuthPageLayout';
 
 const LoginForm = () => {
   let navigate = useNavigate();
@@ -603,17 +604,8 @@ const LoginForm = () => {
   };
 
   return (
-    <div className='relative overflow-hidden bg-gray-100 flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8'>
-      {/* 背景模糊晕染球 */}
-      <div
-        className='blur-ball blur-ball-indigo'
-        style={{ top: '-80px', right: '-80px', transform: 'none' }}
-      />
-      <div
-        className='blur-ball blur-ball-teal'
-        style={{ top: '50%', left: '-120px' }}
-      />
-      <div className='w-full max-w-sm mt-[60px]'>
+    <AuthPageLayout>
+      <div className='w-full max-w-md px-4 sm:px-6 lg:px-8'>
         {showEmailLogin ||
         !(
           status.github_oauth ||
@@ -638,7 +630,7 @@ const LoginForm = () => {
           </div>
         )}
       </div>
-    </div>
+    </AuthPageLayout>
   );
 };
 
diff --git a/web/src/components/auth/PasswordResetConfirm.jsx b/web/src/components/auth/PasswordResetConfirm.jsx
index 9bc37b3ce560..fd48b6011904 100644
--- a/web/src/components/auth/PasswordResetConfirm.jsx
+++ b/web/src/components/auth/PasswordResetConfirm.jsx
@@ -30,6 +30,7 @@ import { useSearchParams, Link } from 'react-router-dom';
 import { Button, Card, Form, Typography, Banner } from '@douyinfe/semi-ui';
 import { IconMail, IconLock, IconCopy } from '@douyinfe/semi-icons';
 import { useTranslation } from 'react-i18next';
+import AuthPageLayout from './AuthPageLayout';
 
 const { Text, Title } = Typography;
 
@@ -104,17 +105,8 @@ const PasswordResetConfirm = () => {
   }
 
   return (
-    <div className='relative overflow-hidden bg-gray-100 flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8'>
-      {/* 背景模糊晕染球 */}
-      <div
-        className='blur-ball blur-ball-indigo'
-        style={{ top: '-80px', right: '-80px', transform: 'none' }}
-      />
-      <div
-        className='blur-ball blur-ball-teal'
-        style={{ top: '50%', left: '-120px' }}
-      />
-      <div className='w-full max-w-sm mt-[60px]'>
+    <AuthPageLayout>
+      <div className='w-full max-w-md px-4 sm:px-6 lg:px-8'>
         <div className='flex flex-col items-center'>
           <div className='w-full max-w-md'>
             <div className='flex items-center justify-center mb-6 gap-2'>
@@ -213,7 +205,7 @@ const PasswordResetConfirm = () => {
           </div>
         </div>
       </div>
-    </div>
+    </AuthPageLayout>
   );
 };
 
diff --git a/web/src/components/auth/PasswordResetForm.jsx b/web/src/components/auth/PasswordResetForm.jsx
index 92afc2afa439..c07d8bef6b3f 100644
--- a/web/src/components/auth/PasswordResetForm.jsx
+++ b/web/src/components/auth/PasswordResetForm.jsx
@@ -31,6 +31,7 @@ import { Button, Card, Form, Typography } from '@douyinfe/semi-ui';
 import { IconMail } from '@douyinfe/semi-icons';
 import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
+import AuthPageLayout from './AuthPageLayout';
 
 const { Text, Title } = Typography;
 
@@ -104,17 +105,8 @@ const PasswordResetForm = () => {
   }
 
   return (
-    <div className='relative overflow-hidden bg-gray-100 flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8'>
-      {/* 背景模糊晕染球 */}
-      <div
-        className='blur-ball blur-ball-indigo'
-        style={{ top: '-80px', right: '-80px', transform: 'none' }}
-      />
-      <div
-        className='blur-ball blur-ball-teal'
-        style={{ top: '50%', left: '-120px' }}
-      />
-      <div className='w-full max-w-sm mt-[60px]'>
+    <AuthPageLayout>
+      <div className='w-full max-w-md px-4 sm:px-6 lg:px-8'>
         <div className='flex flex-col items-center'>
           <div className='w-full max-w-md'>
             <div className='flex items-center justify-center mb-6 gap-2'>
@@ -186,7 +178,7 @@ const PasswordResetForm = () => {
           </div>
         </div>
       </div>
-    </div>
+    </AuthPageLayout>
   );
 };
 
diff --git a/web/src/components/auth/RegisterForm.jsx b/web/src/components/auth/RegisterForm.jsx
index 9c98bdc3a0e9..e3c59d930647 100644
--- a/web/src/components/auth/RegisterForm.jsx
+++ b/web/src/components/auth/RegisterForm.jsx
@@ -51,6 +51,7 @@ import WeChatIcon from '../common/logo/WeChatIcon';
 import TelegramLoginButton from 'react-telegram-login/src';
 import { UserContext } from '../../context/User';
 import { useTranslation } from 'react-i18next';
+import AuthPageLayout from './AuthPageLayout';
 
 const RegisterForm = () => {
   let navigate = useNavigate();
@@ -601,17 +602,8 @@ const RegisterForm = () => {
   };
 
   return (
-    <div className='relative overflow-hidden bg-gray-100 flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8'>
-      {/* 背景模糊晕染球 */}
-      <div
-        className='blur-ball blur-ball-indigo'
-        style={{ top: '-80px', right: '-80px', transform: 'none' }}
-      />
-      <div
-        className='blur-ball blur-ball-teal'
-        style={{ top: '50%', left: '-120px' }}
-      />
-      <div className='w-full max-w-sm mt-[60px]'>
+    <AuthPageLayout>
+      <div className='w-full max-w-md px-4 sm:px-6 lg:px-8'>
         {showEmailRegister ||
         !(
           status.github_oauth ||
@@ -635,7 +627,7 @@ const RegisterForm = () => {
           </div>
         )}
       </div>
-    </div>
+    </AuthPageLayout>
   );
 };
 
diff --git a/web/src/components/layout/Footer.jsx b/web/src/components/layout/Footer.jsx
index 5c210fca89bf..59b25ddd8608 100644
--- a/web/src/components/layout/Footer.jsx
+++ b/web/src/components/layout/Footer.jsx
@@ -221,7 +221,7 @@ const FooterBar = () => {
   }, []);
 
   return (
-    <div className='w-full'>
+    <div className='w-full' style={{ borderTop: '1px solid var(--semi-color-border)' }}>
       {footer ? (
         <div
           className='custom-footer'
diff --git a/web/src/components/layout/headerbar/LanguageSelector.jsx b/web/src/components/layout/headerbar/LanguageSelector.jsx
index cbfd69b35706..3952771eecdd 100644
--- a/web/src/components/layout/headerbar/LanguageSelector.jsx
+++ b/web/src/components/layout/headerbar/LanguageSelector.jsx
@@ -32,8 +32,8 @@ const LanguageSelector = ({ currentLang, onLanguageChange, t }) => {
             onClick={() => onLanguageChange('zh')}
             className={`!flex !items-center !gap-2 !px-3 !py-1.5 !text-sm !text-semi-color-text-0 dark:!text-gray-200 ${currentLang === 'zh' ? '!bg-semi-color-primary-light-default dark:!bg-blue-600 !font-semibold' : 'hover:!bg-semi-color-fill-1 dark:hover:!bg-gray-600'}`}
           >
-            <CN title='中文' className='!w-5 !h-auto' />
-            <span>中文</span>
+            <CN title='简体中文' className='!w-5 !h-auto' />
+            <span>简体中文</span>
           </Dropdown.Item>
           <Dropdown.Item
             onClick={() => onLanguageChange('en')}
diff --git a/web/src/components/settings/personal/components/UserInfoHeader.jsx b/web/src/components/settings/personal/components/UserInfoHeader.jsx
index 3209a17ee84a..c2c3110b5209 100644
--- a/web/src/components/settings/personal/components/UserInfoHeader.jsx
+++ b/web/src/components/settings/personal/components/UserInfoHeader.jsx
@@ -159,7 +159,7 @@ const UserInfoHeader = ({ t, userState }) => {
                   {t('用户分组')}
                 </Typography.Text>
                 <Typography.Text size='small' type='tertiary' strong>
-                  {userState?.user?.group || t('默认')}
+                  {userState?.user?.group === 'default' ? t('默认') : (userState?.user?.group || t('默认'))}
                 </Typography.Text>
               </div>
             </div>
@@ -207,7 +207,7 @@ const UserInfoHeader = ({ t, userState }) => {
                 </Typography.Text>
               </div>
               <Typography.Text size='small' type='tertiary' strong>
-                {userState?.user?.group || t('默认')}
+                {userState?.user?.group === 'default' ? t('默认') : (userState?.user?.group || t('默认'))}
               </Typography.Text>
             </div>
           </div>
diff --git a/web/src/components/table/users/UsersActions.jsx b/web/src/components/table/users/UsersActions.jsx
index c3f2602a2596..0cc57207e0a1 100644
--- a/web/src/components/table/users/UsersActions.jsx
+++ b/web/src/components/table/users/UsersActions.jsx
@@ -17,21 +17,94 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 
-import React from 'react';
+import { useState, useContext } from 'react';
 import { Button } from '@douyinfe/semi-ui';
+import UserGroupManagement from './modals/UserGroupManagement';
+import { StatusContext } from '../../../context/Status';
+
+const UsersActions = ({ setShowAddUser, onRefreshUsers, t }) => {
+  const [showGroupManagement, setShowGroupManagement] = useState(false);
+  const [statusState] = useContext(StatusContext);
+
+  // 检查用户权限
+  const getUserRole = () => {
+    const user = JSON.parse(localStorage.getItem('user') || '{}');
+    return user?.role || 0;
+  };
+
+  const isAdmin = () => getUserRole() >= 10;
+  const isRoot = () => getUserRole() >= 100;
+
+  // 检查分组管理功能是否可见
+  const canShowGroupManagement = () => {
+    // 超级管理员始终可以看到分组管理按钮
+    if (isRoot()) {
+      return true;
+    }
+
+    // 管理员需要检查系统设置中的分组管理开关
+    if (isAdmin()) {
+      // 从StatusContext中获取侧边栏管理员配置
+      if (statusState?.status?.SidebarModulesAdmin) {
+        try {
+          const config = JSON.parse(statusState.status.SidebarModulesAdmin);
+          const userModuleConfig = config?.admin?.user;
+
+          // 检查用户管理模块是否启用
+          if (!userModuleConfig || !userModuleConfig.enabled) {
+            return false;
+          }
+
+          // 检查分组管理子功能是否启用
+          return userModuleConfig.groupManagement === true;
+        } catch (error) {
+          console.error('解析侧边栏配置失败:', error);
+          return true; // 解析失败时默认允许访问
+        }
+      }
+      return true; // 没有配置时默认允许访问
+    }
+
+    // 普通用户无权访问
+    return false;
+  };
 
-const UsersActions = ({ setShowAddUser, t }) => {
   // Add new user
   const handleAddUser = () => {
     setShowAddUser(true);
   };
 
+  // Show group management
+  const handleGroupManagement = () => {
+    setShowGroupManagement(true);
+  };
+
   return (
-    <div className='flex gap-2 w-full md:w-auto order-2 md:order-1'>
-      <Button className='w-full md:w-auto' onClick={handleAddUser} size='small'>
-        {t('添加用户')}
-      </Button>
-    </div>
+    <>
+      <div className='flex gap-2 w-full md:w-auto order-2 md:order-1'>
+        <Button className='w-full md:w-auto' onClick={handleAddUser} size='small'>
+          {t('添加用户')}
+        </Button>
+        {canShowGroupManagement() && (
+          <Button
+            className='w-full md:w-auto'
+            onClick={handleGroupManagement}
+            size='small'
+            theme='light'
+          >
+            {t('分组管理')}
+          </Button>
+        )}
+      </div>
+
+      {canShowGroupManagement() && (
+        <UserGroupManagement
+          visible={showGroupManagement}
+          onClose={() => setShowGroupManagement(false)}
+          onGroupUpdated={onRefreshUsers}
+        />
+      )}
+    </>
   );
 };
 
diff --git a/web/src/components/table/users/index.jsx b/web/src/components/table/users/index.jsx
index 59e12a4e5fc0..0f8fc08a9752 100644
--- a/web/src/components/table/users/index.jsx
+++ b/web/src/components/table/users/index.jsx
@@ -88,7 +88,11 @@ const UsersPage = () => {
         }
         actionsArea={
           <div className='flex flex-col md:flex-row justify-between items-center gap-2 w-full'>
-            <UsersActions setShowAddUser={setShowAddUser} t={t} />
+            <UsersActions
+              setShowAddUser={setShowAddUser}
+              onRefreshUsers={refresh}
+              t={t}
+            />
 
             <UsersFilters
               formInitValues={formInitValues}
diff --git a/web/src/components/table/users/modals/AddUserModal.jsx b/web/src/components/table/users/modals/AddUserModal.jsx
index 05b3620c8a7d..03f2d9ed1d2f 100644
--- a/web/src/components/table/users/modals/AddUserModal.jsx
+++ b/web/src/components/table/users/modals/AddUserModal.jsx
@@ -17,7 +17,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import { API, showError, showSuccess } from '../../../../helpers';
 import { useIsMobile } from '../../../../hooks/common/useIsMobile';
 import {
@@ -42,15 +42,34 @@ const AddUserModal = (props) => {
   const { t } = useTranslation();
   const formApiRef = useRef(null);
   const [loading, setLoading] = useState(false);
+  const [groupOptions, setGroupOptions] = useState([]);
   const isMobile = useIsMobile();
 
   const getInitValues = () => ({
     username: '',
     display_name: '',
     password: '',
+    group: 'default', // 默认分组
     remark: '',
   });
 
+  // 获取分组列表
+  const fetchGroups = async () => {
+    try {
+      const res = await API.get('/api/group/');
+      if (res.data.success) {
+        setGroupOptions(
+          res.data.data.map((group) => ({
+            label: group,
+            value: group,
+          }))
+        );
+      }
+    } catch (error) {
+      showError(t('获取分组列表失败'));
+    }
+  };
+
   const submit = async (values) => {
     setLoading(true);
     const res = await API.post(`/api/user/`, values);
@@ -70,6 +89,13 @@ const AddUserModal = (props) => {
     props.handleClose();
   };
 
+  // 组件加载时获取分组列表
+  useEffect(() => {
+    if (props.visible) {
+      fetchGroups();
+    }
+  }, [props.visible]);
+
   return (
     <>
       <SideSheet
@@ -165,6 +191,17 @@ const AddUserModal = (props) => {
                       showClear
                     />
                   </Col>
+                  <Col span={24}>
+                    <Form.Select
+                      field='group'
+                      label={t('分组')}
+                      placeholder={t('请选择用户分组')}
+                      optionList={groupOptions}
+                      rules={[{ required: true, message: t('请选择分组') }]}
+                      allowAdditions
+                      search
+                    />
+                  </Col>
                   <Col span={24}>
                     <Form.Input
                       field='remark'
diff --git a/web/src/components/table/users/modals/EditUserGroupModal.jsx b/web/src/components/table/users/modals/EditUserGroupModal.jsx
new file mode 100644
index 000000000000..c0bb1fc7148c
--- /dev/null
+++ b/web/src/components/table/users/modals/EditUserGroupModal.jsx
@@ -0,0 +1,221 @@
+/*
+Copyright 2024 Quantumnous Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+
+import React, { useState, useRef, useEffect } from 'react';
+import {
+  Modal,
+  Form,
+  Button,
+  Space,
+  Spin,
+  Avatar,
+  Typography,
+  Tag,
+} from '@douyinfe/semi-ui';
+import {
+  IconSave,
+  IconClose,
+  IconUserGroup,
+} from '@douyinfe/semi-icons';
+import { useTranslation } from 'react-i18next';
+import { API, showError, showSuccess } from '../../../../helpers';
+
+const EditUserGroupModal = ({ visible, onClose, editingGroup, onSuccess }) => {
+  const { t } = useTranslation();
+  const formApiRef = useRef(null);
+  const [loading, setLoading] = useState(false);
+
+  const isEdit = editingGroup && editingGroup.id;
+  const isSystemGroup = editingGroup && (
+    editingGroup.name === 'default' ||
+    editingGroup.name === 'vip' ||
+    editingGroup.name === 'svip'
+  );
+
+  // 获取分组显示名称
+  const getGroupDisplayName = (groupName) => {
+    if (groupName === 'default') {
+      return t('默认');
+    }
+    return groupName;
+  };
+
+  const getInitValues = () => ({
+    name: editingGroup?.name || '',
+    description: editingGroup?.description || '',
+    ratio: editingGroup?.ratio || 1.0,
+  });
+
+  const submit = async (values) => {
+    setLoading(true);
+    try {
+      const data = {
+        ...values,
+        ratio: parseFloat(values.ratio) || 1.0,
+      };
+
+      if (isEdit) {
+        data.id = editingGroup.id;
+      }
+
+      const url = isEdit ? '/api/user_group' : '/api/user_group';
+      const method = isEdit ? 'PUT' : 'POST';
+      
+      const res = await API[method.toLowerCase()](url, data);
+      const { success, message } = res.data;
+      
+      if (success) {
+        showSuccess(isEdit ? t('分组更新成功！') : t('分组创建成功！'));
+        onSuccess();
+      } else {
+        showError(message);
+      }
+    } catch (error) {
+      showError(isEdit ? t('分组更新失败') : t('分组创建失败'));
+    }
+    setLoading(false);
+  };
+
+  const handleCancel = () => {
+    onClose();
+  };
+
+  // 重置表单当编辑分组改变时
+  useEffect(() => {
+    if (visible && formApiRef.current) {
+      formApiRef.current.setValues(getInitValues());
+    }
+  }, [visible, editingGroup]);
+
+  return (
+    <Modal
+      title={
+        <Space>
+          <Avatar size='small' color={isEdit ? 'orange' : 'green'} className='shadow-md'>
+            <IconUserGroup size={16} />
+          </Avatar>
+          <Typography.Text className='text-lg font-medium'>
+            {isEdit ? t('编辑分组') : t('新建分组')}
+          </Typography.Text>
+          {isEdit && (
+            <Tag color='blue' shape='circle'>
+              {getGroupDisplayName(editingGroup.name)}
+            </Tag>
+          )}
+        </Space>
+      }
+      visible={visible}
+      onCancel={handleCancel}
+      width={500}
+      footer={
+        <div className='flex justify-end'>
+          <Space>
+            <Button
+              theme='solid'
+              onClick={() => formApiRef.current?.submitForm()}
+              icon={<IconSave />}
+              loading={loading}
+            >
+              {t('保存')}
+            </Button>
+            <Button
+              theme='light'
+              type='primary'
+              onClick={handleCancel}
+              icon={<IconClose />}
+            >
+              {t('取消')}
+            </Button>
+          </Space>
+        </div>
+      }
+      closeIcon={null}
+    >
+      <Spin spinning={loading}>
+        <Form
+          initValues={getInitValues()}
+          getFormApi={(api) => (formApiRef.current = api)}
+          onSubmit={submit}
+          onSubmitFail={(errs) => {
+            const first = Object.values(errs)[0];
+            if (first) showError(Array.isArray(first) ? first[0] : first);
+            formApiRef.current?.scrollToError();
+          }}
+        >
+          <div className='p-4'>
+            <Form.Input
+              field='name'
+              label={t('分组名称')}
+              placeholder={t('请输入分组名称')}
+              disabled={isSystemGroup}
+              rules={[
+                { required: true, message: t('分组名称不能为空') },
+                { max: 64, message: t('分组名称不能超过64个字符') },
+                {
+                  pattern: /^[a-zA-Z0-9_-]+$/,
+                  message: t('分组名称只能包含字母、数字、下划线和连字符'),
+                },
+              ]}
+              extraText={
+                isSystemGroup 
+                  ? t('系统默认分组，名称不可修改')
+                  : t('分组名称只能包含字母、数字、下划线和连字符')
+              }
+            />
+
+            <Form.TextArea
+              field='description'
+              label={t('分组描述')}
+              placeholder={t('请输入分组描述（可选）')}
+              maxCount={255}
+              autosize={{ minRows: 2, maxRows: 4 }}
+              extraText={t('分组的详细描述，用于说明分组用途')}
+            />
+
+            <Form.InputNumber
+              field='ratio'
+              label={t('分组倍率')}
+              placeholder={t('请输入分组倍率')}
+              min={0}
+              max={999}
+              step={0.1}
+              precision={2}
+              rules={[
+                { required: true, message: t('分组倍率不能为空') },
+                { type: 'number', min: 0, message: t('分组倍率不能小于0') },
+              ]}
+              extraText={t('分组的计费倍率，影响该分组用户的费用计算')}
+              suffix={t('倍')}
+            />
+
+            {isSystemGroup && (
+              <div className='mt-4 p-3 bg-blue-50 rounded-lg border border-blue-200'>
+                <Typography.Text type='tertiary' size='small'>
+                  <strong>{t('提示：')}</strong>
+                  {t('这是系统默认分组，只能修改描述和倍率，不能修改名称或删除。')}
+                </Typography.Text>
+              </div>
+            )}
+          </div>
+        </Form>
+      </Spin>
+    </Modal>
+  );
+};
+
+export default EditUserGroupModal;
diff --git a/web/src/components/table/users/modals/UserGroupManagement.jsx b/web/src/components/table/users/modals/UserGroupManagement.jsx
new file mode 100644
index 000000000000..429fbf996ed2
--- /dev/null
+++ b/web/src/components/table/users/modals/UserGroupManagement.jsx
@@ -0,0 +1,298 @@
+/*
+Copyright 2024 Quantumnous Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+
+import React, { useState, useEffect } from 'react';
+import {
+  SideSheet,
+  Button,
+  Space,
+  Card,
+  Avatar,
+  Typography,
+  Spin,
+  Empty,
+  Popconfirm,
+  Tag,
+} from '@douyinfe/semi-ui';
+import {
+  IconUserGroup,
+  IconPlus,
+} from '@douyinfe/semi-icons';
+import {
+  IllustrationNoResult,
+  IllustrationNoResultDark,
+} from '@douyinfe/semi-illustrations';
+import { useTranslation } from 'react-i18next';
+import { useIsMobile } from '../../../../hooks/common/useIsMobile';
+import { API, showError, showSuccess } from '../../../../helpers';
+import CardTable from '../../../common/ui/CardTable';
+import EditUserGroupModal from './EditUserGroupModal';
+
+const UserGroupManagement = ({ visible, onClose, onGroupUpdated }) => {
+  const { t } = useTranslation();
+  const isMobile = useIsMobile();
+  const [loading, setLoading] = useState(false);
+  const [groups, setGroups] = useState([]);
+  const [showEdit, setShowEdit] = useState(false);
+  const [editingGroup, setEditingGroup] = useState({ id: undefined });
+
+  // 加载分组列表
+  const loadGroups = async () => {
+    setLoading(true);
+    try {
+      const res = await API.get('/api/user_group');
+      if (res.data.success) {
+        setGroups(res.data.data || []);
+      } else {
+        showError(res.data.message || t('获取分组列表失败'));
+      }
+    } catch (error) {
+      showError(t('获取分组列表失败'));
+    }
+    setLoading(false);
+  };
+
+  // 删除分组
+  const deleteGroup = async (id) => {
+    try {
+      const res = await API.delete(`/api/user_group/${id}`);
+      if (res.data.success) {
+        showSuccess(t('删除成功'));
+        loadGroups();
+      } else {
+        showError(res.data.message || t('删除失败'));
+      }
+    } catch (error) {
+      showError(t('删除失败'));
+    }
+  };
+
+  // 编辑分组
+  const handleEdit = (group = {}) => {
+    setEditingGroup(group);
+    setShowEdit(true);
+  };
+
+  // 关闭编辑
+  const closeEdit = () => {
+    setShowEdit(false);
+    setTimeout(() => {
+      setEditingGroup({ id: undefined });
+    }, 300);
+  };
+
+  // 编辑成功回调
+  const handleEditSuccess = () => {
+    closeEdit();
+    loadGroups();
+    // 通知父组件刷新用户数据
+    if (onGroupUpdated) {
+      onGroupUpdated();
+    }
+  };
+
+  // 获取分组显示名称
+  const getGroupDisplayName = (groupName) => {
+    if (groupName === 'default') {
+      return t('默认');
+    }
+    return groupName;
+  };
+
+  // 获取分组描述的翻译
+  const getGroupDescription = (groupName, originalDescription) => {
+    // 对于系统默认分组，使用翻译
+    if (groupName === 'default' && originalDescription === '默认分组') {
+      return t('默认分组');
+    }
+    if (groupName === 'vip' && originalDescription === 'VIP分组') {
+      return t('VIP分组');
+    }
+    if (groupName === 'svip' && originalDescription === 'SVIP分组') {
+      return t('SVIP分组');
+    }
+    // 对于用户自定义分组，使用原始描述
+    return originalDescription;
+  };
+
+  // 表格列定义
+  const columns = [
+    {
+      title: 'ID',
+      dataIndex: 'id',
+      width: 80,
+    },
+    {
+      title: t('分组名称'),
+      dataIndex: 'name',
+      render: (text, record) => (
+        <div className='flex items-center gap-2'>
+          <Tag
+            color={record.name === 'default' ? 'blue' :
+                   record.name === 'vip' ? 'orange' :
+                   record.name === 'svip' ? 'red' : 'green'}
+            shape='circle'
+          >
+            {getGroupDisplayName(text)}
+          </Tag>
+          {(record.name === 'default' || record.name === 'vip' || record.name === 'svip') && (
+            <Tag size='small' color='grey'>
+              {t('系统默认')}
+            </Tag>
+          )}
+        </div>
+      ),
+    },
+    {
+      title: t('分组描述'),
+      dataIndex: 'description',
+      render: (text, record) => {
+        const translatedDescription = getGroupDescription(record.name, text);
+        return translatedDescription || <Typography.Text type='tertiary'>{t('无描述')}</Typography.Text>;
+      },
+    },
+    {
+      title: t('分组倍率'),
+      dataIndex: 'ratio',
+      width: 100,
+      render: (text) => (
+        <Tag color='cyan' shape='circle'>
+          {text}
+        </Tag>
+      ),
+    },
+    {
+      title: t('创建时间'),
+      dataIndex: 'created_time',
+      width: 150,
+      render: (text) => new Date(text * 1000).toLocaleString(),
+    },
+    {
+      title: '',
+      key: 'action',
+      fixed: 'right',
+      width: 140,
+      render: (_, record) => (
+        <Space>
+          <Button size='small' onClick={() => handleEdit(record)}>
+            {t('编辑')}
+          </Button>
+          {record.name !== 'default' && record.name !== 'vip' && record.name !== 'svip' && (
+            <Popconfirm
+              title={t('确定删除此分组？')}
+              content={t('删除后无法恢复，请确认该分组未被用户使用')}
+              onConfirm={() => deleteGroup(record.id)}
+            >
+              <Button size='small' type='danger'>
+                {t('删除')}
+              </Button>
+            </Popconfirm>
+          )}
+        </Space>
+      ),
+    },
+  ];
+
+  useEffect(() => {
+    if (visible) {
+      loadGroups();
+    }
+  }, [visible]);
+
+  return (
+    <>
+      <SideSheet
+        title={
+          <Space>
+            <Avatar size='small' color='blue' className='shadow-md'>
+              <IconUserGroup size={16} />
+            </Avatar>
+            <Typography.Text className='text-lg font-medium'>{t('用户分组管理')}</Typography.Text>
+          </Space>
+        }
+        visible={visible}
+        onCancel={onClose}
+        width={isMobile ? '100%' : 1000}
+        bodyStyle={{ padding: '0' }}
+        closeIcon={null}
+      >
+        <Spin spinning={loading}>
+          <div className='p-2'>
+            <Card className='!rounded-2xl shadow-sm border-0'>
+              <div className='flex items-center mb-2'>
+                <Avatar size='small' color='blue' className='mr-2 shadow-md'>
+                  <IconUserGroup size={16} />
+                </Avatar>
+                <div>
+                  <Typography.Text className='text-lg font-medium'>{t('分组列表')}</Typography.Text>
+                  <div className='text-xs text-gray-600'>
+                    {t('管理用户分组，设置分组倍率')}
+                  </div>
+                </div>
+              </div>
+              <div className='flex justify-end mb-4'>
+                <Button
+                  type='primary'
+                  theme='solid'
+                  size='small'
+                  icon={<IconPlus />}
+                  onClick={() => handleEdit()}
+                >
+                  {t('新建分组')}
+                </Button>
+              </div>
+              {groups.length > 0 ? (
+                <CardTable
+                  columns={columns}
+                  dataSource={groups}
+                  rowKey='id'
+                  hidePagination={true}
+                  size='small'
+                  scroll={{ x: 'max-content' }}
+                />
+              ) : (
+                <Empty
+                  image={
+                    <IllustrationNoResult style={{ width: 150, height: 150 }} />
+                  }
+                  darkModeImage={
+                    <IllustrationNoResultDark
+                      style={{ width: 150, height: 150 }}
+                    />
+                  }
+                  description={t('暂无用户分组')}
+                  style={{ padding: 30 }}
+                />
+              )}
+            </Card>
+          </div>
+        </Spin>
+      </SideSheet>
+
+      {/* 编辑组件 */}
+      <EditUserGroupModal
+        visible={showEdit}
+        onClose={closeEdit}
+        editingGroup={editingGroup}
+        onSuccess={handleEditSuccess}
+      />
+    </>
+  );
+};
+
+export default UserGroupManagement;
diff --git a/web/src/helpers/api.js b/web/src/helpers/api.js
index b7092fe775e2..84ab6c4e02ac 100644
--- a/web/src/helpers/api.js
+++ b/web/src/helpers/api.js
@@ -25,6 +25,7 @@ import {
 } from './utils';
 import axios from 'axios';
 import { MESSAGE_ROLES } from '../constants/playground.constants';
+import i18next from 'i18next';
 
 export let API = axios.create({
   baseURL: import.meta.env.VITE_REACT_APP_SERVER_URL
@@ -185,15 +186,34 @@ export const processModelsData = (data, currentModel) => {
   return { modelOptions, selectedModel };
 };
 
+// 获取分组描述的翻译
+const getGroupDescription = (groupName, originalDescription) => {
+  // 对于系统默认分组，使用翻译
+  if (groupName === 'default' && originalDescription === '默认分组') {
+    return i18next.t('默认分组');
+  }
+  if (groupName === 'vip' && originalDescription === 'VIP分组') {
+    return i18next.t('VIP分组');
+  }
+  if (groupName === 'svip' && originalDescription === 'SVIP分组') {
+    return i18next.t('SVIP分组');
+  }
+  // 对于用户自定义分组，使用原始描述
+  return originalDescription;
+};
+
 // 处理分组数据
 export const processGroupsData = (data, userGroup) => {
-  let groupOptions = Object.entries(data).map(([group, info]) => ({
-    label:
-      info.desc.length > 20 ? info.desc.substring(0, 20) + '...' : info.desc,
-    value: group,
-    ratio: info.ratio,
-    fullLabel: info.desc,
-  }));
+  let groupOptions = Object.entries(data).map(([group, info]) => {
+    const translatedDesc = getGroupDescription(group, info.desc);
+    return {
+      label:
+        translatedDesc.length > 20 ? translatedDesc.substring(0, 20) + '...' : translatedDesc,
+      value: group,
+      ratio: info.ratio,
+      fullLabel: translatedDesc,
+    };
+  });
 
   if (groupOptions.length === 0) {
     groupOptions = [
diff --git a/web/src/helpers/render.jsx b/web/src/helpers/render.jsx
index 65332701bbb6..8de251036853 100644
--- a/web/src/helpers/render.jsx
+++ b/web/src/helpers/render.jsx
@@ -629,6 +629,14 @@ export function renderGroup(group) {
     premium: 'red',
   };
 
+  // 获取分组显示名称
+  const getGroupDisplayName = (groupName) => {
+    if (groupName === 'default') {
+      return i18next.t('默认');
+    }
+    return groupName;
+  };
+
   const groups = group.split(',').sort();
 
   return (
@@ -650,7 +658,7 @@ export function renderGroup(group) {
             }
           }}
         >
-          {group}
+          {getGroupDisplayName(group)}
         </Tag>
       ))}
     </span>
diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index 8d520b72bb3d..1bc94ecd6585 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -2091,8 +2091,52 @@
   "模型社区需要大家的共同维护，如发现数据有误或想贡献新的模型数据，请访问：": "The model community needs everyone's contribution. If you find incorrect data or want to contribute new models, please visit:",
   "是": "Yes",
   "否": "No",
-  "原价": "Original price",
-  "优惠": "Discount",
-  "折": "% off",
-  "节省": "Save"
+  "邀请功能": "Invitation Feature",
+  "关闭后：不在启用邀请奖励功能": "When disabled: invitation reward feature will not be enabled",
+  "分组管理": "Group Management",
+  "用户分组管理": "User Group Management",
+  "分组列表": "Group List",
+  "管理用户分组，设置分组倍率": "Manage user groups and set group ratios",
+  "新建分组": "Create Group",
+  "编辑分组": "Edit Group",
+  "分组名称": "Group Name",
+  "请输入分组名称": "Please enter group name",
+  "分组名称不能为空": "Group name cannot be empty",
+  "分组名称不能超过64个字符": "Group name cannot exceed 64 characters",
+  "分组名称只能包含字母、数字、下划线和连字符": "Group name can only contain letters, numbers, underscores and hyphens",
+  "系统默认分组，名称不可修改": "System default group, name cannot be modified",
+  "分组描述": "Group Description",
+  "请输入分组描述（可选）": "Please enter group description (optional)",
+  "分组的详细描述，用于说明分组用途": "Detailed description of the group, used to explain the group purpose",
+  "分组倍率": "Group Ratio",
+  "请输入分组倍率": "Please enter group ratio",
+  "分组倍率不能为空": "Group ratio cannot be empty",
+  "分组倍率不能小于0": "Group ratio cannot be less than 0",
+  "分组的计费倍率，影响该分组用户的费用计算": "Billing ratio of the group, affects cost calculation for users in this group",
+  "倍": "x",
+  "系统默认": "System Default",
+  "无描述": "No Description",
+  "创建时间": "Created Time",
+  "确定删除此分组？": "Are you sure to delete this group?",
+  "删除后无法恢复，请确认该分组未被用户使用": "Cannot be recovered after deletion, please confirm that this group is not being used by users",
+  "删除成功": "Deleted successfully",
+  "删除失败": "Delete failed",
+  "分组名称已存在": "Group name already exists",
+  "分组倍率不能小于0": "Group ratio cannot be less than 0",
+  "缺少分组 ID": "Missing group ID",
+  "该分组正在被用户使用，无法删除": "This group is being used by users and cannot be deleted",
+  "不能删除系统默认分组": "Cannot delete system default groups",
+  "分组创建成功！": "Group created successfully!",
+  "分组更新成功！": "Group updated successfully!",
+  "分组创建失败": "Group creation failed",
+  "分组更新失败": "Group update failed",
+  "获取分组列表失败": "Failed to get group list",
+  "暂无用户分组": "No user groups",
+  "提示：": "Note: ",
+  "这是系统默认分组，只能修改描述和倍率，不能修改名称或删除。": "This is a system default group. You can only modify the description and ratio, but cannot modify the name or delete it.",
+  "默认": "default",
+  "控制管理员是否可以访问分组管理功能": "Control whether administrators can access group management features",
+  "默认分组": "Default Group",
+  "VIP分组": "VIP Group",
+  "SVIP分组": "SVIP Group"
 }
diff --git a/web/src/pages/Home/index.jsx b/web/src/pages/Home/index.jsx
index 19681639ab6b..ffe2cf1abaad 100644
--- a/web/src/pages/Home/index.jsx
+++ b/web/src/pages/Home/index.jsx
@@ -158,7 +158,7 @@ const Home = () => {
       {homePageContentLoaded && homePageContent === '' ? (
         <div className='w-full overflow-x-hidden'>
           {/* Banner 部分 */}
-          <div className='w-full border-b border-semi-color-border min-h-[500px] md:min-h-[600px] lg:min-h-[700px] relative overflow-x-hidden'>
+          <div className='w-full min-h-[500px] md:min-h-[600px] lg:min-h-[700px] relative overflow-x-hidden'>
             {/* 背景模糊晕染球 */}
             <div className='blur-ball blur-ball-indigo' />
             <div className='blur-ball blur-ball-teal' />
diff --git a/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx b/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx
index a46893b81d4b..8472181bcb93 100644
--- a/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx
+++ b/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx
@@ -63,9 +63,12 @@ export default function SettingsSidebarModulesAdmin(props) {
       channel: true,
       models: true,
       redemption: true,
-      user: true,
-      setting: true,
-    },
+      user: {
+        enabled: true,
+        groupManagement: false // 默认关闭分组管理
+      },
+      setting: true
+    }
   });
 
   // 处理区域级别开关变更
@@ -89,13 +92,28 @@ export default function SettingsSidebarModulesAdmin(props) {
         ...sidebarModulesAdmin,
         [sectionKey]: {
           ...sidebarModulesAdmin[sectionKey],
-          [moduleKey]: checked,
-        },
+          [moduleKey]: checked
+        }
       };
       setSidebarModulesAdmin(newModules);
     };
   }
 
+  // 处理用户管理分组管理子开关变更
+  function handleUserGroupManagementChange(checked) {
+    const newModules = {
+      ...sidebarModulesAdmin,
+      admin: {
+        ...sidebarModulesAdmin.admin,
+        user: {
+          ...sidebarModulesAdmin.admin.user,
+          groupManagement: checked
+        }
+      }
+    };
+    setSidebarModulesAdmin(newModules);
+  }
+
   // 重置为默认配置
   function resetSidebarModules() {
     const defaultModules = {
@@ -122,9 +140,12 @@ export default function SettingsSidebarModulesAdmin(props) {
         channel: true,
         models: true,
         redemption: true,
-        user: true,
-        setting: true,
-      },
+        user: {
+          enabled: true,
+          groupManagement: false // 默认关闭分组管理
+        },
+        setting: true
+      }
     };
     setSidebarModulesAdmin(defaultModules);
     showSuccess(t('已重置为默认配置'));
@@ -189,9 +210,12 @@ export default function SettingsSidebarModulesAdmin(props) {
             channel: true,
             models: true,
             redemption: true,
-            user: true,
-            setting: true,
-          },
+            user: {
+              enabled: true,
+              groupManagement: false // 默认关闭分组管理
+            },
+            setting: true
+          }
         };
         setSidebarModulesAdmin(defaultModules);
       }
@@ -366,14 +390,86 @@ export default function SettingsSidebarModulesAdmin(props) {
                       <div style={{ marginLeft: '16px' }}>
                         <Switch
                           checked={
-                            sidebarModulesAdmin[section.key]?.[module.key]
+                            module.key === 'user'
+                              ? sidebarModulesAdmin[section.key]?.user?.enabled
+                              : sidebarModulesAdmin[section.key]?.[module.key]
+                          }
+                          onChange={
+                            module.key === 'user'
+                              ? (checked) => {
+                                  const newModules = {
+                                    ...sidebarModulesAdmin,
+                                    [section.key]: {
+                                      ...sidebarModulesAdmin[section.key],
+                                      user: {
+                                        ...sidebarModulesAdmin[section.key].user,
+                                        enabled: checked
+                                      }
+                                    }
+                                  };
+                                  setSidebarModulesAdmin(newModules);
+                                }
+                              : handleModuleChange(section.key, module.key)
                           }
-                          onChange={handleModuleChange(section.key, module.key)}
-                          size='default'
+                          size="default"
                           disabled={!sidebarModulesAdmin[section.key]?.enabled}
                         />
                       </div>
                     </div>
+
+                    {/* 为用户管理添加分组管理子开关 */}
+                    {module.key === 'user' && (
+                      module.key === 'user'
+                        ? sidebarModulesAdmin[section.key]?.user?.enabled
+                        : sidebarModulesAdmin[section.key]?.[module.key]
+                    ) && (
+                      <div style={{
+                        borderTop: '1px solid var(--semi-color-border)',
+                        marginTop: '12px',
+                        paddingTop: '12px'
+                      }}>
+                        <div style={{
+                          display: 'flex',
+                          justifyContent: 'space-between',
+                          alignItems: 'center'
+                        }}>
+                          <div style={{ flex: 1, textAlign: 'left' }}>
+                            <div style={{
+                              fontWeight: '500',
+                              fontSize: '12px',
+                              color: 'var(--semi-color-text-1)',
+                              marginBottom: '2px'
+                            }}>
+                              {t('分组管理')}
+                            </div>
+                            <Text
+                              type="secondary"
+                              size="small"
+                              style={{
+                                fontSize: '11px',
+                                color: 'var(--semi-color-text-2)',
+                                lineHeight: '1.4',
+                                display: 'block'
+                              }}
+                            >
+                              {t('控制管理员是否可以访问分组管理功能')}
+                            </Text>
+                          </div>
+                          <div style={{ marginLeft: '16px' }}>
+                            <Switch
+                              checked={sidebarModulesAdmin[section.key]?.user?.groupManagement || false}
+                              onChange={handleUserGroupManagementChange}
+                              size="small"
+                              disabled={!sidebarModulesAdmin[section.key]?.enabled || !(
+                                module.key === 'user'
+                                  ? sidebarModulesAdmin[section.key]?.user?.enabled
+                                  : sidebarModulesAdmin[section.key]?.[module.key]
+                              )}
+                            />
+                          </div>
+                        </div>
+                      </div>
+                    )}
                   </Card>
                 </Col>
               ))}
diff --git a/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx b/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
index 939e76cfc920..ff63b73a5fc7 100644
--- a/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
+++ b/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
@@ -141,8 +141,8 @@ export default function SettingsSidebarModulesUser() {
         ...sidebarModulesUser,
         [sectionKey]: {
           ...sidebarModulesUser[sectionKey],
-          [moduleKey]: checked,
-        },
+          [moduleKey]: checked
+        }
       };
       setSidebarModulesUser(newModules);
       console.log(

From 001f7320055ded23a4e8a34e2e47ce839d19fe8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Mon, 1 Sep 2025 09:52:52 +0800
Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D"=E8=BE=B9=E6=A0=8F"?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=90=8E=E6=97=A0=E6=B3=95=E5=8D=B3=E6=97=B6?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../personal/cards/NotificationSettings.jsx   |  9 ++++++-
 web/src/hooks/common/useSidebar.js            | 27 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/web/src/components/settings/personal/cards/NotificationSettings.jsx b/web/src/components/settings/personal/cards/NotificationSettings.jsx
index 68ddab51a3b4..e54a64ab63f0 100644
--- a/web/src/components/settings/personal/cards/NotificationSettings.jsx
+++ b/web/src/components/settings/personal/cards/NotificationSettings.jsx
@@ -44,6 +44,7 @@ import CodeViewer from '../../../playground/CodeViewer';
 import { StatusContext } from '../../../../context/Status';
 import { UserContext } from '../../../../context/User';
 import { useUserPermissions } from '../../../../hooks/common/useUserPermissions';
+import { useSidebar } from '../../../../hooks/common/useSidebar';
 
 const NotificationSettings = ({
   t,
@@ -97,6 +98,9 @@ const NotificationSettings = ({
     isSidebarModuleAllowed,
   } = useUserPermissions();
 
+  // 使用useSidebar钩子获取刷新方法
+  const { refreshUserConfig } = useSidebar();
+
   // 左侧边栏设置处理函数
   const handleSectionChange = (sectionKey) => {
     return (checked) => {
@@ -132,6 +136,9 @@ const NotificationSettings = ({
       });
       if (res.data.success) {
         showSuccess(t('侧边栏设置保存成功'));
+
+        // 刷新useSidebar钩子中的用户配置，实现实时更新
+        await refreshUserConfig();
       } else {
         showError(res.data.message);
       }
@@ -334,7 +341,7 @@ const NotificationSettings = ({
                 loading={sidebarLoading}
                 className='!rounded-lg'
               >
-                {t('保存边栏设置')}
+                {t('保存设置')}
               </Button>
             </>
           ) : (
diff --git a/web/src/hooks/common/useSidebar.js b/web/src/hooks/common/useSidebar.js
index 5dce44f9ec2e..e964855e382f 100644
--- a/web/src/hooks/common/useSidebar.js
+++ b/web/src/hooks/common/useSidebar.js
@@ -21,6 +21,10 @@ import { useState, useEffect, useMemo, useContext } from 'react';
 import { StatusContext } from '../../context/Status';
 import { API } from '../../helpers';
 
+// 创建一个全局事件系统来同步所有useSidebar实例
+const sidebarEventTarget = new EventTarget();
+const SIDEBAR_REFRESH_EVENT = 'sidebar-refresh';
+
 export const useSidebar = () => {
   const [statusState] = useContext(StatusContext);
   const [userConfig, setUserConfig] = useState(null);
@@ -124,9 +128,11 @@ export const useSidebar = () => {
 
   // 刷新用户配置的方法（供外部调用）
   const refreshUserConfig = async () => {
-    if (Object.keys(adminConfig).length > 0) {
-      await loadUserConfig();
-    }
+    // 移除adminConfig的条件限制，直接刷新用户配置
+    await loadUserConfig();
+
+    // 触发全局刷新事件，通知所有useSidebar实例更新
+    sidebarEventTarget.dispatchEvent(new CustomEvent(SIDEBAR_REFRESH_EVENT));
   };
 
   // 加载用户配置
@@ -137,6 +143,21 @@ export const useSidebar = () => {
     }
   }, [adminConfig]);
 
+  // 监听全局刷新事件
+  useEffect(() => {
+    const handleRefresh = () => {
+      if (Object.keys(adminConfig).length > 0) {
+        loadUserConfig();
+      }
+    };
+
+    sidebarEventTarget.addEventListener(SIDEBAR_REFRESH_EVENT, handleRefresh);
+
+    return () => {
+      sidebarEventTarget.removeEventListener(SIDEBAR_REFRESH_EVENT, handleRefresh);
+    };
+  }, [adminConfig]);
+
   // 计算最终的显示配置
   const finalConfig = useMemo(() => {
     const result = {};

From 3410ec14aa952f77c80a6db16260ab4731925246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Mon, 1 Sep 2025 10:20:15 +0800
Subject: [PATCH 04/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D"=E8=BE=B9=E6=A0=8F"?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/hooks/common/useSidebar.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web/src/hooks/common/useSidebar.js b/web/src/hooks/common/useSidebar.js
index e964855e382f..13d76fd86281 100644
--- a/web/src/hooks/common/useSidebar.js
+++ b/web/src/hooks/common/useSidebar.js
@@ -128,8 +128,9 @@ export const useSidebar = () => {
 
   // 刷新用户配置的方法（供外部调用）
   const refreshUserConfig = async () => {
-    // 移除adminConfig的条件限制，直接刷新用户配置
-    await loadUserConfig();
+     if (Object.keys(adminConfig).length > 0) {
+      await loadUserConfig();
+    }
 
     // 触发全局刷新事件，通知所有useSidebar实例更新
     sidebarEventTarget.dispatchEvent(new CustomEvent(SIDEBAR_REFRESH_EVENT));

From 228bd86be0e224ddc52a8a590a3a174c65f5ef05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Tue, 2 Sep 2025 18:10:08 +0800
Subject: [PATCH 05/18] =?UTF-8?q?=E6=94=B9=E8=BF=9B"=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F"=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/auth/ModuleRoute.jsx | 200 ++++++++++++++++++++++++
 1 file changed, 200 insertions(+)
 create mode 100644 web/src/components/auth/ModuleRoute.jsx

diff --git a/web/src/components/auth/ModuleRoute.jsx b/web/src/components/auth/ModuleRoute.jsx
new file mode 100644
index 000000000000..3f208c7faf29
--- /dev/null
+++ b/web/src/components/auth/ModuleRoute.jsx
@@ -0,0 +1,200 @@
+/*
+Copyright (C) 2025 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+
+import React, { useState, useEffect, useContext } from 'react';
+import { Navigate } from 'react-router-dom';
+import { StatusContext } from '../../context/Status';
+import Loading from '../common/ui/Loading';
+import { API } from '../../helpers';
+
+/**
+ * ModuleRoute - 基于功能模块权限的路由保护组件
+ * 
+ * @param {Object} props
+ * @param {React.ReactNode} props.children - 要保护的子组件
+ * @param {string} props.modulePath - 模块权限路径，如 "admin.channel", "console.token"
+ * @param {React.ReactNode} props.fallback - 无权限时显示的组件，默认跳转到 /forbidden
+ * @returns {React.ReactNode}
+ */
+const ModuleRoute = ({ children, modulePath, fallback = <Navigate to="/forbidden" replace /> }) => {
+  const [hasPermission, setHasPermission] = useState(null);
+  const [statusState] = useContext(StatusContext);
+
+  useEffect(() => {
+    checkModulePermission();
+  }, [modulePath, statusState?.status]); // 只在status数据变化时重新检查
+
+  const checkModulePermission = async () => {
+    try {
+      // 检查用户是否已登录
+      const user = localStorage.getItem('user');
+      if (!user) {
+        setHasPermission(false);
+        return;
+      }
+
+      const userData = JSON.parse(user);
+      const userRole = userData.role;
+
+      // 超级管理员始终有权限
+      if (userRole >= 100) {
+        setHasPermission(true);
+        return;
+      }
+
+      // 检查模块权限
+      const permission = await checkModulePermissionAPI(modulePath);
+
+      // 如果返回null，表示status数据还未加载完成，保持loading状态
+      if (permission === null) {
+        setHasPermission(null);
+        return;
+      }
+
+      setHasPermission(permission);
+    } catch (error) {
+      console.error('检查模块权限失败:', error);
+      // 出错时采用安全优先策略，拒绝访问
+      setHasPermission(false);
+    }
+  };
+
+  const checkModulePermissionAPI = async (modulePath) => {
+    try {
+      // 数据看板始终允许访问，不受控制台区域开关影响
+      if (modulePath === 'console.detail') {
+        return true;
+      }
+
+      // 从StatusContext中获取配置信息
+      // 如果status数据还未加载完成，返回null表示需要等待
+      if (!statusState?.status) {
+        return null;
+      }
+
+      const user = JSON.parse(localStorage.getItem('user'));
+      const userRole = user.role;
+
+      // 解析模块路径
+      const pathParts = modulePath.split('.');
+      if (pathParts.length < 2) {
+        return false;
+      }
+
+      // 普通用户权限检查
+      if (userRole < 10) {
+        return await isUserModuleAllowed(modulePath);
+      }
+
+      // 超级管理员权限检查 - 不受系统配置限制
+      if (userRole >= 100) {
+        return true;
+      }
+
+      // 管理员权限检查 - 受系统配置限制
+      if (userRole >= 10 && userRole < 100) {
+        // 从/api/user/self获取系统权限配置
+        try {
+          const userRes = await API.get('/api/user/self');
+          if (userRes.data.success && userRes.data.data.sidebar_config) {
+            const sidebarConfigData = userRes.data.data.sidebar_config;
+            // 管理员权限检查基于系统配置，不受用户偏好影响
+            const systemConfig = sidebarConfigData.system || sidebarConfigData;
+            return checkModulePermissionInConfig(systemConfig, modulePath);
+          } else {
+            // 没有配置时，除了系统设置外都允许访问
+            return modulePath !== 'admin.setting';
+          }
+        } catch (error) {
+          console.error('获取侧边栏配置失败:', error);
+          return false;
+        }
+      }
+
+      return false;
+    } catch (error) {
+      console.error('API权限检查失败:', error);
+      return false;
+    }
+  };
+
+  const isUserModuleAllowed = async (modulePath) => {
+    // 数据看板始终允许访问，不受控制台区域开关影响
+    if (modulePath === 'console.detail') {
+      return true;
+    }
+
+    // 普通用户的权限基于最终计算的配置
+    try {
+      const userRes = await API.get('/api/user/self');
+      if (userRes.data.success && userRes.data.data.sidebar_config) {
+        const sidebarConfigData = userRes.data.data.sidebar_config;
+        // 使用最终计算的配置进行权限检查
+        const finalConfig = sidebarConfigData.final || sidebarConfigData;
+        return checkModulePermissionInConfig(finalConfig, modulePath);
+      }
+      return false;
+    } catch (error) {
+      console.error('获取用户权限配置失败:', error);
+      return false;
+    }
+  };
+
+  // 检查新的sidebar_config结构中的模块权限
+  const checkModulePermissionInConfig = (sidebarConfig, modulePath) => {
+    const parts = modulePath.split('.');
+    if (parts.length !== 2) {
+      return false;
+    }
+
+    const [sectionKey, moduleKey] = parts;
+    const section = sidebarConfig[sectionKey];
+
+    // 检查区域是否存在且启用
+    if (!section || !section.enabled) {
+      return false;
+    }
+
+    // 检查模块是否启用
+    const moduleValue = section[moduleKey];
+    // 处理布尔值和嵌套对象两种情况
+    if (typeof moduleValue === 'boolean') {
+      return moduleValue === true;
+    } else if (typeof moduleValue === 'object' && moduleValue !== null) {
+      // 对于嵌套对象，检查其enabled状态
+      return moduleValue.enabled === true;
+    }
+    return false;
+  };
+
+  // 权限检查中
+  if (hasPermission === null) {
+    return <Loading />;
+  }
+
+  // 无权限
+  if (!hasPermission) {
+    return fallback;
+  }
+
+  // 有权限，渲染子组件
+  return children;
+};
+
+export default ModuleRoute;

From 7512e4a48d2499bc8355b1abb0a537777b54434b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Tue, 2 Sep 2025 19:26:30 +0800
Subject: [PATCH 06/18] =?UTF-8?q?=E6=94=B9=E8=BF=9B"=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F"=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit d798db5953906aa5ff76cf6f2b641eb204d279b0.
---
 web/src/components/auth/ModuleRoute.jsx | 200 ------------------------
 1 file changed, 200 deletions(-)
 delete mode 100644 web/src/components/auth/ModuleRoute.jsx

diff --git a/web/src/components/auth/ModuleRoute.jsx b/web/src/components/auth/ModuleRoute.jsx
deleted file mode 100644
index 3f208c7faf29..000000000000
--- a/web/src/components/auth/ModuleRoute.jsx
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-Copyright (C) 2025 QuantumNous
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-For commercial licensing, please contact support@quantumnous.com
-*/
-
-import React, { useState, useEffect, useContext } from 'react';
-import { Navigate } from 'react-router-dom';
-import { StatusContext } from '../../context/Status';
-import Loading from '../common/ui/Loading';
-import { API } from '../../helpers';
-
-/**
- * ModuleRoute - 基于功能模块权限的路由保护组件
- * 
- * @param {Object} props
- * @param {React.ReactNode} props.children - 要保护的子组件
- * @param {string} props.modulePath - 模块权限路径，如 "admin.channel", "console.token"
- * @param {React.ReactNode} props.fallback - 无权限时显示的组件，默认跳转到 /forbidden
- * @returns {React.ReactNode}
- */
-const ModuleRoute = ({ children, modulePath, fallback = <Navigate to="/forbidden" replace /> }) => {
-  const [hasPermission, setHasPermission] = useState(null);
-  const [statusState] = useContext(StatusContext);
-
-  useEffect(() => {
-    checkModulePermission();
-  }, [modulePath, statusState?.status]); // 只在status数据变化时重新检查
-
-  const checkModulePermission = async () => {
-    try {
-      // 检查用户是否已登录
-      const user = localStorage.getItem('user');
-      if (!user) {
-        setHasPermission(false);
-        return;
-      }
-
-      const userData = JSON.parse(user);
-      const userRole = userData.role;
-
-      // 超级管理员始终有权限
-      if (userRole >= 100) {
-        setHasPermission(true);
-        return;
-      }
-
-      // 检查模块权限
-      const permission = await checkModulePermissionAPI(modulePath);
-
-      // 如果返回null，表示status数据还未加载完成，保持loading状态
-      if (permission === null) {
-        setHasPermission(null);
-        return;
-      }
-
-      setHasPermission(permission);
-    } catch (error) {
-      console.error('检查模块权限失败:', error);
-      // 出错时采用安全优先策略，拒绝访问
-      setHasPermission(false);
-    }
-  };
-
-  const checkModulePermissionAPI = async (modulePath) => {
-    try {
-      // 数据看板始终允许访问，不受控制台区域开关影响
-      if (modulePath === 'console.detail') {
-        return true;
-      }
-
-      // 从StatusContext中获取配置信息
-      // 如果status数据还未加载完成，返回null表示需要等待
-      if (!statusState?.status) {
-        return null;
-      }
-
-      const user = JSON.parse(localStorage.getItem('user'));
-      const userRole = user.role;
-
-      // 解析模块路径
-      const pathParts = modulePath.split('.');
-      if (pathParts.length < 2) {
-        return false;
-      }
-
-      // 普通用户权限检查
-      if (userRole < 10) {
-        return await isUserModuleAllowed(modulePath);
-      }
-
-      // 超级管理员权限检查 - 不受系统配置限制
-      if (userRole >= 100) {
-        return true;
-      }
-
-      // 管理员权限检查 - 受系统配置限制
-      if (userRole >= 10 && userRole < 100) {
-        // 从/api/user/self获取系统权限配置
-        try {
-          const userRes = await API.get('/api/user/self');
-          if (userRes.data.success && userRes.data.data.sidebar_config) {
-            const sidebarConfigData = userRes.data.data.sidebar_config;
-            // 管理员权限检查基于系统配置，不受用户偏好影响
-            const systemConfig = sidebarConfigData.system || sidebarConfigData;
-            return checkModulePermissionInConfig(systemConfig, modulePath);
-          } else {
-            // 没有配置时，除了系统设置外都允许访问
-            return modulePath !== 'admin.setting';
-          }
-        } catch (error) {
-          console.error('获取侧边栏配置失败:', error);
-          return false;
-        }
-      }
-
-      return false;
-    } catch (error) {
-      console.error('API权限检查失败:', error);
-      return false;
-    }
-  };
-
-  const isUserModuleAllowed = async (modulePath) => {
-    // 数据看板始终允许访问，不受控制台区域开关影响
-    if (modulePath === 'console.detail') {
-      return true;
-    }
-
-    // 普通用户的权限基于最终计算的配置
-    try {
-      const userRes = await API.get('/api/user/self');
-      if (userRes.data.success && userRes.data.data.sidebar_config) {
-        const sidebarConfigData = userRes.data.data.sidebar_config;
-        // 使用最终计算的配置进行权限检查
-        const finalConfig = sidebarConfigData.final || sidebarConfigData;
-        return checkModulePermissionInConfig(finalConfig, modulePath);
-      }
-      return false;
-    } catch (error) {
-      console.error('获取用户权限配置失败:', error);
-      return false;
-    }
-  };
-
-  // 检查新的sidebar_config结构中的模块权限
-  const checkModulePermissionInConfig = (sidebarConfig, modulePath) => {
-    const parts = modulePath.split('.');
-    if (parts.length !== 2) {
-      return false;
-    }
-
-    const [sectionKey, moduleKey] = parts;
-    const section = sidebarConfig[sectionKey];
-
-    // 检查区域是否存在且启用
-    if (!section || !section.enabled) {
-      return false;
-    }
-
-    // 检查模块是否启用
-    const moduleValue = section[moduleKey];
-    // 处理布尔值和嵌套对象两种情况
-    if (typeof moduleValue === 'boolean') {
-      return moduleValue === true;
-    } else if (typeof moduleValue === 'object' && moduleValue !== null) {
-      // 对于嵌套对象，检查其enabled状态
-      return moduleValue.enabled === true;
-    }
-    return false;
-  };
-
-  // 权限检查中
-  if (hasPermission === null) {
-    return <Loading />;
-  }
-
-  // 无权限
-  if (!hasPermission) {
-    return fallback;
-  }
-
-  // 有权限，渲染子组件
-  return children;
-};
-
-export default ModuleRoute;

From d451c0d01246d1a347e5ca36ac1af35af56a4b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Tue, 2 Sep 2025 19:55:45 +0800
Subject: [PATCH 07/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B6=E6=A0=8F?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E6=9D=83=E9=99=90=E5=8F=8A=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/misc.go                            | 275 +++++++-
 controller/user.go                            | 608 +++++++++++++++++-
 middleware/auth.go                            | 161 +++++
 model/user.go                                 |  14 +-
 model/user_group.go                           |   4 +-
 router/api-router.go                          |  32 +-
 web/index.html                                |  23 +
 web/src/App.jsx                               |  97 ++-
 web/src/components/auth/ModuleRoute.jsx       | 181 ++++++
 web/src/components/layout/PageLayout.jsx      |   2 +
 web/src/components/settings/OtherSetting.jsx  |   5 +
 .../personal/cards/NotificationSettings.jsx   |  80 ++-
 .../components/table/users/UsersActions.jsx   |  38 +-
 .../table/users/modals/EditUserGroupModal.jsx |  59 +-
 .../users/modals/UserGroupManagement.jsx      |  75 ++-
 web/src/helpers/data.js                       |   7 +
 web/src/hooks/common/useHeaderBar.js          |   2 +-
 web/src/hooks/common/useSidebar.js            | 201 ++----
 web/src/pages/Home/index.jsx                  |  12 +-
 .../Operation/SettingsHeaderNavModules.jsx    |   4 +-
 .../Operation/SettingsSidebarModulesAdmin.jsx |  21 +-
 .../Personal/SettingsSidebarModulesUser.jsx   | 390 ++++++-----
 22 files changed, 1855 insertions(+), 436 deletions(-)
 create mode 100644 web/src/components/auth/ModuleRoute.jsx

diff --git a/controller/misc.go b/controller/misc.go
index 90a10373d95c..9e0892c64fbe 100644
--- a/controller/misc.go
+++ b/controller/misc.go
@@ -42,6 +42,12 @@ func GetStatus(c *gin.Context) {
 	common.OptionMapRWMutex.RLock()
 	defer common.OptionMapRWMutex.RUnlock()
 
+	// 获取用户角色信息（如果已登录）
+	var userRole int = -1
+	if role := c.GetInt("role"); role > 0 {
+		userRole = role
+	}
+
 	data := gin.H{
 		"version":                     common.Version,
 		"start_time":                  common.StartTime,
@@ -88,9 +94,8 @@ func GetStatus(c *gin.Context) {
 		"announcements_enabled": cs.AnnouncementsEnabled,
 		"faq_enabled":           cs.FAQEnabled,
 
-		// 模块管理配置
-		"HeaderNavModules":    common.OptionMap["HeaderNavModules"],
-		"SidebarModulesAdmin": common.OptionMap["SidebarModulesAdmin"],
+		// 模块管理配置 - 根据用户权限过滤
+		"header_nav_modules": filterHeaderNavModulesForUser(common.OptionMap["HeaderNavModules"], userRole),
 
 		"oidc_enabled":                system_setting.GetOIDCSettings().Enabled,
 		"oidc_client_id":              system_setting.GetOIDCSettings().ClientId,
@@ -304,3 +309,267 @@ func ResetPassword(c *gin.Context) {
 	})
 	return
 }
+
+// filterHeaderNavModulesForUser 根据用户权限过滤顶栏模块配置
+func filterHeaderNavModulesForUser(headerNavModulesRaw interface{}, userRole int) interface{} {
+	// 如果配置为空，返回原配置
+	if headerNavModulesRaw == nil {
+		return headerNavModulesRaw
+	}
+
+	// 如果用户未登录，返回原配置（顶栏模块对所有用户都是公开的）
+	if userRole == -1 {
+		return headerNavModulesRaw
+	}
+
+	headerNavModulesStr, ok := headerNavModulesRaw.(string)
+	if !ok || headerNavModulesStr == "" {
+		return headerNavModulesRaw
+	}
+
+	// 解析配置
+	var config map[string]interface{}
+	if err := json.Unmarshal([]byte(headerNavModulesStr), &config); err != nil {
+		// 解析失败时返回空配置，采用安全优先策略
+		return "{}"
+	}
+
+	// 对于所有用户，移除被禁用的模块
+	filteredConfig := make(map[string]interface{})
+	for key, value := range config {
+		// 首先检查模块是否启用
+		if isHeaderNavModuleEnabled(key, value) {
+			// 超级管理员可以看到所有启用的模块
+			if userRole >= common.RoleRootUser {
+				filteredConfig[key] = value
+			} else {
+				// 对于管理员和普通用户，进行额外的权限检查
+				if hasHeaderNavModulePermission(key, value, userRole) {
+					filteredConfig[key] = value
+				}
+			}
+		}
+		// 被禁用的模块（isHeaderNavModuleEnabled返回false）不会被添加到filteredConfig中
+	}
+
+	// 转换回JSON字符串
+	filteredBytes, err := json.Marshal(filteredConfig)
+	if err != nil {
+		return "{}"
+	}
+
+	return string(filteredBytes)
+}
+
+// FilterSidebarModulesAdminForUser 根据用户权限过滤侧边栏管理配置
+func FilterSidebarModulesAdminForUser(sidebarModulesRaw interface{}, userRole int) interface{} {
+	// 如果用户未登录，返回空配置以保护敏感信息
+	if userRole == -1 {
+		return "{}"
+	}
+
+	if sidebarModulesRaw == nil {
+		return sidebarModulesRaw
+	}
+
+	sidebarModulesStr, ok := sidebarModulesRaw.(string)
+	if !ok || sidebarModulesStr == "" {
+		return sidebarModulesRaw
+	}
+
+	// 解析配置
+	var config map[string]interface{}
+	if err := json.Unmarshal([]byte(sidebarModulesStr), &config); err != nil {
+		// 解析失败时返回空配置，采用安全优先策略
+		return "{}"
+	}
+
+
+
+	// 对于所有用户，移除被禁用的模块
+	filteredConfig := make(map[string]interface{})
+	for sectionKey, sectionValue := range config {
+		if sectionObj, ok := sectionValue.(map[string]interface{}); ok {
+			// 检查区域是否启用
+			sectionEnabledByConfig := true
+			if enabled, hasEnabled := sectionObj["enabled"]; hasEnabled {
+				if enabledBool, ok := enabled.(bool); ok && !enabledBool {
+					sectionEnabledByConfig = false
+				}
+			}
+
+			// 如果区域被配置为禁用，跳过整个区域（但console区域需要特殊处理，因为数据看板始终可访问）
+			if !sectionEnabledByConfig && sectionKey != "console" {
+				continue
+			}
+
+			filteredSection := make(map[string]interface{})
+			hasValidModules := false // 标记区域是否有有效的模块
+
+			// 复制区域配置
+			for moduleKey, moduleValue := range sectionObj {
+				// 检查用户是否有权限访问此模块
+				modulePath := sectionKey + "." + moduleKey
+
+				// 数据看板始终允许访问，强制设置为启用
+				if modulePath == "console.detail" {
+					filteredSection[moduleKey] = true
+					hasValidModules = true
+				} else if moduleKey == "enabled" {
+					// 只有当区域启用时才复制enabled字段
+					if sectionEnabledByConfig {
+						filteredSection[moduleKey] = moduleValue
+					}
+				} else if sectionEnabledByConfig && hasModulePermissionForUser(userRole, modulePath, moduleValue) {
+					// 处理嵌套权限（如admin.user.groupManagement）
+					if moduleObj, ok := moduleValue.(map[string]interface{}); ok {
+						filteredModule := make(map[string]interface{})
+
+						// 首先检查模块本身是否启用
+						if enabled, hasEnabled := moduleObj["enabled"]; hasEnabled {
+							if enabledBool, ok := enabled.(bool); ok && !enabledBool {
+								continue // 跳过被禁用的模块
+							}
+							filteredModule["enabled"] = enabled
+						}
+
+						// 过滤子模块
+						for subKey, subValue := range moduleObj {
+							if subKey == "enabled" {
+								continue // enabled字段已经处理过了
+							}
+
+							subModulePath := modulePath + "." + subKey
+
+							// 检查子模块是否启用
+							if subValueBool, ok := subValue.(bool); ok && !subValueBool {
+								continue // 跳过被禁用的子模块
+							}
+
+							if hasModulePermissionForUser(userRole, subModulePath, subValue) {
+								filteredModule[subKey] = subValue
+							}
+						}
+
+						// 只有当过滤后的模块不为空时才添加
+						if len(filteredModule) > 0 {
+							filteredSection[moduleKey] = filteredModule
+							hasValidModules = true
+						}
+					} else {
+						// 检查简单模块值是否启用
+						if moduleValueBool, ok := moduleValue.(bool); ok && !moduleValueBool {
+							continue // 跳过被禁用的简单模块
+						}
+						filteredSection[moduleKey] = moduleValue
+						hasValidModules = true
+					}
+				}
+			}
+
+			// 只有当区域有有效模块时才添加到结果中
+			if hasValidModules && len(filteredSection) > 0 {
+				filteredConfig[sectionKey] = filteredSection
+			}
+		}
+	}
+
+	// 转换回JSON字符串
+	filteredBytes, err := json.Marshal(filteredConfig)
+	if err != nil {
+		return "{}"
+	}
+
+	return string(filteredBytes)
+}
+
+// isHeaderNavModuleEnabled 检查顶栏模块是否启用
+func isHeaderNavModuleEnabled(moduleKey string, moduleValue interface{}) bool {
+	switch v := moduleValue.(type) {
+	case bool:
+		return v
+	case map[string]interface{}:
+		if enabled, hasEnabled := v["enabled"]; hasEnabled {
+			if enabledBool, ok := enabled.(bool); ok {
+				return enabledBool
+			}
+		}
+		return true // 如果没有enabled字段，默认启用
+	default:
+		return true
+	}
+}
+
+// hasHeaderNavModulePermission 检查用户是否有权限访问顶栏模块
+func hasHeaderNavModulePermission(moduleKey string, moduleValue interface{}, userRole int) bool {
+	// 普通用户只能访问基础模块
+	if userRole < common.RoleAdminUser {
+		allowedModules := map[string]bool{
+			"home":    true,
+			"console": true,
+		}
+		return allowedModules[moduleKey]
+	}
+
+	// 管理员可以访问更多模块
+	return true
+}
+
+// hasModulePermissionForUser 检查用户是否有权限访问指定模块
+func hasModulePermissionForUser(userRole int, modulePath string, moduleValue interface{}) bool {
+	// 数据看板始终允许访问，不受控制台区域开关影响
+	if modulePath == "console.detail" {
+		return true
+	}
+
+	// 普通用户只能访问基础功能
+	if userRole < common.RoleAdminUser {
+		return isUserModuleAllowedInFilter(modulePath)
+	}
+
+	// 管理员需要检查模块是否启用
+	if userRole >= common.RoleAdminUser && userRole < common.RoleRootUser {
+		// 检查模块值是否为启用状态
+		switch v := moduleValue.(type) {
+		case bool:
+			return v
+		case map[string]interface{}:
+			if enabled, hasEnabled := v["enabled"]; hasEnabled {
+				if enabledBool, ok := enabled.(bool); ok {
+					return enabledBool
+				}
+			}
+			return true // 如果没有enabled字段，默认启用
+		default:
+			return true
+		}
+	}
+
+	return true
+}
+
+// isUserModuleAllowedInFilter 检查普通用户是否允许访问指定模块（用于过滤）
+func isUserModuleAllowedInFilter(modulePath string) bool {
+	// 数据看板始终允许访问，不受控制台区域开关影响
+	if modulePath == "console.detail" {
+		return true
+	}
+
+	// 普通用户允许访问的模块列表
+	allowedModules := map[string]bool{
+		"console.enabled":    true,
+		"console.detail":     true,
+		"console.token":      true,
+		"console.log":        true,
+		"console.midjourney": true,
+		"console.task":       true,
+		"personal.enabled":   true,
+		"personal.topup":     true,
+		"personal.personal":  true,
+		"chat.enabled":       true,
+		"chat.playground":    true,
+		"chat.chat":          true,
+	}
+
+	return allowedModules[modulePath]
+}
diff --git a/controller/user.go b/controller/user.go
index 8e43fe0e39a2..79e908693400 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -463,28 +463,57 @@ func GetSelf(c *gin.Context) {
 	// 获取用户设置并提取sidebar_modules
 	userSetting := user.GetSetting()
 
-	// 构建响应数据，包含用户信息和权限
+	// 计算系统允许的最大权限范围
+	systemSidebarConfig := calculateFinalSidebarConfig(userRole, userSetting)
+
+	// 提取并过滤用户的侧边栏偏好设置，确保与系统权限一致
+	var userSidebarModules interface{}
+	if userSetting.SidebarModules != "" {
+		var userSidebarModulesMap map[string]interface{}
+		if err := json.Unmarshal([]byte(userSetting.SidebarModules), &userSidebarModulesMap); err == nil {
+			// 基于系统权限过滤用户偏好
+			filteredUserModules := filterUserModulesBySystemConfig(userSidebarModulesMap, systemSidebarConfig)
+			userSidebarModules = filteredUserModules
+		} else {
+			userSidebarModules = userSetting.SidebarModules
+		}
+	} else {
+		userSidebarModules = map[string]interface{}{}
+	}
+
+	// 清理用户设置中的sidebar_modules，确保与最终配置一致
+	cleanedSetting := cleanUserSettingForResponse(user.Setting, systemSidebarConfig)
+
+	// 计算最终的显示配置（系统权限 ∩ 用户偏好）
+	finalSidebarConfig := calculateFinalDisplayConfig(systemSidebarConfig, userSidebarModules)
+
+	// 精简权限信息，只保留必要的权限标识
+	simplifiedPermissions := map[string]interface{}{
+		"sidebar_settings": permissions["sidebar_settings"], // 是否有侧边栏设置权限
+	}
+
+	// 构建响应数据，包含用户信息和精简的配置
 	responseData := map[string]interface{}{
-		"id":               user.Id,
-		"username":         user.Username,
-		"display_name":     user.DisplayName,
-		"role":             user.Role,
-		"status":           user.Status,
-		"email":            user.Email,
-		"group":            user.Group,
-		"quota":            user.Quota,
-		"used_quota":       user.UsedQuota,
-		"request_count":    user.RequestCount,
-		"aff_code":         user.AffCode,
-		"aff_count":        user.AffCount,
-		"aff_quota":        user.AffQuota,
+		"id":                user.Id,
+		"username":          user.Username,
+		"display_name":      user.DisplayName,
+		"role":              user.Role,
+		"status":            user.Status,
+		"email":             user.Email,
+		"group":             user.Group,
+		"quota":             user.Quota,
+		"used_quota":        user.UsedQuota,
+		"request_count":     user.RequestCount,
+		"aff_code":          user.AffCode,
+		"aff_count":         user.AffCount,
+		"aff_quota":         user.AffQuota,
 		"aff_history_quota": user.AffHistoryQuota,
-		"inviter_id":       user.InviterId,
-		"linux_do_id":      user.LinuxDOId,
-		"setting":          user.Setting,
-		"stripe_customer":  user.StripeCustomer,
-		"sidebar_modules":  userSetting.SidebarModules, // 正确提取sidebar_modules字段
-		"permissions":      permissions,                 // 新增权限字段
+		"inviter_id":        user.InviterId,
+		"linux_do_id":       user.LinuxDOId,
+		"setting":           cleanedSetting,        // 完整用户设置（保持兼容性）
+		"stripe_customer":   user.StripeCustomer,
+		"sidebar_config":    finalSidebarConfig,   // 最终的侧边栏配置
+		"permissions":       simplifiedPermissions, // 精简的权限信息
 	}
 
 	c.JSON(http.StatusOK, gin.H{
@@ -523,6 +552,531 @@ func calculateUserPermissions(userRole int) map[string]interface{} {
 	return permissions
 }
 
+// 计算最终的侧边栏配置（系统配置 + 权限过滤，不包含用户偏好）
+func calculateFinalSidebarConfig(userRole int, userSetting dto.UserSetting) map[string]interface{} {
+	// 1. 获取系统的侧边栏管理配置
+	common.OptionMapRWMutex.RLock()
+	sidebarAdminConfigRaw := common.OptionMap["SidebarModulesAdmin"]
+	common.OptionMapRWMutex.RUnlock()
+
+	// 2. 解析系统配置
+	var systemConfig map[string]interface{}
+	if sidebarAdminConfigRaw != "" {
+		if err := json.Unmarshal([]byte(sidebarAdminConfigRaw), &systemConfig); err != nil {
+			// 解析失败时使用默认配置
+			systemConfig = getDefaultSystemConfig()
+		}
+	} else {
+		systemConfig = getDefaultSystemConfig()
+	}
+
+	// 3. 不再考虑用户个人偏好，sidebar_config只反映系统允许的最大权限范围
+
+	// 4. 计算最终配置
+	finalConfig := map[string]interface{}{}
+
+	// 遍历系统配置的所有区域
+	for sectionKey, sectionValue := range systemConfig {
+		sectionObj, ok := sectionValue.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		// 检查用户是否有权限访问这个区域
+		if !hasUserPermissionForSection(userRole, sectionKey) {
+			continue
+		}
+
+		// 检查系统是否启用了这个区域
+		sectionEnabled := true
+		if enabled, hasEnabled := sectionObj["enabled"]; hasEnabled {
+			if enabledBool, ok := enabled.(bool); ok {
+				sectionEnabled = enabledBool
+			}
+		}
+
+		if !sectionEnabled {
+			continue
+		}
+
+		// 计算区域的最终配置（只考虑系统配置和用户权限，不考虑用户偏好）
+		sectionConfig := map[string]interface{}{}
+
+		// 区域级别的enabled状态：只要系统启用就为true
+		sectionConfig["enabled"] = sectionEnabled
+
+		// 处理区域内的各个模块
+		for moduleKey, moduleValue := range sectionObj {
+			if moduleKey == "enabled" {
+				continue
+			}
+
+			// 检查用户是否有权限访问这个模块
+			modulePath := sectionKey + "." + moduleKey
+			if !hasUserPermissionForModule(userRole, modulePath) {
+				sectionConfig[moduleKey] = false
+				continue
+			}
+
+			// 处理嵌套的模块配置（如 admin.user）
+			switch v := moduleValue.(type) {
+			case bool:
+				// 简单的布尔值模块
+				systemModuleEnabled := v
+				finalModuleEnabled := systemModuleEnabled && sectionConfig["enabled"].(bool)
+				sectionConfig[moduleKey] = finalModuleEnabled
+			case map[string]interface{}:
+				// 嵌套的对象模块（如 admin.user 包含 enabled 和 groupManagement）
+				nestedModuleConfig := map[string]interface{}{}
+
+				// 检查嵌套模块的enabled状态
+				nestedEnabled := true
+				if enabled, hasEnabled := v["enabled"]; hasEnabled {
+					if enabledBool, ok := enabled.(bool); ok {
+						nestedEnabled = enabledBool
+					}
+				}
+
+				// 最终的enabled状态
+				finalNestedEnabled := nestedEnabled && sectionConfig["enabled"].(bool)
+				nestedModuleConfig["enabled"] = finalNestedEnabled
+
+				// 处理嵌套模块的子功能
+				for subModuleKey, subModuleValue := range v {
+					if subModuleKey == "enabled" {
+						continue
+					}
+
+					// 检查用户是否有权限访问这个子功能
+					subModulePath := sectionKey + "." + moduleKey + "." + subModuleKey
+					if !hasUserPermissionForModule(userRole, subModulePath) {
+						nestedModuleConfig[subModuleKey] = false
+						continue
+					}
+
+					// 检查系统是否启用了这个子功能
+					subModuleEnabled := true
+					if subModuleBool, ok := subModuleValue.(bool); ok {
+						subModuleEnabled = subModuleBool
+					}
+
+					// 最终状态：系统启用 && 用户权限允许 && 父模块启用
+					finalSubModuleEnabled := subModuleEnabled && finalNestedEnabled
+					nestedModuleConfig[subModuleKey] = finalSubModuleEnabled
+				}
+
+				sectionConfig[moduleKey] = nestedModuleConfig
+			default:
+				// 其他类型，直接设置为false
+				sectionConfig[moduleKey] = false
+			}
+		}
+
+		finalConfig[sectionKey] = sectionConfig
+	}
+
+	return finalConfig
+}
+
+// 获取默认的系统配置
+func getDefaultSystemConfig() map[string]interface{} {
+	return map[string]interface{}{
+		"chat": map[string]interface{}{
+			"enabled":    true,
+			"playground": true,
+			"chat":       true,
+		},
+		"console": map[string]interface{}{
+			"enabled":    true,
+			"detail":     true,
+			"token":      true,
+			"log":        true,
+			"midjourney": true,
+			"task":       true,
+		},
+		"personal": map[string]interface{}{
+			"enabled":  true,
+			"topup":    true,
+			"personal": true,
+		},
+		"admin": map[string]interface{}{
+			"enabled":    true,
+			"channel":    true,
+			"models":     true,
+			"redemption": true,
+			"user": map[string]interface{}{
+				"enabled":         true,
+				"groupManagement": true, // 默认启用分组管理
+			},
+			"setting": true,
+		},
+	}
+}
+
+// 检查用户是否有权限访问指定区域
+func hasUserPermissionForSection(userRole int, sectionKey string) bool {
+	// 普通用户不能访问管理员区域
+	if userRole < common.RoleAdminUser && sectionKey == "admin" {
+		return false
+	}
+	return true
+}
+
+// 检查用户是否有权限访问指定模块
+func hasUserPermissionForModule(userRole int, modulePath string) bool {
+	// 数据看板始终允许访问
+	if modulePath == "console.detail" {
+		return true
+	}
+
+	// 管理员不能访问系统设置
+	if userRole == common.RoleAdminUser && modulePath == "admin.setting" {
+		return false
+	}
+
+	// 处理嵌套的模块路径（如 admin.user.groupManagement）
+	pathParts := strings.Split(modulePath, ".")
+	if len(pathParts) >= 2 {
+		sectionKey := pathParts[0]
+
+		// 普通用户不能访问管理员区域的任何模块
+		if userRole < common.RoleAdminUser && sectionKey == "admin" {
+			return false
+		}
+
+		// 对于三层路径（如 admin.user.groupManagement），检查特殊权限
+		if len(pathParts) == 3 && sectionKey == "admin" && pathParts[1] == "user" && pathParts[2] == "groupManagement" {
+			// 分组管理功能：管理员和超级管理员都可以访问
+			return userRole >= common.RoleAdminUser
+		}
+	}
+
+	return true
+}
+
+// 清理用户设置，添加系统权限信息供个人设置页面使用
+func cleanUserSettingForResponse(originalSetting string, systemSidebarConfig map[string]interface{}) string {
+	if originalSetting == "" {
+		return ""
+	}
+
+	// 解析原始设置
+	var userSetting dto.UserSetting
+	if err := json.Unmarshal([]byte(originalSetting), &userSetting); err != nil {
+		// 解析失败，返回原始设置
+		return originalSetting
+	}
+
+	// 如果没有sidebar_modules配置，直接返回
+	if userSetting.SidebarModules == "" {
+		return originalSetting
+	}
+
+	// 解析用户的sidebar_modules配置
+	var userSidebarModules map[string]interface{}
+	if err := json.Unmarshal([]byte(userSetting.SidebarModules), &userSidebarModules); err != nil {
+		// 解析失败，返回原始设置
+		return originalSetting
+	}
+
+	// 基于系统配置过滤用户的sidebar_modules，同时保留系统权限信息
+	filteredSidebarModules := map[string]interface{}{}
+	for sectionKey, sectionValue := range systemSidebarConfig {
+		sectionObj, ok := sectionValue.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		// 检查系统是否允许这个区域
+		systemSectionEnabled, hasEnabled := sectionObj["enabled"]
+		if !hasEnabled || systemSectionEnabled != true {
+			continue
+		}
+
+		// 获取用户对这个区域的配置
+		userSection := map[string]interface{}{}
+		if userSidebarModules[sectionKey] != nil {
+			if userSectionObj, ok := userSidebarModules[sectionKey].(map[string]interface{}); ok {
+				userSection = userSectionObj
+			}
+		}
+
+		// 构建过滤后的区域配置
+		filteredSection := map[string]interface{}{
+			"enabled": userSection["enabled"], // 保持用户的enabled偏好
+		}
+
+		// 只保留最终配置中存在的模块（支持布尔与嵌套对象）
+		for moduleKey, moduleValue := range sectionObj {
+			if moduleKey == "enabled" {
+				continue
+			}
+
+			// 判断系统是否允许该模块
+			systemAllows := false
+			switch v := moduleValue.(type) {
+			case bool:
+				systemAllows = v
+			case map[string]interface{}:
+				// 嵌套对象，检查其enabled状态，缺省视为true
+				if enabled, hasEnabled := v["enabled"]; hasEnabled {
+					if enabledBool, ok := enabled.(bool); ok {
+						systemAllows = enabledBool
+					} else {
+						systemAllows = true
+					}
+				} else {
+					systemAllows = true
+				}
+			default:
+				systemAllows = false
+			}
+
+			if systemAllows {
+				// 保持用户对这个模块的偏好（布尔或对象），若未设置则默认启用
+				if userModuleValue, exists := userSection[moduleKey]; exists {
+					filteredSection[moduleKey] = userModuleValue
+				} else {
+					filteredSection[moduleKey] = true // 默认启用
+				}
+			}
+		}
+
+		filteredSidebarModules[sectionKey] = filteredSection
+	}
+
+	// 更新用户设置中的sidebar_modules
+	filteredSidebarModulesJSON, err := json.Marshal(filteredSidebarModules)
+	if err != nil {
+		// 序列化失败，返回原始设置
+		return originalSetting
+	}
+
+	userSetting.SidebarModules = string(filteredSidebarModulesJSON)
+
+	// 添加系统权限信息供个人设置页面使用
+	systemConfigJSON, err := json.Marshal(systemSidebarConfig)
+	if err == nil {
+		// 创建一个扩展的用户设置结构
+		extendedSetting := map[string]interface{}{
+			"sidebar_modules":        userSetting.SidebarModules,
+			"sidebar_system_config": string(systemConfigJSON), // 系统权限信息
+		}
+
+		// 添加其他用户设置字段（如果有的话）
+		var originalSettingMap map[string]interface{}
+		if err := json.Unmarshal([]byte(originalSetting), &originalSettingMap); err == nil {
+			for key, value := range originalSettingMap {
+				if key != "sidebar_modules" && key != "sidebar_system_config" {
+					extendedSetting[key] = value
+				}
+			}
+		}
+
+		// 序列化扩展的设置
+		if extendedSettingJSON, err := json.Marshal(extendedSetting); err == nil {
+			return string(extendedSettingJSON)
+		}
+	}
+
+	// 如果添加系统配置失败，使用原有逻辑
+	cleanedSettingJSON, err := json.Marshal(userSetting)
+	if err != nil {
+		return originalSetting
+	}
+
+	return string(cleanedSettingJSON)
+}
+
+// 基于系统权限过滤用户偏好设置
+func filterUserModulesBySystemConfig(userModules map[string]interface{}, systemConfig map[string]interface{}) map[string]interface{} {
+	filteredModules := map[string]interface{}{}
+
+	// 只保留系统允许的区域和模块
+	for sectionKey, sectionValue := range systemConfig {
+		systemSection, ok := sectionValue.(map[string]interface{})
+		if !ok || systemSection["enabled"] != true {
+			continue
+		}
+
+		// 获取用户对这个区域的偏好
+		userSection := map[string]interface{}{}
+		if userModules[sectionKey] != nil {
+			if userSectionObj, ok := userModules[sectionKey].(map[string]interface{}); ok {
+				userSection = userSectionObj
+			}
+		}
+
+		// 构建过滤后的区域配置
+		filteredSection := map[string]interface{}{
+			"enabled": userSection["enabled"], // 保持用户的enabled偏好
+		}
+
+		// 只保留系统允许的模块（同时支持布尔模块与嵌套对象模块）
+		for moduleKey, moduleValue := range systemSection {
+			if moduleKey == "enabled" {
+				continue
+			}
+
+			// 判断系统是否允许该模块
+			systemAllows := false
+			switch v := moduleValue.(type) {
+			case bool:
+				systemAllows = v
+			case map[string]interface{}:
+				// 嵌套对象，检查其enabled状态，缺省视为true
+				if enabled, hasEnabled := v["enabled"]; hasEnabled {
+					if enabledBool, ok := enabled.(bool); ok {
+						systemAllows = enabledBool
+					} else {
+						systemAllows = true
+					}
+				} else {
+					systemAllows = true
+				}
+			default:
+				systemAllows = false
+			}
+
+			if systemAllows {
+				// 保持用户对这个模块的偏好（支持布尔或对象），若未设置则默认启用
+				if userModuleValue, exists := userSection[moduleKey]; exists {
+					filteredSection[moduleKey] = userModuleValue
+				} else {
+					filteredSection[moduleKey] = true // 默认启用
+				}
+			}
+		}
+
+		filteredModules[sectionKey] = filteredSection
+	}
+
+	return filteredModules
+}
+
+// 计算最终的显示配置（系统权限 ∩ 用户偏好）
+func calculateFinalDisplayConfig(systemConfig map[string]interface{}, userModules interface{}) map[string]interface{} {
+	finalConfig := map[string]interface{}{}
+
+	// 解析用户偏好设置
+	var userPreferences map[string]interface{}
+	switch v := userModules.(type) {
+	case map[string]interface{}:
+		userPreferences = v
+	case string:
+		if err := json.Unmarshal([]byte(v), &userPreferences); err != nil {
+			userPreferences = map[string]interface{}{}
+		}
+	default:
+		userPreferences = map[string]interface{}{}
+	}
+
+	// 遍历系统允许的所有区域
+	for sectionKey, sectionValue := range systemConfig {
+		systemSection, ok := sectionValue.(map[string]interface{})
+		if !ok || systemSection["enabled"] != true {
+			continue
+		}
+
+		// 获取用户对这个区域的偏好
+		userSection := map[string]interface{}{}
+		if userPreferences[sectionKey] != nil {
+			if userSectionObj, ok := userPreferences[sectionKey].(map[string]interface{}); ok {
+				userSection = userSectionObj
+			}
+		}
+
+		// 计算区域的最终配置
+		sectionConfig := map[string]interface{}{}
+
+		// 区域级别：用户可以关闭系统允许的区域
+		userSectionEnabled := userSection["enabled"] != false
+		sectionConfig["enabled"] = userSectionEnabled
+
+		// 处理区域内的模块
+		for moduleKey, moduleValue := range systemSection {
+			if moduleKey == "enabled" {
+				continue
+			}
+
+			// 检查系统是否允许这个模块
+			var systemModuleEnabled bool
+			switch v := moduleValue.(type) {
+			case bool:
+				systemModuleEnabled = v
+			case map[string]interface{}:
+				// 对于嵌套对象，检查其enabled状态
+				if enabled, hasEnabled := v["enabled"]; hasEnabled {
+					if enabledBool, ok := enabled.(bool); ok {
+						systemModuleEnabled = enabledBool
+					} else {
+						systemModuleEnabled = true // 默认启用
+					}
+				} else {
+					systemModuleEnabled = true // 没有enabled字段时默认启用
+				}
+			default:
+				systemModuleEnabled = false
+			}
+
+			if !systemModuleEnabled {
+				sectionConfig[moduleKey] = false
+				continue
+			}
+
+			// 对于嵌套对象，需要合并系统配置和用户偏好
+			if nestedObj, isNested := moduleValue.(map[string]interface{}); isNested {
+				// 获取用户对这个嵌套对象的偏好
+				userNestedObj := map[string]interface{}{}
+				if userSection[moduleKey] != nil {
+					if userNestedMap, ok := userSection[moduleKey].(map[string]interface{}); ok {
+						userNestedObj = userNestedMap
+					}
+				}
+
+				// 计算有效的enabled：支持用户以布尔值直接覆盖嵌套对象（个人设置场景）
+				var effectiveEnabled interface{}
+				if userBool, ok := userSection[moduleKey].(bool); ok {
+					effectiveEnabled = userBool
+				} else if ue, exists := userNestedObj["enabled"]; exists {
+					effectiveEnabled = ue
+				} else if sysEnabled, has := nestedObj["enabled"]; has {
+					effectiveEnabled = sysEnabled
+				} else {
+					effectiveEnabled = true
+				}
+
+				// 合并系统配置和用户偏好
+				finalNestedObj := make(map[string]interface{})
+				for k, v := range nestedObj {
+					if k == "enabled" {
+						finalNestedObj[k] = effectiveEnabled
+					} else {
+						// 其他字段保持系统配置
+						finalNestedObj[k] = v
+					}
+				}
+
+				// 如果区域被禁用，强制将嵌套对象的enabled设置为false
+				if !userSectionEnabled {
+					finalNestedObj["enabled"] = false
+				}
+
+				sectionConfig[moduleKey] = finalNestedObj
+			} else {
+				// 简单布尔值模块，用户可以关闭系统允许的模块
+				userModuleEnabled := userSection[moduleKey] != false
+				// 最终状态：系统允许 && 用户偏好 && 区域启用
+				sectionConfig[moduleKey] = systemModuleEnabled && userModuleEnabled && userSectionEnabled
+			}
+		}
+
+		finalConfig[sectionKey] = sectionConfig
+	}
+
+	return finalConfig
+}
+
 // 根据用户角色生成默认的边栏配置
 func generateDefaultSidebarConfig(userRole int) string {
 	defaultConfig := map[string]interface{}{}
@@ -559,8 +1113,11 @@ func generateDefaultSidebarConfig(userRole int) string {
 			"channel":    true,
 			"models":     true,
 			"redemption": true,
-			"user":       true,
-			"setting":    false, // 管理员不能访问系统设置
+			"user": map[string]interface{}{
+				"enabled":         true,
+				"groupManagement": true, // 管理员默认可以访问分组管理
+			},
+			"setting": false, // 管理员不能访问系统设置
 		}
 	} else if userRole == common.RoleRootUser {
 		// 超级管理员可以访问所有功能
@@ -569,8 +1126,11 @@ func generateDefaultSidebarConfig(userRole int) string {
 			"channel":    true,
 			"models":     true,
 			"redemption": true,
-			"user":       true,
-			"setting":    true,
+			"user": map[string]interface{}{
+				"enabled":         true,
+				"groupManagement": true, // 超级管理员默认可以访问分组管理
+			},
+			"setting": true,
 		}
 	}
 	// 普通用户不包含admin区域
diff --git a/middleware/auth.go b/middleware/auth.go
index 25caf50d9be0..b1f0099abc9f 100644
--- a/middleware/auth.go
+++ b/middleware/auth.go
@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"one-api/common"
@@ -175,6 +176,166 @@ func WssAuth(c *gin.Context) {
 
 }
 
+// ModuleAuth 检查用户是否有权限访问特定功能模块
+func ModuleAuth(modulePath string) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		session := sessions.Default(c)
+		role := session.Get("role")
+		id := session.Get("id")
+
+		// 如果用户未登录，先进行基础认证
+		if role == nil || id == nil {
+			c.JSON(http.StatusUnauthorized, gin.H{
+				"success": false,
+				"message": "未登录，无权访问",
+			})
+			c.Abort()
+			return
+		}
+
+		userRole := role.(int)
+		userId := id.(int)
+
+		// 超级管理员始终允许访问所有功能
+		if userRole >= common.RoleRootUser {
+			c.Next()
+			return
+		}
+
+		// 检查用户是否有权限访问指定模块
+		if !hasModulePermission(userRole, userId, modulePath) {
+			c.JSON(http.StatusForbidden, gin.H{
+				"success": false,
+				"message": "无权访问此功能模块",
+			})
+			c.Abort()
+			return
+		}
+
+		c.Next()
+	}
+}
+
+// hasModulePermission 检查用户是否有权限访问指定模块
+func hasModulePermission(userRole int, userId int, modulePath string) bool {
+	// 普通用户只能访问基础功能
+	if userRole < common.RoleAdminUser {
+		return isUserModuleAllowed(modulePath)
+	}
+
+	// 管理员需要检查侧边栏管理配置
+	if userRole >= common.RoleAdminUser && userRole < common.RoleRootUser {
+		return isAdminModuleAllowed(modulePath)
+	}
+
+	return true
+}
+
+// isUserModuleAllowed 检查普通用户是否允许访问指定模块
+func isUserModuleAllowed(modulePath string) bool {
+	// 数据看板始终允许访问，不受控制台区域开关影响
+	if modulePath == "console.detail" {
+		return true
+	}
+
+	// 普通用户允许访问的模块列表
+	allowedModules := map[string]bool{
+		"console.detail":     true,
+		"console.token":      true,
+		"console.log":        true,
+		"console.midjourney": true,
+		"console.task":       true,
+		"personal.topup":     true,
+		"personal.personal":  true,
+		"chat.playground":    true,
+		"chat.chat":          true,
+	}
+
+	return allowedModules[modulePath]
+}
+
+// isAdminModuleAllowed 检查管理员是否允许访问指定模块
+func isAdminModuleAllowed(modulePath string) bool {
+	// 数据看板始终允许访问，不受控制台区域开关影响
+	if modulePath == "console.detail" {
+		return true
+	}
+
+	// 获取侧边栏管理配置
+	common.OptionMapRWMutex.RLock()
+	sidebarConfig, exists := common.OptionMap["SidebarModulesAdmin"]
+	common.OptionMapRWMutex.RUnlock()
+
+	if !exists || sidebarConfig == "" {
+		// 如果没有配置，默认允许管理员访问所有功能（除了系统设置）
+		if modulePath == "admin.setting" {
+			return false
+		}
+		return true
+	}
+
+	// 解析配置
+	var config map[string]interface{}
+	if err := json.Unmarshal([]byte(sidebarConfig), &config); err != nil {
+		// 解析失败时采用安全优先策略，拒绝访问
+		common.SysLog("解析侧边栏配置失败: " + err.Error())
+		return false
+	}
+
+	// 检查嵌套权限
+	return checkNestedPermission(config, modulePath)
+}
+
+// checkNestedPermission 检查嵌套权限路径
+func checkNestedPermission(config map[string]interface{}, modulePath string) bool {
+	parts := strings.Split(modulePath, ".")
+	current := config
+
+	for i, part := range parts {
+		if current == nil {
+			return false
+		}
+
+		value, exists := current[part]
+		if !exists {
+			return false
+		}
+
+		// 如果是最后一个部分，检查布尔值
+		if i == len(parts)-1 {
+			if boolVal, ok := value.(bool); ok {
+				return boolVal
+			}
+			// 如果是对象且有enabled字段，检查enabled
+			if objVal, ok := value.(map[string]interface{}); ok {
+				if enabled, hasEnabled := objVal["enabled"]; hasEnabled {
+					if enabledBool, ok := enabled.(bool); ok {
+						return enabledBool
+					}
+				}
+				// 如果没有enabled字段，默认为true
+				return true
+			}
+			return false
+		}
+
+		// 中间路径必须是对象
+		if objVal, ok := value.(map[string]interface{}); ok {
+			// 检查区域是否启用
+			if enabled, hasEnabled := objVal["enabled"]; hasEnabled {
+				if enabledBool, ok := enabled.(bool); ok && !enabledBool {
+					return false
+				}
+			}
+			current = objVal
+		} else {
+			return false
+		}
+	}
+
+	return false
+}
+
 func TokenAuth() func(c *gin.Context) {
 	return func(c *gin.Context) {
 		// 先检测是否为ws
diff --git a/model/user.go b/model/user.go
index 16dd64d519a5..a53e6eb32032 100644
--- a/model/user.go
+++ b/model/user.go
@@ -128,8 +128,11 @@ func GenerateDefaultSidebarConfigForRole(userRole int) string {
 			"channel":    true,
 			"models":     true,
 			"redemption": true,
-			"user":       true,
-			"setting":    false, // 管理员不能访问系统设置
+			"user": map[string]interface{}{
+				"enabled":         true,
+				"groupManagement": true, // 管理员默认可以访问分组管理
+			},
+			"setting": false, // 管理员不能访问系统设置
 		}
 	} else if userRole == common.RoleRootUser {
 		// 超级管理员可以访问所有功能
@@ -138,8 +141,11 @@ func GenerateDefaultSidebarConfigForRole(userRole int) string {
 			"channel":    true,
 			"models":     true,
 			"redemption": true,
-			"user":       true,
-			"setting":    true,
+			"user": map[string]interface{}{
+				"enabled":         true,
+				"groupManagement": true, // 超级管理员默认可以访问分组管理
+			},
+			"setting": true,
 		}
 	}
 	// 普通用户不包含admin区域
diff --git a/model/user_group.go b/model/user_group.go
index b63ae5e7459c..9a5ce7e9c29e 100644
--- a/model/user_group.go
+++ b/model/user_group.go
@@ -29,9 +29,9 @@ func (g *UserGroup) Update() error {
 	return DB.Model(g).Updates(g).Error
 }
 
-// Delete 软删除用户分组
+// Delete 硬删除用户分组
 func (g *UserGroup) Delete() error {
-	return DB.Delete(g).Error
+	return DB.Unscoped().Delete(g).Error
 }
 
 // GetAllUserGroups 获取所有用户分组
diff --git a/router/api-router.go b/router/api-router.go
index 9b10f7f58e9a..9ceb96fcdb8c 100644
--- a/router/api-router.go
+++ b/router/api-router.go
@@ -79,6 +79,7 @@ func SetApiRouter(router *gin.Engine) {
 
 			adminRoute := userRoute.Group("/")
 			adminRoute.Use(middleware.AdminAuth())
+			adminRoute.Use(middleware.ModuleAuth("admin.user"))
 			{
 				adminRoute.GET("/", controller.GetAllUsers)
 				adminRoute.GET("/search", controller.SearchUsers)
@@ -109,6 +110,7 @@ func SetApiRouter(router *gin.Engine) {
 		}
 		channelRoute := apiRouter.Group("/channel")
 		channelRoute.Use(middleware.AdminAuth())
+		channelRoute.Use(middleware.ModuleAuth("admin.channel"))
 		{
 			channelRoute.GET("/", controller.GetAllChannels)
 			channelRoute.GET("/search", controller.SearchChannels)
@@ -138,6 +140,7 @@ func SetApiRouter(router *gin.Engine) {
 		}
 		tokenRoute := apiRouter.Group("/token")
 		tokenRoute.Use(middleware.UserAuth())
+		tokenRoute.Use(middleware.ModuleAuth("console.token"))
 		{
 			tokenRoute.GET("/", controller.GetAllTokens)
 			tokenRoute.GET("/search", controller.SearchTokens)
@@ -160,6 +163,7 @@ func SetApiRouter(router *gin.Engine) {
 
 		redemptionRoute := apiRouter.Group("/redemption")
 		redemptionRoute.Use(middleware.AdminAuth())
+		redemptionRoute.Use(middleware.ModuleAuth("admin.redemption"))
 		{
 			redemptionRoute.GET("/", controller.GetAllRedemptions)
 			redemptionRoute.GET("/search", controller.SearchRedemptions)
@@ -170,17 +174,17 @@ func SetApiRouter(router *gin.Engine) {
 			redemptionRoute.DELETE("/:id", controller.DeleteRedemption)
 		}
 		logRoute := apiRouter.Group("/log")
-		logRoute.GET("/", middleware.AdminAuth(), controller.GetAllLogs)
-		logRoute.DELETE("/", middleware.AdminAuth(), controller.DeleteHistoryLogs)
-		logRoute.GET("/stat", middleware.AdminAuth(), controller.GetLogsStat)
-		logRoute.GET("/self/stat", middleware.UserAuth(), controller.GetLogsSelfStat)
-		logRoute.GET("/search", middleware.AdminAuth(), controller.SearchAllLogs)
-		logRoute.GET("/self", middleware.UserAuth(), controller.GetUserLogs)
-		logRoute.GET("/self/search", middleware.UserAuth(), controller.SearchUserLogs)
+		logRoute.GET("/", middleware.AdminAuth(), middleware.ModuleAuth("console.log"), controller.GetAllLogs)
+		logRoute.DELETE("/", middleware.AdminAuth(), middleware.ModuleAuth("console.log"), controller.DeleteHistoryLogs)
+		logRoute.GET("/stat", middleware.AdminAuth(), middleware.ModuleAuth("console.log"), controller.GetLogsStat)
+		logRoute.GET("/self/stat", middleware.UserAuth(), middleware.ModuleAuth("console.log"), controller.GetLogsSelfStat)
+		logRoute.GET("/search", middleware.AdminAuth(), middleware.ModuleAuth("console.log"), controller.SearchAllLogs)
+		logRoute.GET("/self", middleware.UserAuth(), middleware.ModuleAuth("console.log"), controller.GetUserLogs)
+		logRoute.GET("/self/search", middleware.UserAuth(), middleware.ModuleAuth("console.log"), controller.SearchUserLogs)
 
 		dataRoute := apiRouter.Group("/data")
-		dataRoute.GET("/", middleware.AdminAuth(), controller.GetAllQuotaDates)
-		dataRoute.GET("/self", middleware.UserAuth(), controller.GetUserQuotaDates)
+		dataRoute.GET("/", middleware.AdminAuth(), middleware.ModuleAuth("console.detail"), controller.GetAllQuotaDates)
+		dataRoute.GET("/self", middleware.UserAuth(), middleware.ModuleAuth("console.detail"), controller.GetUserQuotaDates)
 
 		logRoute.Use(middleware.CORS())
 		{
@@ -203,6 +207,7 @@ func SetApiRouter(router *gin.Engine) {
 
 		userGroupRoute := apiRouter.Group("/user_group")
 		userGroupRoute.Use(middleware.AdminAuth())
+		userGroupRoute.Use(middleware.ModuleAuth("admin.user.groupManagement"))
 		{
 			userGroupRoute.GET("/", controller.GetAllUserGroups)
 			userGroupRoute.POST("/", controller.CreateUserGroup)
@@ -211,13 +216,13 @@ func SetApiRouter(router *gin.Engine) {
 		}
 
 		mjRoute := apiRouter.Group("/mj")
-		mjRoute.GET("/self", middleware.UserAuth(), controller.GetUserMidjourney)
-		mjRoute.GET("/", middleware.AdminAuth(), controller.GetAllMidjourney)
+		mjRoute.GET("/self", middleware.UserAuth(), middleware.ModuleAuth("console.midjourney"), controller.GetUserMidjourney)
+		mjRoute.GET("/", middleware.AdminAuth(), middleware.ModuleAuth("console.midjourney"), controller.GetAllMidjourney)
 
 		taskRoute := apiRouter.Group("/task")
 		{
-			taskRoute.GET("/self", middleware.UserAuth(), controller.GetUserTask)
-			taskRoute.GET("/", middleware.AdminAuth(), controller.GetAllTask)
+			taskRoute.GET("/self", middleware.UserAuth(), middleware.ModuleAuth("console.task"), controller.GetUserTask)
+			taskRoute.GET("/", middleware.AdminAuth(), middleware.ModuleAuth("console.task"), controller.GetAllTask)
 		}
 
 		vendorRoute := apiRouter.Group("/vendors")
@@ -233,6 +238,7 @@ func SetApiRouter(router *gin.Engine) {
 
 		modelsRoute := apiRouter.Group("/models")
 		modelsRoute.Use(middleware.AdminAuth())
+		modelsRoute.Use(middleware.ModuleAuth("admin.models"))
 		{
 			modelsRoute.GET("/sync_upstream/preview", controller.SyncUpstreamPreview)
 			modelsRoute.POST("/sync_upstream", controller.SyncUpstreamModels)
diff --git a/web/index.html b/web/index.html
index 09d87ae1a890..a9ecbe0153e4 100644
--- a/web/index.html
+++ b/web/index.html
@@ -10,6 +10,29 @@
       content="OpenAI 接口聚合管理，支持多种渠道包括 Azure，可用于二次分发管理 key，仅单可执行文件，已打包好 Docker 镜像，一键部署，开箱即用"
     />
     <title>New API</title>
+    <script>
+      // 立即设置title，避免刷新时闪现默认title
+      (function() {
+        const systemName = localStorage.getItem('system_name');
+        if (systemName) {
+          document.title = systemName;
+        }
+
+        // 监听localStorage变化，实时更新title
+        window.addEventListener('storage', function(e) {
+          if (e.key === 'system_name' && e.newValue) {
+            document.title = e.newValue;
+          }
+        });
+
+        // 监听自定义事件，用于同页面内的title更新
+        window.addEventListener('systemNameUpdated', function(e) {
+          if (e.detail && e.detail.systemName) {
+            document.title = e.detail.systemName;
+          }
+        });
+      })();
+    </script>
   </head>
 
   <body>
diff --git a/web/src/App.jsx b/web/src/App.jsx
index 635742f9161e..ed2261ad569b 100644
--- a/web/src/App.jsx
+++ b/web/src/App.jsx
@@ -22,6 +22,7 @@ import { Route, Routes, useLocation } from 'react-router-dom';
 import Loading from './components/common/ui/Loading';
 import User from './pages/User';
 import { AuthRedirect, PrivateRoute, AdminRoute } from './helpers';
+import ModuleRoute from './components/auth/ModuleRoute';
 import RegisterForm from './components/auth/RegisterForm';
 import LoginForm from './components/auth/LoginForm';
 import NotFound from './pages/NotFound';
@@ -58,7 +59,7 @@ function App() {
 
   // 获取模型广场权限配置
   const pricingRequireAuth = useMemo(() => {
-    const headerNavModulesConfig = statusState?.status?.HeaderNavModules;
+    const headerNavModulesConfig = statusState?.status?.header_nav_modules;
     if (headerNavModulesConfig) {
       try {
         const modules = JSON.parse(headerNavModulesConfig);
@@ -76,7 +77,7 @@ function App() {
       }
     }
     return false; // 默认不需要登录
-  }, [statusState?.status?.HeaderNavModules]);
+  }, [statusState?.status?.header_nav_modules]);
 
   return (
     <SetupCheck>
@@ -102,7 +103,9 @@ function App() {
           path='/console/models'
           element={
             <AdminRoute>
-              <ModelPage />
+              <ModuleRoute modulePath="admin.models">
+                <ModelPage />
+              </ModuleRoute>
             </AdminRoute>
           }
         />
@@ -110,7 +113,9 @@ function App() {
           path='/console/channel'
           element={
             <AdminRoute>
-              <Channel />
+              <ModuleRoute modulePath="admin.channel">
+                <Channel />
+              </ModuleRoute>
             </AdminRoute>
           }
         />
@@ -118,7 +123,9 @@ function App() {
           path='/console/token'
           element={
             <PrivateRoute>
-              <Token />
+              <ModuleRoute modulePath="console.token">
+                <Token />
+              </ModuleRoute>
             </PrivateRoute>
           }
         />
@@ -126,7 +133,9 @@ function App() {
           path='/console/playground'
           element={
             <PrivateRoute>
-              <Playground />
+              <ModuleRoute modulePath="chat.playground">
+                <Playground />
+              </ModuleRoute>
             </PrivateRoute>
           }
         />
@@ -134,7 +143,9 @@ function App() {
           path='/console/redemption'
           element={
             <AdminRoute>
-              <Redemption />
+              <ModuleRoute modulePath="admin.redemption">
+                <Redemption />
+              </ModuleRoute>
             </AdminRoute>
           }
         />
@@ -142,7 +153,9 @@ function App() {
           path='/console/user'
           element={
             <AdminRoute>
-              <User />
+              <ModuleRoute modulePath="admin.user">
+                <User />
+              </ModuleRoute>
             </AdminRoute>
           }
         />
@@ -210,9 +223,11 @@ function App() {
           path='/console/setting'
           element={
             <AdminRoute>
-              <Suspense fallback={<Loading></Loading>} key={location.pathname}>
-                <Setting />
-              </Suspense>
+              <ModuleRoute modulePath="admin.setting">
+                <Suspense fallback={<Loading></Loading>} key={location.pathname}>
+                  <Setting />
+                </Suspense>
+              </ModuleRoute>
             </AdminRoute>
           }
         />
@@ -220,9 +235,11 @@ function App() {
           path='/console/personal'
           element={
             <PrivateRoute>
-              <Suspense fallback={<Loading></Loading>} key={location.pathname}>
-                <PersonalSetting />
-              </Suspense>
+              <ModuleRoute modulePath="personal.personal">
+                <Suspense fallback={<Loading></Loading>} key={location.pathname}>
+                  <PersonalSetting />
+                </Suspense>
+              </ModuleRoute>
             </PrivateRoute>
           }
         />
@@ -230,9 +247,11 @@ function App() {
           path='/console/topup'
           element={
             <PrivateRoute>
-              <Suspense fallback={<Loading></Loading>} key={location.pathname}>
-                <TopUp />
-              </Suspense>
+              <ModuleRoute modulePath="personal.topup">
+                <Suspense fallback={<Loading></Loading>} key={location.pathname}>
+                  <TopUp />
+                </Suspense>
+              </ModuleRoute>
             </PrivateRoute>
           }
         />
@@ -240,7 +259,9 @@ function App() {
           path='/console/log'
           element={
             <PrivateRoute>
-              <Log />
+              <ModuleRoute modulePath="console.log">
+                <Log />
+              </ModuleRoute>
             </PrivateRoute>
           }
         />
@@ -248,9 +269,11 @@ function App() {
           path='/console'
           element={
             <PrivateRoute>
-              <Suspense fallback={<Loading></Loading>} key={location.pathname}>
-                <Dashboard />
-              </Suspense>
+              <ModuleRoute modulePath="console.detail">
+                <Suspense fallback={<Loading></Loading>} key={location.pathname}>
+                  <Dashboard />
+                </Suspense>
+              </ModuleRoute>
             </PrivateRoute>
           }
         />
@@ -258,9 +281,11 @@ function App() {
           path='/console/midjourney'
           element={
             <PrivateRoute>
-              <Suspense fallback={<Loading></Loading>} key={location.pathname}>
-                <Midjourney />
-              </Suspense>
+              <ModuleRoute modulePath="console.midjourney">
+                <Suspense fallback={<Loading></Loading>} key={location.pathname}>
+                  <Midjourney />
+                </Suspense>
+              </ModuleRoute>
             </PrivateRoute>
           }
         />
@@ -268,9 +293,11 @@ function App() {
           path='/console/task'
           element={
             <PrivateRoute>
-              <Suspense fallback={<Loading></Loading>} key={location.pathname}>
-                <Task />
-              </Suspense>
+              <ModuleRoute modulePath="console.task">
+                <Suspense fallback={<Loading></Loading>} key={location.pathname}>
+                  <Task />
+                </Suspense>
+              </ModuleRoute>
             </PrivateRoute>
           }
         />
@@ -304,9 +331,11 @@ function App() {
         <Route
           path='/console/chat/:id?'
           element={
-            <Suspense fallback={<Loading></Loading>} key={location.pathname}>
-              <Chat />
-            </Suspense>
+            <ModuleRoute modulePath="chat.chat">
+              <Suspense fallback={<Loading></Loading>} key={location.pathname}>
+                <Chat />
+              </Suspense>
+            </ModuleRoute>
           }
         />
         {/* 方便使用chat2link直接跳转聊天... */}
@@ -314,9 +343,11 @@ function App() {
           path='/chat2link'
           element={
             <PrivateRoute>
-              <Suspense fallback={<Loading></Loading>} key={location.pathname}>
-                <Chat2Link />
-              </Suspense>
+              <ModuleRoute modulePath="chat.chat">
+                <Suspense fallback={<Loading></Loading>} key={location.pathname}>
+                  <Chat2Link />
+                </Suspense>
+              </ModuleRoute>
             </PrivateRoute>
           }
         />
diff --git a/web/src/components/auth/ModuleRoute.jsx b/web/src/components/auth/ModuleRoute.jsx
new file mode 100644
index 000000000000..93f7b438dd3a
--- /dev/null
+++ b/web/src/components/auth/ModuleRoute.jsx
@@ -0,0 +1,181 @@
+import React, { useState, useEffect, useContext } from 'react';
+import { Navigate } from 'react-router-dom';
+import { StatusContext } from '../../context/Status';
+import Loading from '../common/ui/Loading';
+import { API } from '../../helpers';
+
+/**
+ * ModuleRoute - 基于功能模块权限的路由保护组件
+ * 
+ * @param {Object} props
+ * @param {React.ReactNode} props.children - 要保护的子组件
+ * @param {string} props.modulePath - 模块权限路径，如 "admin.channel", "console.token"
+ * @param {React.ReactNode} props.fallback - 无权限时显示的组件，默认跳转到 /forbidden
+ * @returns {React.ReactNode}
+ */
+const ModuleRoute = ({ children, modulePath, fallback = <Navigate to="/forbidden" replace /> }) => {
+  const [hasPermission, setHasPermission] = useState(null);
+  const [statusState] = useContext(StatusContext);
+
+  useEffect(() => {
+    checkModulePermission();
+  }, [modulePath, statusState?.status]); // 只在status数据变化时重新检查
+
+  const checkModulePermission = async () => {
+    try {
+      // 检查用户是否已登录
+      const user = localStorage.getItem('user');
+      if (!user) {
+        setHasPermission(false);
+        return;
+      }
+
+      const userData = JSON.parse(user);
+      const userRole = userData.role;
+
+      // 超级管理员始终有权限
+      if (userRole >= 100) {
+        setHasPermission(true);
+        return;
+      }
+
+      // 检查模块权限
+      const permission = await checkModulePermissionAPI(modulePath);
+
+      // 如果返回null，表示status数据还未加载完成，保持loading状态
+      if (permission === null) {
+        setHasPermission(null);
+        return;
+      }
+
+      setHasPermission(permission);
+    } catch (error) {
+      console.error('检查模块权限失败:', error);
+      // 出错时采用安全优先策略，拒绝访问
+      setHasPermission(false);
+    }
+  };
+
+  const checkModulePermissionAPI = async (modulePath) => {
+    try {
+      // 数据看板始终允许访问，不受控制台区域开关影响
+      if (modulePath === 'console.detail') {
+        return true;
+      }
+
+      // 从StatusContext中获取配置信息
+      // 如果status数据还未加载完成，返回null表示需要等待
+      if (!statusState?.status) {
+        return null;
+      }
+
+      const user = JSON.parse(localStorage.getItem('user'));
+      const userRole = user.role;
+
+      // 解析模块路径
+      const pathParts = modulePath.split('.');
+      if (pathParts.length < 2) {
+        return false;
+      }
+
+      // 普通用户权限检查
+      if (userRole < 10) {
+        return await isUserModuleAllowed(modulePath);
+      }
+
+      // 超级管理员权限检查 - 不受系统配置限制
+      if (userRole >= 100) {
+        return true;
+      }
+
+      // 管理员权限检查 - 受系统配置限制
+      if (userRole >= 10 && userRole < 100) {
+        // 从/api/user/self获取系统权限配置
+        try {
+          const userRes = await API.get('/api/user/self');
+          if (userRes.data.success && userRes.data.data.sidebar_config) {
+            const sidebarConfigData = userRes.data.data.sidebar_config;
+            // 管理员权限检查基于系统配置，不受用户偏好影响
+            const systemConfig = sidebarConfigData.system || sidebarConfigData;
+            return checkModulePermissionInConfig(systemConfig, modulePath);
+          } else {
+            // 没有配置时，除了系统设置外都允许访问
+            return modulePath !== 'admin.setting';
+          }
+        } catch (error) {
+          console.error('获取侧边栏配置失败:', error);
+          return false;
+        }
+      }
+
+      return false;
+    } catch (error) {
+      console.error('API权限检查失败:', error);
+      return false;
+    }
+  };
+
+  const isUserModuleAllowed = async (modulePath) => {
+    // 数据看板始终允许访问，不受控制台区域开关影响
+    if (modulePath === 'console.detail') {
+      return true;
+    }
+
+    // 普通用户的权限基于最终计算的配置
+    try {
+      const userRes = await API.get('/api/user/self');
+      if (userRes.data.success && userRes.data.data.sidebar_config) {
+        const sidebarConfigData = userRes.data.data.sidebar_config;
+        // 使用最终计算的配置进行权限检查
+        const finalConfig = sidebarConfigData.final || sidebarConfigData;
+        return checkModulePermissionInConfig(finalConfig, modulePath);
+      }
+      return false;
+    } catch (error) {
+      console.error('获取用户权限配置失败:', error);
+      return false;
+    }
+  };
+
+  // 检查新的sidebar_config结构中的模块权限
+  const checkModulePermissionInConfig = (sidebarConfig, modulePath) => {
+    const parts = modulePath.split('.');
+    if (parts.length !== 2) {
+      return false;
+    }
+
+    const [sectionKey, moduleKey] = parts;
+    const section = sidebarConfig[sectionKey];
+
+    // 检查区域是否存在且启用
+    if (!section || !section.enabled) {
+      return false;
+    }
+
+    // 检查模块是否启用
+    const moduleValue = section[moduleKey];
+    // 处理布尔值和嵌套对象两种情况
+    if (typeof moduleValue === 'boolean') {
+      return moduleValue === true;
+    } else if (typeof moduleValue === 'object' && moduleValue !== null) {
+      // 对于嵌套对象，检查其enabled状态
+      return moduleValue.enabled === true;
+    }
+    return false;
+  };
+
+  // 权限检查中
+  if (hasPermission === null) {
+    return <Loading />;
+  }
+
+  // 无权限
+  if (!hasPermission) {
+    return fallback;
+  }
+
+  // 有权限，渲染子组件
+  return children;
+};
+
+export default ModuleRoute;
\ No newline at end of file
diff --git a/web/src/components/layout/PageLayout.jsx b/web/src/components/layout/PageLayout.jsx
index f8cdfb0cb8a1..f11fa358df7b 100644
--- a/web/src/components/layout/PageLayout.jsx
+++ b/web/src/components/layout/PageLayout.jsx
@@ -139,6 +139,8 @@ const PageLayout = () => {
           overflow: isMobile ? 'visible' : 'auto',
           display: 'flex',
           flexDirection: 'column',
+          height: '100%',
+          flex: '1 1 auto',
         }}
       >
         {showSider && (
diff --git a/web/src/components/settings/OtherSetting.jsx b/web/src/components/settings/OtherSetting.jsx
index 18119d2427db..46d22b696a26 100644
--- a/web/src/components/settings/OtherSetting.jsx
+++ b/web/src/components/settings/OtherSetting.jsx
@@ -106,6 +106,11 @@ const OtherSetting = () => {
         SystemName: true,
       }));
       await updateOption('SystemName', inputs.SystemName);
+      // 更新localStorage并触发title更新事件
+      localStorage.setItem('system_name', inputs.SystemName);
+      window.dispatchEvent(new CustomEvent('systemNameUpdated', {
+        detail: { systemName: inputs.SystemName }
+      }));
       showSuccess(t('系统名称已更新'));
     } catch (error) {
       console.error(t('系统名称更新失败'), error);
diff --git a/web/src/components/settings/personal/cards/NotificationSettings.jsx b/web/src/components/settings/personal/cards/NotificationSettings.jsx
index e54a64ab63f0..61e4341cce8f 100644
--- a/web/src/components/settings/personal/cards/NotificationSettings.jsx
+++ b/web/src/components/settings/personal/cards/NotificationSettings.jsx
@@ -53,8 +53,6 @@ const NotificationSettings = ({
   saveNotificationSettings,
 }) => {
   const formApiRef = useRef(null);
-  const [statusState] = useContext(StatusContext);
-  const [userState] = useContext(UserContext);
 
   // 左侧边栏设置相关状态
   const [sidebarLoading, setSidebarLoading] = useState(false);
@@ -172,29 +170,85 @@ const NotificationSettings = ({
     setSidebarModulesUser(defaultConfig);
   };
 
+  // 获取默认系统配置
+  const getDefaultSystemConfig = () => {
+    return {
+      chat: {
+        enabled: true,
+        playground: true,
+        chat: true
+      },
+      console: {
+        enabled: true,
+        detail: true,
+        token: true,
+        log: true,
+        midjourney: true,
+        task: true
+      },
+      personal: {
+        enabled: true,
+        topup: true,
+        personal: true
+      },
+      admin: {
+        enabled: true,
+        channel: true,
+        models: true,
+        redemption: true,
+        user: true,
+        setting: true
+      }
+    };
+  };
+
   // 加载左侧边栏配置
   useEffect(() => {
     const loadSidebarConfigs = async () => {
       try {
-        // 获取管理员全局配置
-        if (statusState?.status?.SidebarModulesAdmin) {
-          const adminConf = JSON.parse(statusState.status.SidebarModulesAdmin);
-          setAdminConfig(adminConf);
-        }
-
-        // 获取用户个人配置
+        // 获取侧边栏配置
         const userRes = await API.get('/api/user/self');
-        if (userRes.data.success && userRes.data.data.sidebar_modules) {
-          const userConf = JSON.parse(userRes.data.data.sidebar_modules);
-          setSidebarModulesUser(userConf);
+        if (userRes.data.success) {
+          // 从setting字段中获取系统配置和用户偏好设置
+          if (userRes.data.data.setting) {
+            try {
+              const setting = JSON.parse(userRes.data.data.setting);
+
+              // 获取系统配置（用于权限检查）
+              const systemConfig = setting.sidebar_system_config ?
+                JSON.parse(setting.sidebar_system_config) :
+                getDefaultSystemConfig();
+              setAdminConfig(systemConfig);
+
+              // 获取用户偏好设置（用于显示当前状态）
+              if (setting.sidebar_modules) {
+                let userConf;
+                if (typeof setting.sidebar_modules === 'string') {
+                  userConf = JSON.parse(setting.sidebar_modules);
+                } else {
+                  userConf = setting.sidebar_modules;
+                }
+                setSidebarModulesUser(userConf);
+              }
+            } catch (error) {
+              console.error('解析用户设置失败:', error);
+              // 出错时使用默认配置
+              setAdminConfig(getDefaultSystemConfig());
+            }
+          } else {
+            // 没有setting时使用默认配置
+            setAdminConfig(getDefaultSystemConfig());
+          }
         }
       } catch (error) {
         console.error('加载边栏配置失败:', error);
+        // 出错时使用默认配置
+        setAdminConfig(getDefaultSystemConfig());
       }
     };
 
     loadSidebarConfigs();
-  }, [statusState]);
+  }, []);
 
   // 初始化表单值
   useEffect(() => {
diff --git a/web/src/components/table/users/UsersActions.jsx b/web/src/components/table/users/UsersActions.jsx
index 0cc57207e0a1..2241ea8d06b2 100644
--- a/web/src/components/table/users/UsersActions.jsx
+++ b/web/src/components/table/users/UsersActions.jsx
@@ -17,14 +17,14 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 
-import { useState, useContext } from 'react';
+import { useState } from 'react';
 import { Button } from '@douyinfe/semi-ui';
 import UserGroupManagement from './modals/UserGroupManagement';
-import { StatusContext } from '../../../context/Status';
+import { useSidebar } from '../../../hooks/common/useSidebar';
 
 const UsersActions = ({ setShowAddUser, onRefreshUsers, t }) => {
   const [showGroupManagement, setShowGroupManagement] = useState(false);
-  const [statusState] = useContext(StatusContext);
+  const { finalConfig, loading: sidebarLoading } = useSidebar();
 
   // 检查用户权限
   const getUserRole = () => {
@@ -37,6 +37,11 @@ const UsersActions = ({ setShowAddUser, onRefreshUsers, t }) => {
 
   // 检查分组管理功能是否可见
   const canShowGroupManagement = () => {
+    // 如果侧边栏配置还在加载中，暂时不显示按钮
+    if (sidebarLoading) {
+      return false;
+    }
+
     // 超级管理员始终可以看到分组管理按钮
     if (isRoot()) {
       return true;
@@ -44,25 +49,16 @@ const UsersActions = ({ setShowAddUser, onRefreshUsers, t }) => {
 
     // 管理员需要检查系统设置中的分组管理开关
     if (isAdmin()) {
-      // 从StatusContext中获取侧边栏管理员配置
-      if (statusState?.status?.SidebarModulesAdmin) {
-        try {
-          const config = JSON.parse(statusState.status.SidebarModulesAdmin);
-          const userModuleConfig = config?.admin?.user;
-
-          // 检查用户管理模块是否启用
-          if (!userModuleConfig || !userModuleConfig.enabled) {
-            return false;
-          }
-
-          // 检查分组管理子功能是否启用
-          return userModuleConfig.groupManagement === true;
-        } catch (error) {
-          console.error('解析侧边栏配置失败:', error);
-          return true; // 解析失败时默认允许访问
-        }
+      // 从useSidebar钩子获取最终的权限配置
+      const userSection = finalConfig?.admin?.user;
+
+      // 检查用户管理模块是否启用
+      if (!userSection || userSection.enabled === false) {
+        return false;
       }
-      return true; // 没有配置时默认允许访问
+
+      // 检查分组管理子功能是否启用
+      return userSection.groupManagement === true;
     }
 
     // 普通用户无权访问
diff --git a/web/src/components/table/users/modals/EditUserGroupModal.jsx b/web/src/components/table/users/modals/EditUserGroupModal.jsx
index c0bb1fc7148c..572f5ecd166e 100644
--- a/web/src/components/table/users/modals/EditUserGroupModal.jsx
+++ b/web/src/components/table/users/modals/EditUserGroupModal.jsx
@@ -34,11 +34,52 @@ import {
 } from '@douyinfe/semi-icons';
 import { useTranslation } from 'react-i18next';
 import { API, showError, showSuccess } from '../../../../helpers';
+import { useSidebar } from '../../../../hooks/common/useSidebar';
 
 const EditUserGroupModal = ({ visible, onClose, editingGroup, onSuccess }) => {
   const { t } = useTranslation();
   const formApiRef = useRef(null);
   const [loading, setLoading] = useState(false);
+  const { finalConfig, loading: sidebarLoading } = useSidebar();
+
+  // 检查用户权限
+  const getUserRole = () => {
+    const user = JSON.parse(localStorage.getItem('user') || '{}');
+    return user?.role || 0;
+  };
+
+  const isRoot = () => getUserRole() >= 100;
+  const isAdmin = () => getUserRole() >= 10;
+
+  // 检查是否有分组管理权限
+  const hasGroupManagementPermission = () => {
+    // 如果侧边栏配置还在加载中，暂时拒绝访问
+    if (sidebarLoading) {
+      return false;
+    }
+
+    // 超级管理员始终有权限
+    if (isRoot()) {
+      return true;
+    }
+
+    // 管理员需要检查权限配置
+    if (isAdmin()) {
+      // 从useSidebar钩子获取最终的权限配置
+      const userSection = finalConfig?.admin?.user;
+
+      // 检查用户管理模块是否启用
+      if (!userSection || userSection.enabled === false) {
+        return false;
+      }
+
+      // 检查分组管理子功能是否启用
+      return userSection.groupManagement === true;
+    }
+
+    // 普通用户无权访问
+    return false;
+  };
 
   const isEdit = editingGroup && editingGroup.id;
   const isSystemGroup = editingGroup && (
@@ -62,6 +103,13 @@ const EditUserGroupModal = ({ visible, onClose, editingGroup, onSuccess }) => {
   });
 
   const submit = async (values) => {
+    // 检查权限
+    if (!hasGroupManagementPermission()) {
+      showError(t('无权访问分组管理功能'));
+      onClose();
+      return;
+    }
+
     setLoading(true);
     try {
       const data = {
@@ -75,10 +123,10 @@ const EditUserGroupModal = ({ visible, onClose, editingGroup, onSuccess }) => {
 
       const url = isEdit ? '/api/user_group' : '/api/user_group';
       const method = isEdit ? 'PUT' : 'POST';
-      
+
       const res = await API[method.toLowerCase()](url, data);
       const { success, message } = res.data;
-      
+
       if (success) {
         showSuccess(isEdit ? t('分组更新成功！') : t('分组创建成功！'));
         onSuccess();
@@ -86,7 +134,12 @@ const EditUserGroupModal = ({ visible, onClose, editingGroup, onSuccess }) => {
         showError(message);
       }
     } catch (error) {
-      showError(isEdit ? t('分组更新失败') : t('分组创建失败'));
+      if (error.response?.status === 403) {
+        showError(t('无权访问分组管理功能'));
+        onClose();
+      } else {
+        showError(isEdit ? t('分组更新失败') : t('分组创建失败'));
+      }
     }
     setLoading(false);
   };
diff --git a/web/src/components/table/users/modals/UserGroupManagement.jsx b/web/src/components/table/users/modals/UserGroupManagement.jsx
index 429fbf996ed2..98b6bbb675f2 100644
--- a/web/src/components/table/users/modals/UserGroupManagement.jsx
+++ b/web/src/components/table/users/modals/UserGroupManagement.jsx
@@ -42,6 +42,7 @@ import { useIsMobile } from '../../../../hooks/common/useIsMobile';
 import { API, showError, showSuccess } from '../../../../helpers';
 import CardTable from '../../../common/ui/CardTable';
 import EditUserGroupModal from './EditUserGroupModal';
+import { useSidebar } from '../../../../hooks/common/useSidebar';
 
 const UserGroupManagement = ({ visible, onClose, onGroupUpdated }) => {
   const { t } = useTranslation();
@@ -50,9 +51,56 @@ const UserGroupManagement = ({ visible, onClose, onGroupUpdated }) => {
   const [groups, setGroups] = useState([]);
   const [showEdit, setShowEdit] = useState(false);
   const [editingGroup, setEditingGroup] = useState({ id: undefined });
+  const { finalConfig, loading: sidebarLoading } = useSidebar();
+
+  // 检查用户权限
+  const getUserRole = () => {
+    const user = JSON.parse(localStorage.getItem('user') || '{}');
+    return user?.role || 0;
+  };
+
+  const isRoot = () => getUserRole() >= 100;
+  const isAdmin = () => getUserRole() >= 10;
+
+  // 检查是否有分组管理权限
+  const hasGroupManagementPermission = () => {
+    // 如果侧边栏配置还在加载中，暂时拒绝访问
+    if (sidebarLoading) {
+      return false;
+    }
+
+    // 超级管理员始终有权限
+    if (isRoot()) {
+      return true;
+    }
+
+    // 管理员需要检查权限配置
+    if (isAdmin()) {
+      // 从useSidebar钩子获取最终的权限配置
+      const userSection = finalConfig?.admin?.user;
+
+      // 检查用户管理模块是否启用
+      if (!userSection || userSection.enabled === false) {
+        return false;
+      }
+
+      // 检查分组管理子功能是否启用
+      return userSection.groupManagement === true;
+    }
+
+    // 普通用户无权访问
+    return false;
+  };
 
   // 加载分组列表
   const loadGroups = async () => {
+    // 检查权限
+    if (!hasGroupManagementPermission()) {
+      showError(t('无权访问分组管理功能'));
+      onClose();
+      return;
+    }
+
     setLoading(true);
     try {
       const res = await API.get('/api/user_group');
@@ -60,15 +108,29 @@ const UserGroupManagement = ({ visible, onClose, onGroupUpdated }) => {
         setGroups(res.data.data || []);
       } else {
         showError(res.data.message || t('获取分组列表失败'));
+        // 如果是权限错误，关闭模态框
+        if (res.status === 403) {
+          onClose();
+        }
       }
     } catch (error) {
       showError(t('获取分组列表失败'));
+      // 如果是权限错误，关闭模态框
+      if (error.response?.status === 403) {
+        onClose();
+      }
     }
     setLoading(false);
   };
 
   // 删除分组
   const deleteGroup = async (id) => {
+    // 检查权限
+    if (!hasGroupManagementPermission()) {
+      showError(t('无权访问分组管理功能'));
+      return;
+    }
+
     try {
       const res = await API.delete(`/api/user_group/${id}`);
       if (res.data.success) {
@@ -78,12 +140,23 @@ const UserGroupManagement = ({ visible, onClose, onGroupUpdated }) => {
         showError(res.data.message || t('删除失败'));
       }
     } catch (error) {
-      showError(t('删除失败'));
+      if (error.response?.status === 403) {
+        showError(t('无权访问分组管理功能'));
+        onClose();
+      } else {
+        showError(t('删除失败'));
+      }
     }
   };
 
   // 编辑分组
   const handleEdit = (group = {}) => {
+    // 检查权限
+    if (!hasGroupManagementPermission()) {
+      showError(t('无权访问分组管理功能'));
+      return;
+    }
+
     setEditingGroup(group);
     setShowEdit(true);
   };
diff --git a/web/src/helpers/data.js b/web/src/helpers/data.js
index b894a953c318..6404e9e8dbd0 100644
--- a/web/src/helpers/data.js
+++ b/web/src/helpers/data.js
@@ -21,6 +21,13 @@ export function setStatusData(data) {
   localStorage.setItem('status', JSON.stringify(data));
   localStorage.setItem('system_name', data.system_name);
   localStorage.setItem('logo', data.logo);
+
+  // 触发自定义事件来立即更新title
+  if (data.system_name) {
+    window.dispatchEvent(new CustomEvent('systemNameUpdated', {
+      detail: { systemName: data.system_name }
+    }));
+  }
   localStorage.setItem('footer_html', data.footer_html);
   localStorage.setItem('quota_per_unit', data.quota_per_unit);
   localStorage.setItem('display_in_currency', data.display_in_currency);
diff --git a/web/src/hooks/common/useHeaderBar.js b/web/src/hooks/common/useHeaderBar.js
index 3458a1d163da..375e57dd355d 100644
--- a/web/src/hooks/common/useHeaderBar.js
+++ b/web/src/hooks/common/useHeaderBar.js
@@ -52,7 +52,7 @@ export const useHeaderBar = ({ onMobileMenuToggle, drawerOpen }) => {
   const isDemoSiteMode = statusState?.status?.demo_site_enabled || false;
 
   // 获取顶栏模块配置
-  const headerNavModulesConfig = statusState?.status?.HeaderNavModules;
+  const headerNavModulesConfig = statusState?.status?.header_nav_modules;
 
   // 使用useMemo确保headerNavModules正确响应statusState变化
   const headerNavModules = useMemo(() => {
diff --git a/web/src/hooks/common/useSidebar.js b/web/src/hooks/common/useSidebar.js
index 13d76fd86281..8c8fd7f5f502 100644
--- a/web/src/hooks/common/useSidebar.js
+++ b/web/src/hooks/common/useSidebar.js
@@ -17,21 +17,22 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 
-import { useState, useEffect, useMemo, useContext } from 'react';
-import { StatusContext } from '../../context/Status';
+import { useState, useEffect } from 'react';
 import { API } from '../../helpers';
 
 // 创建一个全局事件系统来同步所有useSidebar实例
-const sidebarEventTarget = new EventTarget();
+if (!window.sidebarEventTarget) {
+  window.sidebarEventTarget = new EventTarget();
+}
+const sidebarEventTarget = window.sidebarEventTarget;
 const SIDEBAR_REFRESH_EVENT = 'sidebar-refresh';
 
 export const useSidebar = () => {
-  const [statusState] = useContext(StatusContext);
-  const [userConfig, setUserConfig] = useState(null);
+  const [sidebarConfig, setSidebarConfig] = useState(null);
   const [loading, setLoading] = useState(true);
 
   // 默认配置
-  const defaultAdminConfig = {
+  const defaultSidebarConfig = {
     chat: {
       enabled: true,
       playground: true,
@@ -55,101 +56,49 @@ export const useSidebar = () => {
       channel: true,
       models: true,
       redemption: true,
-      user: true,
-      setting: true,
-    },
-  };
-
-  // 获取管理员配置
-  const adminConfig = useMemo(() => {
-    if (statusState?.status?.SidebarModulesAdmin) {
-      try {
-        const config = JSON.parse(statusState.status.SidebarModulesAdmin);
-        return config;
-      } catch (error) {
-        return defaultAdminConfig;
-      }
+      user: {
+        enabled: true,
+        groupManagement: true  // 默认启用分组管理
+      },
+      setting: true
     }
-    return defaultAdminConfig;
-  }, [statusState?.status?.SidebarModulesAdmin]);
+  };
 
-  // 加载用户配置的通用方法
-  const loadUserConfig = async () => {
+  // 加载侧边栏配置的方法
+  const loadSidebarConfig = async () => {
     try {
       setLoading(true);
       const res = await API.get('/api/user/self');
-      if (res.data.success && res.data.data.sidebar_modules) {
-        let config;
-        // 检查sidebar_modules是字符串还是对象
-        if (typeof res.data.data.sidebar_modules === 'string') {
-          config = JSON.parse(res.data.data.sidebar_modules);
-        } else {
-          config = res.data.data.sidebar_modules;
-        }
-        setUserConfig(config);
+      if (res.data.success && res.data.data.sidebar_config) {
+        setSidebarConfig(res.data.data.sidebar_config);
       } else {
-        // 当用户没有配置时，生成一个基于管理员配置的默认用户配置
-        // 这样可以确保权限控制正确生效
-        const defaultUserConfig = {};
-        Object.keys(adminConfig).forEach((sectionKey) => {
-          if (adminConfig[sectionKey]?.enabled) {
-            defaultUserConfig[sectionKey] = { enabled: true };
-            // 为每个管理员允许的模块设置默认值为true
-            Object.keys(adminConfig[sectionKey]).forEach((moduleKey) => {
-              if (
-                moduleKey !== 'enabled' &&
-                adminConfig[sectionKey][moduleKey]
-              ) {
-                defaultUserConfig[sectionKey][moduleKey] = true;
-              }
-            });
-          }
-        });
-        setUserConfig(defaultUserConfig);
+        // 使用默认配置
+        setSidebarConfig(defaultSidebarConfig);
       }
     } catch (error) {
-      // 出错时也生成默认配置，而不是设置为空对象
-      const defaultUserConfig = {};
-      Object.keys(adminConfig).forEach((sectionKey) => {
-        if (adminConfig[sectionKey]?.enabled) {
-          defaultUserConfig[sectionKey] = { enabled: true };
-          Object.keys(adminConfig[sectionKey]).forEach((moduleKey) => {
-            if (moduleKey !== 'enabled' && adminConfig[sectionKey][moduleKey]) {
-              defaultUserConfig[sectionKey][moduleKey] = true;
-            }
-          });
-        }
-      });
-      setUserConfig(defaultUserConfig);
+      // 出错时使用默认配置
+      setSidebarConfig(defaultSidebarConfig);
     } finally {
       setLoading(false);
     }
   };
 
-  // 刷新用户配置的方法（供外部调用）
+  // 刷新侧边栏配置的方法（供外部调用）
   const refreshUserConfig = async () => {
-     if (Object.keys(adminConfig).length > 0) {
-      await loadUserConfig();
-    }
-
+    await loadSidebarConfig();
     // 触发全局刷新事件，通知所有useSidebar实例更新
     sidebarEventTarget.dispatchEvent(new CustomEvent(SIDEBAR_REFRESH_EVENT));
   };
 
-  // 加载用户配置
+  // 初始加载配置
   useEffect(() => {
-    // 只有当管理员配置加载完成后才加载用户配置
-    if (Object.keys(adminConfig).length > 0) {
-      loadUserConfig();
-    }
-  }, [adminConfig]);
+    loadSidebarConfig();
+  }, []);
 
   // 监听全局刷新事件
   useEffect(() => {
     const handleRefresh = () => {
-      if (Object.keys(adminConfig).length > 0) {
-        loadUserConfig();
-      }
+      loadSidebarConfig();
     };
 
     sidebarEventTarget.addEventListener(SIDEBAR_REFRESH_EVENT, handleRefresh);
@@ -157,60 +106,23 @@ export const useSidebar = () => {
     return () => {
       sidebarEventTarget.removeEventListener(SIDEBAR_REFRESH_EVENT, handleRefresh);
     };
-  }, [adminConfig]);
-
-  // 计算最终的显示配置
-  const finalConfig = useMemo(() => {
-    const result = {};
+  }, []);
 
-    // 确保adminConfig已加载
-    if (!adminConfig || Object.keys(adminConfig).length === 0) {
-      return result;
-    }
-
-    // 如果userConfig未加载，等待加载完成
-    if (!userConfig) {
-      return result;
-    }
-
-    // 遍历所有区域
-    Object.keys(adminConfig).forEach((sectionKey) => {
-      const adminSection = adminConfig[sectionKey];
-      const userSection = userConfig[sectionKey];
-
-      // 如果管理员禁用了整个区域，则该区域不显示
-      if (!adminSection?.enabled) {
-        result[sectionKey] = { enabled: false };
-        return;
-      }
-
-      // 区域级别：用户可以选择隐藏管理员允许的区域
-      // 当userSection存在时检查enabled状态，否则默认为true
-      const sectionEnabled = userSection ? userSection.enabled !== false : true;
-      result[sectionKey] = { enabled: sectionEnabled };
-
-      // 功能级别：只有管理员和用户都允许的功能才显示
-      Object.keys(adminSection).forEach((moduleKey) => {
-        if (moduleKey === 'enabled') return;
-
-        const adminAllowed = adminSection[moduleKey];
-        // 当userSection存在时检查模块状态，否则默认为true
-        const userAllowed = userSection
-          ? userSection[moduleKey] !== false
-          : true;
-
-        result[sectionKey][moduleKey] =
-          adminAllowed && userAllowed && sectionEnabled;
-      });
-    });
-
-    return result;
-  }, [adminConfig, userConfig]);
+  // 直接使用后端计算好的最终配置
+  const finalConfig = sidebarConfig || {};
 
   // 检查特定功能是否应该显示
   const isModuleVisible = (sectionKey, moduleKey = null) => {
     if (moduleKey) {
-      return finalConfig[sectionKey]?.[moduleKey] === true;
+      const moduleValue = finalConfig[sectionKey]?.[moduleKey];
+      // 处理布尔值和嵌套对象两种情况
+      if (typeof moduleValue === 'boolean') {
+        return moduleValue === true;
+      } else if (typeof moduleValue === 'object' && moduleValue !== null) {
+        // 对于嵌套对象，检查其enabled状态
+        return moduleValue.enabled === true;
+      }
+      return false;
     } else {
       return finalConfig[sectionKey]?.enabled === true;
     }
@@ -221,9 +133,19 @@ export const useSidebar = () => {
     const section = finalConfig[sectionKey];
     if (!section?.enabled) return false;
 
-    return Object.keys(section).some(
-      (key) => key !== 'enabled' && section[key] === true,
-    );
+    return Object.keys(section).some(key => {
+      if (key === 'enabled') return false;
+
+      const moduleValue = section[key];
+      // 处理布尔值和嵌套对象两种情况
+      if (typeof moduleValue === 'boolean') {
+        return moduleValue === true;
+      } else if (typeof moduleValue === 'object' && moduleValue !== null) {
+        // 对于嵌套对象，检查其enabled状态
+        return moduleValue.enabled === true;
+      }
+      return false;
+    });
   };
 
   // 获取区域的可见功能列表
@@ -231,15 +153,24 @@ export const useSidebar = () => {
     const section = finalConfig[sectionKey];
     if (!section?.enabled) return [];
 
-    return Object.keys(section).filter(
-      (key) => key !== 'enabled' && section[key] === true,
-    );
+    return Object.keys(section).filter(key => {
+      if (key === 'enabled') return false;
+
+      const moduleValue = section[key];
+      // 处理布尔值和嵌套对象两种情况
+      if (typeof moduleValue === 'boolean') {
+        return moduleValue === true;
+      } else if (typeof moduleValue === 'object' && moduleValue !== null) {
+        // 对于嵌套对象，检查其enabled状态
+        return moduleValue.enabled === true;
+      }
+      return false;
+    });
   };
 
   return {
     loading,
-    adminConfig,
-    userConfig,
+    sidebarConfig,
     finalConfig,
     isModuleVisible,
     hasSectionVisibleModules,
diff --git a/web/src/pages/Home/index.jsx b/web/src/pages/Home/index.jsx
index ffe2cf1abaad..c556ec27832e 100644
--- a/web/src/pages/Home/index.jsx
+++ b/web/src/pages/Home/index.jsx
@@ -149,20 +149,20 @@ const Home = () => {
   }, [endpointItems.length]);
 
   return (
-    <div className='w-full overflow-x-hidden'>
+    <div className='w-full overflow-x-hidden min-h-full flex flex-col'>
       <NoticeModal
         visible={noticeVisible}
         onClose={() => setNoticeVisible(false)}
         isMobile={isMobile}
       />
       {homePageContentLoaded && homePageContent === '' ? (
-        <div className='w-full overflow-x-hidden'>
+        <div className='w-full overflow-x-hidden flex-1 flex flex-col'>
           {/* Banner 部分 */}
           <div className='w-full min-h-[500px] md:min-h-[600px] lg:min-h-[700px] relative overflow-x-hidden'>
             {/* 背景模糊晕染球 */}
             <div className='blur-ball blur-ball-indigo' />
             <div className='blur-ball blur-ball-teal' />
-            <div className='flex items-center justify-center h-full px-4 py-20 md:py-24 lg:py-32 mt-10'>
+            <div className='flex items-center justify-center h-full px-4 py-20 md:py-24 lg:py-20 mt-10'>
               {/* 居中内容区 */}
               <div className='flex flex-col items-center justify-center text-center max-w-4xl mx-auto'>
                 <div className='flex flex-col items-center justify-center mb-6 md:mb-8'>
@@ -343,15 +343,15 @@ const Home = () => {
           </div>
         </div>
       ) : (
-        <div className='overflow-x-hidden w-full'>
+        <div className='overflow-x-hidden w-full flex-1 flex flex-col'>
           {homePageContent.startsWith('https://') ? (
             <iframe
               src={homePageContent}
-              className='w-full h-screen border-none'
+              className='w-full flex-1 border-none'
             />
           ) : (
             <div
-              className='mt-[60px]'
+              className='mt-[60px] flex-1'
               dangerouslySetInnerHTML={{ __html: homePageContent }}
             />
           )}
diff --git a/web/src/pages/Setting/Operation/SettingsHeaderNavModules.jsx b/web/src/pages/Setting/Operation/SettingsHeaderNavModules.jsx
index 19943c1a8aa6..12bda379c67f 100644
--- a/web/src/pages/Setting/Operation/SettingsHeaderNavModules.jsx
+++ b/web/src/pages/Setting/Operation/SettingsHeaderNavModules.jsx
@@ -110,8 +110,8 @@ export default function SettingsHeaderNavModules(props) {
           type: 'set',
           payload: {
             ...statusState.status,
-            HeaderNavModules: JSON.stringify(headerNavModules),
-          },
+            header_nav_modules: JSON.stringify(headerNavModules)
+          }
         });
 
         // 刷新父组件状态
diff --git a/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx b/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx
index 8472181bcb93..1a4b9a1d2163 100644
--- a/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx
+++ b/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx
@@ -17,7 +17,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 
-import React, { useState, useEffect, useContext } from 'react';
+import { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   Card,
@@ -29,15 +29,13 @@ import {
   Typography,
 } from '@douyinfe/semi-ui';
 import { API, showSuccess, showError } from '../../../helpers';
-import { StatusContext } from '../../../context/Status';
 
 const { Text } = Typography;
 
 export default function SettingsSidebarModulesAdmin(props) {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [statusState, statusDispatch] = useContext(StatusContext);
-
+  
   // 左侧边栏模块管理状态（管理员全局控制）
   const [sidebarModulesAdmin, setSidebarModulesAdmin] = useState({
     chat: {
@@ -163,19 +161,16 @@ export default function SettingsSidebarModulesAdmin(props) {
       if (success) {
         showSuccess(t('保存成功'));
 
-        // 立即更新StatusContext中的状态
-        statusDispatch({
-          type: 'set',
-          payload: {
-            ...statusState.status,
-            SidebarModulesAdmin: JSON.stringify(sidebarModulesAdmin),
-          },
-        });
-
         // 刷新父组件状态
         if (props.refresh) {
           await props.refresh();
         }
+
+        // 触发全局侧边栏刷新事件，通知所有useSidebar实例更新
+        // 使用全局事件目标（与useSidebar钩子中的一致）
+        if (window.sidebarEventTarget) {
+          window.sidebarEventTarget.dispatchEvent(new CustomEvent('sidebar-refresh'));
+        }
       } else {
         showError(message);
       }
diff --git a/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx b/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
index ff63b73a5fc7..08daf4d57efa 100644
--- a/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
+++ b/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
@@ -17,7 +17,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 
-import { useState, useEffect, useContext } from 'react';
+import { useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
   Card,
@@ -29,8 +29,7 @@ import {
   Avatar,
 } from '@douyinfe/semi-ui';
 import { API, showSuccess, showError } from '../../../helpers';
-import { StatusContext } from '../../../context/Status';
-import { UserContext } from '../../../context/User';
+
 import { useUserPermissions } from '../../../hooks/common/useUserPermissions';
 import { useSidebar } from '../../../hooks/common/useSidebar';
 import { Settings } from 'lucide-react';
@@ -40,15 +39,11 @@ const { Text } = Typography;
 export default function SettingsSidebarModulesUser() {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
-  const [statusState] = useContext(StatusContext);
 
   // 使用后端权限验证替代前端角色判断
   const {
-    permissions,
     loading: permissionsLoading,
     hasSidebarSettingsPermission,
-    isSidebarSectionAllowed,
-    isSidebarModuleAllowed,
   } = useUserPermissions();
 
   // 使用useSidebar钩子获取刷新方法
@@ -59,55 +54,133 @@ export default function SettingsSidebarModulesUser() {
     return null;
   }
 
+  // 如果配置还在加载中，显示加载状态
+  if (configLoading || permissionsLoading) {
+    return (
+      <Card className='!rounded-2xl shadow-sm border-0'>
+        <div className='flex items-center justify-center py-8'>
+          <div className='text-gray-500'>{t('加载中...')}</div>
+        </div>
+      </Card>
+    );
+  }
+
   // 权限加载中，显示加载状态
   if (permissionsLoading) {
     return null;
   }
 
-  // 根据用户权限生成默认配置
-  const generateDefaultConfig = () => {
-    const defaultConfig = {};
-
-    // 聊天区域 - 所有用户都可以访问
-    if (isSidebarSectionAllowed('chat')) {
-      defaultConfig.chat = {
+  // 获取默认系统配置
+  const getDefaultSystemConfig = () => {
+    return {
+      chat: {
         enabled: true,
-        playground: isSidebarModuleAllowed('chat', 'playground'),
-        chat: isSidebarModuleAllowed('chat', 'chat'),
-      };
-    }
-
-    // 控制台区域 - 所有用户都可以访问
-    if (isSidebarSectionAllowed('console')) {
-      defaultConfig.console = {
+        playground: true,
+        chat: true
+      },
+      console: {
         enabled: true,
-        detail: isSidebarModuleAllowed('console', 'detail'),
-        token: isSidebarModuleAllowed('console', 'token'),
-        log: isSidebarModuleAllowed('console', 'log'),
-        midjourney: isSidebarModuleAllowed('console', 'midjourney'),
-        task: isSidebarModuleAllowed('console', 'task'),
-      };
-    }
-
-    // 个人中心区域 - 所有用户都可以访问
-    if (isSidebarSectionAllowed('personal')) {
-      defaultConfig.personal = {
+        detail: true,
+        token: true,
+        log: true,
+        midjourney: true,
+        task: true
+      },
+      personal: {
         enabled: true,
-        topup: isSidebarModuleAllowed('personal', 'topup'),
-        personal: isSidebarModuleAllowed('personal', 'personal'),
-      };
-    }
-
-    // 管理员区域 - 只有管理员可以访问
-    if (isSidebarSectionAllowed('admin')) {
-      defaultConfig.admin = {
+        topup: true,
+        personal: true
+      },
+      admin: {
         enabled: true,
-        channel: isSidebarModuleAllowed('admin', 'channel'),
-        models: isSidebarModuleAllowed('admin', 'models'),
-        redemption: isSidebarModuleAllowed('admin', 'redemption'),
-        user: isSidebarModuleAllowed('admin', 'user'),
-        setting: isSidebarModuleAllowed('admin', 'setting'),
-      };
+        channel: true,
+        models: true,
+        redemption: true,
+        user: {
+          enabled: true,
+          groupManagement: true
+        },
+        setting: true
+      }
+    };
+  };
+
+  // 合并用户配置与系统配置，确保显示所有系统允许的区域
+  const mergeUserConfigWithSystemConfig = (userConfig, systemConfig) => {
+    const mergedConfig = {};
+
+    // 遍历系统配置的所有区域
+    Object.keys(systemConfig).forEach(sectionKey => {
+      const systemSection = systemConfig[sectionKey];
+      if (systemSection && systemSection.enabled) {
+        // 获取用户对这个区域的配置，如果没有则使用默认值
+        const userSection = userConfig[sectionKey] || {};
+
+        mergedConfig[sectionKey] = {
+          enabled: userSection.enabled !== undefined ? userSection.enabled : true
+        };
+
+        // 遍历区域内的模块
+        Object.keys(systemSection).forEach(moduleKey => {
+          if (moduleKey !== 'enabled') {
+            const systemModuleValue = systemSection[moduleKey];
+
+            // 处理布尔值和嵌套对象两种情况
+            if (typeof systemModuleValue === 'boolean' && systemModuleValue === true) {
+              mergedConfig[sectionKey][moduleKey] = userSection[moduleKey] !== undefined ? userSection[moduleKey] : true;
+            } else if (typeof systemModuleValue === 'object' && systemModuleValue !== null && systemModuleValue.enabled === true) {
+              // 对于嵌套对象，在个人设置中只关心enabled状态，不处理子功能
+              let userEnabled = systemModuleValue.enabled; // 使用系统默认值
+
+              if (userSection[moduleKey] !== undefined) {
+                if (typeof userSection[moduleKey] === 'boolean') {
+                  // 如果用户配置是布尔值，直接使用
+                  userEnabled = userSection[moduleKey];
+                } else if (typeof userSection[moduleKey] === 'object' && userSection[moduleKey] !== null) {
+                  // 如果用户配置是对象，提取enabled状态
+                  userEnabled = userSection[moduleKey].enabled !== false;
+                }
+              }
+
+              // 在个人设置中，只保存enabled状态，不保存子功能配置
+              mergedConfig[sectionKey][moduleKey] = userEnabled;
+            }
+          }
+        });
+      }
+    });
+
+    return mergedConfig;
+  };
+
+  // 根据系统允许的权限范围生成默认配置
+  const generateDefaultConfig = (systemConfig = null) => {
+    const defaultConfig = {};
+    const configToUse = systemConfig || adminConfig;
+
+    // 基于系统配置生成默认配置
+    if (configToUse) {
+      Object.keys(configToUse).forEach(sectionKey => {
+        const section = configToUse[sectionKey];
+        if (section && section.enabled) {
+          defaultConfig[sectionKey] = { enabled: true };
+
+          // 为每个系统允许的模块设置默认值为true
+          Object.keys(section).forEach(moduleKey => {
+            if (moduleKey !== 'enabled') {
+              const moduleValue = section[moduleKey];
+
+              // 处理布尔值和嵌套对象两种情况
+              if (typeof moduleValue === 'boolean' && moduleValue === true) {
+                defaultConfig[sectionKey][moduleKey] = true;
+              } else if (typeof moduleValue === 'object' && moduleValue !== null && moduleValue.enabled === true) {
+                // 对于嵌套对象，在个人设置中只关心enabled状态，默认为true
+                defaultConfig[sectionKey][moduleKey] = true;
+              }
+            }
+          });
+        }
+      });
     }
 
     return defaultConfig;
@@ -118,6 +191,7 @@ export default function SettingsSidebarModulesUser() {
 
   // 管理员全局配置
   const [adminConfig, setAdminConfig] = useState(null);
+  const [configLoading, setConfigLoading] = useState(true);
 
   // 处理区域级别开关变更
   function handleSectionChange(sectionKey) {
@@ -137,6 +211,7 @@ export default function SettingsSidebarModulesUser() {
   // 处理功能级别开关变更
   function handleModuleChange(sectionKey, moduleKey) {
     return (checked) => {
+      // 在个人设置中，所有模块都使用简单布尔值，不处理嵌套对象的子功能
       const newModules = {
         ...sidebarModulesUser,
         [sectionKey]: {
@@ -195,54 +270,65 @@ export default function SettingsSidebarModulesUser() {
   useEffect(() => {
     const loadConfigs = async () => {
       try {
-        // 获取管理员全局配置
-        if (statusState?.status?.SidebarModulesAdmin) {
-          const adminConf = JSON.parse(statusState.status.SidebarModulesAdmin);
-          setAdminConfig(adminConf);
-          console.log('加载管理员边栏配置:', adminConf);
-        }
-
-        // 获取用户个人配置
+        setConfigLoading(true);
+        // 获取用户信息和设置
         const userRes = await API.get('/api/user/self');
-        if (userRes.data.success && userRes.data.data.sidebar_modules) {
-          let userConf;
-          // 检查sidebar_modules是字符串还是对象
-          if (typeof userRes.data.data.sidebar_modules === 'string') {
-            userConf = JSON.parse(userRes.data.data.sidebar_modules);
-          } else {
-            userConf = userRes.data.data.sidebar_modules;
+        if (userRes.data.success && userRes.data.data.setting) {
+          // 从setting字段中获取系统权限信息
+          try {
+            const setting = JSON.parse(userRes.data.data.setting);
+            if (setting.sidebar_system_config) {
+              const systemConfig = JSON.parse(setting.sidebar_system_config);
+              setAdminConfig(systemConfig);
+            } else {
+              // 如果没有系统配置，使用默认配置
+              setAdminConfig(getDefaultSystemConfig());
+              console.log('使用默认系统配置');
+            }
+          } catch (error) {
+            console.error('解析系统配置失败:', error);
+            setAdminConfig(getDefaultSystemConfig());
           }
-          console.log('从API加载的用户配置:', userConf);
-
-          // 确保用户配置也经过权限过滤
-          const filteredUserConf = {};
-          Object.keys(userConf).forEach((sectionKey) => {
-            if (isSidebarSectionAllowed(sectionKey)) {
-              filteredUserConf[sectionKey] = { ...userConf[sectionKey] };
-              // 过滤不允许的模块
-              Object.keys(userConf[sectionKey]).forEach((moduleKey) => {
-                if (
-                  moduleKey !== 'enabled' &&
-                  !isSidebarModuleAllowed(sectionKey, moduleKey)
-                ) {
-                  delete filteredUserConf[sectionKey][moduleKey];
-                }
-              });
+
+          // 从同一个setting字段中获取用户的原始偏好设置
+          try {
+            const setting = JSON.parse(userRes.data.data.setting);
+            const systemConfig = setting.sidebar_system_config ? JSON.parse(setting.sidebar_system_config) : getDefaultSystemConfig();
+
+            if (setting.sidebar_modules) {
+              let userConf;
+              if (typeof setting.sidebar_modules === 'string') {
+                userConf = JSON.parse(setting.sidebar_modules);
+              } else {
+                userConf = setting.sidebar_modules;
+              }
+
+              // 确保用户配置包含所有系统允许的区域，即使用户关闭了它们
+              const mergedConfig = mergeUserConfigWithSystemConfig(userConf, systemConfig);
+              setSidebarModulesUser(mergedConfig);
+            } else {
+              const defaultConfig = generateDefaultConfig(systemConfig);
+              setSidebarModulesUser(defaultConfig);
             }
-          });
-          setSidebarModulesUser(filteredUserConf);
-          console.log('权限过滤后的用户配置:', filteredUserConf);
+          } catch (error) {
+            console.error('解析用户设置失败:', error);
+            const defaultConfig = generateDefaultConfig(systemConfig);
+            setSidebarModulesUser(defaultConfig);
+          }
         } else {
-          // 如果用户没有配置，使用权限过滤后的默认配置
-          const defaultConfig = generateDefaultConfig();
+          // 如果没有setting数据，使用默认配置
+          const defaultSystemConfig = getDefaultSystemConfig();
+          setAdminConfig(defaultSystemConfig);
+          const defaultConfig = generateDefaultConfig(defaultSystemConfig);
           setSidebarModulesUser(defaultConfig);
-          console.log('用户无配置，使用默认配置:', defaultConfig);
         }
       } catch (error) {
         console.error('加载边栏配置失败:', error);
-        // 出错时也使用默认配置
-        const defaultConfig = generateDefaultConfig();
-        setSidebarModulesUser(defaultConfig);
+        // 出错时设置空配置
+        setAdminConfig({});
+        setSidebarModulesUser({});
+      } finally {
+        setConfigLoading(false);
       }
     };
 
@@ -250,26 +336,7 @@ export default function SettingsSidebarModulesUser() {
     if (!permissionsLoading && hasSidebarSettingsPermission()) {
       loadConfigs();
     }
-  }, [
-    statusState,
-    permissionsLoading,
-    hasSidebarSettingsPermission,
-    isSidebarSectionAllowed,
-    isSidebarModuleAllowed,
-  ]);
-
-  // 检查功能是否被管理员允许
-  const isAllowedByAdmin = (sectionKey, moduleKey = null) => {
-    if (!adminConfig) return true;
-
-    if (moduleKey) {
-      return (
-        adminConfig[sectionKey]?.enabled && adminConfig[sectionKey]?.[moduleKey]
-      );
-    } else {
-      return adminConfig[sectionKey]?.enabled;
-    }
-  };
+  }, [permissionsLoading, hasSidebarSettingsPermission]);
 
   // 区域配置数据（根据后端权限过滤）
   const sectionConfigs = [
@@ -328,29 +395,28 @@ export default function SettingsSidebarModulesUser() {
           description: t('兑换码生成管理'),
         },
         { key: 'user', title: t('用户管理'), description: t('用户账户管理') },
-        {
-          key: 'setting',
-          title: t('系统设置'),
-          description: t('系统参数配置'),
-        },
-      ],
-    },
-  ]
-    .filter((section) => {
-      // 使用后端权限验证替代前端角色判断
-      return isSidebarSectionAllowed(section.key);
+        { key: 'setting', title: t('系统设置'), description: t('系统参数配置') }
+      ]
+    }
+  ].filter(section => {
+    // 基于系统权限过滤区域：只要系统中存在这个区域就显示（不管用户是否启用）
+    const systemAllowed = adminConfig && adminConfig[section.key];
+    console.log(`区域 ${section.key} 系统是否允许:`, systemAllowed, 'adminConfig:', adminConfig);
+    return systemAllowed;
+  }).map(section => ({
+    ...section,
+    modules: section.modules.filter(module => {
+      // 基于系统权限过滤模块：只要系统配置中存在这个模块就显示
+      const systemAllowed = adminConfig && adminConfig[section.key] && adminConfig[section.key].hasOwnProperty(module.key);
+      console.log(`模块 ${section.key}.${module.key} 系统是否允许:`, systemAllowed);
+      return systemAllowed;
     })
-    .map((section) => ({
-      ...section,
-      modules: section.modules.filter((module) =>
-        isSidebarModuleAllowed(section.key, module.key),
-      ),
-    }))
-    .filter(
-      (section) =>
-        // 过滤掉没有可用模块的区域
-        section.modules.length > 0 && isAllowedByAdmin(section.key),
-    );
+  })).filter(section => {
+    // 过滤掉没有可用模块的区域
+    const hasModules = section.modules.length > 0;
+    console.log(`区域 ${section.key} 是否有可用模块:`, hasModules, '模块数量:', section.modules.length);
+    return hasModules;
+  });
 
   return (
     <Card className='!rounded-2xl shadow-sm border-0'>
@@ -394,41 +460,41 @@ export default function SettingsSidebarModulesUser() {
             />
           </div>
 
-          {/* 功能模块网格 */}
-          <Row gutter={[12, 12]}>
-            {section.modules.map((module) => (
-              <Col key={module.key} xs={24} sm={12} md={8} lg={6} xl={6}>
-                <Card
-                  className={`!rounded-xl border border-gray-200 hover:border-blue-300 transition-all duration-200 ${
-                    sidebarModulesUser[section.key]?.enabled ? '' : 'opacity-50'
-                  }`}
-                  bodyStyle={{ padding: '16px' }}
-                  hoverable
-                >
-                  <div className='flex justify-between items-center h-full'>
-                    <div className='flex-1 text-left'>
-                      <div className='font-semibold text-sm text-gray-900 mb-1'>
-                        {module.title}
+            {/* 功能模块网格 */}
+            <Row gutter={[12, 12]}>
+              {section.modules.map((module) => (
+                <Col key={module.key} xs={24} sm={12} md={8} lg={6} xl={6}>
+                  <Card
+                    className={`!rounded-xl border border-gray-200 hover:border-blue-300 transition-all duration-200 ${
+                      sidebarModulesUser[section.key]?.enabled ? '' : 'opacity-50'
+                    }`}
+                    bodyStyle={{ padding: '16px' }}
+                    hoverable
+                  >
+                    <div className='flex justify-between items-center h-full'>
+                      <div className='flex-1 text-left'>
+                        <div className='font-semibold text-sm text-gray-900 mb-1'>
+                          {module.title}
+                        </div>
+                        <Text className='text-xs text-gray-600 leading-relaxed block'>
+                          {module.description}
+                        </Text>
+                      </div>
+                      <div className='ml-4'>
+                        <Switch
+                          checked={sidebarModulesUser[section.key]?.[module.key] === true}
+                          onChange={handleModuleChange(section.key, module.key)}
+                          size="default"
+                          disabled={!sidebarModulesUser[section.key]?.enabled}
+                        />
                       </div>
-                      <Text className='text-xs text-gray-600 leading-relaxed block'>
-                        {module.description}
-                      </Text>
-                    </div>
-                    <div className='ml-4'>
-                      <Switch
-                        checked={sidebarModulesUser[section.key]?.[module.key]}
-                        onChange={handleModuleChange(section.key, module.key)}
-                        size='default'
-                        disabled={!sidebarModulesUser[section.key]?.enabled}
-                      />
                     </div>
-                  </div>
-                </Card>
-              </Col>
-            ))}
-          </Row>
-        </div>
-      ))}
+                  </Card>
+                </Col>
+              ))}
+            </Row>
+          </div>
+        ))}
 
       {/* 底部按钮 */}
       <div className='flex justify-end gap-3 mt-6 pt-4 border-t border-gray-200'>

From 835543159a0636d7dce0ee8c1a55d1a4822b36d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Tue, 2 Sep 2025 22:39:30 +0800
Subject: [PATCH 08/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=9F=BA=E4=BA=8Ecoderabbitai=E5=AE=A1=E6=9F=A5=E7=9A=84?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.潜在的权限问题
2.用户体验等问题
---
 common/topup-ratio.go                         |  13 ++
 controller/misc.go                            |  56 ++++++-
 controller/pricing.go                         |  94 +++++++++++
 controller/user.go                            |  70 --------
 controller/user_group.go                      | 100 ++++++++---
 middleware/auth.go                            |  22 ++-
 model/user.go                                 |  17 +-
 model/user_group.go                           |  17 +-
 web/index.html                                |  33 ++--
 web/src/components/auth/ModuleRoute.jsx       | 158 +++++++-----------
 .../table/users/modals/EditUserGroupModal.jsx |  32 ++--
 .../users/modals/UserGroupManagement.jsx      |  23 +--
 web/src/constants/user.constants.js           |  59 +++++++
 web/src/helpers/data.js                       |  17 +-
 .../model-pricing/useModelPricingData.jsx     |  73 ++++----
 web/src/i18n/locales/en.json                  |   5 +-
 .../Setting/Operation/SettingsGeneral.jsx     |   2 +-
 .../Personal/SettingsSidebarModulesUser.jsx   |  23 ++-
 18 files changed, 519 insertions(+), 295 deletions(-)

diff --git a/common/topup-ratio.go b/common/topup-ratio.go
index 8f03395d2f97..14c17aeb0c64 100644
--- a/common/topup-ratio.go
+++ b/common/topup-ratio.go
@@ -2,6 +2,7 @@ package common
 
 import (
 	"encoding/json"
+	"sync"
 )
 
 var TopupGroupRatio = map[string]float64{
@@ -10,6 +11,18 @@ var TopupGroupRatio = map[string]float64{
 	"svip":    1,
 }
 
+var topupGroupRatioMutex sync.RWMutex
+
+func GetTopupGroupRatioCopy() map[string]float64 {
+	topupGroupRatioMutex.RLock()
+	defer topupGroupRatioMutex.RUnlock()
+	cp := make(map[string]float64, len(TopupGroupRatio))
+	for k, v := range TopupGroupRatio {
+		cp[k] = v
+	}
+	return cp
+}
+
 func TopupGroupRatio2JSONString() string {
 	jsonBytes, err := json.Marshal(TopupGroupRatio)
 	if err != nil {
diff --git a/controller/misc.go b/controller/misc.go
index 9e0892c64fbe..93c4f07b7e60 100644
--- a/controller/misc.go
+++ b/controller/misc.go
@@ -317,11 +317,6 @@ func filterHeaderNavModulesForUser(headerNavModulesRaw interface{}, userRole int
 		return headerNavModulesRaw
 	}
 
-	// 如果用户未登录，返回原配置（顶栏模块对所有用户都是公开的）
-	if userRole == -1 {
-		return headerNavModulesRaw
-	}
-
 	headerNavModulesStr, ok := headerNavModulesRaw.(string)
 	if !ok || headerNavModulesStr == "" {
 		return headerNavModulesRaw
@@ -334,16 +329,22 @@ func filterHeaderNavModulesForUser(headerNavModulesRaw interface{}, userRole int
 		return "{}"
 	}
 
-	// 对于所有用户，移除被禁用的模块
+	// 对于所有用户（包括未登录用户），都需要移除被禁用的模块
 	filteredConfig := make(map[string]interface{})
 	for key, value := range config {
 		// 首先检查模块是否启用
 		if isHeaderNavModuleEnabled(key, value) {
+			// 未登录用户：仅移除被禁用的模块，保留启用模块（包括 pricing，以便前端根据 requireAuth 决定跳转到 /login）
+			if userRole == -1 {
+				filteredConfig[key] = value
+				continue
+			}
+
 			// 超级管理员可以看到所有启用的模块
 			if userRole >= common.RoleRootUser {
 				filteredConfig[key] = value
 			} else {
-				// 对于管理员和普通用户，进行额外的权限检查
+				// 管理员和普通用户：进行权限检查
 				if hasHeaderNavModulePermission(key, value, userRole) {
 					filteredConfig[key] = value
 				}
@@ -502,11 +503,18 @@ func isHeaderNavModuleEnabled(moduleKey string, moduleValue interface{}) bool {
 
 // hasHeaderNavModulePermission 检查用户是否有权限访问顶栏模块
 func hasHeaderNavModulePermission(moduleKey string, moduleValue interface{}, userRole int) bool {
-	// 普通用户只能访问基础模块
+	// 对于模型广场，需要检查requireAuth配置
+	if moduleKey == "pricing" {
+		return checkPricingModulePermission(moduleValue, userRole)
+	}
+
+	// 未登录用户和普通用户只能访问基础模块
 	if userRole < common.RoleAdminUser {
 		allowedModules := map[string]bool{
 			"home":    true,
 			"console": true,
+			"docs":    true, // 文档允许未登录用户访问
+			"about":   true, // 关于页面允许未登录用户访问
 		}
 		return allowedModules[moduleKey]
 	}
@@ -515,6 +523,38 @@ func hasHeaderNavModulePermission(moduleKey string, moduleValue interface{}, use
 	return true
 }
 
+// checkPricingModulePermission 检查模型广场模块的权限
+func checkPricingModulePermission(moduleValue interface{}, userRole int) bool {
+	// 如果是布尔值配置，默认不需要登录
+	if boolValue, ok := moduleValue.(bool); ok {
+		return boolValue // 简单的启用/禁用
+	}
+
+	// 如果是对象配置，检查requireAuth设置
+	if objValue, ok := moduleValue.(map[string]interface{}); ok {
+		// 检查模块是否启用
+		if enabled, hasEnabled := objValue["enabled"]; hasEnabled {
+			if enabledBool, ok := enabled.(bool); ok && !enabledBool {
+				return false // 模块被禁用
+			}
+		}
+
+		// 检查是否需要登录
+		if requireAuth, hasRequireAuth := objValue["requireAuth"]; hasRequireAuth {
+			if requireAuthBool, ok := requireAuth.(bool); ok && requireAuthBool {
+				// 需要登录才能访问，未登录用户不能访问
+				return userRole >= common.RoleCommonUser
+			}
+		}
+
+		// 默认不需要登录
+		return true
+	}
+
+	// 其他情况默认允许
+	return true
+}
+
 // hasModulePermissionForUser 检查用户是否有权限访问指定模块
 func hasModulePermissionForUser(userRole int, modulePath string, moduleValue interface{}) bool {
 	// 数据看板始终允许访问，不受控制台区域开关影响
diff --git a/controller/pricing.go b/controller/pricing.go
index 4b7cc86d505c..117f46652918 100644
--- a/controller/pricing.go
+++ b/controller/pricing.go
@@ -1,6 +1,9 @@
 package controller
 
 import (
+	"encoding/json"
+	"net/http"
+	"one-api/common"
 	"one-api/model"
 	"one-api/setting"
 	"one-api/setting/ratio_setting"
@@ -9,6 +12,15 @@ import (
 )
 
 func GetPricing(c *gin.Context) {
+	// 检查模型广场访问权限
+	if !checkPricingAccess(c) {
+		c.JSON(http.StatusForbidden, gin.H{
+			"success": false,
+			"message": "需要登录才能访问模型广场",
+		})
+		return
+	}
+
 	pricing := model.GetPricing()
 	userId, exists := c.Get("id")
 	usableGroup := map[string]string{}
@@ -49,6 +61,88 @@ func GetPricing(c *gin.Context) {
 	})
 }
 
+// checkPricingAccess 检查用户是否有权限访问模型广场
+func checkPricingAccess(c *gin.Context) bool {
+	// 获取顶栏模块配置
+	common.OptionMapRWMutex.RLock()
+	headerNavModulesRaw, exists := common.OptionMap["HeaderNavModules"]
+	common.OptionMapRWMutex.RUnlock()
+
+	if !exists || headerNavModulesRaw == "" {
+		// 如果没有配置，默认允许访问
+		return true
+	}
+
+	// 解析配置
+	var config map[string]interface{}
+	if err := json.Unmarshal([]byte(headerNavModulesRaw), &config); err != nil {
+		// 解析失败时采用安全优先策略，拒绝访问
+		return false
+	}
+
+	// 检查pricing模块配置
+	pricingConfig, hasPricing := config["pricing"]
+	if !hasPricing {
+		// 如果没有pricing配置，默认允许访问
+		return true
+	}
+
+	// 检查模块是否启用
+	if !isPricingModuleEnabled(pricingConfig) {
+		return false
+	}
+
+	// 检查是否需要登录
+	if isPricingRequireAuth(pricingConfig) {
+		// 需要登录，检查用户是否已登录
+		userId, exists := c.Get("id")
+		if !exists || userId == nil {
+			return false // 用户未登录
+		}
+
+		// 从数据库获取用户信息验证角色
+		user, err := model.GetUserById(userId.(int), false)
+		if err != nil {
+			return false // 获取用户信息失败
+		}
+
+		return user.Role >= common.RoleCommonUser
+	}
+
+	// 不需要登录，允许访问
+	return true
+}
+
+// isPricingModuleEnabled 检查pricing模块是否启用
+func isPricingModuleEnabled(moduleValue interface{}) bool {
+	switch v := moduleValue.(type) {
+	case bool:
+		return v
+	case map[string]interface{}:
+		if enabled, hasEnabled := v["enabled"]; hasEnabled {
+			if enabledBool, ok := enabled.(bool); ok {
+				return enabledBool
+			}
+		}
+		return true // 如果没有enabled字段，默认启用
+	default:
+		return true
+	}
+}
+
+// isPricingRequireAuth 检查pricing模块是否需要登录
+func isPricingRequireAuth(moduleValue interface{}) bool {
+	if objValue, ok := moduleValue.(map[string]interface{}); ok {
+		if requireAuth, hasRequireAuth := objValue["requireAuth"]; hasRequireAuth {
+			if requireAuthBool, ok := requireAuth.(bool); ok {
+				return requireAuthBool
+			}
+		}
+	}
+	// 默认不需要登录
+	return false
+}
+
 func ResetModelRatio(c *gin.Context) {
 	defaultStr := ratio_setting.DefaultModelRatio2JSONString()
 	err := model.UpdateOption("ModelRatio", defaultStr)
diff --git a/controller/user.go b/controller/user.go
index 79e908693400..3db88e091de9 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -1077,76 +1077,6 @@ func calculateFinalDisplayConfig(systemConfig map[string]interface{}, userModule
 	return finalConfig
 }
 
-// 根据用户角色生成默认的边栏配置
-func generateDefaultSidebarConfig(userRole int) string {
-	defaultConfig := map[string]interface{}{}
-
-	// 聊天区域 - 所有用户都可以访问
-	defaultConfig["chat"] = map[string]interface{}{
-		"enabled":    true,
-		"playground": true,
-		"chat":       true,
-	}
-
-	// 控制台区域 - 所有用户都可以访问
-	defaultConfig["console"] = map[string]interface{}{
-		"enabled":    true,
-		"detail":     true,
-		"token":      true,
-		"log":        true,
-		"midjourney": true,
-		"task":       true,
-	}
-
-	// 个人中心区域 - 所有用户都可以访问
-	defaultConfig["personal"] = map[string]interface{}{
-		"enabled":  true,
-		"topup":    true,
-		"personal": true,
-	}
-
-	// 管理员区域 - 根据角色决定
-	if userRole == common.RoleAdminUser {
-		// 管理员可以访问管理员区域，但不能访问系统设置
-		defaultConfig["admin"] = map[string]interface{}{
-			"enabled":    true,
-			"channel":    true,
-			"models":     true,
-			"redemption": true,
-			"user": map[string]interface{}{
-				"enabled":         true,
-				"groupManagement": true, // 管理员默认可以访问分组管理
-			},
-			"setting": false, // 管理员不能访问系统设置
-		}
-	} else if userRole == common.RoleRootUser {
-		// 超级管理员可以访问所有功能
-		defaultConfig["admin"] = map[string]interface{}{
-			"enabled":    true,
-			"channel":    true,
-			"models":     true,
-			"redemption": true,
-			"user": map[string]interface{}{
-				"enabled":         true,
-				"groupManagement": true, // 超级管理员默认可以访问分组管理
-			},
-			"setting": true,
-		}
-	}
-	// 普通用户不包含admin区域
-
-	// 转换为JSON字符串
-	configBytes, err := json.Marshal(defaultConfig)
-	if err != nil {
-		common.SysLog("生成默认边栏配置失败: " + err.Error())
-		return ""
-	}
-
-	return string(configBytes)
-}
-
-
-
 func GetUserModels(c *gin.Context) {
 	id, err := strconv.Atoi(c.Param("id"))
 	if err != nil {
diff --git a/controller/user_group.go b/controller/user_group.go
index 4d7b77dac033..b8f4f298e52a 100644
--- a/controller/user_group.go
+++ b/controller/user_group.go
@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"one-api/common"
 	"one-api/model"
@@ -23,6 +24,16 @@ func GetAllUserGroups(c *gin.Context) {
 	common.ApiSuccess(c, groups)
 }
 
+// isReservedGroup reports whether the name is one of the system reserved groups.
+func isReservedGroup(name string) bool {
+	switch strings.ToLower(name) {
+	case "default", "vip", "svip":
+		return true
+	default:
+		return false
+	}
+}
+
 // CreateUserGroup 创建新的用户分组
 func CreateUserGroup(c *gin.Context) {
 	var g model.UserGroup
@@ -30,17 +41,23 @@ func CreateUserGroup(c *gin.Context) {
 		common.ApiError(c, err)
 		return
 	}
+	g.Name = strings.TrimSpace(g.Name)
 	if g.Name == "" {
-		common.ApiErrorMsg(c, "分组名称不能为空")
-		return
-	}
-	if g.Ratio < 0 {
-		common.ApiErrorMsg(c, "分组倍率不能小于0")
-		return
-	}
-	if g.Ratio == 0 {
-		g.Ratio = 1.0 // 默认倍率为1.0
-	}
+ 		common.ApiErrorMsg(c, "分组名称不能为空")
+ 		return
+ 	}
+ 	// 禁止使用系统保留分组名
+ 	if isReservedGroup(strings.ToLower(g.Name)) {
+ 		common.ApiErrorMsg(c, "不能使用系统保留分组名：default、vip、svip")
+ 		return
+ 	}
+ 	if g.Ratio < 0 {
+ 		common.ApiErrorMsg(c, "分组倍率不能小于0")
+ 		return
+ 	}
+ 	if g.Ratio == 0 {
+ 		g.Ratio = 1.0 // 默认倍率为1.0
+ 	}
 
 	// 创建前检查名称
 	if dup, err := model.IsUserGroupNameDuplicated(0, g.Name); err != nil {
@@ -85,11 +102,18 @@ func UpdateUserGroup(c *gin.Context) {
 		common.ApiErrorMsg(c, "缺少分组 ID")
 		return
 	}
+	g.Name = strings.TrimSpace(g.Name)
+	if g.Name == "" {
+		common.ApiErrorMsg(c, "分组名称不能为空")
+		return
+	}
 	if g.Ratio < 0 {
 		common.ApiErrorMsg(c, "分组倍率不能小于0")
 		return
 	}
-
+	if g.Ratio == 0 {
+		g.Ratio = 1.0
+	}
 	// 获取原分组信息
 	oldGroup, err := model.GetUserGroupById(g.Id)
 	if err != nil {
@@ -106,22 +130,56 @@ func UpdateUserGroup(c *gin.Context) {
 		return
 	}
 
-	if err := g.Update(); err != nil {
+	// 使用事务确保分组更新和用户更新的数据一致性
+	tx := model.DB.Begin()
+	if tx.Error != nil {
+		common.ApiError(c, tx.Error)
+		return
+	}
+
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	// 在事务中更新分组
+	if err := g.UpdateTx(tx); err != nil {
+		tx.Rollback()
 		common.ApiError(c, err)
 		return
 	}
 
-	// 如果名称发生变化，需要更新相关设置和用户数据
+	// 如果名称发生变化，需要在同一事务中更新用户数据
 	if oldGroup.Name != g.Name {
 		common.SysLog(fmt.Sprintf("检测到分组名称变化: '%s' -> '%s'", oldGroup.Name, g.Name))
 
-		// 更新所有使用旧分组名的用户
-		if err := model.UpdateUsersGroupName(oldGroup.Name, g.Name); err != nil {
-			common.SysLog("更新用户分组名称失败: " + err.Error())
-			common.ApiErrorMsg(c, "更新用户分组名称失败: "+err.Error())
+		// 禁止修改系统保留分组名
+		if isReservedGroup(strings.ToLower(oldGroup.Name)) {
+			common.ApiErrorMsg(c, "不能修改系统保留分组名称")
 			return
 		}
 
+		// 在同一事务中更新所有使用旧分组名的用户
+		result := tx.Model(&model.User{}).Where("group = ?", oldGroup.Name).Update("group", g.Name)
+		if result.Error != nil {
+			tx.Rollback()
+			common.SysLog("更新用户分组名称失败: " + result.Error.Error())
+			common.ApiErrorMsg(c, "更新用户分组名称失败: "+result.Error.Error())
+			return
+		}
+		common.SysLog(fmt.Sprintf("在事务中成功更新 %d 个用户的分组名称", result.RowsAffected))
+	}
+
+	// 提交事务
+	if err := tx.Commit().Error; err != nil {
+		common.SysLog("提交分组更新事务失败: " + err.Error())
+		common.ApiError(c, err)
+		return
+	}
+
+	// 事务提交成功后，同步设置（这些操作失败不影响核心数据一致性）
+	if oldGroup.Name != g.Name {
 		// 从旧设置中移除
 		if err := syncGroupToRatioSetting(oldGroup.Name, 0, false); err != nil {
 			common.SysLog("从倍率设置中移除旧分组失败: " + err.Error())
@@ -257,12 +315,8 @@ func syncGroupToUserUsableGroups(groupName, description string, add bool) error
 
 // syncGroupToTopupRatio 同步分组到充值倍率设置
 func syncGroupToTopupRatio(groupName string, ratio float64, add bool) error {
-	// 获取当前充值分组倍率的副本
-	topupGroupRatio := make(map[string]float64)
-	for k, v := range common.TopupGroupRatio {
-		topupGroupRatio[k] = v
-	}
-
+	// 获取当前充值分组倍率的副本（线程安全）
+	topupGroupRatio := common.GetTopupGroupRatioCopy()
 	if add {
 		topupGroupRatio[groupName] = ratio
 	} else {
diff --git a/middleware/auth.go b/middleware/auth.go
index b1f0099abc9f..b2fc104f68a4 100644
--- a/middleware/auth.go
+++ b/middleware/auth.go
@@ -179,12 +179,21 @@ func WssAuth(c *gin.Context) {
 // ModuleAuth 检查用户是否有权限访问特定功能模块
 func ModuleAuth(modulePath string) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		session := sessions.Default(c)
-		role := session.Get("role")
-		id := session.Get("id")
-
+		// 优先从上游鉴权放入的上下文读取
+		userRole := c.GetInt("role")
+		userId := c.GetInt("id")
+		if userRole == 0 || userId == 0 {
+			// 兼容旧流程：再从 session 兜底
+			sess := sessions.Default(c)
+			if v, ok := sess.Get("role").(int); ok {
+				userRole = v
+			}
+			if v, ok := sess.Get("id").(int); ok {
+				userId = v
+			}
+		}
 		// 如果用户未登录，先进行基础认证
-		if role == nil || id == nil {
+		if userRole == 0 || userId == 0 {
 			c.JSON(http.StatusUnauthorized, gin.H{
 				"success": false,
 				"message": "未登录，无权访问",
@@ -193,9 +202,6 @@ func ModuleAuth(modulePath string) gin.HandlerFunc {
 			return
 		}
 
-		userRole := role.(int)
-		userId := id.(int)
-
 		// 超级管理员始终允许访问所有功能
 		if userRole >= common.RoleRootUser {
 			c.Next()
diff --git a/model/user.go b/model/user.go
index a53e6eb32032..0c9f5861a4c5 100644
--- a/model/user.go
+++ b/model/user.go
@@ -431,8 +431,9 @@ func (user *User) Insert(inviterId int) error {
 			if common.QuotaForInviter > 0 {
 				//_ = IncreaseUserQuota(inviterId, common.QuotaForInviter)
 				RecordLog(inviterId, LogTypeSystem, fmt.Sprintf("邀请用户赠送 %s", logger.LogQuota(common.QuotaForInviter)))
-				_ = inviteUser(inviterId)
 			}
+			// 无论是否有奖励额度，都要更新邀请者的邀请统计
+			_ = inviteUser(inviterId)
 		}
 	}
 	return nil
@@ -969,6 +970,20 @@ func UpdateUsersGroupName(oldGroupName, newGroupName string) error {
 		return err
 	}
 
+	// 刷新缓存（异步），避免旧分组缓存导致读取不一致
+	if common.RedisEnabled {
+	  gopool.Go(func() {
+	    var ids []int
+	    if err := DB.Model(&User{}).
+	       Where(commonGroupCol+" = ?", newGroupName).
+	        Pluck("id", &ids).Error; err == nil {
+		    for _, id := range ids {
+	        _ = invalidateUserCache(id)
+	       }
+	    }
+	  })
+	}
+
 	common.SysLog(fmt.Sprintf("成功更新 %d 个用户的分组名称从 '%s' 到 '%s'", result.RowsAffected, oldGroupName, newGroupName))
 
 	// 验证更新结果
diff --git a/model/user_group.go b/model/user_group.go
index 9a5ce7e9c29e..0c4817fc5322 100644
--- a/model/user_group.go
+++ b/model/user_group.go
@@ -24,9 +24,22 @@ func (g *UserGroup) Insert() error {
 }
 
 // Update 更新用户分组
-func (g *UserGroup) Update() error {
+ func (g *UserGroup) Update() error {
 	g.UpdatedTime = common.GetTimestamp()
-	return DB.Model(g).Updates(g).Error
+	return DB.Model(&UserGroup{}).
+		Where("id = ?", g.Id).
+		Updates(map[string]any{
+			"name":         g.Name,
+			"description":  g.Description,
+			"ratio":        g.Ratio,
+			"updated_time": g.UpdatedTime,
+		}).Error
+ }
+
+// UpdateTx 在事务中更新用户分组
+func (g *UserGroup) UpdateTx(tx *gorm.DB) error {
+	g.UpdatedTime = common.GetTimestamp()
+	return tx.Model(g).Updates(g).Error
 }
 
 // Delete 硬删除用户分组
diff --git a/web/index.html b/web/index.html
index a9ecbe0153e4..d54a471b3631 100644
--- a/web/index.html
+++ b/web/index.html
@@ -11,26 +11,27 @@
     />
     <title>New API</title>
     <script>
-      // 立即设置title，避免刷新时闪现默认title
-      (function() {
-        const systemName = localStorage.getItem('system_name');
-        if (systemName) {
-          document.title = systemName;
-        }
+       // 立即设置title，避免刷新时闪现默认title
+       (function() {
+         const defaultTitle = document.title;
+         let systemName = null;
+         try {
+           systemName = localStorage.getItem('system_name');
+         } catch (_) {}
+         document.title = systemName || defaultTitle;
 
         // 监听localStorage变化，实时更新title
-        window.addEventListener('storage', function(e) {
-          if (e.key === 'system_name' && e.newValue) {
-            document.title = e.newValue;
-          }
-        });
+         window.addEventListener('storage', function(e) {
+           if (e.key === 'system_name') {
+             document.title = e.newValue || defaultTitle;
+           }
+         });
 
         // 监听自定义事件，用于同页面内的title更新
-        window.addEventListener('systemNameUpdated', function(e) {
-          if (e.detail && e.detail.systemName) {
-            document.title = e.detail.systemName;
-          }
-        });
+         window.addEventListener('systemNameUpdated', function(e) {
+           const name = e?.detail?.systemName || '';
+           document.title = name || defaultTitle;
+         });
       })();
     </script>
   </head>
diff --git a/web/src/components/auth/ModuleRoute.jsx b/web/src/components/auth/ModuleRoute.jsx
index 93f7b438dd3a..bfcd3ea3ff0b 100644
--- a/web/src/components/auth/ModuleRoute.jsx
+++ b/web/src/components/auth/ModuleRoute.jsx
@@ -2,11 +2,12 @@ import React, { useState, useEffect, useContext } from 'react';
 import { Navigate } from 'react-router-dom';
 import { StatusContext } from '../../context/Status';
 import Loading from '../common/ui/Loading';
-import { API } from '../../helpers';
+import { useSidebar } from '../../hooks/common/useSidebar';
+import { USER_ROLES } from '../../constants/user.constants';
 
 /**
  * ModuleRoute - 基于功能模块权限的路由保护组件
- * 
+ *
  * @param {Object} props
  * @param {React.ReactNode} props.children - 要保护的子组件
  * @param {string} props.modulePath - 模块权限路径，如 "admin.channel", "console.token"
@@ -17,128 +18,99 @@ const ModuleRoute = ({ children, modulePath, fallback = <Navigate to="/forbidden
   const [hasPermission, setHasPermission] = useState(null);
   const [statusState] = useContext(StatusContext);
 
-  useEffect(() => {
-    checkModulePermission();
-  }, [modulePath, statusState?.status]); // 只在status数据变化时重新检查
+  // 复用 useSidebar 钩子的配置数据，避免重复 API 调用
+  const { loading: sidebarLoading, finalConfig } = useSidebar();
 
-  const checkModulePermission = async () => {
+  // 获取用户信息的辅助函数
+  const getUserFromStorage = () => {
     try {
-      // 检查用户是否已登录
-      const user = localStorage.getItem('user');
-      if (!user) {
-        setHasPermission(false);
-        return;
-      }
-
-      const userData = JSON.parse(user);
-      const userRole = userData.role;
-
-      // 超级管理员始终有权限
-      if (userRole >= 100) {
-        setHasPermission(true);
-        return;
-      }
-
-      // 检查模块权限
-      const permission = await checkModulePermissionAPI(modulePath);
-
-      // 如果返回null，表示status数据还未加载完成，保持loading状态
-      if (permission === null) {
-        setHasPermission(null);
-        return;
-      }
-
-      setHasPermission(permission);
-    } catch (error) {
-      console.error('检查模块权限失败:', error);
-      // 出错时采用安全优先策略，拒绝访问
-      setHasPermission(false);
+      return JSON.parse(localStorage.getItem('user') || 'null');
+    } catch {
+      return null;
     }
   };
 
-  const checkModulePermissionAPI = async (modulePath) => {
-    try {
-      // 数据看板始终允许访问，不受控制台区域开关影响
-      if (modulePath === 'console.detail') {
-        return true;
-      }
+  useEffect(() => {
+    let cancelled = false;
 
-      // 从StatusContext中获取配置信息
-      // 如果status数据还未加载完成，返回null表示需要等待
-      if (!statusState?.status) {
-        return null;
+    const checkPermission = async () => {
+      const userObj = getUserFromStorage();
+      const permission = await checkModulePermission(userObj);
+
+      if (!cancelled) {
+        setHasPermission(permission);
       }
+    };
+
+    checkPermission();
 
-      const user = JSON.parse(localStorage.getItem('user'));
-      const userRole = user.role;
+    return () => {
+      cancelled = true;
+    };
+  }, [modulePath, statusState?.status, sidebarLoading, finalConfig]); // 依赖 sidebar 配置变化
 
-      // 解析模块路径
-      const pathParts = modulePath.split('.');
-      if (pathParts.length < 2) {
+  const checkModulePermission = async (userObj) => {
+    try {
+      // 检查用户是否已登录
+      if (!userObj) {
         return false;
       }
 
-      // 普通用户权限检查
-      if (userRole < 10) {
-        return await isUserModuleAllowed(modulePath);
-      }
+      const userRole = userObj.role;
 
-      // 超级管理员权限检查 - 不受系统配置限制
-      if (userRole >= 100) {
-        return true;
+      // 使用精确角色匹配，避免范围检查导致的漂移
+      if (userRole === USER_ROLES.ROOT) {
+        return true; // 超级管理员始终有权限
       }
 
-      // 管理员权限检查 - 受系统配置限制
-      if (userRole >= 10 && userRole < 100) {
-        // 从/api/user/self获取系统权限配置
-        try {
-          const userRes = await API.get('/api/user/self');
-          if (userRes.data.success && userRes.data.data.sidebar_config) {
-            const sidebarConfigData = userRes.data.data.sidebar_config;
-            // 管理员权限检查基于系统配置，不受用户偏好影响
-            const systemConfig = sidebarConfigData.system || sidebarConfigData;
-            return checkModulePermissionInConfig(systemConfig, modulePath);
-          } else {
-            // 没有配置时，除了系统设置外都允许访问
-            return modulePath !== 'admin.setting';
-          }
-        } catch (error) {
-          console.error('获取侧边栏配置失败:', error);
-          return false;
-        }
+      // 如果 sidebar 配置还在加载中，返回 null 表示需要等待
+      if (sidebarLoading || !finalConfig) {
+        return null;
       }
 
-      return false;
+      // 检查模块权限
+      return checkModulePermissionInConfig(userRole, modulePath);
     } catch (error) {
-      console.error('API权限检查失败:', error);
+      console.error('检查模块权限失败:', error);
+      // 出错时采用安全优先策略，拒绝访问
       return false;
     }
   };
 
-  const isUserModuleAllowed = async (modulePath) => {
+  const checkModulePermissionInConfig = (userRole, modulePath) => {
     // 数据看板始终允许访问，不受控制台区域开关影响
     if (modulePath === 'console.detail') {
       return true;
     }
 
-    // 普通用户的权限基于最终计算的配置
-    try {
-      const userRes = await API.get('/api/user/self');
-      if (userRes.data.success && userRes.data.data.sidebar_config) {
-        const sidebarConfigData = userRes.data.data.sidebar_config;
-        // 使用最终计算的配置进行权限检查
-        const finalConfig = sidebarConfigData.final || sidebarConfigData;
-        return checkModulePermissionInConfig(finalConfig, modulePath);
-      }
-      return false;
-    } catch (error) {
-      console.error('获取用户权限配置失败:', error);
+    // 解析模块路径
+    const pathParts = modulePath.split('.');
+    if (pathParts.length < 2) {
+      console.warn(`无效的模块路径: ${modulePath}`);
       return false;
     }
+
+    // 使用精确角色匹配进行权限检查
+    if (userRole === USER_ROLES.COMMON) {
+      // 普通用户：使用最终计算的配置进行权限检查
+      return checkModuleInSidebarConfig(finalConfig, modulePath);
+    } else if (userRole === USER_ROLES.ADMIN) {
+      // 管理员：不能访问系统设置，其他基于配置检查
+      if (modulePath === 'admin.setting') {
+        return false;
+      }
+      return checkModuleInSidebarConfig(finalConfig, modulePath);
+    } else if (userRole === USER_ROLES.ROOT) {
+      // 超级管理员：始终有权限
+      return true;
+    }
+
+    // 未知角色，拒绝访问
+    return false;
   };
 
-  // 检查新的sidebar_config结构中的模块权限
-  const checkModulePermissionInConfig = (sidebarConfig, modulePath) => {
+  // 检查sidebar_config结构中的模块权限
+  const checkModuleInSidebarConfig = (sidebarConfig, modulePath) => {
     const parts = modulePath.split('.');
     if (parts.length !== 2) {
       return false;
diff --git a/web/src/components/table/users/modals/EditUserGroupModal.jsx b/web/src/components/table/users/modals/EditUserGroupModal.jsx
index 572f5ecd166e..0932ef2c3c1f 100644
--- a/web/src/components/table/users/modals/EditUserGroupModal.jsx
+++ b/web/src/components/table/users/modals/EditUserGroupModal.jsx
@@ -1,21 +1,21 @@
 /*
-Copyright 2024 Quantumnous Inc.
+Copyright (C) 2025 QuantumNous
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact support@quantumnous.com
-*/
-
++*/
 import React, { useState, useRef, useEffect } from 'react';
 import {
   Modal,
@@ -99,7 +99,7 @@ const EditUserGroupModal = ({ visible, onClose, editingGroup, onSuccess }) => {
   const getInitValues = () => ({
     name: editingGroup?.name || '',
     description: editingGroup?.description || '',
-    ratio: editingGroup?.ratio || 1.0,
+    ratio: editingGroup?.ratio ?? 1.0,
   });
 
   const submit = async (values) => {
@@ -112,10 +112,12 @@ const EditUserGroupModal = ({ visible, onClose, editingGroup, onSuccess }) => {
 
     setLoading(true);
     try {
+      const ratioNum =
+        typeof values.ratio === 'number' ? values.ratio : parseFloat(values.ratio);
       const data = {
         ...values,
-        ratio: parseFloat(values.ratio) || 1.0,
-      };
+        ratio: Number.isFinite(ratioNum) ? ratioNum : 1.0,
+    };
 
       if (isEdit) {
         data.id = editingGroup.id;
diff --git a/web/src/components/table/users/modals/UserGroupManagement.jsx b/web/src/components/table/users/modals/UserGroupManagement.jsx
index 98b6bbb675f2..daa359fa727c 100644
--- a/web/src/components/table/users/modals/UserGroupManagement.jsx
+++ b/web/src/components/table/users/modals/UserGroupManagement.jsx
@@ -1,20 +1,21 @@
 /*
-Copyright 2024 Quantumnous Inc.
+Copyright (C) 2025 QuantumNous
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
 
-    http://www.apache.org/licenses/LICENSE-2.0
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact support@quantumnous.com
-*/
++*/
 
 import React, { useState, useEffect } from 'react';
 import {
diff --git a/web/src/constants/user.constants.js b/web/src/constants/user.constants.js
index 05d3e1fa6e52..4cf1f7a51f5e 100644
--- a/web/src/constants/user.constants.js
+++ b/web/src/constants/user.constants.js
@@ -36,3 +36,62 @@ export const userConstants = {
   DELETE_SUCCESS: 'USERS_DELETE_SUCCESS',
   DELETE_FAILURE: 'USERS_DELETE_FAILURE',
 };
+
+/**
+ * 用户角色常量 - 与后端保持一致
+ * 对应后端 common/constants.go 中的角色定义
+ */
+export const USER_ROLES = {
+  GUEST: 0,      // RoleGuestUser
+  COMMON: 1,     // RoleCommonUser
+  ADMIN: 10,     // RoleAdminUser
+  ROOT: 100,     // RoleRootUser
+};
+
+/**
+ * 检查用户是否为管理员（包括超级管理员）
+ * @param {number} role - 用户角色
+ * @returns {boolean}
+ */
+export const isAdmin = (role) => {
+  return role === USER_ROLES.ADMIN || role === USER_ROLES.ROOT;
+};
+
+/**
+ * 检查用户是否为超级管理员
+ * @param {number} role - 用户角色
+ * @returns {boolean}
+ */
+export const isRoot = (role) => {
+  return role === USER_ROLES.ROOT;
+};
+
+/**
+ * 检查用户是否为普通用户
+ * @param {number} role - 用户角色
+ * @returns {boolean}
+ */
+export const isCommonUser = (role) => {
+  return role === USER_ROLES.COMMON;
+};
+
+/**
+ * 获取角色显示名称
+ * @param {number} role - 用户角色
+ * @param {function} t - 翻译函数
+ * @returns {string}
+ */
+export const getRoleDisplayName = (role, t) => {
+  switch (role) {
+    case USER_ROLES.COMMON:
+      return t('普通用户');
+    case USER_ROLES.ADMIN:
+      return t('管理员');
+    case USER_ROLES.ROOT:
+      return t('超级管理员');
+    case USER_ROLES.GUEST:
+      return t('访客');
+    default:
+      return t('未知身份');
+  }
+};
diff --git a/web/src/helpers/data.js b/web/src/helpers/data.js
index 6404e9e8dbd0..9c938246b9b8 100644
--- a/web/src/helpers/data.js
+++ b/web/src/helpers/data.js
@@ -19,15 +19,18 @@ For commercial licensing, please contact support@quantumnous.com
 
 export function setStatusData(data) {
   localStorage.setItem('status', JSON.stringify(data));
-  localStorage.setItem('system_name', data.system_name);
   localStorage.setItem('logo', data.logo);
 
-  // 触发自定义事件来立即更新title
-  if (data.system_name) {
-    window.dispatchEvent(new CustomEvent('systemNameUpdated', {
-      detail: { systemName: data.system_name }
-    }));
-  }
+  // 同步系统名称并触发事件（支持清空还原默认标题）
+  const name = (data.system_name ?? '').toString().trim();
+  if (name) {
+     localStorage.setItem('system_name', name);
+   } else {
+     localStorage.removeItem('system_name');
+   }
+   window.dispatchEvent(new CustomEvent('systemNameUpdated', {
+     detail: { systemName: name }
+   }));
   localStorage.setItem('footer_html', data.footer_html);
   localStorage.setItem('quota_per_unit', data.quota_per_unit);
   localStorage.setItem('display_in_currency', data.display_in_currency);
diff --git a/web/src/hooks/model-pricing/useModelPricingData.jsx b/web/src/hooks/model-pricing/useModelPricingData.jsx
index 799cdc1367df..37cca3856e87 100644
--- a/web/src/hooks/model-pricing/useModelPricingData.jsx
+++ b/web/src/hooks/model-pricing/useModelPricingData.jsx
@@ -19,6 +19,7 @@ For commercial licensing, please contact support@quantumnous.com
 
 import { useState, useEffect, useContext, useRef, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useNavigate } from 'react-router-dom';
 import { API, copy, showError, showInfo, showSuccess } from '../../helpers';
 import { Modal } from '@douyinfe/semi-ui';
 import { UserContext } from '../../context/User';
@@ -26,6 +27,7 @@ import { StatusContext } from '../../context/Status';
 
 export const useModelPricingData = () => {
   const { t } = useTranslation();
+  const navigate = useNavigate();
   const [searchValue, setSearchValue] = useState('');
   const compositionRef = useRef({ isComposition: false });
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
@@ -195,35 +197,50 @@ export const useModelPricingData = () => {
 
   const loadPricing = async () => {
     setLoading(true);
-    let url = '/api/pricing';
-    const res = await API.get(url);
-    const {
-      success,
-      message,
-      data,
-      vendors,
-      group_ratio,
-      usable_group,
-      supported_endpoint,
-      auto_groups,
-    } = res.data;
-    if (success) {
-      setGroupRatio(group_ratio);
-      setUsableGroup(usable_group);
-      setSelectedGroup('all');
-      // 构建供应商 Map 方便查找
-      const vendorMap = {};
-      if (Array.isArray(vendors)) {
-        vendors.forEach((v) => {
-          vendorMap[v.id] = v;
-        });
+    try {
+      let url = '/api/pricing';
+      const res = await API.get(url);
+      const {
+        success,
+        message,
+        data,
+        vendors,
+        group_ratio,
+        usable_group,
+        supported_endpoint,
+        auto_groups,
+      } = res.data;
+      if (success) {
+        setGroupRatio(group_ratio);
+        setUsableGroup(usable_group);
+        setSelectedGroup('all');
+        // 构建供应商 Map 方便查找
+        const vendorMap = {};
+        if (Array.isArray(vendors)) {
+          vendors.forEach((v) => {
+            vendorMap[v.id] = v;
+          });
+        }
+        setVendorsMap(vendorMap);
+        setEndpointMap(supported_endpoint || {});
+        setAutoGroups(auto_groups || []);
+        setModelsFormat(data, group_ratio, vendorMap);
+      } else {
+        showError(message);
       }
-      setVendorsMap(vendorMap);
-      setEndpointMap(supported_endpoint || {});
-      setAutoGroups(auto_groups || []);
-      setModelsFormat(data, group_ratio, vendorMap);
-    } else {
-      showError(message);
+    } catch (error) {
+      // 检查是否是403权限错误
+      if (error.response && error.response.status === 403) {
+        // 未登录用户跳转登录页；已登录但无权限（理论上极少见）跳转禁止访问
+        if (!userState?.user) {
+          navigate('/login');
+        } else {
+          navigate('/forbidden');
+        }
+        return;
+      }
+      // 其他错误正常处理
+      showError(error.message || t('加载模型广场数据失败'));
     }
     setLoading(false);
   };
diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index 1bc94ecd6585..135648a3efdf 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -2062,7 +2062,7 @@
   "系统设置": "System Settings",
   "系统参数配置": "System parameter configuration",
   "边栏设置": "Sidebar Settings",
-  "您可以个性化设置侧边栏要显示的功能": "You can customize the sidebar functions to display",
+  "您可以个性化设置侧边栏要显示的功能": "You can customize which features are shown in the sidebar",
   "保存边栏设置": "Save Sidebar Settings",
   "侧边栏设置保存成功": "Sidebar settings saved successfully",
   "需要登录访问": "Require Login",
@@ -2092,7 +2092,7 @@
   "是": "Yes",
   "否": "No",
   "邀请功能": "Invitation Feature",
-  "关闭后：不在启用邀请奖励功能": "When disabled: invitation reward feature will not be enabled",
+  "关闭后：不再启用邀请奖励功能": "When disabled: invitation reward feature will not be enabled",
   "分组管理": "Group Management",
   "用户分组管理": "User Group Management",
   "分组列表": "Group List",
@@ -2122,7 +2122,6 @@
   "删除成功": "Deleted successfully",
   "删除失败": "Delete failed",
   "分组名称已存在": "Group name already exists",
-  "分组倍率不能小于0": "Group ratio cannot be less than 0",
   "缺少分组 ID": "Missing group ID",
   "该分组正在被用户使用，无法删除": "This group is being used by users and cannot be deleted",
   "不能删除系统默认分组": "Cannot delete system default groups",
diff --git a/web/src/pages/Setting/Operation/SettingsGeneral.jsx b/web/src/pages/Setting/Operation/SettingsGeneral.jsx
index 29e9b7348845..97a952a286d5 100644
--- a/web/src/pages/Setting/Operation/SettingsGeneral.jsx
+++ b/web/src/pages/Setting/Operation/SettingsGeneral.jsx
@@ -238,7 +238,7 @@ export default function GeneralSettings(props) {
                 <Form.Switch
                   field={'general_setting.invitation_enabled'}
                   label={t('邀请功能')}
-                  extraText={t('关闭后：不在启用邀请奖励功能')}
+                  extraText={t('关闭后：不再启用邀请奖励功能')}
                   size='default'
                   checkedText='｜'
                   uncheckedText='〇'
diff --git a/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx b/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
index 08daf4d57efa..29a82c5ad0d0 100644
--- a/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
+++ b/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
@@ -39,6 +39,11 @@ const { Text } = Typography;
 export default function SettingsSidebarModulesUser() {
   const { t } = useTranslation();
   const [loading, setLoading] = useState(false);
+  // 用户个人左侧边栏模块设置
+   const [sidebarModulesUser, setSidebarModulesUser] = useState({});
+   // 管理员全局配置
+   const [adminConfig, setAdminConfig] = useState(null);
+   const [configLoading, setConfigLoading] = useState(true);
 
   // 使用后端权限验证替代前端角色判断
   const {
@@ -65,10 +70,10 @@ export default function SettingsSidebarModulesUser() {
     );
   }
 
-  // 权限加载中，显示加载状态
-  if (permissionsLoading) {
-    return null;
-  }
+  // // 权限加载中，显示加载状态
+  // if (permissionsLoading) {
+  //   return null;
+  // }
 
   // 获取默认系统配置
   const getDefaultSystemConfig = () => {
@@ -186,12 +191,12 @@ export default function SettingsSidebarModulesUser() {
     return defaultConfig;
   };
 
-  // 用户个人左侧边栏模块设置
-  const [sidebarModulesUser, setSidebarModulesUser] = useState({});
+  // // 用户个人左侧边栏模块设置
+  // const [sidebarModulesUser, setSidebarModulesUser] = useState({});
 
-  // 管理员全局配置
-  const [adminConfig, setAdminConfig] = useState(null);
-  const [configLoading, setConfigLoading] = useState(true);
+  // // 管理员全局配置
+  // const [adminConfig, setAdminConfig] = useState(null);
+  // const [configLoading, setConfigLoading] = useState(true);
 
   // 处理区域级别开关变更
   function handleSectionChange(sectionKey) {

From a33e749d79cc410eb6198c9864e39b7532e59844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Wed, 3 Sep 2025 00:11:45 +0800
Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/topup-ratio.go                         | 14 ++++++--
 controller/pricing.go                         | 33 ++++++++++---------
 controller/user_group.go                      |  6 ++++
 web/src/components/auth/ModuleRoute.jsx       | 12 +++----
 .../table/users/modals/EditUserGroupModal.jsx |  1 +
 .../users/modals/UserGroupManagement.jsx      | 14 +++++---
 web/src/i18n/locales/en.json                  |  1 +
 .../Operation/SettingsSidebarModulesAdmin.jsx |  6 ++--
 .../Personal/SettingsSidebarModulesUser.jsx   | 16 +++++----
 9 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/common/topup-ratio.go b/common/topup-ratio.go
index 14c17aeb0c64..79d448ca2539 100644
--- a/common/topup-ratio.go
+++ b/common/topup-ratio.go
@@ -24,6 +24,8 @@ func GetTopupGroupRatioCopy() map[string]float64 {
 }
 
 func TopupGroupRatio2JSONString() string {
+	topupGroupRatioMutex.RLock()
+	defer topupGroupRatioMutex.RUnlock()
 	jsonBytes, err := json.Marshal(TopupGroupRatio)
 	if err != nil {
 		SysError("error marshalling model ratio: " + err.Error())
@@ -32,12 +34,20 @@ func TopupGroupRatio2JSONString() string {
 }
 
 func UpdateTopupGroupRatioByJSONString(jsonStr string) error {
-	TopupGroupRatio = make(map[string]float64)
-	return json.Unmarshal([]byte(jsonStr), &TopupGroupRatio)
+	var tmp map[string]float64
+	if err := json.Unmarshal([]byte(jsonStr), &tmp); err != nil {
+		return err
+	}
+	topupGroupRatioMutex.Lock()
+	TopupGroupRatio = tmp
+	topupGroupRatioMutex.Unlock()
+	return nil
 }
 
 func GetTopupGroupRatio(name string) float64 {
+	topupGroupRatioMutex.RLock()
 	ratio, ok := TopupGroupRatio[name]
+	topupGroupRatioMutex.RUnlock()
 	if !ok {
 		SysError("topup group ratio not found: " + name)
 		return 1
diff --git a/controller/pricing.go b/controller/pricing.go
index 117f46652918..c77250e0a174 100644
--- a/controller/pricing.go
+++ b/controller/pricing.go
@@ -13,14 +13,14 @@ import (
 
 func GetPricing(c *gin.Context) {
 	// 检查模型广场访问权限
-	if !checkPricingAccess(c) {
-		c.JSON(http.StatusForbidden, gin.H{
+	allowed, code, msg := checkPricingAccess(c)
+	if !allowed {
+		c.JSON(code, gin.H{
 			"success": false,
-			"message": "需要登录才能访问模型广场",
+			"message": msg,
 		})
 		return
 	}
-
 	pricing := model.GetPricing()
 	userId, exists := c.Get("id")
 	usableGroup := map[string]string{}
@@ -62,7 +62,8 @@ func GetPricing(c *gin.Context) {
 }
 
 // checkPricingAccess 检查用户是否有权限访问模型广场
-func checkPricingAccess(c *gin.Context) bool {
+// 返回值：(是否允许访问, HTTP状态码, 错误消息)
+func checkPricingAccess(c *gin.Context) (bool, int, string) {
 	// 获取顶栏模块配置
 	common.OptionMapRWMutex.RLock()
 	headerNavModulesRaw, exists := common.OptionMap["HeaderNavModules"]
@@ -70,26 +71,26 @@ func checkPricingAccess(c *gin.Context) bool {
 
 	if !exists || headerNavModulesRaw == "" {
 		// 如果没有配置，默认允许访问
-		return true
+		return true, 0, ""
 	}
 
 	// 解析配置
 	var config map[string]interface{}
 	if err := json.Unmarshal([]byte(headerNavModulesRaw), &config); err != nil {
-		// 解析失败时采用安全优先策略，拒绝访问
-		return false
+		// 解析失败时返回500错误
+		return false, http.StatusInternalServerError, "配置解析失败"
 	}
 
 	// 检查pricing模块配置
 	pricingConfig, hasPricing := config["pricing"]
 	if !hasPricing {
 		// 如果没有pricing配置，默认允许访问
-		return true
+		return true, 0, ""
 	}
 
 	// 检查模块是否启用
 	if !isPricingModuleEnabled(pricingConfig) {
-		return false
+		return false, http.StatusForbidden, "模型广场功能已被禁用"
 	}
 
 	// 检查是否需要登录
@@ -97,20 +98,22 @@ func checkPricingAccess(c *gin.Context) bool {
 		// 需要登录，检查用户是否已登录
 		userId, exists := c.Get("id")
 		if !exists || userId == nil {
-			return false // 用户未登录
+			return false, http.StatusUnauthorized, "需要登录才能访问模型广场"
 		}
 
 		// 从数据库获取用户信息验证角色
 		user, err := model.GetUserById(userId.(int), false)
 		if err != nil {
-			return false // 获取用户信息失败
+			return false, http.StatusInternalServerError, "获取用户信息失败"
 		}
 
-		return user.Role >= common.RoleCommonUser
+		if user.Role < common.RoleCommonUser {
+			return false, http.StatusForbidden, "权限不足"
+		}
 	}
 
-	// 不需要登录，允许访问
-	return true
+	// 允许访问
+	return true, 0, ""
 }
 
 // isPricingModuleEnabled 检查pricing模块是否启用
diff --git a/controller/user_group.go b/controller/user_group.go
index b8f4f298e52a..bcbe952f48d4 100644
--- a/controller/user_group.go
+++ b/controller/user_group.go
@@ -152,10 +152,16 @@ func UpdateUserGroup(c *gin.Context) {
 
 	// 如果名称发生变化，需要在同一事务中更新用户数据
 	if oldGroup.Name != g.Name {
+		if isReservedGroup(strings.ToLower(g.Name)) {
+			tx.Rollback()
+			common.ApiErrorMsg(c, "不能将分组名称修改为系统保留分组名")
+			return
+		}
 		common.SysLog(fmt.Sprintf("检测到分组名称变化: '%s' -> '%s'", oldGroup.Name, g.Name))
 
 		// 禁止修改系统保留分组名
 		if isReservedGroup(strings.ToLower(oldGroup.Name)) {
+			tx.Rollback()
 			common.ApiErrorMsg(c, "不能修改系统保留分组名称")
 			return
 		}
diff --git a/web/src/components/auth/ModuleRoute.jsx b/web/src/components/auth/ModuleRoute.jsx
index bfcd3ea3ff0b..4c4bd359f929 100644
--- a/web/src/components/auth/ModuleRoute.jsx
+++ b/web/src/components/auth/ModuleRoute.jsx
@@ -56,13 +56,9 @@ const ModuleRoute = ({ children, modulePath, fallback = <Navigate to="/forbidden
         return false;
       }
 
+      // 不再基于本地角色直接授予 ROOT 权限，统一依赖服务端下发的最终配置
       const userRole = userObj.role;
 
-      // 使用精确角色匹配，避免范围检查导致的漂移
-      if (userRole === USER_ROLES.ROOT) {
-        return true; // 超级管理员始终有权限
-      }
-
       // 如果 sidebar 配置还在加载中，返回 null 表示需要等待
       if (sidebarLoading || !finalConfig) {
         return null;
@@ -90,7 +86,7 @@ const ModuleRoute = ({ children, modulePath, fallback = <Navigate to="/forbidden
       return false;
     }
 
-    // 使用精确角色匹配进行权限检查
+    // 所有用户角色统一依赖服务端下发的最终配置进行权限检查
     if (userRole === USER_ROLES.COMMON) {
       // 普通用户：使用最终计算的配置进行权限检查
       return checkModuleInSidebarConfig(finalConfig, modulePath);
@@ -101,8 +97,8 @@ const ModuleRoute = ({ children, modulePath, fallback = <Navigate to="/forbidden
       }
       return checkModuleInSidebarConfig(finalConfig, modulePath);
     } else if (userRole === USER_ROLES.ROOT) {
-      // 超级管理员：始终有权限
-      return true;
+      // 超级管理员：也依赖服务端配置，不再客户端直接授权
+      return checkModuleInSidebarConfig(finalConfig, modulePath);
     }
 
     // 未知角色，拒绝访问
diff --git a/web/src/components/table/users/modals/EditUserGroupModal.jsx b/web/src/components/table/users/modals/EditUserGroupModal.jsx
index 0932ef2c3c1f..3787b68e46eb 100644
--- a/web/src/components/table/users/modals/EditUserGroupModal.jsx
+++ b/web/src/components/table/users/modals/EditUserGroupModal.jsx
@@ -16,6 +16,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 For commercial licensing, please contact support@quantumnous.com
 +*/
+
 import React, { useState, useRef, useEffect } from 'react';
 import {
   Modal,
diff --git a/web/src/components/table/users/modals/UserGroupManagement.jsx b/web/src/components/table/users/modals/UserGroupManagement.jsx
index daa359fa727c..8ee7feeb2636 100644
--- a/web/src/components/table/users/modals/UserGroupManagement.jsx
+++ b/web/src/components/table/users/modals/UserGroupManagement.jsx
@@ -65,9 +65,9 @@ const UserGroupManagement = ({ visible, onClose, onGroupUpdated }) => {
 
   // 检查是否有分组管理权限
   const hasGroupManagementPermission = () => {
-    // 如果侧边栏配置还在加载中，暂时拒绝访问
+    // 如果侧边栏配置还在加载中，返回null表示未判定
     if (sidebarLoading) {
-      return false;
+      return null;
     }
 
     // 超级管理员始终有权限
@@ -96,7 +96,11 @@ const UserGroupManagement = ({ visible, onClose, onGroupUpdated }) => {
   // 加载分组列表
   const loadGroups = async () => {
     // 检查权限
-    if (!hasGroupManagementPermission()) {
+    const perm = hasGroupManagementPermission();
+    if (perm === null) {
+      return; // 等待权限加载完成后再拉取
+    }
+    if (perm === false) {
       showError(t('无权访问分组管理功能'));
       onClose();
       return;
@@ -283,10 +287,10 @@ const UserGroupManagement = ({ visible, onClose, onGroupUpdated }) => {
   ];
 
   useEffect(() => {
-    if (visible) {
+    if (visible && !sidebarLoading) {
       loadGroups();
     }
-  }, [visible]);
+  }, [visible, sidebarLoading]);
 
   return (
     <>
diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index 135648a3efdf..83fc625ca29a 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -384,6 +384,7 @@
   "普通用户": "Normal User",
   "管理员": "Admin",
   "超级管理员": "Super Admin",
+  "访客": "Guest",
   "未知身份": "Unknown Identity",
   "已激活": "Activated",
   "已封禁": "Banned",
diff --git a/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx b/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx
index 1a4b9a1d2163..327e0bc88636 100644
--- a/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx
+++ b/web/src/pages/Setting/Operation/SettingsSidebarModulesAdmin.jsx
@@ -63,7 +63,7 @@ export default function SettingsSidebarModulesAdmin(props) {
       redemption: true,
       user: {
         enabled: true,
-        groupManagement: false // 默认关闭分组管理
+        groupManagement: true // 默认启用分组管理
       },
       setting: true
     }
@@ -140,7 +140,7 @@ export default function SettingsSidebarModulesAdmin(props) {
         redemption: true,
         user: {
           enabled: true,
-          groupManagement: false // 默认关闭分组管理
+          groupManagement: true // 默认启用分组管理
         },
         setting: true
       }
@@ -207,7 +207,7 @@ export default function SettingsSidebarModulesAdmin(props) {
             redemption: true,
             user: {
               enabled: true,
-              groupManagement: false // 默认关闭分组管理
+              groupManagement: true // 默认启用分组管理
             },
             setting: true
           }
diff --git a/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx b/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
index 29a82c5ad0d0..0771543d05dc 100644
--- a/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
+++ b/web/src/pages/Setting/Personal/SettingsSidebarModulesUser.jsx
@@ -317,7 +317,7 @@ export default function SettingsSidebarModulesUser() {
             }
           } catch (error) {
             console.error('解析用户设置失败:', error);
-            const defaultConfig = generateDefaultConfig(systemConfig);
+            const defaultConfig = generateDefaultConfig();
             setSidebarModulesUser(defaultConfig);
           }
         } else {
@@ -404,17 +404,19 @@ export default function SettingsSidebarModulesUser() {
       ]
     }
   ].filter(section => {
-    // 基于系统权限过滤区域：只要系统中存在这个区域就显示（不管用户是否启用）
-    const systemAllowed = adminConfig && adminConfig[section.key];
+    // 仅显示系统启用的区域
+    const sec = adminConfig?.[section.key];
+    const systemAllowed = !!sec && sec.enabled === true;
     console.log(`区域 ${section.key} 系统是否允许:`, systemAllowed, 'adminConfig:', adminConfig);
     return systemAllowed;
   }).map(section => ({
     ...section,
     modules: section.modules.filter(module => {
-      // 基于系统权限过滤模块：只要系统配置中存在这个模块就显示
-      const systemAllowed = adminConfig && adminConfig[section.key] && adminConfig[section.key].hasOwnProperty(module.key);
-      console.log(`模块 ${section.key}.${module.key} 系统是否允许:`, systemAllowed);
-      return systemAllowed;
+      // 仅显示系统启用的模块（布尔true或对象enabled为true）
+      const sysVal = adminConfig?.[section.key]?.[module.key];
+      const allowed = typeof sysVal === 'boolean' ? sysVal === true : sysVal?.enabled === true;
+      console.log(`模块 ${section.key}.${module.key} 系统是否允许:`, allowed);
+      return allowed;
     })
   })).filter(section => {
     // 过滤掉没有可用模块的区域

From d24c96bd702b86be4e04832807fa14da783cc146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Wed, 3 Sep 2025 01:50:08 +0800
Subject: [PATCH 10/18] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96"=E5=88=86?=
 =?UTF-8?q?=E7=BB=84"=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/user_group.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controller/user_group.go b/controller/user_group.go
index bcbe952f48d4..b8fc09fd2e5a 100644
--- a/controller/user_group.go
+++ b/controller/user_group.go
@@ -240,7 +240,7 @@ func DeleteUserGroup(c *gin.Context) {
 	}
 
 	// 不允许删除默认分组
-	if group.Name == "default" || group.Name == "vip" || group.Name == "svip" {
+	if isReservedGroup(group.Name) {
 		common.ApiErrorMsg(c, "不能删除系统默认分组")
 		return
 	}

From 94ba28c224e9279508961b7a3aa572f8aa94e97c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Wed, 3 Sep 2025 04:34:08 +0800
Subject: [PATCH 11/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/user.go                            | 133 ++++++++++-
 model/user.go                                 |   2 +
 router/api-router.go                          |   1 +
 .../components/layout/headerbar/UserArea.jsx  |   5 +-
 .../components/settings/PersonalSetting.jsx   |  27 ++-
 .../personal/components/UserInfoHeader.jsx    | 217 +++++++++++++++++-
 web/src/context/User/reducer.js               |   7 +
 web/src/helpers/avatarCache.js                |  72 ++++++
 web/src/helpers/userDataManager.js            | 116 ++++++++++
 web/src/hooks/dashboard/useDashboardData.js   |  18 +-
 web/src/i18n/locales/en.json                  |  23 +-
 .../Operation/SettingsHeaderNavModules.jsx    |   4 +-
 12 files changed, 594 insertions(+), 31 deletions(-)
 create mode 100644 web/src/helpers/avatarCache.js
 create mode 100644 web/src/helpers/userDataManager.js

diff --git a/controller/user.go b/controller/user.go
index 3db88e091de9..59347f16de6c 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"net/http"
@@ -12,6 +13,7 @@ import (
 	"one-api/setting"
 	"one-api/setting/operation_setting"
 	"strconv"
+	"time"
 	"strings"
 	"sync"
 
@@ -26,6 +28,61 @@ type LoginRequest struct {
 	Password string `json:"password"`
 }
 
+// validateAvatar 验证头像数据
+func validateAvatar(avatarData string) error {
+	if avatarData == "" {
+		return nil // 允许空头像
+	}
+
+	// 检查是否是有效的base64数据
+	if !strings.HasPrefix(avatarData, "data:image/") {
+		return fmt.Errorf("头像必须是有效的图片格式")
+	}
+
+	// 提取base64数据部分
+	parts := strings.Split(avatarData, ",")
+	if len(parts) != 2 {
+		return fmt.Errorf("头像数据格式无效")
+	}
+
+	// 检查MIME类型
+	mimeType := parts[0]
+	allowedTypes := []string{
+		"data:image/jpeg;base64",
+		"data:image/jpg;base64",
+		"data:image/png;base64",
+		"data:image/gif;base64",
+		"data:image/webp;base64",
+	}
+
+	isValidType := false
+	for _, allowedType := range allowedTypes {
+		if mimeType == allowedType {
+			isValidType = true
+			break
+		}
+	}
+
+	if !isValidType {
+		return fmt.Errorf("不支持的图片格式，仅支持 JPEG、PNG、GIF、WebP")
+	}
+
+	// 解码base64数据检查大小
+	base64Data := parts[1]
+	decodedData, err := base64.StdEncoding.DecodeString(base64Data)
+	if err != nil {
+		return fmt.Errorf("头像数据解码失败")
+	}
+
+	// 检查文件大小（2MB限制）
+	const maxSize = 2 * 1024 * 1024 // 2MB
+	if len(decodedData) > maxSize {
+		return fmt.Errorf("头像文件大小不能超过2MB")
+	}
+
+	return nil
+}
+
 func Login(c *gin.Context) {
 	if !common.PasswordLoginEnabled {
 		c.JSON(http.StatusOK, gin.H{
@@ -116,6 +173,7 @@ func setupLogin(user *model.User, c *gin.Context) {
 		Role:        user.Role,
 		Status:      user.Status,
 		Group:       user.Group,
+		Avatar:      user.Avatar,
 	}
 	c.JSON(http.StatusOK, gin.H{
 		"message": "",
@@ -457,6 +515,9 @@ func GetSelf(c *gin.Context) {
 	// Hide admin remarks: set to empty to trigger omitempty tag, ensuring the remark field is not included in JSON returned to regular users
 	user.Remark = ""
 
+	// 完全移除头像数据，头像通过专用端点获取
+	user.Avatar = ""
+
 	// 计算用户权限信息
 	permissions := calculateUserPermissions(userRole)
 
@@ -512,6 +573,7 @@ func GetSelf(c *gin.Context) {
 		"linux_do_id":       user.LinuxDOId,
 		"setting":           cleanedSetting,        // 完整用户设置（保持兼容性）
 		"stripe_customer":   user.StripeCustomer,
+		"avatar":            user.Avatar,
 		"sidebar_config":    finalSidebarConfig,   // 最终的侧边栏配置
 		"permissions":       simplifiedPermissions, // 精简的权限信息
 	}
@@ -1162,6 +1224,54 @@ func UpdateUser(c *gin.Context) {
 	return
 }
 
+func GetUserAvatar(c *gin.Context) {
+	id := c.GetInt("id")
+	user, err := model.GetUserById(id, false)
+	if err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 检查是否强制获取头像（用于上传后刷新）
+	forceRefresh := c.Query("force_refresh") == "true"
+
+	// 检查会话中是否已获取过头像
+	sessionId := c.GetHeader("X-Session-ID")
+	if sessionId == "" {
+		// 如果没有会话ID，生成一个
+		sessionId = fmt.Sprintf("session_%d_%d", id, time.Now().Unix())
+	}
+
+	// sessionKey := fmt.Sprintf("avatar_session_%s", sessionId) // 保留用于未来扩展
+
+	// 如果不是强制刷新且会话中已获取过，返回空响应
+	if !forceRefresh {
+		if sessionValue := c.GetHeader("X-Avatar-Fetched"); sessionValue == "true" {
+			c.JSON(http.StatusOK, gin.H{
+				"success": true,
+				"message": "avatar_cached",
+				"data": gin.H{
+					"avatar": "",
+					"cached": true,
+				},
+			})
+			return
+		}
+	}
+
+	// 返回头像数据
+	c.JSON(http.StatusOK, gin.H{
+		"success": true,
+		"message": "",
+		"data": gin.H{
+			"avatar": user.Avatar,
+			"cached": false,
+			"session_id": sessionId,
+		},
+	})
+	return
+}
+
 func UpdateSelf(c *gin.Context) {
 	var requestData map[string]interface{}
 	err := json.NewDecoder(c.Request.Body).Decode(&requestData)
@@ -1237,20 +1347,35 @@ func UpdateSelf(c *gin.Context) {
 		return
 	}
 
+	// 验证头像数据
+	if err := validateAvatar(user.Avatar); err != nil {
+		c.JSON(http.StatusOK, gin.H{
+			"success": false,
+			"message": err.Error(),
+		})
+		return
+	}
+
 	cleanUser := model.User{
 		Id:          c.GetInt("id"),
 		Username:    user.Username,
 		Password:    user.Password,
 		DisplayName: user.DisplayName,
+		Avatar:      user.Avatar,
 	}
 	if user.Password == "$I_LOVE_U" {
 		user.Password = "" // rollback to what it should be
 		cleanUser.Password = ""
 	}
-	updatePassword, err := checkUpdatePassword(user.OriginalPassword, user.Password, cleanUser.Id)
-	if err != nil {
-		common.ApiError(c, err)
-		return
+
+	// 只有当明确提供了 original_password 或者要更新密码时才进行密码验证
+	var updatePassword bool
+	if _, hasOriginalPassword := requestData["original_password"]; hasOriginalPassword || user.Password != "" {
+		updatePassword, err = checkUpdatePassword(user.OriginalPassword, user.Password, cleanUser.Id)
+		if err != nil {
+			common.ApiError(c, err)
+			return
+		}
 	}
 	if err := cleanUser.Update(updatePassword); err != nil {
 		common.ApiError(c, err)
diff --git a/model/user.go b/model/user.go
index 0c9f5861a4c5..b35b320f9164 100644
--- a/model/user.go
+++ b/model/user.go
@@ -46,6 +46,7 @@ type User struct {
 	Setting          string         `json:"setting" gorm:"type:text;column:setting"`
 	Remark           string         `json:"remark,omitempty" gorm:"type:varchar(255)" validate:"max=255"`
 	StripeCustomer   string         `json:"stripe_customer" gorm:"type:varchar(64);column:stripe_customer;index"`
+	Avatar           string         `json:"avatar,omitempty" gorm:"type:longtext;column:avatar"`
 }
 
 func (user *User) ToBaseUser() *UserBase {
@@ -473,6 +474,7 @@ func (user *User) Edit(updatePassword bool) error {
 		"group":        newUser.Group,
 		"quota":        newUser.Quota,
 		"remark":       newUser.Remark,
+		"avatar":       newUser.Avatar,
 	}
 	if updatePassword {
 		updates["password"] = newUser.Password
diff --git a/router/api-router.go b/router/api-router.go
index 9ceb96fcdb8c..304c23b351e1 100644
--- a/router/api-router.go
+++ b/router/api-router.go
@@ -55,6 +55,7 @@ func SetApiRouter(router *gin.Engine) {
 			{
 				selfRoute.GET("/self/groups", controller.GetUserGroups)
 				selfRoute.GET("/self", controller.GetSelf)
+				selfRoute.GET("/avatar", controller.GetUserAvatar)
 				selfRoute.GET("/models", controller.GetUserModels)
 				selfRoute.PUT("/self", controller.UpdateSelf)
 				selfRoute.DELETE("/self", controller.DeleteSelf)
diff --git a/web/src/components/layout/headerbar/UserArea.jsx b/web/src/components/layout/headerbar/UserArea.jsx
index 8ea70f47f586..e89129d0fb10 100644
--- a/web/src/components/layout/headerbar/UserArea.jsx
+++ b/web/src/components/layout/headerbar/UserArea.jsx
@@ -120,10 +120,11 @@ const UserArea = ({
         >
           <Avatar
             size='extra-small'
-            color={stringToColor(userState.user.username)}
+            src={userState.user?.avatar || undefined}
+            color={userState.user?.avatar ? undefined : stringToColor(userState.user.username)}
             className='mr-1'
           >
-            {userState.user.username[0].toUpperCase()}
+            {!userState.user?.avatar && userState.user.username[0].toUpperCase()}
           </Avatar>
           <span className='hidden md:inline'>
             <Typography.Text className='!text-xs !font-medium !text-semi-color-text-1 dark:!text-gray-300 mr-1'>
diff --git a/web/src/components/settings/PersonalSetting.jsx b/web/src/components/settings/PersonalSetting.jsx
index 3ba8dcfd33d2..92c294834592 100644
--- a/web/src/components/settings/PersonalSetting.jsx
+++ b/web/src/components/settings/PersonalSetting.jsx
@@ -23,6 +23,7 @@ import { API, copy, showError, showInfo, showSuccess } from '../../helpers';
 import { UserContext } from '../../context/User';
 import { Modal } from '@douyinfe/semi-ui';
 import { useTranslation } from 'react-i18next';
+import { getUserData as fetchUserData } from '../../helpers/userDataManager';
 
 // 导入子组件
 import UserInfoHeader from './personal/components/UserInfoHeader';
@@ -80,8 +81,9 @@ const PersonalSetting = () => {
         setTurnstileSiteKey(status.turnstile_site_key);
       }
     }
-    getUserData().then((res) => {
-      console.log(userState);
+
+    getUserData().then(() => {
+      console.log('用户数据已加载');
     });
   }, []);
 
@@ -132,12 +134,17 @@ const PersonalSetting = () => {
   };
 
   const getUserData = async () => {
-    let res = await API.get(`/api/user/self`);
-    const { success, message, data } = res.data;
-    if (success) {
-      userDispatch({ type: 'login', payload: data });
-    } else {
-      showError(message);
+    try {
+      // 使用用户数据获取（包括头像）
+      const result = await fetchUserData();
+      if (result.success) {
+        userDispatch({ type: 'login', payload: result.data });
+      } else {
+        showError(result.message);
+      }
+    } catch (error) {
+      console.error('获取用户数据失败:', error);
+      showError('获取用户数据失败');
     }
   };
 
@@ -302,12 +309,14 @@ const PersonalSetting = () => {
     }
   };
 
+
+
   return (
     <div className='mt-[60px]'>
       <div className='flex justify-center'>
         <div className='w-full max-w-7xl mx-auto px-2'>
           {/* 顶部用户信息区域 */}
-          <UserInfoHeader t={t} userState={userState} />
+          <UserInfoHeader t={t} userState={userState} onUserDataUpdate={getUserData} />
 
           {/* 账户管理和其他设置 */}
           <div className='grid grid-cols-1 xl:grid-cols-2 items-start gap-4 md:gap-6 mt-4 md:mt-6'>
diff --git a/web/src/components/settings/personal/components/UserInfoHeader.jsx b/web/src/components/settings/personal/components/UserInfoHeader.jsx
index c2c3110b5209..81954b97f877 100644
--- a/web/src/components/settings/personal/components/UserInfoHeader.jsx
+++ b/web/src/components/settings/personal/components/UserInfoHeader.jsx
@@ -17,7 +17,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 For commercial licensing, please contact support@quantumnous.com
 */
 
-import React from 'react';
+import React, { useState } from 'react';
 import {
   Avatar,
   Card,
@@ -25,7 +25,11 @@ import {
   Divider,
   Typography,
   Badge,
+  Upload,
+  Toast,
+  Modal,
 } from '@douyinfe/semi-ui';
+import { IconCamera } from '@douyinfe/semi-icons';
 import {
   isRoot,
   isAdmin,
@@ -33,8 +37,30 @@ import {
   stringToColor,
 } from '../../../../helpers';
 import { Coins, BarChart2, Users } from 'lucide-react';
+import { updateUserAvatar } from '../../../../helpers/userDataManager';
+
+// 添加样式确保头像上传的点击热区是圆形
+const avatarUploadStyle = `
+.avatar-upload .semi-upload-add {
+  border-radius: 50% !important;
+}
+`;
+
+// 注入样式
+if (typeof document !== 'undefined') {
+  const styleElement = document.createElement('style');
+  styleElement.textContent = avatarUploadStyle;
+  if (!document.head.querySelector('style[data-avatar-upload]')) {
+    styleElement.setAttribute('data-avatar-upload', 'true');
+    document.head.appendChild(styleElement);
+  }
+}
+
+const UserInfoHeader = ({ t, userState, onUserDataUpdate }) => {
+  const [previewVisible, setPreviewVisible] = useState(false);
+  const [previewImage, setPreviewImage] = useState('');
+  const [uploading, setUploading] = useState(false);
 
-const UserInfoHeader = ({ t, userState }) => {
   const getUsername = () => {
     if (userState.user) {
       return userState.user.username;
@@ -51,6 +77,127 @@ const UserInfoHeader = ({ t, userState }) => {
     return 'NA';
   };
 
+  // 将文件转换为base64
+  const fileToBase64 = (file) => {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsDataURL(file);
+      reader.onload = () => resolve(reader.result);
+      reader.onerror = (error) => reject(error);
+    });
+  };
+
+  // 上传前验证
+  const beforeUpload = ({ file }) => {
+    console.log('beforeUpload file:', file); // 调试日志
+
+    // 获取文件类型，可能在 file.type 或 file.fileInstance.type 中
+    const fileType = file.type || (file.fileInstance && file.fileInstance.type) || '';
+    const fileSize = file.size || (file.fileInstance && file.fileInstance.size) || 0;
+
+    const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/webp'];
+    if (!allowedTypes.includes(fileType.toLowerCase())) {
+      console.log('File type validation failed:', fileType); // 调试日志
+      Toast.error(t('不支持的图片格式，仅支持 JPEG、PNG、GIF、WebP'));
+      return {
+        autoRemove: true,
+        shouldUpload: false,
+        status: 'validateFail',
+        validateMessage: t('不支持的图片格式，仅支持 JPEG、PNG、GIF、WebP')
+      };
+    }
+
+    // 考虑base64编码会增加约33%的大小，所以原始文件限制为1.5MB
+    const maxSize = 1.5 * 1024 * 1024; // 1.5MB
+    if (fileSize > maxSize) {
+      Toast.error(t('图片文件大小不能超过1.5MB'));
+      return {
+        autoRemove: true,
+        shouldUpload: false,
+        status: 'validateFail',
+        validateMessage: t('图片文件大小不能超过1.5MB')
+      };
+    }
+
+    return {
+      shouldUpload: false, // 不直接上传，而是先预览
+      status: 'success'
+    };
+  };
+
+  // 处理文件选择
+  const handleFileChange = async ({ currentFile }) => {
+    console.log('handleFileChange currentFile:', currentFile); // 调试日志
+
+    if (currentFile && currentFile.fileInstance) {
+      // 再次验证文件类型（客户端验证）
+      const fileType = currentFile.fileInstance.type;
+      const allowedTypes = ['image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/webp'];
+
+      if (!allowedTypes.includes(fileType.toLowerCase())) {
+        Toast.error(t('不支持的图片格式，仅支持 JPEG、PNG、GIF、WebP'));
+        return;
+      }
+
+      try {
+        setUploading(true);
+        const base64Data = await fileToBase64(currentFile.fileInstance);
+
+        // 验证base64数据大小（约2MB限制）
+        const base64Size = base64Data.length;
+        const maxBase64Size = 2 * 1024 * 1024; // 2MB
+
+        if (base64Size > maxBase64Size) {
+          Toast.error(t('图片编码后数据过大，请选择更小的图片'));
+          return;
+        }
+
+        setPreviewImage(base64Data);
+        setPreviewVisible(true);
+      } catch (error) {
+        Toast.error(t('图片处理失败，请重试'));
+        console.error('File processing error:', error);
+      } finally {
+        setUploading(false);
+      }
+    }
+  };
+
+  // 确认上传头像
+  const handleConfirmUpload = async () => {
+    if (!previewImage) return;
+
+    try {
+      setUploading(true);
+
+      // 使用新的用户数据管理器上传头像
+      const result = await updateUserAvatar(previewImage, {
+        id: userState.user?.id,
+        username: userState.user?.username || '',
+        display_name: userState.user?.display_name || '',
+      });
+
+      if (result.success) {
+        setPreviewVisible(false);
+        setPreviewImage('');
+        Toast.success(t('头像更新成功'));
+        // 刷新用户数据
+        if (onUserDataUpdate) {
+          await onUserDataUpdate();
+        }
+      } else {
+        Toast.error(result.message || t('头像更新失败，请重试'));
+      }
+    } catch (error) {
+      Toast.error(t('头像更新失败，请重试'));
+      console.error('Avatar update error:', error);
+    } finally {
+      setUploading(false);
+    }
+  };
+
+
+
   return (
     <Card
       className='!rounded-2xl overflow-hidden'
@@ -69,9 +216,43 @@ const UserInfoHeader = ({ t, userState }) => {
           <div className='relative z-10 h-full flex flex-col justify-end p-6'>
             <div className='flex items-center'>
               <div className='flex items-stretch gap-3 sm:gap-4 flex-1 min-w-0'>
-                <Avatar size='large' color={stringToColor(getUsername())}>
-                  {getAvatarText()}
-                </Avatar>
+                <Upload
+                  className="avatar-upload"
+                  accept="image/jpeg,image/jpg,image/png,image/gif,image/webp"
+                  beforeUpload={beforeUpload}
+                  onChange={handleFileChange}
+                  showUploadList={false}
+                  maxSize={1536}
+                  onSizeError={() => {
+                    Toast.error(t('图片文件大小不能超过1.5MB'));
+                  }}
+                  onAcceptInvalid={() => {
+                    Toast.error(t('不支持的图片格式，仅支持 JPEG、PNG、GIF、WebP'));
+                  }}
+                  disabled={uploading}
+                >
+                  <Avatar
+                    size='large'
+                    src={userState.user?.avatar || undefined}
+                    color={userState.user?.avatar ? undefined : stringToColor(getUsername())}
+                    hoverMask={
+                      <div style={{
+                        backgroundColor: 'var(--semi-color-overlay-bg)',
+                        height: '100%',
+                        width: '100%',
+                        display: 'flex',
+                        alignItems: 'center',
+                        justifyContent: 'center',
+                        color: 'var(--semi-color-white)',
+                      }}>
+                        <IconCamera />
+                      </div>
+                    }
+                    style={{ cursor: 'pointer' }}
+                  >
+                    {!userState.user?.avatar && getAvatarText()}
+                  </Avatar>
+                </Upload>
                 <div className='flex-1 min-w-0 flex flex-col justify-between'>
                   <div
                     className='text-3xl font-bold truncate'
@@ -213,6 +394,32 @@ const UserInfoHeader = ({ t, userState }) => {
           </div>
         </Card>
       </div>
+
+      {/* 头像预览模态框 */}
+      <Modal
+        title={t('预览头像')}
+        visible={previewVisible}
+        onCancel={() => {
+          setPreviewVisible(false);
+          setPreviewImage('');
+        }}
+        onOk={handleConfirmUpload}
+        okText={t('确认上传')}
+        cancelText={t('取消')}
+        confirmLoading={uploading}
+        width={400}
+      >
+        <div className="flex flex-col items-center space-y-4">
+          <Avatar
+            size="extra-large"
+            src={previewImage}
+            className="border-2 border-gray-200"
+          />
+          <p className="text-sm text-gray-600">
+            {t('确认要使用这张图片作为头像吗？')}
+          </p>
+        </div>
+      </Modal>
     </Card>
   );
 };
diff --git a/web/src/context/User/reducer.js b/web/src/context/User/reducer.js
index 80275e1fa926..2e8f2db8af64 100644
--- a/web/src/context/User/reducer.js
+++ b/web/src/context/User/reducer.js
@@ -20,11 +20,18 @@ For commercial licensing, please contact support@quantumnous.com
 export const reducer = (state, action) => {
   switch (action.type) {
     case 'login':
+      // 用户登录时，头像数据通过独立端点获取和缓存
       return {
         ...state,
         user: action.payload,
       };
     case 'logout':
+      // 当用户登出时，清理头像缓存和会话标记
+      if (state.user?.id) {
+        import('../../helpers/userDataManager').then(({ cleanupOnLogout }) => {
+          cleanupOnLogout(state.user.id);
+        });
+      }
       return {
         ...state,
         user: undefined,
diff --git a/web/src/helpers/avatarCache.js b/web/src/helpers/avatarCache.js
new file mode 100644
index 000000000000..c4af14cea456
--- /dev/null
+++ b/web/src/helpers/avatarCache.js
@@ -0,0 +1,72 @@
+/*
+Copyright (C) 2025 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+
+/**
+ * 头像缓存管理工具
+ * 核心功能：缓存存储、读取、清理
+ */
+
+const AVATAR_CACHE_KEY = 'user_avatar';
+
+/**
+ * 获取缓存的头像数据
+ * @param {number} userId - 用户ID
+ * @returns {string|null} 头像数据或null
+ */
+export const getCachedAvatar = (userId) => {
+  try {
+    const avatarData = localStorage.getItem(`${AVATAR_CACHE_KEY}_${userId}`);
+    return avatarData || null;
+  } catch (error) {
+    console.error('获取头像缓存失败:', error);
+    return null;
+  }
+};
+
+/**
+ * 缓存头像数据
+ * @param {number} userId - 用户ID
+ * @param {string} avatarData - 头像数据（base64）
+ */
+export const cacheAvatar = (userId, avatarData) => {
+  try {
+    if (!avatarData) {
+      clearAvatarCache(userId);
+      return;
+    }
+
+    localStorage.setItem(`${AVATAR_CACHE_KEY}_${userId}`, avatarData);
+  } catch (error) {
+    console.error('缓存头像失败:', error);
+  }
+};
+
+/**
+ * 清除指定用户的头像缓存
+ * @param {number} userId - 用户ID
+ */
+export const clearAvatarCache = (userId) => {
+  try {
+    localStorage.removeItem(`${AVATAR_CACHE_KEY}_${userId}`);
+  } catch (error) {
+    console.error('清除头像缓存失败:', error);
+  }
+};
+
+
diff --git a/web/src/helpers/userDataManager.js b/web/src/helpers/userDataManager.js
new file mode 100644
index 000000000000..c2b5c90dc099
--- /dev/null
+++ b/web/src/helpers/userDataManager.js
@@ -0,0 +1,116 @@
+/*
+Copyright (C) 2025 QuantumNous
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+For commercial licensing, please contact support@quantumnous.com
+*/
+
+import { API } from './api';
+import {
+  getCachedAvatar,
+  cacheAvatar,
+  clearAvatarCache
+} from './avatarCache';
+
+/**
+ * 用户数据管理器
+ */
+
+/**
+ * 获取用户数据（包含头像）
+ * @returns {Promise<Object>} 用户数据
+ */
+export const getUserData = async () => {
+  try {
+    // 获取基础用户数据
+    const res = await API.get('/api/user/self');
+    const { success, message, data } = res.data;
+
+    if (!success) {
+      throw new Error(message);
+    }
+
+    // 如果有用户ID，尝试获取头像
+    if (data.id) {
+      const cachedAvatar = getCachedAvatar(data.id);
+      if (cachedAvatar) {
+        data.avatar = cachedAvatar;
+      } else {
+        // 如果没有缓存，尝试从头像端点获取
+        try {
+          const avatarRes = await API.get('/api/user/avatar');
+          if (avatarRes.data.success && avatarRes.data.data.avatar) {
+            data.avatar = avatarRes.data.data.avatar;
+            cacheAvatar(data.id, data.avatar);
+          }
+        } catch (avatarError) {
+          console.log('获取头像失败，使用默认头像');
+          data.avatar = '';
+        }
+      }
+    }
+
+    return { success: true, data };
+  } catch (error) {
+    console.error('获取用户数据失败:', error);
+    return { success: false, message: error.message };
+  }
+};
+
+/**
+ * 更新用户头像
+ * @param {string} avatarData - 头像数据（base64）
+ * @param {Object} userInfo - 用户基本信息
+ * @returns {Promise<Object>} 更新结果
+ */
+export const updateUserAvatar = async (avatarData, userInfo = {}) => {
+  try {
+    const payload = {
+      avatar: avatarData,
+      username: userInfo.username || '',
+      display_name: userInfo.display_name || '',
+    };
+
+    const res = await API.put('/api/user/self', payload);
+    const { success, message } = res.data;
+
+    if (success && userInfo.id) {
+      // 更新成功后，立即更新缓存
+      cacheAvatar(userInfo.id, avatarData);
+      console.log(`头像上传成功并已更新缓存 - 用户ID: ${userInfo.id}`);
+    }
+
+    return { success, message };
+  } catch (error) {
+    console.error('更新用户头像失败:', error);
+    return { success: false, message: error.message };
+  }
+};
+
+/**
+ * 用户登出时的清理工作
+ * @param {number} userId - 用户ID
+ */
+export const cleanupOnLogout = (userId) => {
+  try {
+    // 清除头像缓存
+    if (userId) {
+      clearAvatarCache(userId);
+      console.log(`用户登出，已清除头像缓存 - 用户ID: ${userId}`);
+    }
+  } catch (error) {
+    console.error('登出清理失败:', error);
+  }
+};
diff --git a/web/src/hooks/dashboard/useDashboardData.js b/web/src/hooks/dashboard/useDashboardData.js
index b51bcc40c5c2..05e8e37e528a 100644
--- a/web/src/hooks/dashboard/useDashboardData.js
+++ b/web/src/hooks/dashboard/useDashboardData.js
@@ -214,12 +214,18 @@ export const useDashboardData = (userState, userDispatch, statusState) => {
   }, [activeUptimeTab]);
 
   const getUserData = useCallback(async () => {
-    let res = await API.get(`/api/user/self`);
-    const { success, message, data } = res.data;
-    if (success) {
-      userDispatch({ type: 'login', payload: data });
-    } else {
-      showError(message);
+    try {
+      // 使用用户数据获取（包括头像）
+      const { getUserData } = await import('../../helpers/userDataManager');
+      const result = await getUserData();
+      if (result.success) {
+        userDispatch({ type: 'login', payload: result.data });
+      } else {
+        showError(result.message);
+      }
+    } catch (error) {
+      console.error('获取用户数据失败:', error);
+      showError('获取用户数据失败');
     }
   }, [userDispatch]);
 
diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index 83fc625ca29a..9df6a00d89c3 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -2010,8 +2010,8 @@
   "为一个 JSON 文本，键为模型名称，值为倍率，例如：{\"gpt-image-1\": 2}": "A JSON text with model name as key and ratio as value, e.g.: {\"gpt-image-1\": 2}",
   "为一个 JSON 文本，键为模型名称，值为倍率，例如：{\"gpt-4o-audio-preview\": 16}": "A JSON text with model name as key and ratio as value, e.g.: {\"gpt-4o-audio-preview\": 16}",
   "为一个 JSON 文本，键为模型名称，值为倍率，例如：{\"gpt-4o-realtime\": 2}": "A JSON text with model name as key and ratio as value, e.g.: {\"gpt-4o-realtime\": 2}",
-  "顶栏管理": "Header Management",
-  "控制顶栏模块显示状态，全局生效": "Control header module display status, global effect",
+  "导航栏管理": "Navigation bar management",
+  "控制导航栏模块显示状态，全局生效": "Control header module display status, global effect",
   "系统主页": "System homepage",
   "用户控制面板，管理账户": "User control panel for account management",
   "模型广场": "Model Marketplace",
@@ -2138,5 +2138,22 @@
   "控制管理员是否可以访问分组管理功能": "Control whether administrators can access group management features",
   "默认分组": "Default Group",
   "VIP分组": "VIP Group",
-  "SVIP分组": "SVIP Group"
+  "SVIP分组": "SVIP Group",
+  "头像管理": "Avatar Management",
+  "上传头像": "Upload Avatar",
+  "移除头像": "Remove Avatar",
+  "预览头像": "Preview Avatar",
+  "确认上传": "Confirm Upload",
+  "取消": "Cancel",
+  "确认要使用这张图片作为头像吗？": "Are you sure you want to use this image as your avatar?",
+  "支持 JPEG、PNG、GIF、WebP 格式": "Supports JPEG, PNG, GIF, WebP formats",
+  "文件大小不超过 2MB": "File size should not exceed 2MB",
+  "不支持的图片格式，仅支持 JPEG、PNG、GIF、WebP": "Unsupported image format. Only JPEG, PNG, GIF, WebP are supported",
+  "图片文件大小不能超过1.5MB": "Image file size cannot exceed 1.5MB",
+  "图片编码后数据过大，请选择更小的图片": "Image data too large after encoding, please select a smaller image",
+  "图片处理失败，请重试": "Image processing failed, please try again",
+  "头像更新成功": "Avatar updated successfully",
+  "头像更新失败，请重试": "Avatar update failed, please try again",
+  "头像已移除": "Avatar removed",
+  "头像移除失败，请重试": "Avatar removal failed, please try again"
 }
diff --git a/web/src/pages/Setting/Operation/SettingsHeaderNavModules.jsx b/web/src/pages/Setting/Operation/SettingsHeaderNavModules.jsx
index 12bda379c67f..de4e83d982bd 100644
--- a/web/src/pages/Setting/Operation/SettingsHeaderNavModules.jsx
+++ b/web/src/pages/Setting/Operation/SettingsHeaderNavModules.jsx
@@ -193,8 +193,8 @@ export default function SettingsHeaderNavModules(props) {
   return (
     <Card>
       <Form.Section
-        text={t('顶栏管理')}
-        extraText={t('控制顶栏模块显示状态，全局生效')}
+        text={t('导航栏管理')}
+        extraText={t('控制导航栏模块显示状态，全局生效')}
       >
         <Row gutter={[16, 16]} style={{ marginBottom: '24px' }}>
           {moduleConfigs.map((module) => (

From ad04845e9ac24963a9fb8383ef0cfff9e71fc679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Wed, 3 Sep 2025 04:40:01 +0800
Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D"=E5=88=86=E7=BB=84"?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/user_group.go                                  | 4 +++-
 .../components/table/users/modals/UserGroupManagement.jsx | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/controller/user_group.go b/controller/user_group.go
index b8fc09fd2e5a..48cfb0c05392 100644
--- a/controller/user_group.go
+++ b/controller/user_group.go
@@ -167,7 +167,9 @@ func UpdateUserGroup(c *gin.Context) {
 		}
 
 		// 在同一事务中更新所有使用旧分组名的用户
-		result := tx.Model(&model.User{}).Where("group = ?", oldGroup.Name).Update("group", g.Name)
+		result := tx.Model(&model.User{}).
+			Where("`group` = ?", oldGroup.Name).
+			Update(clause.Column{Name: "group"}, g.Name)
 		if result.Error != nil {
 			tx.Rollback()
 			common.SysLog("更新用户分组名称失败: " + result.Error.Error())
diff --git a/web/src/components/table/users/modals/UserGroupManagement.jsx b/web/src/components/table/users/modals/UserGroupManagement.jsx
index 8ee7feeb2636..b2fbc564a9b0 100644
--- a/web/src/components/table/users/modals/UserGroupManagement.jsx
+++ b/web/src/components/table/users/modals/UserGroupManagement.jsx
@@ -157,9 +157,11 @@ const UserGroupManagement = ({ visible, onClose, onGroupUpdated }) => {
   // 编辑分组
   const handleEdit = (group = {}) => {
     // 检查权限
-    if (!hasGroupManagementPermission()) {
-      showError(t('无权访问分组管理功能'));
-      return;
+     const perm = hasGroupManagementPermission();
+    if (perm === null) return; // 等待权限加载
+    if (perm === false) {
+        showError(t('无权访问分组管理功能'));
+        return;
     }
 
     setEditingGroup(group);

From 11eb0521dfaa1f522539f25f3f4c9a97e51cd0eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Wed, 3 Sep 2025 04:50:20 +0800
Subject: [PATCH 13/18] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E6=9C=AC=E5=9C=B0=E5=8C=96=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/i18n/locales/en.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index 9df6a00d89c3..12502e2dd0b0 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -697,7 +697,6 @@
   "显": "show",
   "当前分组可用": "Available in current group",
   "当前分组不可用": "The current group is unavailable",
-  "提示：": "input:",
   "输入：": "input:",
   "补全：": "output:",
   "输出：": "output:",
@@ -2100,7 +2099,6 @@
   "管理用户分组，设置分组倍率": "Manage user groups and set group ratios",
   "新建分组": "Create Group",
   "编辑分组": "Edit Group",
-  "分组名称": "Group Name",
   "请输入分组名称": "Please enter group name",
   "分组名称不能为空": "Group name cannot be empty",
   "分组名称不能超过64个字符": "Group name cannot exceed 64 characters",
@@ -2109,7 +2107,6 @@
   "分组描述": "Group Description",
   "请输入分组描述（可选）": "Please enter group description (optional)",
   "分组的详细描述，用于说明分组用途": "Detailed description of the group, used to explain the group purpose",
-  "分组倍率": "Group Ratio",
   "请输入分组倍率": "Please enter group ratio",
   "分组倍率不能为空": "Group ratio cannot be empty",
   "分组倍率不能小于0": "Group ratio cannot be less than 0",
@@ -2117,7 +2114,6 @@
   "倍": "x",
   "系统默认": "System Default",
   "无描述": "No Description",
-  "创建时间": "Created Time",
   "确定删除此分组？": "Are you sure to delete this group?",
   "删除后无法恢复，请确认该分组未被用户使用": "Cannot be recovered after deletion, please confirm that this group is not being used by users",
   "删除成功": "Deleted successfully",
@@ -2134,7 +2130,6 @@
   "暂无用户分组": "No user groups",
   "提示：": "Note: ",
   "这是系统默认分组，只能修改描述和倍率，不能修改名称或删除。": "This is a system default group. You can only modify the description and ratio, but cannot modify the name or delete it.",
-  "默认": "default",
   "控制管理员是否可以访问分组管理功能": "Control whether administrators can access group management features",
   "默认分组": "Default Group",
   "VIP分组": "VIP Group",
@@ -2144,7 +2139,6 @@
   "移除头像": "Remove Avatar",
   "预览头像": "Preview Avatar",
   "确认上传": "Confirm Upload",
-  "取消": "Cancel",
   "确认要使用这张图片作为头像吗？": "Are you sure you want to use this image as your avatar?",
   "支持 JPEG、PNG、GIF、WebP 格式": "Supports JPEG, PNG, GIF, WebP formats",
   "文件大小不超过 2MB": "File size should not exceed 2MB",

From 224d1c2faa5e85b4b12cf935d83946152f10d061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Wed, 3 Sep 2025 05:04:41 +0800
Subject: [PATCH 14/18] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/user.go                 | 42 ++++++++++++++++++++++++++++++
 controller/user_group.go           |  2 +-
 model/user.go                      | 10 +++++++
 web/src/helpers/userDataManager.js |  4 +--
 4 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/controller/user.go b/controller/user.go
index 59347f16de6c..79ee42e4a851 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -1317,6 +1317,48 @@ func UpdateSelf(c *gin.Context) {
 		return
 	}
 
+	// 检查是否是纯头像更新请求
+	if len(requestData) == 1 {
+		if avatarData, exists := requestData["avatar"]; exists {
+			userId := c.GetInt("id")
+
+			// 验证头像数据
+			avatarStr, ok := avatarData.(string)
+			if !ok {
+				c.JSON(http.StatusOK, gin.H{
+					"success": false,
+					"message": "头像数据格式无效",
+				})
+				return
+			}
+
+			if err := validateAvatar(avatarStr); err != nil {
+				c.JSON(http.StatusOK, gin.H{
+					"success": false,
+					"message": err.Error(),
+				})
+				return
+			}
+
+			// 直接更新头像字段
+			user := model.User{
+				Id:     userId,
+				Avatar: avatarStr,
+			}
+
+			if err := user.UpdateAvatar(); err != nil {
+				common.ApiError(c, err)
+				return
+			}
+
+			c.JSON(http.StatusOK, gin.H{
+				"success": true,
+				"message": "",
+			})
+			return
+		}
+	}
+
 	// 原有的用户信息更新逻辑
 	var user model.User
 	requestDataBytes, err := json.Marshal(requestData)
diff --git a/controller/user_group.go b/controller/user_group.go
index 48cfb0c05392..9f69b20816af 100644
--- a/controller/user_group.go
+++ b/controller/user_group.go
@@ -169,7 +169,7 @@ func UpdateUserGroup(c *gin.Context) {
 		// 在同一事务中更新所有使用旧分组名的用户
 		result := tx.Model(&model.User{}).
 			Where("`group` = ?", oldGroup.Name).
-			Update(clause.Column{Name: "group"}, g.Name)
+			Update("group", g.Name)
 		if result.Error != nil {
 			tx.Rollback()
 			common.SysLog("更新用户分组名称失败: " + result.Error.Error())
diff --git a/model/user.go b/model/user.go
index b35b320f9164..727b7c43f1e0 100644
--- a/model/user.go
+++ b/model/user.go
@@ -458,6 +458,16 @@ func (user *User) Update(updatePassword bool) error {
 	return updateUserCache(*user)
 }
 
+func (user *User) UpdateAvatar() error {
+	if err := DB.Model(&User{}).Where("id = ?", user.Id).Update("avatar", user.Avatar).Error; err != nil {
+		return err
+	}
+
+	// Update cache
+	DB.First(&user, user.Id)
+	return updateUserCache(*user)
+}
+
 func (user *User) Edit(updatePassword bool) error {
 	var err error
 	if updatePassword {
diff --git a/web/src/helpers/userDataManager.js b/web/src/helpers/userDataManager.js
index c2b5c90dc099..0ae2b43a3bc9 100644
--- a/web/src/helpers/userDataManager.js
+++ b/web/src/helpers/userDataManager.js
@@ -72,15 +72,13 @@ export const getUserData = async () => {
 /**
  * 更新用户头像
  * @param {string} avatarData - 头像数据（base64）
- * @param {Object} userInfo - 用户基本信息
+ * @param {Object} userInfo - 用户基本信息（仅用于缓存）
  * @returns {Promise<Object>} 更新结果
  */
 export const updateUserAvatar = async (avatarData, userInfo = {}) => {
   try {
     const payload = {
       avatar: avatarData,
-      username: userInfo.username || '',
-      display_name: userInfo.display_name || '',
     };
 
     const res = await API.put('/api/user/self', payload);

From 6fb7243bb4438d3b10fb11de7e7a57f984fa99e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:03:21 +0800
Subject: [PATCH 15/18] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=9A=84=E6=9C=AC=E5=9C=B0=E5=8C=96=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/i18n/locales/en.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index 12502e2dd0b0..c805dffc9323 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -814,7 +814,6 @@
   "删除所选令牌": "Delete selected token",
   "请先选择要删除的令牌！": "Please select the token to be deleted!",
   "已删除 {{count}} 个令牌！": "Deleted {{count}} tokens!",
-  "删除失败": "Delete failed",
   "复制令牌": "Copy token",
   "请选择你的复制方式": "Please select your copy method",
   "名称+密钥": "Name + key",
@@ -2143,7 +2142,7 @@
   "支持 JPEG、PNG、GIF、WebP 格式": "Supports JPEG, PNG, GIF, WebP formats",
   "文件大小不超过 2MB": "File size should not exceed 2MB",
   "不支持的图片格式，仅支持 JPEG、PNG、GIF、WebP": "Unsupported image format. Only JPEG, PNG, GIF, WebP are supported",
-  "图片文件大小不能超过1.5MB": "Image file size cannot exceed 1.5MB",
+  "图片文件大小不能超过1.5MB": "Image file size cannot exceed 2MB",
   "图片编码后数据过大，请选择更小的图片": "Image data too large after encoding, please select a smaller image",
   "图片处理失败，请重试": "Image processing failed, please try again",
   "头像更新成功": "Avatar updated successfully",

From be789b21b2110f76c4136f7cdd409e009401e75a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:15:56 +0800
Subject: [PATCH 16/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=96=E4=B8=8D=E7=BB=9F=E4=B8=80=E7=9A=84=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/i18n/locales/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index c805dffc9323..ef7ab141d9c1 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -2140,10 +2140,10 @@
   "确认上传": "Confirm Upload",
   "确认要使用这张图片作为头像吗？": "Are you sure you want to use this image as your avatar?",
   "支持 JPEG、PNG、GIF、WebP 格式": "Supports JPEG, PNG, GIF, WebP formats",
-  "文件大小不超过 2MB": "File size should not exceed 2MB",
+  "文件大小不超过 1.5MB": "File size should not exceed 21.5MB",
   "不支持的图片格式，仅支持 JPEG、PNG、GIF、WebP": "Unsupported image format. Only JPEG, PNG, GIF, WebP are supported",
-  "图片文件大小不能超过1.5MB": "Image file size cannot exceed 2MB",
-  "图片编码后数据过大，请选择更小的图片": "Image data too large after encoding, please select a smaller image",
+  "图片文件大小不能超过1.5MB": "Image file size cannot exceed 1.5MB",
+  "图片编码后数据过大，请选择更小的图片": "Encoded image data is too large. Please select a smaller image.",
   "图片处理失败，请重试": "Image processing failed, please try again",
   "头像更新成功": "Avatar updated successfully",
   "头像更新失败，请重试": "Avatar update failed, please try again",

From b765a6ed8d51e47dfb33131c4f67c40c8e452823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Thu, 4 Sep 2025 13:27:46 +0800
Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=96=E6=96=87=E6=9C=AC=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/i18n/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/i18n/locales/en.json b/web/src/i18n/locales/en.json
index ef7ab141d9c1..d5c9eda5dc6b 100644
--- a/web/src/i18n/locales/en.json
+++ b/web/src/i18n/locales/en.json
@@ -2140,7 +2140,7 @@
   "确认上传": "Confirm Upload",
   "确认要使用这张图片作为头像吗？": "Are you sure you want to use this image as your avatar?",
   "支持 JPEG、PNG、GIF、WebP 格式": "Supports JPEG, PNG, GIF, WebP formats",
-  "文件大小不超过 1.5MB": "File size should not exceed 21.5MB",
+  "文件大小不超过 1.5MB": "File size should not exceed 1.5MB",
   "不支持的图片格式，仅支持 JPEG、PNG、GIF、WebP": "Unsupported image format. Only JPEG, PNG, GIF, WebP are supported",
   "图片文件大小不能超过1.5MB": "Image file size cannot exceed 1.5MB",
   "图片编码后数据过大，请选择更小的图片": "Encoded image data is too large. Please select a smaller image.",

From d4f85ae40420eda11ed437b6ebe91409219fd780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=E3=80=82?= <x-Ai@users.noreply.github.com>
Date: Thu, 18 Sep 2025 23:25:44 +0800
Subject: [PATCH 18/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=97=AE=E9=A2=98=E5=8F=8ASQLite=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controller/option.go                          |   6 +-
 controller/user_group.go                      | 190 ++++++++++-----
 model/main.go                                 |  47 ++++
 model/user_group.go                           |   4 +-
 router/api-router.go                          |   3 +
 service/cf_worker.go                          |  12 +-
 service/user_group_service.go                 | 216 ++++++++++++++++++
 service/user_notify.go                        |   6 +-
 service/webhook.go                            |   6 +-
 .../Setting/Ratio/GroupRatioSettings.jsx      |  36 ++-
 10 files changed, 450 insertions(+), 76 deletions(-)
 create mode 100644 service/user_group_service.go

diff --git a/controller/option.go b/controller/option.go
index 3e59c68e044e..7d1c676f540e 100644
--- a/controller/option.go
+++ b/controller/option.go
@@ -129,7 +129,7 @@ func UpdateOption(c *gin.Context) {
 			return
 		}
 	case "ImageRatio":
-		err = ratio_setting.UpdateImageRatioByJSONString(option.Value)
+		err = ratio_setting.UpdateImageRatioByJSONString(option.Value.(string))
 		if err != nil {
 			c.JSON(http.StatusOK, gin.H{
 				"success": false,
@@ -138,7 +138,7 @@ func UpdateOption(c *gin.Context) {
 			return
 		}
 	case "AudioRatio":
-		err = ratio_setting.UpdateAudioRatioByJSONString(option.Value)
+		err = ratio_setting.UpdateAudioRatioByJSONString(option.Value.(string))
 		if err != nil {
 			c.JSON(http.StatusOK, gin.H{
 				"success": false,
@@ -147,7 +147,7 @@ func UpdateOption(c *gin.Context) {
 			return
 		}
 	case "AudioCompletionRatio":
-		err = ratio_setting.UpdateAudioCompletionRatioByJSONString(option.Value)
+		err = ratio_setting.UpdateAudioCompletionRatioByJSONString(option.Value.(string))
 		if err != nil {
 			c.JSON(http.StatusOK, gin.H{
 				"success": false,
diff --git a/controller/user_group.go b/controller/user_group.go
index 9f69b20816af..5c28b8c5475a 100644
--- a/controller/user_group.go
+++ b/controller/user_group.go
@@ -8,6 +8,7 @@ import (
 
 	"one-api/common"
 	"one-api/model"
+	"one-api/service"
 	"one-api/setting"
 	"one-api/setting/ratio_setting"
 
@@ -73,19 +74,9 @@ func CreateUserGroup(c *gin.Context) {
 		return
 	}
 
-	// 同步到分组倍率设置
-	if err := syncGroupToRatioSetting(g.Name, g.Ratio, true); err != nil {
-		common.SysLog("同步分组到倍率设置失败: " + err.Error())
-	}
-
-	// 同步到用户可选分组
-	if err := syncGroupToUserUsableGroups(g.Name, g.Description, true); err != nil {
-		common.SysLog("同步分组到用户可选分组失败: " + err.Error())
-	}
-
-	// 同步到充值分组倍率
-	if err := syncGroupToTopupRatio(g.Name, g.Ratio, true); err != nil {
-		common.SysLog("同步分组到充值倍率设置失败: " + err.Error())
+	// 同步到内存
+	if err := service.SyncUserGroupsToMemory(); err != nil {
+		common.SysLog("同步用户分组到内存失败: " + err.Error())
 	}
 
 	common.ApiSuccess(c, &g)
@@ -186,33 +177,9 @@ func UpdateUserGroup(c *gin.Context) {
 		return
 	}
 
-	// 事务提交成功后，同步设置（这些操作失败不影响核心数据一致性）
-	if oldGroup.Name != g.Name {
-		// 从旧设置中移除
-		if err := syncGroupToRatioSetting(oldGroup.Name, 0, false); err != nil {
-			common.SysLog("从倍率设置中移除旧分组失败: " + err.Error())
-		}
-		if err := syncGroupToUserUsableGroups(oldGroup.Name, "", false); err != nil {
-			common.SysLog("从用户可选分组中移除旧分组失败: " + err.Error())
-		}
-		if err := syncGroupToTopupRatio(oldGroup.Name, 0, false); err != nil {
-			common.SysLog("从充值倍率设置中移除旧分组失败: " + err.Error())
-		}
-	}
-
-	// 同步到分组倍率设置
-	if err := syncGroupToRatioSetting(g.Name, g.Ratio, true); err != nil {
-		common.SysLog("同步分组到倍率设置失败: " + err.Error())
-	}
-
-	// 同步到用户可选分组
-	if err := syncGroupToUserUsableGroups(g.Name, g.Description, true); err != nil {
-		common.SysLog("同步分组到用户可选分组失败: " + err.Error())
-	}
-
-	// 同步到充值分组倍率
-	if err := syncGroupToTopupRatio(g.Name, g.Ratio, true); err != nil {
-		common.SysLog("同步分组到充值倍率设置失败: " + err.Error())
+	// 事务提交成功后，同步到内存
+	if err := service.SyncUserGroupsToMemory(); err != nil {
+		common.SysLog("同步用户分组到内存失败: " + err.Error())
 	}
 
 	common.ApiSuccess(c, &g)
@@ -252,19 +219,9 @@ func DeleteUserGroup(c *gin.Context) {
 		return
 	}
 
-	// 从分组倍率设置中移除
-	if err := syncGroupToRatioSetting(group.Name, 0, false); err != nil {
-		common.SysLog("从倍率设置中移除分组失败: " + err.Error())
-	}
-
-	// 从用户可选分组中移除
-	if err := syncGroupToUserUsableGroups(group.Name, "", false); err != nil {
-		common.SysLog("从用户可选分组中移除分组失败: " + err.Error())
-	}
-
-	// 从充值分组倍率中移除
-	if err := syncGroupToTopupRatio(group.Name, 0, false); err != nil {
-		common.SysLog("从充值倍率设置中移除分组失败: " + err.Error())
+	// 同步到内存
+	if err := service.SyncUserGroupsToMemory(); err != nil {
+		common.SysLog("同步用户分组到内存失败: " + err.Error())
 	}
 
 	common.ApiSuccess(c, nil)
@@ -344,3 +301,130 @@ func syncGroupToTopupRatio(groupName string, ratio float64, add bool) error {
 	// 更新内存中的设置
 	return common.UpdateTopupGroupRatioByJSONString(string(jsonBytes))
 }
+
+// MigrateUserGroupData 迁移用户分组数据
+func MigrateUserGroupData(c *gin.Context) {
+	if err := service.MigrateUserGroupsFromOptions(); err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 同步到内存
+	if err := service.SyncUserGroupsToMemory(); err != nil {
+		common.SysLog("同步用户分组到内存失败: " + err.Error())
+	}
+
+	common.ApiSuccess(c, "用户分组数据迁移完成")
+}
+
+// GetUserGroupsAsOptions 获取用户分组数据（以 options 格式返回）
+func GetUserGroupsAsOptions(c *gin.Context) {
+	options, err := service.GetUserGroupsAsOptions()
+	if err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	common.ApiSuccess(c, options)
+}
+
+// BatchUpdateUserGroups 批量更新用户分组
+func BatchUpdateUserGroups(c *gin.Context) {
+	var req struct {
+		GroupRatio       string `json:"GroupRatio"`
+		UserUsableGroups string `json:"UserUsableGroups"`
+	}
+
+	if err := c.ShouldBindJSON(&req); err != nil {
+		common.ApiError(c, err)
+		return
+	}
+
+	// 解析分组倍率
+	var groupRatio map[string]float64
+	if req.GroupRatio != "" {
+		if err := json.Unmarshal([]byte(req.GroupRatio), &groupRatio); err != nil {
+			common.ApiErrorMsg(c, "分组倍率格式错误: "+err.Error())
+			return
+		}
+	}
+
+	// 解析用户可选分组
+	var userUsableGroups map[string]string
+	if req.UserUsableGroups != "" {
+		if err := json.Unmarshal([]byte(req.UserUsableGroups), &userUsableGroups); err != nil {
+			common.ApiErrorMsg(c, "用户可选分组格式错误: "+err.Error())
+			return
+		}
+	}
+
+	// 合并所有分组名称
+	allGroups := make(map[string]bool)
+	for name := range groupRatio {
+		allGroups[name] = true
+	}
+	for name := range userUsableGroups {
+		allGroups[name] = true
+	}
+
+	// 批量更新分组
+	updatedCount := 0
+	for groupName := range allGroups {
+		// 获取现有分组
+		existingGroup, err := model.GetUserGroupByName(groupName)
+		if err != nil && err.Error() != "record not found" {
+			common.SysLog("获取分组 " + groupName + " 时出错: " + err.Error())
+			continue
+		}
+
+		ratio := groupRatio[groupName]
+		if ratio == 0 {
+			ratio = 1.0 // 默认倍率
+		}
+
+		description := userUsableGroups[groupName]
+		if description == "" {
+			description = groupName + "分组"
+		}
+
+		if existingGroup == nil {
+			// 创建新分组
+			newGroup := &model.UserGroup{
+				Name:        groupName,
+				Description: description,
+				Ratio:       ratio,
+			}
+			if err := newGroup.Insert(); err != nil {
+				common.SysLog("创建分组 " + groupName + " 失败: " + err.Error())
+				continue
+			}
+			updatedCount++
+		} else {
+			// 更新现有分组
+			needUpdate := false
+			if existingGroup.Ratio != ratio {
+				existingGroup.Ratio = ratio
+				needUpdate = true
+			}
+			if existingGroup.Description != description {
+				existingGroup.Description = description
+				needUpdate = true
+			}
+
+			if needUpdate {
+				if err := existingGroup.Update(); err != nil {
+					common.SysLog("更新分组 " + groupName + " 失败: " + err.Error())
+					continue
+				}
+				updatedCount++
+			}
+		}
+	}
+
+	// 同步到内存
+	if err := service.SyncUserGroupsToMemory(); err != nil {
+		common.SysLog("同步用户分组到内存失败: " + err.Error())
+	}
+
+	common.ApiSuccess(c, fmt.Sprintf("批量更新完成，处理了 %d 个分组", updatedCount))
+}
diff --git a/model/main.go b/model/main.go
index 686e22e340ba..087ada2fd8ee 100644
--- a/model/main.go
+++ b/model/main.go
@@ -278,6 +278,11 @@ func migrateDB() error {
 		common.SysLog("初始化默认用户分组失败: " + err.Error())
 	}
 
+	// 迁移用户分组数据
+	if err := MigrateUserGroupData(); err != nil {
+		common.SysLog("迁移用户分组数据失败: " + err.Error())
+	}
+
 	return nil
 }
 
@@ -483,3 +488,45 @@ func PingDB() error {
 	common.SysLog("Database pinged successfully")
 	return nil
 }
+
+// MigrateUserGroupData 迁移用户分组数据
+func MigrateUserGroupData() error {
+	// 检查是否已经执行过迁移标记
+	var migrationOption Option
+	err := DB.Where("`key` = ?", "UserGroupMigrationCompleted").First(&migrationOption).Error
+	if err == nil && migrationOption.Value == "true" {
+		// 已经迁移过，跳过
+		return nil
+	}
+
+	// 检查是否需要迁移
+	var count int64
+	DB.Model(&UserGroup{}).Count(&count)
+	if count == 0 {
+		// 没有用户分组数据，标记为已迁移
+		UpdateOption("UserGroupMigrationCompleted", "true")
+		return nil
+	}
+
+	// 检查是否存在 options 表中的分组数据需要迁移
+	var groupRatioOption Option
+	err = DB.Where("`key` = ?", "GroupRatio").First(&groupRatioOption).Error
+	if err != nil {
+		// 没有 GroupRatio 配置，说明不需要迁移，标记为已完成
+		UpdateOption("UserGroupMigrationCompleted", "true")
+		return nil
+	}
+
+	// 检查是否已经迁移过（通过检查是否存在非默认分组）
+	var nonDefaultCount int64
+	DB.Model(&UserGroup{}).Where("name NOT IN (?)", []string{"default", "vip", "svip"}).Count(&nonDefaultCount)
+
+	if nonDefaultCount > 0 {
+		// 已经有非默认分组，说明已经迁移过，标记为已完成
+		UpdateOption("UserGroupMigrationCompleted", "true")
+		return nil
+	}
+
+	common.SysLog("检测到需要迁移用户分组数据，请访问分组管理页面或调用迁移 API")
+	return nil
+}
diff --git a/model/user_group.go b/model/user_group.go
index 0c4817fc5322..7f60316c9cf3 100644
--- a/model/user_group.go
+++ b/model/user_group.go
@@ -9,7 +9,7 @@ type UserGroup struct {
 	Id          int            `json:"id"`
 	Name        string         `json:"name" gorm:"size:64;not null;uniqueIndex:uk_user_group_name,where:deleted_at IS NULL"`
 	Description string         `json:"description,omitempty" gorm:"type:varchar(255)"`
-	Ratio       float64        `json:"ratio" gorm:"type:decimal(10,4);default:1.0"`
+	Ratio       float64        `json:"ratio" gorm:"default:1.0"`
 	CreatedTime int64          `json:"created_time" gorm:"bigint"`
 	UpdatedTime int64          `json:"updated_time" gorm:"bigint"`
 	DeletedAt   gorm.DeletedAt `json:"-" gorm:"index"`
@@ -135,3 +135,5 @@ func InitDefaultUserGroups() error {
 
 	return nil
 }
+
+
diff --git a/router/api-router.go b/router/api-router.go
index 304c23b351e1..c1302f261c9f 100644
--- a/router/api-router.go
+++ b/router/api-router.go
@@ -214,6 +214,9 @@ func SetApiRouter(router *gin.Engine) {
 			userGroupRoute.POST("/", controller.CreateUserGroup)
 			userGroupRoute.PUT("/", controller.UpdateUserGroup)
 			userGroupRoute.DELETE("/:id", controller.DeleteUserGroup)
+			userGroupRoute.POST("/migrate", controller.MigrateUserGroupData)
+			userGroupRoute.GET("/options", controller.GetUserGroupsAsOptions)
+			userGroupRoute.PUT("/batch", controller.BatchUpdateUserGroups)
 		}
 
 		mjRoute := apiRouter.Group("/mj")
diff --git a/service/cf_worker.go b/service/cf_worker.go
index 4a7b437603ef..d60b6fad5f78 100644
--- a/service/cf_worker.go
+++ b/service/cf_worker.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"one-api/common"
-	"one-api/setting"
+	"one-api/setting/system_setting"
 	"strings"
 )
 
@@ -21,14 +21,14 @@ type WorkerRequest struct {
 
 // DoWorkerRequest 通过Worker发送请求
 func DoWorkerRequest(req *WorkerRequest) (*http.Response, error) {
-	if !setting.EnableWorker() {
+	if !system_setting.EnableWorker() {
 		return nil, fmt.Errorf("worker not enabled")
 	}
-	if !setting.WorkerAllowHttpImageRequestEnabled && !strings.HasPrefix(req.URL, "https") {
+	if !system_setting.WorkerAllowHttpImageRequestEnabled && !strings.HasPrefix(req.URL, "https") {
 		return nil, fmt.Errorf("only support https url")
 	}
 
-	workerUrl := setting.WorkerUrl
+	workerUrl := system_setting.WorkerUrl
 	if !strings.HasSuffix(workerUrl, "/") {
 		workerUrl += "/"
 	}
@@ -43,11 +43,11 @@ func DoWorkerRequest(req *WorkerRequest) (*http.Response, error) {
 }
 
 func DoDownloadRequest(originUrl string, reason ...string) (resp *http.Response, err error) {
-	if setting.EnableWorker() {
+	if system_setting.EnableWorker() {
 		common.SysLog(fmt.Sprintf("downloading file from worker: %s, reason: %s", originUrl, strings.Join(reason, ", ")))
 		req := &WorkerRequest{
 			URL: originUrl,
-			Key: setting.WorkerValidKey,
+			Key: system_setting.WorkerValidKey,
 		}
 		return DoWorkerRequest(req)
 	} else {
diff --git a/service/user_group_service.go b/service/user_group_service.go
new file mode 100644
index 000000000000..377830d399aa
--- /dev/null
+++ b/service/user_group_service.go
@@ -0,0 +1,216 @@
+package service
+
+import (
+	"encoding/json"
+	"fmt"
+	"one-api/common"
+	"one-api/model"
+	"one-api/setting"
+	"one-api/setting/ratio_setting"
+)
+
+// MigrateUserGroupsFromOptions 从 options 表迁移用户分组数据到 UserGroup 表
+func MigrateUserGroupsFromOptions() error {
+	common.SysLog("开始迁移用户分组数据...")
+
+	// 获取当前 options 中的分组数据
+	groupRatioStr := common.OptionMap["GroupRatio"]
+	userUsableGroupsStr := common.OptionMap["UserUsableGroups"]
+	topupGroupRatioStr := common.OptionMap["TopupGroupRatio"]
+
+	// 解析分组倍率
+	var groupRatio map[string]float64
+	if groupRatioStr != "" {
+		if err := json.Unmarshal([]byte(groupRatioStr), &groupRatio); err != nil {
+			common.SysLog("解析 GroupRatio 失败: " + err.Error())
+			groupRatio = make(map[string]float64)
+		}
+	} else {
+		groupRatio = make(map[string]float64)
+	}
+
+	// 解析用户可选分组
+	var userUsableGroups map[string]string
+	if userUsableGroupsStr != "" {
+		if err := json.Unmarshal([]byte(userUsableGroupsStr), &userUsableGroups); err != nil {
+			common.SysLog("解析 UserUsableGroups 失败: " + err.Error())
+			userUsableGroups = make(map[string]string)
+		}
+	} else {
+		userUsableGroups = make(map[string]string)
+	}
+
+	// 解析充值分组倍率
+	var topupGroupRatio map[string]float64
+	if topupGroupRatioStr != "" {
+		if err := json.Unmarshal([]byte(topupGroupRatioStr), &topupGroupRatio); err != nil {
+			common.SysLog("解析 TopupGroupRatio 失败: " + err.Error())
+			topupGroupRatio = make(map[string]float64)
+		}
+	} else {
+		topupGroupRatio = make(map[string]float64)
+	}
+
+	// 合并所有分组名称
+	allGroups := make(map[string]bool)
+	for name := range groupRatio {
+		allGroups[name] = true
+	}
+	for name := range userUsableGroups {
+		allGroups[name] = true
+	}
+	for name := range topupGroupRatio {
+		allGroups[name] = true
+	}
+
+	// 添加默认分组
+	defaultGroups := []string{"default", "vip", "svip"}
+	for _, name := range defaultGroups {
+		allGroups[name] = true
+	}
+
+	// 检查并创建/更新分组
+	migratedCount := 0
+	for groupName := range allGroups {
+		// 检查分组是否已存在
+		existingGroup, err := model.GetUserGroupByName(groupName)
+		if err != nil && err.Error() != "record not found" {
+			common.SysLog("检查分组 " + groupName + " 时出错: " + err.Error())
+			continue
+		}
+
+		ratio := groupRatio[groupName]
+		if ratio == 0 {
+			ratio = 1.0 // 默认倍率
+		}
+
+		description := userUsableGroups[groupName]
+		if description == "" {
+			// 为默认分组设置描述
+			switch groupName {
+			case "default":
+				description = "默认分组"
+			case "vip":
+				description = "VIP分组"
+			case "svip":
+				description = "SVIP分组"
+			default:
+				description = groupName + "分组"
+			}
+		}
+
+		if existingGroup == nil {
+			// 创建新分组
+			newGroup := &model.UserGroup{
+				Name:        groupName,
+				Description: description,
+				Ratio:       ratio,
+			}
+			if err := newGroup.Insert(); err != nil {
+				common.SysLog("创建分组 " + groupName + " 失败: " + err.Error())
+				continue
+			}
+			migratedCount++
+			common.SysLog("创建分组: " + groupName + " (倍率: " + fmt.Sprintf("%.4f", ratio) + ")")
+		} else {
+			// 更新现有分组（如果数据不同）
+			needUpdate := false
+			if existingGroup.Ratio != ratio {
+				existingGroup.Ratio = ratio
+				needUpdate = true
+			}
+			if existingGroup.Description != description {
+				existingGroup.Description = description
+				needUpdate = true
+			}
+
+			if needUpdate {
+				if err := existingGroup.Update(); err != nil {
+					common.SysLog("更新分组 " + groupName + " 失败: " + err.Error())
+					continue
+				}
+				migratedCount++
+				common.SysLog("更新分组: " + groupName + " (倍率: " + fmt.Sprintf("%.4f", ratio) + ")")
+			}
+		}
+	}
+
+	common.SysLog("用户分组数据迁移完成，处理了 " + fmt.Sprintf("%d", migratedCount) + " 个分组")
+
+	// 设置迁移完成标记
+	if err := model.UpdateOption("UserGroupMigrationCompleted", "true"); err != nil {
+		common.SysLog("设置迁移完成标记失败: " + err.Error())
+	}
+
+	return nil
+}
+
+// SyncUserGroupsToMemory 将 UserGroup 表数据同步到内存中的设置
+func SyncUserGroupsToMemory() error {
+	groups, err := model.GetAllUserGroups()
+	if err != nil {
+		return err
+	}
+
+	// 构建分组倍率映射
+	groupRatio := make(map[string]float64)
+	userUsableGroups := make(map[string]string)
+	topupGroupRatio := make(map[string]float64)
+
+	for _, group := range groups {
+		groupRatio[group.Name] = group.Ratio
+		userUsableGroups[group.Name] = group.Description
+		topupGroupRatio[group.Name] = group.Ratio // 充值倍率使用相同的倍率
+	}
+
+	// 更新内存中的设置
+	if groupRatioJson, err := json.Marshal(groupRatio); err == nil {
+		ratio_setting.UpdateGroupRatioByJSONString(string(groupRatioJson))
+	}
+
+	if userUsableGroupsJson, err := json.Marshal(userUsableGroups); err == nil {
+		setting.UpdateUserUsableGroupsByJSONString(string(userUsableGroupsJson))
+	}
+
+	if topupGroupRatioJson, err := json.Marshal(topupGroupRatio); err == nil {
+		common.UpdateTopupGroupRatioByJSONString(string(topupGroupRatioJson))
+	}
+
+	return nil
+}
+
+// GetUserGroupsAsOptions 获取用户分组数据并转换为 options 格式
+func GetUserGroupsAsOptions() (map[string]string, error) {
+	groups, err := model.GetAllUserGroups()
+	if err != nil {
+		return nil, err
+	}
+
+	options := make(map[string]string)
+
+	// 构建分组倍率
+	groupRatio := make(map[string]float64)
+	userUsableGroups := make(map[string]string)
+	topupGroupRatio := make(map[string]float64)
+
+	for _, group := range groups {
+		groupRatio[group.Name] = group.Ratio
+		userUsableGroups[group.Name] = group.Description
+		topupGroupRatio[group.Name] = group.Ratio
+	}
+
+	// 转换为 JSON 字符串
+	if groupRatioJson, err := json.Marshal(groupRatio); err == nil {
+		options["GroupRatio"] = string(groupRatioJson)
+	}
+
+	if userUsableGroupsJson, err := json.Marshal(userUsableGroups); err == nil {
+		options["UserUsableGroups"] = string(userUsableGroupsJson)
+	}
+
+	if topupGroupRatioJson, err := json.Marshal(topupGroupRatio); err == nil {
+		options["TopupGroupRatio"] = string(topupGroupRatioJson)
+	}
+
+	return options, nil
+}
diff --git a/service/user_notify.go b/service/user_notify.go
index c4a3ea91f9de..972ca655c52d 100644
--- a/service/user_notify.go
+++ b/service/user_notify.go
@@ -7,7 +7,7 @@ import (
 	"one-api/common"
 	"one-api/dto"
 	"one-api/model"
-	"one-api/setting"
+	"one-api/setting/system_setting"
 	"strings"
 )
 
@@ -91,11 +91,11 @@ func sendBarkNotify(barkURL string, data dto.Notify) error {
 	var resp *http.Response
 	var err error
 
-	if setting.EnableWorker() {
+	if system_setting.EnableWorker() {
 		// 使用worker发送请求
 		workerReq := &WorkerRequest{
 			URL:    finalURL,
-			Key:    setting.WorkerValidKey,
+			Key:    system_setting.WorkerValidKey,
 			Method: http.MethodGet,
 			Headers: map[string]string{
 				"User-Agent": "OneAPI-Bark-Notify/1.0",
diff --git a/service/webhook.go b/service/webhook.go
index 8faccda30102..9c6ec8102783 100644
--- a/service/webhook.go
+++ b/service/webhook.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"net/http"
 	"one-api/dto"
-	"one-api/setting"
+	"one-api/setting/system_setting"
 	"time"
 )
 
@@ -56,11 +56,11 @@ func SendWebhookNotify(webhookURL string, secret string, data dto.Notify) error
 	var req *http.Request
 	var resp *http.Response
 
-	if setting.EnableWorker() {
+	if system_setting.EnableWorker() {
 		// 构建worker请求数据
 		workerReq := &WorkerRequest{
 			URL:    webhookURL,
-			Key:    setting.WorkerValidKey,
+			Key:    system_setting.WorkerValidKey,
 			Method: http.MethodPost,
 			Headers: map[string]string{
 				"Content-Type": "application/json",
diff --git a/web/src/pages/Setting/Ratio/GroupRatioSettings.jsx b/web/src/pages/Setting/Ratio/GroupRatioSettings.jsx
index 88e3acbdb230..9469395ecfab 100644
--- a/web/src/pages/Setting/Ratio/GroupRatioSettings.jsx
+++ b/web/src/pages/Setting/Ratio/GroupRatioSettings.jsx
@@ -51,13 +51,35 @@ export default function GroupRatioSettings(props) {
           if (!updateArray.length)
             return showWarning(t('你似乎并没有修改什么'));
 
-          const requestQueue = updateArray.map((item) => {
-            const value =
-              typeof inputs[item.key] === 'boolean'
-                ? String(inputs[item.key])
-                : inputs[item.key];
-            return API.put('/api/option/', { key: item.key, value });
-          });
+          // 检查是否包含分组相关的设置
+          const groupRelatedKeys = ['GroupRatio', 'UserUsableGroups'];
+          const hasGroupUpdates = updateArray.some(item => groupRelatedKeys.includes(item.key));
+          const otherUpdates = updateArray.filter(item => !groupRelatedKeys.includes(item.key));
+
+          let requestQueue = [];
+
+          // 处理非分组相关的更新
+          if (otherUpdates.length > 0) {
+            requestQueue = otherUpdates.map((item) => {
+              const value =
+                typeof inputs[item.key] === 'boolean'
+                  ? String(inputs[item.key])
+                  : inputs[item.key];
+              return API.put('/api/option/', { key: item.key, value });
+            });
+          }
+
+          // 处理分组相关的更新
+          if (hasGroupUpdates) {
+            const groupData = {};
+            if (inputs.GroupRatio) groupData.GroupRatio = inputs.GroupRatio;
+            if (inputs.UserUsableGroups) groupData.UserUsableGroups = inputs.UserUsableGroups;
+            requestQueue.push(API.put('/api/user_group/batch', groupData));
+          }
+
+          if (requestQueue.length === 0) {
+            return showWarning(t('你似乎并没有修改什么'));
+          }
 
           setLoading(true);
           Promise.all(requestQueue)