From f7c3d76d37ccb0ea85f1d1fe15290c4140f9d0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 19 Jun 2025 15:33:05 +0800
Subject: [PATCH 01/56] =?UTF-8?q?feat(=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?):=20=E9=87=8D=E6=9E=84=E8=8F=9C=E5=8D=95=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B9=B6=E6=9B=B4=E6=96=B0element-plus?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json                      |   2 +-
 web/src/view/superAdmin/menu/menu.vue | 731 +++++++++++++++-----------
 2 files changed, 430 insertions(+), 303 deletions(-)

diff --git a/web/package.json b/web/package.json
index 8c059b933..7d0a78100 100644
--- a/web/package.json
+++ b/web/package.json
@@ -25,7 +25,7 @@
     "chokidar": "^4.0.0",
     "core-js": "^3.38.1",
     "echarts": "5.5.1",
-    "element-plus": "^2.8.5",
+    "element-plus": "^2.10.2",
     "highlight.js": "^11.10.0",
     "install": "^0.13.0",
     "marked": "14.1.1",
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index 48007233e..f0f1b3b95 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -119,315 +119,394 @@
       </template>
 
       <warning-bar title="新增菜单，需要在角色管理内配置权限才可使用" />
-      <el-form
-        v-if="dialogFormVisible"
-        ref="menuForm"
-        :inline="true"
-        :model="form"
-        :rules="rules"
-        label-position="top"
-      >
-        <el-row class="w-full">
-          <el-col :span="16">
-            <el-form-item label="文件路径" prop="component">
-              <components-cascader
-                :component="form.component"
-                @change="fmtComponent"
-              />
-              <span style="font-size: 12px; margin-right: 12px"
-                >如果菜单包含子菜单，请创建router-view二级路由页面或者</span
-              >
-              <el-button
-                style="margin-top: 4px"
-                @click="form.component = 'view/routerHolder.vue'"
-              >
-                点我设置
-              </el-button>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="展示名称" prop="meta.title">
-              <el-input v-model="form.meta.title" autocomplete="off" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="w-full">
-          <el-col :span="8">
-            <el-form-item label="路由Name" prop="path">
-              <el-input
-                v-model="form.name"
-                autocomplete="off"
-                placeholder="唯一英文字符串"
-                @change="changeName"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="path">
-              <template #label>
-                <span style="display: inline-flex; align-items: center">
-                  <span>路由Path</span>
-                  <el-checkbox
-                    v-model="checkFlag"
-                    style="margin-left: 12px; height: auto"
-                    >添加参数</el-checkbox
+      
+      <!-- 基础信息区域 -->
+      <div class="border-b border-gray-200">
+        <h3 class="font-semibold text-gray-700 mb-4">基础信息</h3>
+        <el-form
+          v-if="dialogFormVisible"
+          ref="menuForm"
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+        >
+          <el-row class="w-full">
+            <el-col :span="24">
+              <el-form-item label="文件路径" prop="component">
+                <components-cascader
+                  :component="form.component"
+                  @change="fmtComponent"
+                />
+                <div class="form-tip">
+                  <el-icon><InfoFilled /></el-icon>
+                  <span>如果菜单包含子菜单，请创建router-view二级路由页面或者</span>
+                  <el-button
+                    size="small"
+                    type="text"
+                    @click="form.component = 'view/routerHolder.vue'"
                   >
-                </span>
-              </template>
-
-              <el-input
-                v-model="form.path"
-                :disabled="!checkFlag"
-                autocomplete="off"
-                placeholder="建议只在后方拼接参数"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否隐藏">
-              <el-select
-                v-model="form.hidden"
-                style="width: 100%"
-                placeholder="是否在列表隐藏"
-              >
-                <el-option :value="false" label="否" />
-                <el-option :value="true" label="是" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="w-full">
-          <el-col :span="8">
-            <el-form-item label="父节点ID">
-              <el-cascader
-                v-model="form.parentId"
-                style="width: 100%"
-                :disabled="!isEdit"
-                :options="menuOption"
-                :props="{
-                  checkStrictly: true,
-                  label: 'title',
-                  value: 'ID',
-                  disabled: 'disabled',
-                  emitPath: false
-                }"
-                :show-all-levels="false"
-                filterable
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="图标" prop="meta.icon">
-              <icon v-model="form.meta.icon" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="排序标记" prop="sort">
-              <el-input v-model.number="form.sort" autocomplete="off" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="w-full">
-          <el-col :span="8">
-            <el-form-item prop="meta.activeName">
-              <template #label>
-                <div>
-                  <span> 高亮菜单 </span>
-                  <el-tooltip
-                    content="注：当到达此路由时候，指定左侧菜单指定name会处于活跃状态（亮起），可为空，为空则为本路由Name。"
-                    placement="top"
-                    effect="light"
-                  >
-                    <el-icon><QuestionFilled /></el-icon>
-                  </el-tooltip>
+                    点我设置
+                  </el-button>
                 </div>
-              </template>
-              <el-input
-                v-model="form.meta.activeName"
-                :placeholder="form.name"
-                autocomplete="off"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="KeepAlive" prop="meta.keepAlive">
-              <el-select
-                v-model="form.meta.keepAlive"
-                style="width: 100%"
-                placeholder="是否keepAlive缓存页面"
-              >
-                <el-option :value="false" label="否" />
-                <el-option :value="true" label="是" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="CloseTab" prop="meta.closeTab">
-              <el-select
-                v-model="form.meta.closeTab"
-                style="width: 100%"
-                placeholder="是否自动关闭tab"
-              >
-                <el-option :value="false" label="否" />
-                <el-option :value="true" label="是" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row class="w-full">
-          <el-col :span="8">
-            <el-form-item>
-              <template #label>
-                <div>
-                  <span> 是否为基础页面 </span>
-                  <el-tooltip
-                    content="此项选择为是，则不会展示左侧菜单以及顶部信息。"
-                    placement="top"
-                    effect="light"
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row class="w-full">
+            <el-col :span="12">
+              <el-form-item label="展示名称" prop="meta.title">
+                <el-input 
+                  v-model="form.meta.title" 
+                  autocomplete="off" 
+                  placeholder="请输入菜单展示名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="路由Name" prop="path">
+                <el-input
+                  v-model="form.name"
+                  autocomplete="off"
+                  placeholder="唯一英文字符串"
+                  @change="changeName"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+       
+      <!-- 路由配置区域 -->
+      <div class="border-b border-gray-200">
+        <h3 class="font-semibold text-gray-700 mb-4">路由配置</h3>
+        <el-form
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+        >
+           <el-row class="w-full">
+             <el-col :span="12">
+               <el-form-item label="父节点ID">
+                 <el-cascader
+                   v-model="form.parentId"
+                   style="width: 100%"
+                   :disabled="!isEdit"
+                   :options="menuOption"
+                   :props="{
+                     checkStrictly: true,
+                     label: 'title',
+                     value: 'ID',
+                     disabled: 'disabled',
+                     emitPath: false
+                   }"
+                   :show-all-levels="false"
+                   filterable
+                   placeholder="请选择父节点"
+                 />
+               </el-form-item>
+             </el-col>
+             <el-col :span="12">
+               <el-form-item prop="path">
+                 <template #label>
+                  <div class="inline-flex items-center h-4">
+                     <span>路由Path</span>
+                     <el-checkbox
+                       class="ml-2"
+                       v-model="checkFlag"
+                       >添加参数</el-checkbox
+                     >
+                    </div>
+                 </template>
+                 <el-input
+                   v-model="form.path"
+                   :disabled="!checkFlag"
+                   autocomplete="off"
+                   placeholder="建议只在后方拼接参数"
+                 />
+               </el-form-item>
+             </el-col>
+           </el-row>
+        </el-form>
+      </div>
+       
+      <!-- 显示设置区域 -->
+      <div class="border-b border-gray-200">
+        <h3 class="font-semibold text-gray-700 mb-4">显示设置</h3>
+        <el-form
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+        >
+           <el-row class="w-full">
+              <el-col :span="8">
+                <el-form-item label="图标" prop="meta.icon">
+                  <icon v-model="form.meta.icon" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="排序标记" prop="sort">
+                  <el-input 
+                    v-model.number="form.sort" 
+                    autocomplete="off" 
+                    placeholder="请输入排序数字"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="是否隐藏">
+                  <el-select
+                    v-model="form.hidden"
+                    style="width: 100%"
+                    placeholder="是否在列表隐藏"
                   >
-                    <el-icon><QuestionFilled /></el-icon>
-                  </el-tooltip>
-                </div>
-              </template>
-
-              <el-select
-                v-model="form.meta.defaultMenu"
-                style="width: 100%"
-                placeholder="是否为基础页面"
-              >
-                <el-option :value="false" label="否" />
-                <el-option :value="true" label="是" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item>
-              <template #label>
-                <div>
-                  <span> 路由切换动画 </span>
-                  <el-tooltip
-                      content="如果设置了路由切换动画，在本路由下的动画优先级高于全局动画切换优先级。"
-                      placement="top"
-                      effect="light"
+                    <el-option :value="false" label="否" />
+                    <el-option :value="true" label="是" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+        </el-form>
+      </div>
+        
+      <!-- 高级配置区域 -->
+      <div class="border-b border-gray-200">
+        <h3 class="font-semibold text-gray-700 mb-4">高级配置</h3>
+        <el-form
+          :inline="true"
+          :model="form"
+          :rules="rules"
+          label-position="top"
+        >
+            <el-row class="w-full">
+              <el-col :span="12">
+                <el-form-item prop="meta.activeName">
+                  <template #label>
+                    <div class="label-with-tooltip">
+                      <span>高亮菜单</span>
+                      <el-tooltip
+                        content="注：当到达此路由时候，指定左侧菜单指定name会处于活跃状态（亮起），可为空，为空则为本路由Name。"
+                        placement="top"
+                        effect="light"
+                      >
+                        <el-icon><QuestionFilled /></el-icon>
+                      </el-tooltip>
+                    </div>
+                  </template>
+                  <el-input
+                    v-model="form.meta.activeName"
+                    :placeholder="form.name || '请输入高亮菜单名称'"
+                    autocomplete="off"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="KeepAlive" prop="meta.keepAlive">
+                  <el-select
+                    v-model="form.meta.keepAlive"
+                    style="width: 100%"
+                    placeholder="是否keepAlive缓存页面"
                   >
-                    <el-icon><QuestionFilled /></el-icon>
-                  </el-tooltip>
-                </div>
-              </template>
-
-              <el-select
-                  v-model="form.meta.transitionType"
-                  style="width: 100%"
-                  placeholder="跟随全局"
-                  clearable
-              >
-                <el-option value="fade" label="淡入淡出" />
-                <el-option value="slide" label="滑动" />
-                <el-option value="zoom" label="缩放" />
-                <el-option value="none" label="无动画" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div>
-        <div class="flex items-center gap-2">
-          <el-button type="primary" icon="edit" @click="addParameter(form)">
+                    <el-option :value="false" label="否" />
+                    <el-option :value="true" label="是" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+             <el-row class="w-full">
+               <el-col :span="8">
+                 <el-form-item label="CloseTab" prop="meta.closeTab">
+                   <el-select
+                     v-model="form.meta.closeTab"
+                     style="width: 100%"
+                     placeholder="是否自动关闭tab"
+                   >
+                     <el-option :value="false" label="否" />
+                     <el-option :value="true" label="是" />
+                   </el-select>
+                 </el-form-item>
+               </el-col>
+               <el-col :span="8">
+                 <el-form-item>
+                   <template #label>
+                     <div class="label-with-tooltip">
+                       <span>是否为基础页面</span>
+                       <el-tooltip
+                         content="此项选择为是，则不会展示左侧菜单以及顶部信息。"
+                         placement="top"
+                         effect="light"
+                       >
+                         <el-icon><QuestionFilled /></el-icon>
+                       </el-tooltip>
+                     </div>
+                   </template>
+                   <el-select
+                     v-model="form.meta.defaultMenu"
+                     style="width: 100%"
+                     placeholder="是否为基础页面"
+                   >
+                     <el-option :value="false" label="否" />
+                     <el-option :value="true" label="是" />
+                   </el-select>
+                 </el-form-item>
+               </el-col>
+               <el-col :span="8">
+                 <el-form-item>
+                   <template #label>
+                     <div class="label-with-tooltip">
+                       <span>路由切换动画</span>
+                       <el-tooltip
+                         content="如果设置了路由切换动画，在本路由下的动画优先级高于全局动画切换优先级。"
+                         placement="top"
+                         effect="light"
+                       >
+                         <el-icon><QuestionFilled /></el-icon>
+                       </el-tooltip>
+                     </div>
+                   </template>
+                   <el-select
+                     v-model="form.meta.transitionType"
+                     style="width: 100%"
+                     placeholder="跟随全局"
+                     clearable
+                   >
+                     <el-option value="fade" label="淡入淡出" />
+                     <el-option value="slide" label="滑动" />
+                     <el-option value="zoom" label="缩放" />
+                     <el-option value="none" label="无动画" />
+                   </el-select>
+                 </el-form-item>
+               </el-col>
+             </el-row>
+        </el-form>
+      </div>
+          
+      <!-- 菜单参数配置区域 -->
+      <div class="border-b border-gray-200">
+        <div class="flex justify-between items-center mb-4">
+          <h3 class="font-semibold text-gray-700">菜单参数配置</h3>
+          <el-button type="primary" size="small" @click="addParameter(form)">
             新增菜单参数
           </el-button>
         </div>
-        <el-table :data="form.parameters" style="width: 100%; margin-top: 12px">
-          <el-table-column
-            align="left"
-            prop="type"
-            label="参数类型"
-            width="180"
-          >
-            <template #default="scope">
-              <el-select v-model="scope.row.type" placeholder="请选择">
-                <el-option key="query" value="query" label="query" />
-                <el-option key="params" value="params" label="params" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" prop="key" label="参数key" width="180">
-            <template #default="scope">
-              <div>
-                <el-input v-model="scope.row.key" />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" prop="value" label="参数值">
-            <template #default="scope">
-              <div>
-                <el-input v-model="scope.row.value" />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="left">
-            <template #default="scope">
-              <div>
-                <el-button
-                  type="danger"
-                  icon="delete"
-                  @click="deleteParameter(form.parameters, scope.$index)"
-                >
-                  删除
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <div class="flex items-center gap-2 mt-3">
-          <el-button type="primary" icon="edit" @click="addBtn(form)">
-            新增可控按钮
-          </el-button>
-          <el-icon
-            class="cursor-pointer"
-            @click="
-              toDoc('https://www.gin-vue-admin.com/guide/web/button-auth.html')
-            "
-          >
-            <QuestionFilled />
-          </el-icon>
-        </div>
-
-        <el-table :data="form.menuBtn" style="width: 100%; margin-top: 12px">
-          <el-table-column
-            align="left"
-            prop="name"
-            label="按钮名称"
-            width="180"
-          >
-            <template #default="scope">
-              <div>
-                <el-input v-model="scope.row.name" />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="left" prop="name" label="备注" width="180">
-            <template #default="scope">
-              <div>
-                <el-input v-model="scope.row.desc" />
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column align="left">
-            <template #default="scope">
-              <div>
-                <el-button
-                  type="danger"
-                  icon="delete"
-                  @click="deleteBtn(form.menuBtn, scope.$index)"
-                >
-                  删除
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-table 
+              :data="form.parameters" 
+              style="width: 100%"
+              class="parameter-table"
+            >
+              <el-table-column
+                align="center"
+                prop="type"
+                label="参数类型"
+                width="150"
+              >
+                <template #default="scope">
+                  <el-select 
+                    v-model="scope.row.type" 
+                    placeholder="请选择"
+                    size="small"
+                  >
+                    <el-option key="query" value="query" label="query" />
+                    <el-option key="params" value="params" label="params" />
+                  </el-select>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="key" label="参数key" width="150">
+                <template #default="scope">
+                  <el-input 
+                    v-model="scope.row.key" 
+                    size="small"
+                    placeholder="请输入参数key"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column align="center" prop="value" label="参数值">
+                <template #default="scope">
+                  <el-input 
+                    v-model="scope.row.value" 
+                    size="small"
+                    placeholder="请输入参数值"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="操作" width="100">
+                <template #default="scope">
+                  <el-button
+                    type="danger"
+                    size="small"
+                    @click="deleteParameter(form.parameters, scope.$index)"
+                  >
+                    <el-icon><Delete /></el-icon>
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
       </div>
+           
+      <!-- 可控按钮配置区域 -->
+      <div class="mb-2 mt-2">
+        <div class="flex justify-between items-center mb-4">
+          <h3 class="font-semibold text-gray-700">可控按钮配置</h3>
+          <div class="flex items-center gap-2">
+            <el-button type="primary" size="small" @click="addBtn(form)">
+              新增可控按钮
+            </el-button>
+            <el-tooltip
+              content="点击查看按钮权限配置文档"
+              placement="top"
+              effect="light"
+            >
+              <el-icon
+                class="cursor-pointer text-blue-500 hover:text-blue-700"
+                @click="toDoc('https://www.gin-vue-admin.com/guide/web/button-auth.html')"
+              >
+                <QuestionFilled />
+              </el-icon>
+            </el-tooltip>
+          </div>
+        </div>
+             <el-table 
+               :data="form.menuBtn" 
+               style="width: 100%"
+               class="button-table"
+             >
+               <el-table-column
+                 align="center"
+                 prop="name"
+                 label="按钮名称"
+                 width="150"
+               >
+                 <template #default="scope">
+                   <el-input 
+                     v-model="scope.row.name" 
+                     size="small"
+                     placeholder="请输入按钮名称"
+                   />
+                 </template>
+               </el-table-column>
+               <el-table-column align="center" prop="desc" label="备注">
+                 <template #default="scope">
+                   <el-input 
+                     v-model="scope.row.desc" 
+                     size="small"
+                     placeholder="请输入按钮备注"
+                   />
+                 </template>
+               </el-table-column>
+               <el-table-column align="center" label="操作" width="100">
+                 <template #default="scope">
+                   <el-button
+                     type="danger"
+                     size="small"
+                     @click="deleteBtn(form.menuBtn, scope.$index)"
+                   >
+                     <el-icon><Delete /></el-icon>
+                   </el-button>
+                 </template>
+               </el-table-column>
+             </el-table>
+       </div>
     </el-drawer>
   </div>
 </template>
@@ -445,7 +524,7 @@
   import { canRemoveAuthorityBtnApi } from '@/api/authorityBtn'
   import { reactive, ref } from 'vue'
   import { ElMessage, ElMessageBox } from 'element-plus'
-  import { QuestionFilled } from '@element-plus/icons-vue'
+  import { QuestionFilled, InfoFilled, Delete } from '@element-plus/icons-vue'
   import { toDoc } from '@/utils/doc'
   import { toLowerCase } from '@/utils/stringFun'
   import ComponentsCascader from '@/view/superAdmin/menu/components/components-cascader.vue'
@@ -705,4 +784,52 @@
       margin-right: 8px;
     }
   }
+
+
+  
+  .form-tip {
+    margin-top: 8px;
+    font-size: 12px;
+    color: #909399;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    
+    .el-icon {
+      color: #409eff;
+    }
+  }
+  
+  .label-with-tooltip {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    
+    .el-icon {
+      color: #909399;
+      cursor: help;
+      
+      &:hover {
+        color: #409eff;
+      }
+    }
+  }
+  
+  .parameter-table,
+  .button-table {
+    border: 1px solid #ebeef5;
+    border-radius: 6px;
+    
+    :deep(.el-table__header) {
+      background-color: #fafafa;
+    }
+    
+    :deep(.el-table__body) {
+      .el-table__row {
+        &:hover {
+          background-color: #f5f7fa;
+        }
+      }
+    }
+  }
 </style>

From e58d40ab8332e25f45dba60dc0bfffb047802571 Mon Sep 17 00:00:00 2001
From: zayn <972858472@qq.com>
Date: Fri, 20 Jun 2025 13:36:43 +0800
Subject: [PATCH 02/56] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E9=87=8C=E7=9A=84=E8=8F=9C=E5=8D=95=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=AD=A3=E5=B8=B8=E6=B8=B2=E6=9F=93=E5=87=BA=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?bug=20(#2046)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

菜单循环中没有子菜单就直接返回，没有添加到arr列表中导致arr始终是空的
---
 web/src/components/commandMenu/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/src/components/commandMenu/index.vue b/web/src/components/commandMenu/index.vue
index 27ef93fc4..4ab4e205e 100644
--- a/web/src/components/commandMenu/index.vue
+++ b/web/src/components/commandMenu/index.vue
@@ -55,7 +55,6 @@
   const deepMenus = (menus) => {
     const arr = []
     menus?.forEach((menu) => {
-      if (!menu?.children) return
       if (menu.children && menu.children.length > 0) {
         arr.push(...deepMenus(menu.children))
       } else {

From 44751357b47da3cbe5b5a7aa24775597778dc39b Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Sat, 28 Jun 2025 17:45:11 +0800
Subject: [PATCH 03/56] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E4=B8=AD=E9=97=B4=E4=BB=B6=E4=BB=A5=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82=E8=B6=85=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/middleware/timeout.go | 55 ++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 server/middleware/timeout.go

diff --git a/server/middleware/timeout.go b/server/middleware/timeout.go
new file mode 100644
index 000000000..473abf6c8
--- /dev/null
+++ b/server/middleware/timeout.go
@@ -0,0 +1,55 @@
+package middleware
+
+import (
+	"context"
+	"github.com/gin-gonic/gin"
+	"net/http"
+	"time"
+)
+
+// TimeoutMiddleware 创建超时中间件
+// 入参 timeout 设置超时时间（例如：time.Second * 5）
+// 使用示例 xxx.Get("path",middleware.TimeoutMiddleware(30*time.Second),HandleFunc)
+func TimeoutMiddleware(timeout time.Duration) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		ctx, cancel := context.WithTimeout(c.Request.Context(), timeout)
+		defer cancel()
+
+		c.Request = c.Request.WithContext(ctx)
+
+		// 使用 buffered channel 避免 goroutine 泄漏
+		done := make(chan struct{}, 1)
+		panicChan := make(chan interface{}, 1)
+
+		go func() {
+			defer func() {
+				if p := recover(); p != nil {
+					select {
+					case panicChan <- p:
+					default:
+					}
+				}
+				select {
+				case done <- struct{}{}:
+				default:
+				}
+			}()
+			c.Next()
+		}()
+
+		select {
+		case p := <-panicChan:
+			panic(p)
+		case <-done:
+			return
+		case <-ctx.Done():
+			// 确保服务器超时设置足够长
+			c.Header("Connection", "close")
+			c.AbortWithStatusJSON(http.StatusGatewayTimeout, gin.H{
+				"code": 504,
+				"msg":  "请求超时",
+			})
+			return
+		}
+	}
+}

From a5e1170af02a33fdd883121d10bce198486ac4f6 Mon Sep 17 00:00:00 2001
From: Joy <seaplan777@gmail.com>
Date: Sat, 28 Jun 2025 22:29:02 +0800
Subject: [PATCH 04/56] =?UTF-8?q?web/src/utils/request.js:=20Fix=20Server?=
 =?UTF-8?q?=20=E8=BF=94=E5=9B=9E=E9=9D=9E=20JSON=20=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E5=AF=BC=E8=87=B4=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=20(#2049)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/utils/request.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/src/utils/request.js b/web/src/utils/request.js
index 3c532b1fd..cc113cbd1 100644
--- a/web/src/utils/request.js
+++ b/web/src/utils/request.js
@@ -77,6 +77,9 @@ service.interceptors.response.use(
     if (response.headers['new-token']) {
       userStore.setToken(response.headers['new-token'])
     }
+    if (typeof response.data.code === 'undefined') {
+      return response
+    }
     if (response.data.code === 0 || response.headers.success === 'true') {
       if (response.headers.msg) {
         response.data.msg = decodeURI(response.headers.msg)

From ea7455e0929cdbef59352e685947de1515190eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=91=E7=9C=8B=E8=B0=81=E4=B8=8D=E5=8D=B7?=
 <39643887+lmb1113@users.noreply.github.com>
Date: Sat, 28 Jun 2025 22:30:45 +0800
Subject: [PATCH 05/56] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=97=A0=E6=B3=95=E6=B7=BB=E5=8A=A0=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#2047)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/systemTools/autoCode/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index 45b6d46cd..e946cbf2d 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -697,7 +697,7 @@
                 style="width: 100%"
                 placeholder="请选择字段查询条件"
                 clearable
-                :disabled="row.fieldType !== 'json' || row.disabled"
+                :disabled="row.fieldType === 'json' || row.disabled"
               >
                 <el-option
                   v-for="item in typeSearchOptions"

From ca24945af6d3ecbf53f09b5f04ac3c06924df6a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E8=8F=9C=E7=99=BD=E7=8E=89=E6=B1=A4?=
 <79054161+Azir-11@users.noreply.github.com>
Date: Sun, 29 Jun 2025 13:27:12 +0800
Subject: [PATCH 06/56] =?UTF-8?q?feat:=20=E9=87=8D=E6=9E=84=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E6=A8=A1=E5=BC=8F=E3=80=81=E9=A2=9C=E8=89=B2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=92=8C=E5=B8=83=E5=B1=80=E9=85=8D=E7=BD=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=20(#2050)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 重构设置界面，添加主题模式、颜色选择和布局配置模块，移除冗余组件

---------

Co-authored-by: PiexlMax(奇淼 <165128580+pixelmaxQm@users.noreply.github.com>
---
 .../setting/components/layoutModeCard.vue     | 219 +++++++++++++
 .../layout/setting/components/settingItem.vue | 113 +++++++
 .../setting/components/themeColorPicker.vue   | 152 +++++++++
 .../setting/components/themeModeSelector.vue  |  70 +++++
 web/src/view/layout/setting/index.vue         | 275 +++++++----------
 .../setting/modules/appearance/index.vue      | 114 +++++++
 .../layout/setting/modules/general/index.vue  | 288 ++++++++++++++++++
 .../layout/setting/modules/layout/index.vue   | 164 ++++++++++
 web/src/view/layout/setting/title.vue         |  34 ---
 9 files changed, 1238 insertions(+), 191 deletions(-)
 create mode 100644 web/src/view/layout/setting/components/layoutModeCard.vue
 create mode 100644 web/src/view/layout/setting/components/settingItem.vue
 create mode 100644 web/src/view/layout/setting/components/themeColorPicker.vue
 create mode 100644 web/src/view/layout/setting/components/themeModeSelector.vue
 create mode 100644 web/src/view/layout/setting/modules/appearance/index.vue
 create mode 100644 web/src/view/layout/setting/modules/general/index.vue
 create mode 100644 web/src/view/layout/setting/modules/layout/index.vue
 delete mode 100644 web/src/view/layout/setting/title.vue

diff --git a/web/src/view/layout/setting/components/layoutModeCard.vue b/web/src/view/layout/setting/components/layoutModeCard.vue
new file mode 100644
index 000000000..5f1fd1b79
--- /dev/null
+++ b/web/src/view/layout/setting/components/layoutModeCard.vue
@@ -0,0 +1,219 @@
+<template>
+  <div class="grid grid-cols-2 gap-6 font-inter px-6">
+    <div
+      v-for="layout in layoutModes"
+      :key="layout.value"
+      class="bg-white dark:bg-gray-700 border-2 border-gray-200 dark:border-gray-600 rounded-xl p-6 cursor-pointer transition-all duration-150 ease-in-out hover:transform hover:-translate-y-1 hover:shadow-xl"
+      :class="{
+        'ring-2 ring-offset-2 ring-offset-gray-50 dark:ring-offset-gray-900 transform -translate-y-1 shadow-xl': modelValue === layout.value
+      }"
+      :style="modelValue === layout.value ? {
+        borderColor: primaryColor,
+        ringColor: primaryColor + '40'
+      } : {}"
+      @click="handleLayoutChange(layout.value)"
+    >
+      <div class="flex justify-center mb-5">
+        <div
+          class="w-28 h-20 bg-gray-50 dark:bg-gray-600 border border-gray-200 dark:border-gray-500 rounded-lg p-2 flex gap-1.5 shadow-inner"
+          :class="layout.containerClass"
+        >
+          <div
+            v-if="layout.showSidebar"
+            class="rounded-sm"
+            :class="[layout.sidebarClass]"
+            :style="getSidebarStyle(layout)"
+          ></div>
+
+          <div class="flex-1 flex flex-col gap-1.5">
+            <div
+              v-if="layout.showHeader"
+              class="rounded-sm"
+              :class="layout.headerClass"
+              :style="getHeaderStyle(layout)"
+            ></div>
+
+            <div
+              class="flex-1 rounded-sm"
+              :class="layout.contentClass"
+              :style="getContentStyle(layout)"
+            ></div>
+          </div>
+        </div>
+      </div>
+
+      <div class="text-center">
+        <span class="block text-base font-semibold text-gray-900 dark:text-white mb-2" :class="{ 'text-current': modelValue === layout.value }" :style="modelValue === layout.value ? { color: primaryColor } : {}">{{ layout.label }}</span>
+        <span class="block text-sm text-gray-500 dark:text-gray-400">{{ layout.description }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { storeToRefs } from 'pinia'
+import { useAppStore } from '@/pinia'
+
+defineOptions({
+  name: 'LayoutModeCard'
+})
+
+const props = defineProps({
+  modelValue: {
+    type: String,
+    default: 'normal'
+  }
+})
+
+const emit = defineEmits(['update:modelValue'])
+
+const appStore = useAppStore()
+const { config } = storeToRefs(appStore)
+
+const primaryColor = computed(() => config.value.primaryColor)
+const lighterPrimaryColor = computed(() => {
+  const hex = config.value.primaryColor.replace('#', '')
+  const r = parseInt(hex.substr(0, 2), 16)
+  const g = parseInt(hex.substr(2, 2), 16)
+  const b = parseInt(hex.substr(4, 2), 16)
+  return `rgba(${r}, ${g}, ${b}, 0.7)`
+})
+const lightestPrimaryColor = computed(() => {
+  const hex = config.value.primaryColor.replace('#', '')
+  const r = parseInt(hex.substr(0, 2), 16)
+  const g = parseInt(hex.substr(2, 2), 16)
+  const b = parseInt(hex.substr(4, 2), 16)
+  return `rgba(${r}, ${g}, ${b}, 0.4)`
+})
+
+const layoutModes = [
+  {
+    value: 'normal',
+    label: '经典布局',
+    description: '左侧导航，顶部标题栏',
+    containerClass: '',
+    showSidebar: true,
+    sidebarClass: 'w-1/4',
+    showHeader: true,
+    headerClass: 'h-1/4',
+    contentClass: '',
+    showRightSidebar: false,
+    primaryElement: 'sidebar'
+  },
+  {
+    value: 'head',
+    label: '顶部导航',
+    description: '水平导航栏布局',
+    containerClass: 'flex-col',
+    showSidebar: false,
+    showHeader: true,
+    headerClass: 'h-1/3',
+    contentClass: '',
+    showRightSidebar: false,
+    primaryElement: 'header'
+  },
+  {
+    value: 'combination',
+    label: '混合布局',
+    description: '多级导航组合模式',
+    containerClass: '',
+    showSidebar: true,
+    sidebarClass: 'w-1/5',
+    showHeader: true,
+    headerClass: 'h-1/4',
+    contentClass: '',
+    showRightSidebar: true,
+    rightSidebarClass: 'w-1/5',
+    primaryElement: 'header',
+    secondaryElement: 'sidebar'
+  },
+  {
+    value: 'sidebar',
+    label: '侧栏常驻',
+    description: '二级菜单会始终打开',
+    containerClass: '',
+    showSidebar: true,
+    sidebarClass: 'w-1/3',
+    showHeader: true,
+    headerClass: 'h-1/4',
+    contentClass: '',
+    showRightSidebar: false,
+    primaryElement: 'sidebar'
+  }
+]
+
+const getSidebarStyle = (layout) => {
+  if (layout.primaryElement === 'sidebar') {
+    return { backgroundColor: primaryColor.value, opacity: '0.95' }
+  } else if (layout.secondaryElement === 'sidebar') {
+    return { backgroundColor: lighterPrimaryColor.value, opacity: '0.85' }
+  } else {
+    return { backgroundColor: lightestPrimaryColor.value, opacity: '0.6' }
+  }
+}
+
+const getHeaderStyle = (layout) => {
+  if (layout.primaryElement === 'header') {
+    return { backgroundColor: primaryColor.value, opacity: '0.95' }
+  } else if (layout.secondaryElement === 'header') {
+    return { backgroundColor: lighterPrimaryColor.value, opacity: '0.85' }
+  } else {
+    return { backgroundColor: lightestPrimaryColor.value, opacity: '0.6' }
+  }
+}
+
+const getContentStyle = (layout) => {
+  return { backgroundColor: lightestPrimaryColor.value, opacity: '0.5' }
+}
+
+const getRightSidebarStyle = (layout) => {
+  if (layout.primaryElement === 'rightSidebar') {
+    return { backgroundColor: primaryColor.value, opacity: '0.95' }
+  } else if (layout.secondaryElement === 'rightSidebar') {
+    return { backgroundColor: lighterPrimaryColor.value, opacity: '0.85' }
+  } else {
+    return { backgroundColor: lightestPrimaryColor.value, opacity: '0.6' }
+  }
+}
+
+const handleLayoutChange = (layout) => {
+  emit('update:modelValue', layout)
+}
+</script>
+
+<style scoped>
+.font-inter {
+  font-family: 'Inter', sans-serif;
+}
+
+.flex-col {
+  flex-direction: column;
+}
+
+.w-1\/4 {
+  width: 25%;
+}
+
+.w-1\/3 {
+  width: 33.333333%;
+}
+
+.w-1\/5 {
+  width: 20%;
+}
+
+.h-1\/4 {
+  height: 25%;
+}
+
+.h-1\/3 {
+  height: 33.333333%;
+}
+
+@media (max-width: 480px) {
+  .grid-cols-2 {
+    grid-template-columns: repeat(1, minmax(0, 1fr));
+  }
+}
+</style>
diff --git a/web/src/view/layout/setting/components/settingItem.vue b/web/src/view/layout/setting/components/settingItem.vue
new file mode 100644
index 000000000..bc5d7d84f
--- /dev/null
+++ b/web/src/view/layout/setting/components/settingItem.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="flex items-center justify-between py-4 font-inter border-b border-gray-100 dark:border-gray-700 last:border-b-0">
+    <div class="flex items-center gap-2">
+      <span class="text-sm font-medium text-gray-900 dark:text-white">{{ label }}</span>
+      <slot name="suffix"></slot>
+    </div>
+    <div class="flex items-center setting-controls">
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { storeToRefs } from 'pinia'
+import { useAppStore } from '@/pinia'
+
+defineOptions({
+  name: 'SettingItem'
+})
+
+defineProps({
+  label: {
+    type: String,
+    required: true
+  }
+})
+
+const appStore = useAppStore()
+const { config } = storeToRefs(appStore)
+
+const primaryColor = computed(() => config.value.primaryColor)
+const primaryColorWithOpacity = computed(() => config.value.primaryColor + '40')
+</script>
+
+<style scoped>
+.font-inter {
+  font-family: 'Inter', sans-serif;
+}
+
+.setting-controls {
+  ::v-deep(.el-switch) {
+    --el-switch-on-color: v-bind(primaryColor);
+    --el-switch-off-color: #d1d5db;
+  }
+
+  ::v-deep(.el-select) {
+    .el-input__wrapper {
+      border: 1px solid #e5e7eb;
+      border-radius: 6px;
+      transition: all 150ms ease-in-out;
+
+      &:hover {
+        border-color: v-bind(primaryColor);
+        transform: translateY(-1px);
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+      }
+
+      &.is-focus {
+        border-color: v-bind(primaryColor);
+        box-shadow: 0 0 0 2px v-bind(primaryColorWithOpacity);
+      }
+    }
+  }
+
+  ::v-deep(.el-input-number) {
+    .el-input__wrapper {
+      border: 1px solid #e5e7eb;
+      border-radius: 6px;
+      transition: all 150ms ease-in-out;
+
+      &:hover {
+        border-color: v-bind(primaryColor);
+        transform: translateY(-1px);
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+      }
+
+      &.is-focus {
+        border-color: v-bind(primaryColor);
+        box-shadow: 0 0 0 2px v-bind(primaryColorWithOpacity);
+      }
+    }
+  }
+}
+
+.dark .setting-controls {
+  ::v-deep(.el-switch) {
+    --el-switch-off-color: #4b5563;
+  }
+
+  ::v-deep(.el-select) {
+    .el-input__wrapper {
+      border-color: #4b5563;
+      background-color: #374151;
+
+      &:hover {
+        border-color: v-bind(primaryColor);
+      }
+    }
+  }
+
+  ::v-deep(.el-input-number) {
+    .el-input__wrapper {
+      border-color: #4b5563;
+      background-color: #374151;
+
+      &:hover {
+        border-color: v-bind(primaryColor);
+      }
+    }
+  }
+}
+</style>
diff --git a/web/src/view/layout/setting/components/themeColorPicker.vue b/web/src/view/layout/setting/components/themeColorPicker.vue
new file mode 100644
index 000000000..4523c923d
--- /dev/null
+++ b/web/src/view/layout/setting/components/themeColorPicker.vue
@@ -0,0 +1,152 @@
+<template>
+  <div class="font-inter">
+    <div class="bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-8 shadow-sm">
+      <div class="mb-8">
+        <p class="text-base font-semibold text-gray-700 dark:text-gray-300 mb-5">精选色彩</p>
+        <div class="grid grid-cols-3 gap-4">
+          <div
+            v-for="colorItem in presetColors"
+            :key="colorItem.color"
+            class="flex items-center gap-4 p-4 bg-white dark:bg-gray-700 border-2 border-gray-200 dark:border-gray-600 rounded-xl cursor-pointer transition-all duration-150 ease-in-out hover:transform hover:-translate-y-1 hover:shadow-lg"
+            :class="{
+              'ring-2 ring-offset-2 ring-offset-gray-50 dark:ring-offset-gray-800 transform -translate-y-1 shadow-lg': modelValue === colorItem.color
+            }"
+            :style="modelValue === colorItem.color ? {
+              borderColor: colorItem.color,
+              ringColor: colorItem.color + '40'
+            } : {}"
+            @click="handleColorChange(colorItem.color)"
+          >
+            <div
+              class="relative w-10 h-10 rounded-lg border border-gray-300 dark:border-gray-500 flex-shrink-0 shadow-sm"
+              :style="{ backgroundColor: colorItem.color }"
+            >
+              <div
+                v-if="modelValue === colorItem.color"
+                class="absolute inset-0 flex items-center justify-center text-white text-base"
+                style="text-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);"
+              >
+                <el-icon>
+                  <Check />
+                </el-icon>
+              </div>
+            </div>
+            <div class="min-w-0 flex-1">
+              <span class="block text-sm font-semibold text-gray-900 dark:text-white">{{ colorItem.name }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="flex items-center justify-between p-5 bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-xl mb-6 shadow-sm">
+        <div class="flex-1">
+          <h4 class="text-base font-semibold text-gray-900 dark:text-white">自定义颜色</h4>
+          <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">选择任意颜色作为主题色</p>
+        </div>
+        <el-color-picker
+          v-model="customColor"
+          size="large"
+          :predefine="presetColors.map(item => item.color)"
+          @change="handleCustomColorChange"
+          class="custom-color-picker"
+        />
+      </div>
+
+      <div class="bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-xl p-5 shadow-sm">
+        <div class="flex items-center justify-between">
+          <span class="text-base font-semibold text-gray-700 dark:text-gray-300">当前主题色</span>
+          <div class="flex items-center gap-3">
+            <div
+              class="w-6 h-6 rounded-lg border border-gray-300 dark:border-gray-500 shadow-sm"
+              :style="{ backgroundColor: modelValue }"
+            ></div>
+            <code class="text-sm font-mono bg-gray-100 dark:bg-gray-600 text-gray-700 dark:text-gray-300 px-3 py-2 rounded-lg border border-gray-200 dark:border-gray-500">
+              {{ modelValue }}
+            </code>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue'
+import { Check } from '@element-plus/icons-vue'
+
+defineOptions({
+  name: 'ThemeColorPicker'
+})
+
+const props = defineProps({
+  modelValue: {
+    type: String,
+    default: '#3b82f6'
+  }
+})
+
+const emit = defineEmits(['update:modelValue'])
+
+const customColor = ref(props.modelValue)
+
+const presetColors = [
+  { color: '#4E80EE', name: '默认' },
+  { color: '#8bb5d1', name: '晨雾蓝' },
+  { color: '#a8c8a8', name: '薄荷绿' },
+  { color: '#d4a5a5', name: '玫瑰粉' },
+  { color: '#c8a8d8', name: '薰衣草' },
+  { color: '#f0c674', name: '暖阳黄' },
+  { color: '#b8b8b8', name: '月光银' },
+  { color: '#d8a8a8', name: '珊瑚橙' },
+  { color: '#a8d8d8', name: '海雾青' },
+  { color: '#c8c8a8', name: '橄榄绿' },
+  { color: '#d8c8a8', name: '奶茶棕' },
+  { color: '#a8a8d8', name: '梦幻紫' },
+  { color: '#c8d8a8', name: '抹茶绿' }
+]
+
+const handleColorChange = (color) => {
+  customColor.value = color
+  emit('update:modelValue', color)
+}
+
+const handleCustomColorChange = (color) => {
+  if (color) {
+    emit('update:modelValue', color)
+  }
+}
+
+watch(() => props.modelValue, (newValue) => {
+  customColor.value = newValue
+})
+</script>
+
+<style scoped>
+.font-inter {
+  font-family: 'Inter', sans-serif;
+}
+
+.custom-color-picker {
+  ::v-deep(.el-color-picker__trigger) {
+    border: 1px solid #e5e7eb;
+    border-radius: 6px;
+    transition: all 150ms ease-in-out;
+
+    &:hover {
+      border-color: #9ca3af;
+      transform: translateY(-1px);
+      box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    }
+  }
+}
+
+.dark .custom-color-picker {
+  ::v-deep(.el-color-picker__trigger) {
+    border-color: #4b5563;
+
+    &:hover {
+      border-color: #6b7280;
+    }
+  }
+}
+</style>
diff --git a/web/src/view/layout/setting/components/themeModeSelector.vue b/web/src/view/layout/setting/components/themeModeSelector.vue
new file mode 100644
index 000000000..72eb4e8c4
--- /dev/null
+++ b/web/src/view/layout/setting/components/themeModeSelector.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="flex justify-center">
+    <div class="inline-flex bg-gray-100 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg p-1 gap-1">
+      <div
+        v-for="mode in themeModes"
+        :key="mode.value"
+        class="flex flex-col items-center justify-center px-4 py-3 rounded-md cursor-pointer transition-all duration-150 ease-in-out min-w-[64px]"
+        :class="[
+          modelValue === mode.value
+            ? 'text-white shadow-sm transform -translate-y-0.5'
+            : 'text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700'
+        ]"
+        :style="modelValue === mode.value ? { backgroundColor: primaryColor } : {}"
+        @click="handleModeChange(mode.value)"
+      >
+        <el-icon class="text-lg mb-1">
+          <component :is="mode.icon" />
+        </el-icon>
+        <span class="text-xs font-medium">{{ mode.label }}</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import { storeToRefs } from 'pinia'
+import { Sunny, Moon, Monitor } from '@element-plus/icons-vue'
+import { useAppStore } from '@/pinia'
+
+defineOptions({
+  name: 'ThemeModeSelector'
+})
+
+const props = defineProps({
+  modelValue: {
+    type: String,
+    default: 'auto'
+  }
+})
+
+const emit = defineEmits(['update:modelValue'])
+
+const appStore = useAppStore()
+const { config } = storeToRefs(appStore)
+
+const primaryColor = computed(() => config.value.primaryColor)
+
+const themeModes = [
+  {
+    value: 'light',
+    label: '浅色',
+    icon: Sunny
+  },
+  {
+    value: 'dark',
+    label: '深色',
+    icon: Moon
+  },
+  {
+    value: 'auto',
+    label: '跟随系统',
+    icon: Monitor
+  }
+]
+
+const handleModeChange = (mode) => {
+  emit('update:modelValue', mode)
+}
+</script>
diff --git a/web/src/view/layout/setting/index.vue b/web/src/view/layout/setting/index.vue
index 916691ba8..ac24d4735 100644
--- a/web/src/view/layout/setting/index.vue
+++ b/web/src/view/layout/setting/index.vue
@@ -5,214 +5,175 @@
     direction="rtl"
     :size="width"
     :show-close="false"
+    class="theme-config-drawer"
   >
     <template #header>
-      <div class="flex justify-between items-center">
-        <span class="text-lg">系统配置</span>
-        <el-button type="primary" @click="resetConfig">重置配置</el-button>
+      <div class="flex items-center justify-between w-full px-6 py-4 bg-white dark:bg-gray-900 border-b border-gray-200 dark:border-gray-700">
+        <h2 class="text-xl font-semibold text-gray-900 dark:text-white font-inter">系统配置</h2>
+        <el-button
+          type="primary"
+          size="small"
+          class="reset-btn"
+          :style="{ backgroundColor: config.primaryColor, borderColor: config.primaryColor }"
+          @click="resetConfig"
+        >
+          重置配置
+        </el-button>
       </div>
     </template>
-    <div class="flex flex-col">
-      <div class="mb-8">
-        <Title title="默认主题"></Title>
-        <div class="mt-2 text-sm p-2 flex items-center justify-center gap-2">
-          <el-segmented
-            v-model="config.darkMode"
-            :options="options"
-            size="default"
-            @change="appStore.toggleDarkMode"
-          />
-        </div>
-      </div>
-      <div class="mb-8">
-        <Title title="主题色"></Title>
-        <div class="mt-2 text-sm p-2 flex items-center gap-2 justify-center">
-          <div
-            v-for="item in colors"
-            :key="item"
-            class="w-5 h-5 rounded cursor-pointer flex items-center justify-center"
-            :style="`background:${item}`"
-            @click="appStore.togglePrimaryColor(item)"
-          >
-            <el-icon v-if="config.primaryColor === item">
-              <Select />
-            </el-icon>
-          </div>
-          <el-color-picker
-            v-model="customColor"
-            @change="appStore.togglePrimaryColor"
-          />
-        </div>
-      </div>
-      <div class="mb-8">
-        <Title title="主题配置"></Title>
-        <div class="mt-2 text-md p-2 flex flex-col gap-2">
-          <div class="flex items-center justify-between">
-            <div>展示水印</div>
-            <el-switch
-              v-model="config.show_watermark"
-              @change="appStore.toggleConfigWatermark"
-            />
-          </div>
-          <div class="flex items-center justify-between">
-            <div>灰色模式</div>
-            <el-switch v-model="config.grey" @change="appStore.toggleGrey" />
-          </div>
-          <div class="flex items-center justify-between">
-            <div>色弱模式</div>
-            <el-switch
-              v-model="config.weakness"
-              @change="appStore.toggleWeakness"
-            />
-          </div>
-          <div class="flex items-center justify-between">
-            <div>菜单模式</div>
-            <el-segmented
-              v-model="config.side_mode"
-              :options="sideModes"
-              size="default"
-              @change="appStore.toggleSideMode"
-            />
-          </div>
 
-          <div class="flex items-center justify-between">
-            <div>显示标签页</div>
-            <el-switch
-              v-model="config.showTabs"
-              @change="appStore.toggleTabs"
-            />
-          </div>
-          <div class="flex items-center justify-between gap-2">
-            <div class="flex-shrink-0">页面切换动画</div>
-            <el-select
-              v-model="config.transition_type"
-              @change="appStore.toggleTransition"
-              class="w-40"
+    <div class="h-full bg-white dark:bg-gray-900">
+      <div class="px-8 pt-4 pb-6 border-b border-gray-200 dark:border-gray-700">
+        <div class="flex justify-center">
+          <div class="inline-flex bg-gray-100 dark:bg-gray-800 rounded-xl p-1.5 border border-gray-200 dark:border-gray-700 shadow-sm">
+            <button
+              v-for="tab in tabs"
+              :key="tab.key"
+              class="px-6 py-3 text-base font-medium rounded-lg transition-all duration-150 ease-in-out min-w-[80px]"
+              :class="[
+                activeTab === tab.key
+                  ? 'text-white shadow-md transform -translate-y-0.5'
+                  : 'text-gray-600 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-700'
+              ]"
+              :style="activeTab === tab.key ? { backgroundColor: config.primaryColor } : {}"
+              @click="activeTab = tab.key"
             >
-              <el-option value="fade" label="淡入淡出" />
-              <el-option value="slide" label="滑动" />
-              <el-option value="zoom" label="缩放" />
-              <el-option value="none" label="无动画" />
-            </el-select>
+              {{ tab.label }}
+            </button>
           </div>
         </div>
       </div>
 
-      <div class="mb-8">
-        <Title title="layout 大小配置"></Title>
-        <div class="mt-2 text-md p-2 flex flex-col gap-2">
-          <div class="flex items-center justify-between mb-2">
-            <div>侧边栏展开宽度</div>
-            <el-input-number
-              v-model="config.layout_side_width"
-              :min="150"
-              :max="400"
-              :step="10"
-            ></el-input-number>
-          </div>
-          <div class="flex items-center justify-between mb-2">
-            <div>侧边栏收缩宽度</div>
-            <el-input-number
-              v-model="config.layout_side_collapsed_width"
-              :min="60"
-              :max="100"
-            ></el-input-number>
-          </div>
-          <div class="flex items-center justify-between mb-2">
-            <div>侧边栏子项高度</div>
-            <el-input-number
-              v-model="config.layout_side_item_height"
-              :min="30"
-              :max="50"
-            ></el-input-number>
-          </div>
+      <div class="pb-8 h-full overflow-y-auto">
+        <div class="transition-all duration-300 ease-in-out">
+          <AppearanceSettings v-if="activeTab === 'appearance'" />
+          <LayoutSettings v-else-if="activeTab === 'layout'" />
+          <GeneralSettings v-else-if="activeTab === 'general'" />
         </div>
       </div>
-
-      <!--      <el-alert type="warning" :closable="false">
-        请注意，所有配置请保存到本地文件的
-        <el-tag>config.json</el-tag> 文件中，否则刷新页面后会丢失配置
-      </el-alert>-->
     </div>
   </el-drawer>
 </template>
 
 <script setup>
-  import { useAppStore } from '@/pinia'
+  import { ref, computed, watch } from 'vue'
   import { storeToRefs } from 'pinia'
-  import { ref, computed } from 'vue'
   import { ElMessage } from 'element-plus'
+  import { useAppStore } from '@/pinia'
   import { setSelfSetting } from '@/api/user'
-  import Title from './title.vue'
-  import { watch } from 'vue';
+  import AppearanceSettings from './modules/appearance/index.vue'
+  import LayoutSettings from './modules/layout/index.vue'
+  import GeneralSettings from './modules/general/index.vue'
 
-  const appStore = useAppStore()
-  const { config, device } = storeToRefs(appStore)
   defineOptions({
     name: 'GvaSetting'
   })
 
+  const appStore = useAppStore()
+  const { config, device } = storeToRefs(appStore)
+
+  const activeTab = ref('appearance')
+
+  const tabs = [
+    { key: 'appearance', label: '外观' },
+    { key: 'layout', label: '布局' },
+    { key: 'general', label: '通用' }
+  ]
+
   const width = computed(() => {
     return device.value === 'mobile' ? '100%' : '500px'
   })
 
-  const colors = [
-    '#EB2F96',
-    '#3b82f6',
-    '#2FEB54',
-    '#EBEB2F',
-    '#EB2F2F',
-    '#2FEBEB'
-  ]
-
   const drawer = defineModel('drawer', {
     default: true,
     type: Boolean
   })
 
-  const options = ['dark', 'light', 'auto']
-  const sideModes = [
-    {
-      label: '正常模式',
-      value: 'normal'
-    },
-    {
-      label: '顶部菜单栏模式',
-      value: 'head'
-    },
-    {
-      label: '组合模式',
-      value: 'combination'
-    },
-    {
-      label: '侧边栏常驻',
-      value: 'sidebar'
-    }
-  ]
-
   const saveConfig = async () => {
     const res = await setSelfSetting(config.value)
-    console.log(config.value)
     if (res.code === 0) {
       localStorage.setItem('originSetting', JSON.stringify(config.value))
       ElMessage.success('保存成功')
     }
   }
 
-  const customColor = ref('')
-
   const resetConfig = () => {
     appStore.resetConfig()
   }
 
-
   watch(config, async () => {
     await saveConfig();
   }, { deep: true });
 </script>
 
 <style lang="scss" scoped>
-  ::v-deep(.el-drawer__header) {
-    @apply border-gray-400 dark:border-gray-600;
+.theme-config-drawer {
+  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+
+  ::v-deep(.el-drawer) {
+    background: white;
   }
+
+  ::v-deep(.el-drawer__header) {
+    padding: 0;
+    border: 0;
+  }
+
+  ::v-deep(.el-drawer__body) {
+    padding: 0;
+  }
+}
+
+.dark .theme-config-drawer {
+  ::v-deep(.el-drawer) {
+    background: #111827;
+  }
+}
+
+.font-inter {
+  font-family: 'Inter', sans-serif;
+}
+
+.reset-btn {
+  border-radius: 0.5rem;
+  font-weight: 500;
+  transition: all 150ms ease-in-out;
+
+  &:hover {
+    transform: translateY(-2px);
+    filter: brightness(0.9);
+    box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  }
+}
+
+/* Custom scrollbar for webkit browsers */
+::-webkit-scrollbar {
+  width: 6px;
+}
+
+::-webkit-scrollbar-track {
+  background: #f3f4f6;
+  border-radius: 3px;
+}
+
+::-webkit-scrollbar-thumb {
+  background: #d1d5db;
+  border-radius: 3px;
+
+  &:hover {
+    background: #9ca3af;
+  }
+}
+
+.dark ::-webkit-scrollbar-track {
+  background: #1f2937;
+}
+
+.dark ::-webkit-scrollbar-thumb {
+  background: #4b5563;
+
+  &:hover {
+    background: #6b7280;
+  }
+}
 </style>
diff --git a/web/src/view/layout/setting/modules/appearance/index.vue b/web/src/view/layout/setting/modules/appearance/index.vue
new file mode 100644
index 000000000..70fb98db2
--- /dev/null
+++ b/web/src/view/layout/setting/modules/appearance/index.vue
@@ -0,0 +1,114 @@
+<template>
+  <div class="font-inter">
+    <!-- Theme Mode Section -->
+    <div class="mb-10">
+      <div class="flex items-center justify-center mb-6">
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+        <span class="px-6 text-lg font-semibold text-gray-700 dark:text-gray-300">主题模式</span>
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+      </div>
+
+      <div class="section-content">
+        <ThemeModeSelector
+          v-model="config.darkMode"
+          @update:modelValue="appStore.toggleDarkMode"
+        />
+      </div>
+    </div>
+
+    <!-- Theme Color Section -->
+    <div class="mb-10">
+      <div class="flex items-center justify-center mb-6">
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+        <span class="px-6 text-lg font-semibold text-gray-700 dark:text-gray-300">主题颜色</span>
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+      </div>
+
+      <div class="section-content">
+        <ThemeColorPicker
+          v-model="config.primaryColor"
+          @update:modelValue="appStore.togglePrimaryColor"
+        />
+      </div>
+    </div>
+
+    <!-- Visual Accessibility Section -->
+    <div class="mb-10">
+      <div class="flex items-center justify-center mb-6">
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+        <span class="px-6 text-lg font-semibold text-gray-700 dark:text-gray-300">视觉辅助</span>
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+      </div>
+
+      <div class="section-content">
+        <div class="bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-6 shadow-sm">
+          <SettingItem label="灰色模式">
+            <template #suffix>
+              <span class="text-xs text-gray-400 dark:text-gray-500 ml-2">降低色彩饱和度</span>
+            </template>
+            <el-switch
+              v-model="config.grey"
+              @change="appStore.toggleGrey"
+            />
+          </SettingItem>
+
+          <SettingItem label="色弱模式">
+            <template #suffix>
+              <span class="text-xs text-gray-400 dark:text-gray-500 ml-2">优化色彩对比度</span>
+            </template>
+            <el-switch
+              v-model="config.weakness"
+              @change="appStore.toggleWeakness"
+            />
+          </SettingItem>
+
+          <SettingItem label="显示水印">
+            <template #suffix>
+              <span class="text-xs text-gray-400 dark:text-gray-500 ml-2">在页面显示水印标识</span>
+            </template>
+            <el-switch
+              v-model="config.show_watermark"
+              @change="appStore.toggleConfigWatermark"
+            />
+          </SettingItem>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { storeToRefs } from 'pinia'
+import { useAppStore } from '@/pinia'
+import ThemeModeSelector from '../../components/themeModeSelector.vue'
+import ThemeColorPicker from '../../components/themeColorPicker.vue'
+import SettingItem from '../../components/settingItem.vue'
+
+defineOptions({
+  name: 'AppearanceSettings'
+})
+
+const appStore = useAppStore()
+const { config } = storeToRefs(appStore)
+</script>
+
+<style scoped>
+.font-inter {
+  font-family: 'Inter', sans-serif;
+}
+
+.section-content {
+  animation: fadeInUp 0.3s ease;
+}
+
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    transform: translateY(12px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+</style>
diff --git a/web/src/view/layout/setting/modules/general/index.vue b/web/src/view/layout/setting/modules/general/index.vue
new file mode 100644
index 000000000..31e2a8500
--- /dev/null
+++ b/web/src/view/layout/setting/modules/general/index.vue
@@ -0,0 +1,288 @@
+<template>
+  <div class="font-inter">
+    <div class="mb-10">
+      <div class="flex items-center justify-center mb-6">
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+        <span class="px-6 text-lg font-semibold text-gray-700 dark:text-gray-300">系统信息</span>
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+      </div>
+
+      <div class="section-content">
+        <div class="bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-6 shadow-sm">
+          <div class="grid grid-cols-2 gap-4 text-sm">
+            <div class="flex justify-between items-center py-3 border-b border-gray-200 dark:border-gray-600">
+              <span class="text-gray-600 dark:text-gray-400 font-medium">版本</span>
+              <span class="font-mono text-gray-900 dark:text-white font-semibold">v2.7.4</span>
+            </div>
+            <div class="flex justify-between items-center py-3 border-b border-gray-200 dark:border-gray-600">
+              <span class="text-gray-600 dark:text-gray-400 font-medium">前端框架</span>
+              <span class="font-mono text-gray-900 dark:text-white font-semibold">Vue 3</span>
+            </div>
+            <div class="flex justify-between items-center py-3 border-b border-gray-200 dark:border-gray-600">
+              <span class="text-gray-600 dark:text-gray-400 font-medium">UI 组件库</span>
+              <span class="font-mono text-gray-900 dark:text-white font-semibold">Element Plus</span>
+            </div>
+            <div class="flex justify-between items-center py-3 border-b border-gray-200 dark:border-gray-600">
+              <span class="text-gray-600 dark:text-gray-400 font-medium">构建工具</span>
+              <span class="font-mono text-gray-900 dark:text-white font-semibold">Vite</span>
+            </div>
+            <div class="flex justify-between items-center py-3">
+              <span class="text-gray-600 dark:text-gray-400 font-medium">浏览器</span>
+              <span class="font-mono text-gray-900 dark:text-white font-semibold">{{ browserInfo }}</span>
+            </div>
+            <div class="flex justify-between items-center py-3">
+              <span class="text-gray-600 dark:text-gray-400 font-medium">屏幕分辨率</span>
+              <span class="font-mono text-gray-900 dark:text-white font-semibold">{{ screenResolution }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-10">
+      <div class="flex items-center justify-center mb-6">
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+        <span class="px-6 text-lg font-semibold text-gray-700 dark:text-gray-300">配置管理</span>
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+      </div>
+
+      <div class="section-content">
+        <div class="bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-6 shadow-sm">
+          <div class="space-y-5">
+            <div class="bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-lg p-5 flex items-center justify-between hover:shadow-md transition-all duration-150 ease-in-out hover:-translate-y-0.5">
+              <div class="flex items-center gap-4">
+                <div class="w-12 h-12 bg-red-50 dark:bg-red-900/20 border border-red-200 dark:border-red-800 rounded-xl flex items-center justify-center text-red-600 dark:text-red-400 text-xl">
+                  🔄
+                </div>
+                <div>
+                  <h4 class="text-sm font-semibold text-gray-900 dark:text-white">重置配置</h4>
+                  <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">将所有设置恢复为默认值</p>
+                </div>
+              </div>
+              <el-button
+                type="danger"
+                size="small"
+                class="rounded-lg font-medium transition-all duration-150 ease-in-out hover:-translate-y-0.5"
+                @click="handleResetConfig"
+              >
+                重置配置
+              </el-button>
+            </div>
+
+            <div class="bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-lg p-5 flex items-center justify-between hover:shadow-md transition-all duration-150 ease-in-out hover:-translate-y-0.5">
+              <div class="flex items-center gap-4">
+                <div class="w-12 h-12 bg-blue-50 dark:bg-blue-900/20 border border-blue-200 dark:border-blue-800 rounded-xl flex items-center justify-center text-blue-600 dark:text-blue-400 text-xl">
+                  📤
+                </div>
+                <div>
+                  <h4 class="text-sm font-semibold text-gray-900 dark:text-white">导出配置</h4>
+                  <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">导出当前配置为 JSON 文件</p>
+                </div>
+              </div>
+              <el-button
+                type="primary"
+                size="small"
+                class="rounded-lg font-medium transition-all duration-150 ease-in-out hover:-translate-y-0.5"
+                :style="{ backgroundColor: config.primaryColor, borderColor: config.primaryColor }"
+                @click="handleExportConfig"
+              >
+                导出配置
+              </el-button>
+            </div>
+
+            <div class="bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-lg p-5 flex items-center justify-between hover:shadow-md transition-all duration-150 ease-in-out hover:-translate-y-0.5">
+              <div class="flex items-center gap-4">
+                <div class="w-12 h-12 bg-green-50 dark:bg-green-900/20 border border-green-200 dark:border-green-800 rounded-xl flex items-center justify-center text-green-600 dark:text-green-400 text-xl">
+                  📥
+                </div>
+                <div>
+                  <h4 class="text-sm font-semibold text-gray-900 dark:text-white">导入配置</h4>
+                  <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">从 JSON 文件导入配置</p>
+                </div>
+              </div>
+              <el-upload
+                ref="uploadRef"
+                :auto-upload="false"
+                :show-file-list="false"
+                accept=".json"
+                @change="handleImportConfig"
+              >
+                <el-button
+                  type="success"
+                  size="small"
+                  class="rounded-lg font-medium transition-all duration-150 ease-in-out hover:-translate-y-0.5"
+                >
+                  导入配置
+                </el-button>
+              </el-upload>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-10">
+      <div class="flex items-center justify-center mb-6">
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+        <span class="px-6 text-lg font-semibold text-gray-700 dark:text-gray-300">关于项目</span>
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+      </div>
+
+      <div class="section-content">
+        <div class="bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-6 shadow-sm">
+          <div class="flex items-start gap-5">
+            <div class="w-16 h-16 bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-xl flex items-center justify-center flex-shrink-0 shadow-sm">
+              <img
+                src="/logo.png"
+                alt="Gin-Vue-Admin Logo"
+                class="w-10 h-10 object-contain"
+                @error="handleLogoError"
+              />
+            </div>
+            <div class="flex-1">
+              <h4 class="text-xl font-semibold text-gray-900 dark:text-white mb-3">Gin-Vue-Admin</h4>
+              <p class="text-sm text-gray-600 dark:text-gray-400 mb-5 leading-relaxed">
+                基于 Vue3 + Gin 的全栈开发基础平台，提供完整的后台管理解决方案
+              </p>
+              <div class="flex items-center gap-3 text-sm">
+                <a
+                  href="https://github.com/flipped-aurora/gin-vue-admin"
+                  target="_blank"
+                  class="font-medium transition-colors duration-150 hover:underline"
+                  :style="{ color: config.primaryColor }"
+                >
+                  GitHub 仓库
+                </a>
+                <span class="text-gray-400 dark:text-gray-500">·</span>
+                <a
+                  href="https://www.gin-vue-admin.com/"
+                  target="_blank"
+                  class="font-medium transition-colors duration-150 hover:underline"
+                  :style="{ color: config.primaryColor }"
+                >
+                  官方文档
+                </a>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { storeToRefs } from 'pinia'
+import { useAppStore } from '@/pinia'
+
+defineOptions({
+  name: 'GeneralSettings'
+})
+
+const appStore = useAppStore()
+const { config } = storeToRefs(appStore)
+const uploadRef = ref()
+
+const browserInfo = ref('')
+const screenResolution = ref('')
+const logoUrl = ref('')
+
+onMounted(() => {
+  const userAgent = navigator.userAgent
+  if (userAgent.includes('Chrome')) {
+    browserInfo.value = 'Chrome'
+  } else if (userAgent.includes('Firefox')) {
+    browserInfo.value = 'Firefox'
+  } else if (userAgent.includes('Safari')) {
+    browserInfo.value = 'Safari'
+  } else if (userAgent.includes('Edge')) {
+    browserInfo.value = 'Edge'
+  } else {
+    browserInfo.value = 'Unknown'
+  }
+
+  screenResolution.value = `${screen.width}×${screen.height}`
+})
+
+const handleLogoError = () => {
+  logoUrl.value = ''
+}
+
+const handleResetConfig = async () => {
+  try {
+    await ElMessageBox.confirm(
+      '确定要重置所有配置吗？此操作不可撤销。',
+      '重置配置',
+      {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }
+    )
+    
+    appStore.resetConfig()
+    ElMessage.success('配置已重置')
+  } catch {
+    // User cancelled
+  }
+}
+
+const handleExportConfig = () => {
+  const configData = JSON.stringify(config.value, null, 2)
+  const blob = new Blob([configData], { type: 'application/json' })
+  const url = URL.createObjectURL(blob)
+  
+  const link = document.createElement('a')
+  link.href = url
+  link.download = `gin-vue-admin-config-${new Date().toISOString().split('T')[0]}.json`
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+  URL.revokeObjectURL(url)
+  
+  ElMessage.success('配置已导出')
+}
+
+const handleImportConfig = (file) => {
+  const reader = new FileReader()
+  reader.onload = (e) => {
+    try {
+      const importedConfig = JSON.parse(e.target.result)
+      
+      Object.keys(importedConfig).forEach(key => {
+        if (key in config.value) {
+          config.value[key] = importedConfig[key]
+        }
+      })
+      
+      ElMessage.success('配置已导入')
+    } catch (error) {
+      ElMessage.error('配置文件格式错误')
+    }
+  }
+  reader.readAsText(file.raw)
+}
+</script>
+
+<style scoped>
+.font-inter {
+  font-family: 'Inter', sans-serif;
+}
+
+.section-content {
+  animation: fadeInUp 0.3s ease;
+}
+
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    transform: translateY(12px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+</style>
diff --git a/web/src/view/layout/setting/modules/layout/index.vue b/web/src/view/layout/setting/modules/layout/index.vue
new file mode 100644
index 000000000..bcc4809ef
--- /dev/null
+++ b/web/src/view/layout/setting/modules/layout/index.vue
@@ -0,0 +1,164 @@
+<template>
+  <div class="font-inter">
+    <div class="mb-10">
+      <div class="flex items-center justify-center mb-6">
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+        <span class="px-6 text-lg font-semibold text-gray-700 dark:text-gray-300">布局模式</span>
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+      </div>
+
+      <div class="section-content">
+        <LayoutModeCard
+          v-model="config.side_mode"
+          @update:modelValue="appStore.toggleSideMode"
+        />
+      </div>
+    </div>
+
+    <div class="mb-10">
+      <div class="flex items-center justify-center mb-6">
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+        <span class="px-6 text-lg font-semibold text-gray-700 dark:text-gray-300">界面配置</span>
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+      </div>
+
+      <div class="section-content">
+        <div class="bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-6 shadow-sm">
+          <SettingItem label="显示标签页">
+            <template #suffix>
+              <span class="text-xs text-gray-400 dark:text-gray-500 ml-2">页面标签导航</span>
+            </template>
+            <el-switch
+              v-model="config.showTabs"
+              @change="appStore.toggleTabs"
+            />
+          </SettingItem>
+
+          <SettingItem label="页面切换动画">
+            <template #suffix>
+              <span class="text-xs text-gray-400 dark:text-gray-500 ml-2">页面过渡效果</span>
+            </template>
+            <el-select
+              v-model="config.transition_type"
+              @change="appStore.toggleTransition"
+              class="w-32"
+              size="small"
+            >
+              <el-option value="fade" label="淡入淡出" />
+              <el-option value="slide" label="滑动" />
+              <el-option value="zoom" label="缩放" />
+              <el-option value="none" label="无动画" />
+            </el-select>
+          </SettingItem>
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-10">
+      <div class="flex items-center justify-center mb-6">
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+        <span class="px-6 text-lg font-semibold text-gray-700 dark:text-gray-300">尺寸配置</span>
+        <div class="h-px bg-gray-200 dark:bg-gray-700 flex-1"></div>
+      </div>
+
+      <div class="section-content">
+        <div class="bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl p-6 shadow-sm">
+          <div class="space-y-6">
+            <div class="bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-lg p-5 hover:shadow-md transition-all duration-150 ease-in-out hover:-translate-y-0.5">
+              <div class="flex items-center justify-between">
+                <div>
+                  <h4 class="text-sm font-medium text-gray-900 dark:text-white">侧边栏展开宽度</h4>
+                  <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">侧边栏完全展开时的宽度</p>
+                </div>
+                <div class="flex items-center gap-2">
+                  <el-input-number
+                    v-model="config.layout_side_width"
+                    :min="150"
+                    :max="400"
+                    :step="10"
+                    size="small"
+                    class="w-24"
+                  />
+                  <span class="text-xs font-medium text-gray-500 dark:text-gray-400">px</span>
+                </div>
+              </div>
+            </div>
+
+            <div class="bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-lg p-5 hover:shadow-md transition-all duration-150 ease-in-out hover:-translate-y-0.5">
+              <div class="flex items-center justify-between">
+                <div>
+                  <h4 class="text-sm font-medium text-gray-900 dark:text-white">侧边栏收缩宽度</h4>
+                  <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">侧边栏收缩时的最小宽度</p>
+                </div>
+                <div class="flex items-center gap-2">
+                  <el-input-number
+                    v-model="config.layout_side_collapsed_width"
+                    :min="60"
+                    :max="100"
+                    size="small"
+                    class="w-24"
+                  />
+                  <span class="text-xs font-medium text-gray-500 dark:text-gray-400">px</span>
+                </div>
+              </div>
+            </div>
+
+            <div class="bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-lg p-5 hover:shadow-md transition-all duration-150 ease-in-out hover:-translate-y-0.5">
+              <div class="flex items-center justify-between">
+                <div>
+                  <h4 class="text-sm font-medium text-gray-900 dark:text-white">菜单项高度</h4>
+                  <p class="text-xs text-gray-500 dark:text-gray-400 mt-1">侧边栏菜单项的行高</p>
+                </div>
+                <div class="flex items-center gap-2">
+                  <el-input-number
+                    v-model="config.layout_side_item_height"
+                    :min="30"
+                    :max="50"
+                    size="small"
+                    class="w-24"
+                  />
+                  <span class="text-xs font-medium text-gray-500 dark:text-gray-400">px</span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { storeToRefs } from 'pinia'
+import { useAppStore } from '@/pinia'
+import LayoutModeCard from '../../components/layoutModeCard.vue'
+import SettingItem from '../../components/settingItem.vue'
+
+defineOptions({
+  name: 'LayoutSettings'
+})
+
+const appStore = useAppStore()
+const { config } = storeToRefs(appStore)
+</script>
+
+<style scoped>
+.font-inter {
+  font-family: 'Inter', sans-serif;
+}
+
+.section-content {
+  animation: fadeInUp 0.3s ease;
+}
+
+@keyframes fadeInUp {
+  from {
+    opacity: 0;
+    transform: translateY(12px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+</style>
diff --git a/web/src/view/layout/setting/title.vue b/web/src/view/layout/setting/title.vue
deleted file mode 100644
index ea536ad92..000000000
--- a/web/src/view/layout/setting/title.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div class="title relative my-2">
-    <div class="flex-shrink-0 text-center text-xl text-gray-600">
-      {{ title }}
-    </div>
-  </div>
-</template>
-
-<script setup>
-  defineOptions({
-    name: 'layoutSettingTitle'
-  })
-
-  defineProps({
-    title: String
-  })
-</script>
-
-<style scoped>
-  .title {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    gap: 4rem;
-  }
-
-  .title::before,
-  .title::after {
-    content: '';
-    height: 1px;
-    width: 100%;
-    background-color: #e3e3e3;
-  }
-</style>

From a1c8f6bc55fca205bfb5bb3d014d5c67ee45e1f9 Mon Sep 17 00:00:00 2001
From: zayn <972858472@qq.com>
Date: Mon, 30 Jun 2025 16:04:18 +0800
Subject: [PATCH 07/56] =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20(#2052)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/layout/aside/headMode.vue | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/web/src/view/layout/aside/headMode.vue b/web/src/view/layout/aside/headMode.vue
index d29f849e9..78318ba4e 100644
--- a/web/src/view/layout/aside/headMode.vue
+++ b/web/src/view/layout/aside/headMode.vue
@@ -107,21 +107,13 @@
       })
     if (index === route.name) return
     if (index.indexOf('http://') > -1 || index.indexOf('https://') > -1) {
-      if (index === 'Iframe') {
-        query.url = decodeURIComponent(index)
-        router.push({
-          name: 'Iframe',
-          query,
-          params
-        })
-        return
-      } else {
         window.open(index, '_blank')
         return
-      }
-    } else {
-      router.push({ name: index, query, params })
     }
+    if (index === 'Iframe') {
+      query.url = decodeURIComponent(index)
+    }
+    router.push({ name: index, query, params })
   }
 </script>
 

From ff7e002049c9472a88848c27195a5826e20e5c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Wed, 2 Jul 2025 10:32:29 +0800
Subject: [PATCH 08/56] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Drichtext?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8Bgorm=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=80=E4=B8=AA"=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/utils/autocode/template_funcs.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/utils/autocode/template_funcs.go b/server/utils/autocode/template_funcs.go
index 28e347d7d..97b48c35f 100644
--- a/server/utils/autocode/template_funcs.go
+++ b/server/utils/autocode/template_funcs.go
@@ -70,7 +70,7 @@ func GenerateField(field systemReq.AutoCodeField) string {
 		result = fmt.Sprintf(`%s  datatypes.JSON `+"`"+`%s swaggertype:"array,object"`+"`"+``,
 			field.FieldName, tagContent)
 	case "richtext":
-		tagContent := fmt.Sprintf(`json:"%s" form:"%s" gorm:"%s"`,
+		tagContent := fmt.Sprintf(`json:"%s" form:"%s" gorm:"%s`,
 			field.FieldJson, field.FieldJson, gormTag)
 
 		result = fmt.Sprintf(`%s  *string `+"`"+`%stype:text;"`+"`"+``,

From cee3b54b4cf712f1480c3ed37aa6c3d5ee72d8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 3 Jul 2025 11:42:39 +0800
Subject: [PATCH 09/56] =?UTF-8?q?fix(loading):=20=E4=BF=AE=E5=A4=8Dloading?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86=E9=97=AE=E9=A2=98=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B6=85=E6=97=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/utils/request.js | 73 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 2 deletions(-)

diff --git a/web/src/utils/request.js b/web/src/utils/request.js
index cc113cbd1..c05bab408 100644
--- a/web/src/utils/request.js
+++ b/web/src/utils/request.js
@@ -14,6 +14,9 @@ const service = axios.create({
 let activeAxios = 0
 let timer
 let loadingInstance
+let isLoadingVisible = false
+let forceCloseTimer
+
 const showLoading = (
   option = {
     target: null
@@ -21,13 +24,33 @@ const showLoading = (
 ) => {
   const loadDom = document.getElementById('gva-base-load-dom')
   activeAxios++
+  
+  // 清除之前的定时器
   if (timer) {
     clearTimeout(timer)
   }
+  
+  // 清除强制关闭定时器
+  if (forceCloseTimer) {
+    clearTimeout(forceCloseTimer)
+  }
+  
   timer = setTimeout(() => {
-    if (activeAxios > 0) {
+    // 再次检查activeAxios状态，防止竞态条件
+    if (activeAxios > 0 && !isLoadingVisible) {
       if (!option.target) option.target = loadDom
       loadingInstance = ElLoading.service(option)
+      isLoadingVisible = true
+      
+      // 设置强制关闭定时器，防止loading永远不关闭（30秒超时）
+      forceCloseTimer = setTimeout(() => {
+        if (isLoadingVisible && loadingInstance) {
+          console.warn('Loading强制关闭：超时30秒')
+          loadingInstance.close()
+          isLoadingVisible = false
+          activeAxios = 0 // 重置计数器
+        }
+      }, 30000)
     }
   }, 400)
 }
@@ -35,8 +58,44 @@ const showLoading = (
 const closeLoading = () => {
   activeAxios--
   if (activeAxios <= 0) {
+    activeAxios = 0 // 确保不会变成负数
     clearTimeout(timer)
-    loadingInstance && loadingInstance.close()
+    
+    if (forceCloseTimer) {
+      clearTimeout(forceCloseTimer)
+      forceCloseTimer = null
+    }
+    
+    if (isLoadingVisible && loadingInstance) {
+      loadingInstance.close()
+      isLoadingVisible = false
+    }
+    loadingInstance = null
+  }
+}
+
+// 全局重置loading状态的函数，用于异常情况
+const resetLoading = () => {
+  activeAxios = 0
+  isLoadingVisible = false
+  
+  if (timer) {
+    clearTimeout(timer)
+    timer = null
+  }
+  
+  if (forceCloseTimer) {
+    clearTimeout(forceCloseTimer)
+    forceCloseTimer = null
+  }
+  
+  if (loadingInstance) {
+    try {
+      loadingInstance.close()
+    } catch (e) {
+      console.warn('关闭loading时出错:', e)
+    }
+    loadingInstance = null
   }
 }
 // http request 拦截器
@@ -105,6 +164,8 @@ service.interceptors.response.use(
     }
 
     if (!error.response) {
+      // 网络错误时重置loading状态
+      resetLoading()
       errorBoxVisible = true
       ElMessageBox.confirm(
         `
@@ -196,4 +257,12 @@ service.interceptors.response.use(
     return error
   }
 )
+// 监听页面卸载事件，确保loading被正确清理
+if (typeof window !== 'undefined') {
+  window.addEventListener('beforeunload', resetLoading)
+  window.addEventListener('unload', resetLoading)
+}
+
+// 导出service和resetLoading函数
+export { resetLoading }
 export default service

From bf095c38e988f9bb51d564326d77dbc4b8eebe11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 3 Jul 2025 11:50:14 +0800
Subject: [PATCH 10/56] =?UTF-8?q?fix(service):=20=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8FID=E5=8F=98=E4=B8=BA=E5=B0=8F=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/package/server/service/service.go.tpl | 2 +-
 server/resource/plugin/server/service/service.go.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/resource/package/server/service/service.go.tpl b/server/resource/package/server/service/service.go.tpl
index 8226d189f..afaed751e 100644
--- a/server/resource/package/server/service/service.go.tpl
+++ b/server/resource/package/server/service/service.go.tpl
@@ -161,7 +161,7 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis
         var OrderStr string
         orderMap := make(map[string]bool)
         {{- if .GvaModel }}
-           orderMap["ID"] = true
+           orderMap["id"] = true
            orderMap["CreatedAt"] = true
         {{- end }}
        {{- range .Fields}}
diff --git a/server/resource/plugin/server/service/service.go.tpl b/server/resource/plugin/server/service/service.go.tpl
index 4bdcea303..e4fce0faf 100644
--- a/server/resource/plugin/server/service/service.go.tpl
+++ b/server/resource/plugin/server/service/service.go.tpl
@@ -168,7 +168,7 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(ctx context.Context, info
         var OrderStr string
         orderMap := make(map[string]bool)
       {{- if .GvaModel }}
-        orderMap["ID"] = true
+        orderMap["id"] = true
         orderMap["CreatedAt"] = true
       {{- end }}
        {{- range .Fields}}

From 2ec2e9a66ee3f1cce8fccd0757c624a69c153bf0 Mon Sep 17 00:00:00 2001
From: gors <121841794+luodaolv@users.noreply.github.com>
Date: Thu, 3 Jul 2025 13:19:44 +0800
Subject: [PATCH 11/56] Update service.go.tpl (#2053)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix 排序时错误获取失败：错误: 字段 "createdat" 不存在 (SQLSTATE 42703)

---------

Co-authored-by: PiexlMax(奇淼 <165128580+pixelmaxQm@users.noreply.github.com>
---
 server/resource/package/server/service/service.go.tpl | 2 +-
 server/resource/plugin/server/service/service.go.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/resource/package/server/service/service.go.tpl b/server/resource/package/server/service/service.go.tpl
index afaed751e..acd57a3f3 100644
--- a/server/resource/package/server/service/service.go.tpl
+++ b/server/resource/package/server/service/service.go.tpl
@@ -162,7 +162,7 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis
         orderMap := make(map[string]bool)
         {{- if .GvaModel }}
            orderMap["id"] = true
-           orderMap["CreatedAt"] = true
+           orderMap["created_at"] = true
         {{- end }}
        {{- range .Fields}}
             {{- if .Sort}}
diff --git a/server/resource/plugin/server/service/service.go.tpl b/server/resource/plugin/server/service/service.go.tpl
index e4fce0faf..9743602ce 100644
--- a/server/resource/plugin/server/service/service.go.tpl
+++ b/server/resource/plugin/server/service/service.go.tpl
@@ -169,7 +169,7 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(ctx context.Context, info
         orderMap := make(map[string]bool)
       {{- if .GvaModel }}
         orderMap["id"] = true
-        orderMap["CreatedAt"] = true
+        orderMap["created_at"] = true
       {{- end }}
        {{- range .Fields}}
         {{- if .Sort}}

From 72ee8fb6fca3bb311a4673e04506f5b28cc400f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 10 Jul 2025 14:52:59 +0800
Subject: [PATCH 12/56] =?UTF-8?q?fix(router):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1keep-alive=E9=80=BB=E8=BE=91=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/pinia/modules/router.js               | 18 ++++++++++++++++++
 web/src/view/systemTools/autoCode/mcp.vue     |  4 ++++
 web/src/view/systemTools/autoCode/mcpTest.vue |  5 +++++
 3 files changed, 27 insertions(+)

diff --git a/web/src/pinia/modules/router.js b/web/src/pinia/modules/router.js
index 36af51322..22e59d863 100644
--- a/web/src/pinia/modules/router.js
+++ b/web/src/pinia/modules/router.js
@@ -52,14 +52,32 @@ export const useRouterStore = defineStore('router', () => {
   const asyncRouterFlag = ref(0)
   const setKeepAliveRouters = (history) => {
     const keepArrTemp = []
+    
+    // 1. 首先添加原有的keepAlive配置
+    keepArrTemp.push(...keepAliveRoutersArr)
+    
     history.forEach((item) => {
+      // 2. 为所有history中的路由强制启用keep-alive
+      // 通过routeMap获取路由信息，然后通过pathInfo获取组件名
+      const routeInfo = routeMap[item.name]
+      if (routeInfo && routeInfo.meta && routeInfo.meta.path) {
+        const componentName = pathInfo[routeInfo.meta.path]
+        if (componentName) {
+          keepArrTemp.push(componentName)
+        }
+      }
+      
+      // 3. 如果子路由在tabs中打开，父路由也需要keepAlive
       if (nameMap[item.name]) {
         keepArrTemp.push(nameMap[item.name])
       }
     })
+    
     keepAliveRouters.value = Array.from(new Set(keepArrTemp))
+    console.log(keepAliveRouters.value)
   }
 
+
   const route = useRoute()
 
   emitter.on('setKeepAlive', setKeepAliveRouters)
diff --git a/web/src/view/systemTools/autoCode/mcp.vue b/web/src/view/systemTools/autoCode/mcp.vue
index 16f8bc0b4..0113a7b59 100644
--- a/web/src/view/systemTools/autoCode/mcp.vue
+++ b/web/src/view/systemTools/autoCode/mcp.vue
@@ -83,6 +83,10 @@ import { ref, reactive } from 'vue'
 import { ElMessage } from 'element-plus'
 import { mcp } from '@/api/autoCode'
 
+defineOptions({
+  name: 'MCP'
+})
+
 const formRef = ref(null)
 const form = reactive({
   name: '',
diff --git a/web/src/view/systemTools/autoCode/mcpTest.vue b/web/src/view/systemTools/autoCode/mcpTest.vue
index 1a15c1882..c20704e8e 100644
--- a/web/src/view/systemTools/autoCode/mcpTest.vue
+++ b/web/src/view/systemTools/autoCode/mcpTest.vue
@@ -139,6 +139,11 @@ import { ElMessage } from 'element-plus'
 import { VideoPlay, DocumentCopy } from '@element-plus/icons-vue' // Added DocumentCopy
 import { mcpList, mcpTest } from '@/api/autoCode'
 
+defineOptions({
+  name: 'MCPTest'
+})
+
+
 const mcpTools = ref([])
 const testDialogVisible = ref(false)
 const currentTestingTool = ref(null)

From d5b4bbfa84b4f9076ccdbfd35e842938f5447002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 10 Jul 2025 16:11:51 +0800
Subject: [PATCH 13/56] =?UTF-8?q?fix(autoCode):=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84=E8=B7=AF=E7=94=B1=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/pinia/modules/router.js             | 1 -
 web/src/view/systemTools/autoCode/index.vue | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/web/src/pinia/modules/router.js b/web/src/pinia/modules/router.js
index 22e59d863..ff1eb7613 100644
--- a/web/src/pinia/modules/router.js
+++ b/web/src/pinia/modules/router.js
@@ -74,7 +74,6 @@ export const useRouterStore = defineStore('router', () => {
     })
     
     keepAliveRouters.value = Array.from(new Set(keepArrTemp))
-    console.log(keepAliveRouters.value)
   }
 
 
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index e946cbf2d..a9c4f5c46 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -1542,15 +1542,6 @@
   }
   init()
 
-  watch(
-    () => route.params.id,
-    () => {
-      if (route.name === 'autoCodeEdit') {
-        init()
-      }
-    }
-  )
-
   watch(()=>form.value.generateServer,()=>{
     if(!form.value.generateServer){
       form.value.autoCreateApiToSql = false

From 6e27e3a1147e64f730858ea3c07afcb637c59da5 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Thu, 10 Jul 2025 23:36:27 +0800
Subject: [PATCH 14/56] =?UTF-8?q?fix(menus):=20=E5=9C=A8=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=8F=9C=E5=8D=95=E4=BB=A5=E5=90=8E=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=BD=93=E5=89=8D=E8=8F=9C=E5=8D=95=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=8A=8A=E6=97=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=AE=BE=E7=BD=AE=E4=B8=BA=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=B3=BB=E7=BB=9F=E6=AD=BB=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/superAdmin/authority/components/menus.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/view/superAdmin/authority/components/menus.vue b/web/src/view/superAdmin/authority/components/menus.vue
index 65b35d779..2dd571dc5 100644
--- a/web/src/view/superAdmin/authority/components/menus.vue
+++ b/web/src/view/superAdmin/authority/components/menus.vue
@@ -132,7 +132,7 @@
       defaultRouter: data.name
     })
     if (res.code === 0) {
-      ElMessage({ type: 'success', message: '设置成功' })
+      relation()
       emit('changeRow', 'defaultRouter', res.data.authority.defaultRouter)
     }
   }

From 857ba194e554c52c2158eda007ed80b06b1b8043 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Fri, 11 Jul 2025 00:14:14 +0800
Subject: [PATCH 15/56] =?UTF-8?q?fix(menu):=20=E6=9B=B4=E6=96=B0=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E9=85=8D=E8=AF=B4=E6=98=8E=EF=BC=9B?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E6=B7=BB=E5=8A=A0=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=88=B6=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=80=A7=E5=92=8C=E6=9D=83=E9=99=90=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/api/v1/system/sys_menu.go      |  2 +-
 server/service/system/sys_menu.go     | 50 ++++++++++++++++++++++++---
 web/src/view/superAdmin/api/api.vue   |  2 +-
 web/src/view/superAdmin/menu/menu.vue |  2 +-
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/server/api/v1/system/sys_menu.go b/server/api/v1/system/sys_menu.go
index 864b61f38..30859621c 100644
--- a/server/api/v1/system/sys_menu.go
+++ b/server/api/v1/system/sys_menu.go
@@ -143,7 +143,7 @@ func (a *AuthorityMenuApi) AddBaseMenu(c *gin.Context) {
 	err = menuService.AddBaseMenu(menu)
 	if err != nil {
 		global.GVA_LOG.Error("添加失败!", zap.Error(err))
-		response.FailWithMessage("添加失败", c)
+		response.FailWithMessage("添加失败："+err.Error(), c)
 		return
 	}
 	response.OkWithMessage("添加成功", c)
diff --git a/server/service/system/sys_menu.go b/server/service/system/sys_menu.go
index 4d5a0ea71..0a411129b 100644
--- a/server/service/system/sys_menu.go
+++ b/server/service/system/sys_menu.go
@@ -134,10 +134,52 @@ func (menuService *MenuService) getBaseChildrenList(menu *system.SysBaseMenu, tr
 //@return: error
 
 func (menuService *MenuService) AddBaseMenu(menu system.SysBaseMenu) error {
-	if !errors.Is(global.GVA_DB.Where("name = ?", menu.Name).First(&system.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
-		return errors.New("存在重复name，请修改name")
-	}
-	return global.GVA_DB.Create(&menu).Error
+	return global.GVA_DB.Transaction(func(tx *gorm.DB) error {
+		// 检查name是否重复
+		if !errors.Is(tx.Where("name = ?", menu.Name).First(&system.SysBaseMenu{}).Error, gorm.ErrRecordNotFound) {
+			return errors.New("存在重复name，请修改name")
+		}
+
+		if menu.ParentId != 0 {
+			// 检查父菜单是否存在
+			var parentMenu system.SysBaseMenu
+			if err := tx.First(&parentMenu, menu.ParentId).Error; err != nil {
+				if errors.Is(err, gorm.ErrRecordNotFound) {
+					return errors.New("父菜单不存在")
+				}
+				return err
+			}
+
+			// 检查父菜单下现有子菜单数量
+			var existingChildrenCount int64
+			err := tx.Model(&system.SysBaseMenu{}).Where("parent_id = ?", menu.ParentId).Count(&existingChildrenCount).Error
+			if err != nil {
+				return err
+			}
+
+			// 如果父菜单原本是叶子菜单（没有子菜单），现在要变成枝干菜单，需要清空其权限分配
+			if existingChildrenCount == 0 {
+				// 检查父菜单是否被其他角色设置为首页
+				var defaultRouterCount int64
+				err := tx.Model(&system.SysAuthority{}).Where("default_router = ?", parentMenu.Name).Count(&defaultRouterCount).Error
+				if err != nil {
+					return err
+				}
+				if defaultRouterCount > 0 {
+					return errors.New("父菜单已被其他角色的首页占用，请先释放父菜单的首页权限")
+				}
+
+				// 清空父菜单的所有权限分配
+				err = tx.Where("sys_base_menu_id = ?", menu.ParentId).Delete(&system.SysAuthorityMenu{}).Error
+				if err != nil {
+					return err
+				}
+			}
+		}
+
+		// 创建菜单
+		return tx.Create(&menu).Error
+	})
 }
 
 //@author: [piexlmax](https://github.com/piexlmax)
diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
index 21e971c39..db0d21ab8 100644
--- a/web/src/view/superAdmin/api/api.vue
+++ b/web/src/view/superAdmin/api/api.vue
@@ -531,7 +531,7 @@
     if (res.code === 0) {
       ElMessage({
         type: 'success',
-        message: '添加成功',
+        message: '添加成功，请到角色管理页面分配权限',
         showClose: true
       })
       syncApiData.value.newApis = syncApiData.value.newApis.filter(
diff --git a/web/src/view/superAdmin/menu/menu.vue b/web/src/view/superAdmin/menu/menu.vue
index f0f1b3b95..c32c1c930 100644
--- a/web/src/view/superAdmin/menu/menu.vue
+++ b/web/src/view/superAdmin/menu/menu.vue
@@ -700,7 +700,7 @@
         if (res.code === 0) {
           ElMessage({
             type: 'success',
-            message: isEdit.value ? '编辑成功' : '添加成功!'
+            message: isEdit.value ? '编辑成功' : '添加成功，请到角色管理页面分配权限'
           })
           getTableData()
         }

From 23f9227da1884a50a5581ebcc98a7f2287ebf305 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Fri, 11 Jul 2025 00:20:29 +0800
Subject: [PATCH 16/56] =?UTF-8?q?fix(table):=20=E4=BF=AE=E5=A4=8D=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E5=88=97=E7=9A=84=E6=A8=A1=E6=9D=BF=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=8C=E7=A1=AE=E4=BF=9D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E5=88=9B=E5=BB=BA=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/package/web/view/table.vue.tpl | 2 +-
 server/resource/plugin/web/view/view.vue.tpl   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index 91479d114..b6e23de98 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -161,7 +161,7 @@ getDataSourceFunc()
         >
         <el-table-column type="selection" width="55" />
         {{ if .GvaModel }}
-        <el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end }}width="180">
+        <el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end -}}width="180">
             <template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
         </el-table-column>
         {{ end }}
diff --git a/server/resource/plugin/web/view/view.vue.tpl b/server/resource/plugin/web/view/view.vue.tpl
index 6880840a7..832cf29b9 100644
--- a/server/resource/plugin/web/view/view.vue.tpl
+++ b/server/resource/plugin/web/view/view.vue.tpl
@@ -158,7 +158,7 @@ getDataSourceFunc()
         >
         <el-table-column type="selection" width="55" />
         {{ if .GvaModel }}
-        <el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end }}width="180">
+        <el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end -}}width="180">
             <template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
         </el-table-column>
         {{ end }}

From a6b6b5d4aa62b9345d97ff63f2ffd13677783650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Tue, 15 Jul 2025 10:45:58 +0800
Subject: [PATCH 17/56] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=90=8D=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=B0=86detailFrom=E7=BB=9F=E4=B8=80=E6=94=B9=E4=B8=BAdetailFo?=
 =?UTF-8?q?rm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/resource/package/web/view/table.vue.tpl |  8 ++++----
 server/resource/plugin/web/view/view.vue.tpl   |  8 ++++----
 server/utils/autocode/template_funcs.go        | 16 ++++++++--------
 web/src/view/superAdmin/params/sysParams.vue   | 14 +++++++-------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index 91479d114..0aac57c6e 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -232,7 +232,7 @@ getDataSourceFunc()
             {{- if .IsTree }}
             <el-descriptions-item label="父节点">
                 <el-tree-select
-                  v-model="detailFrom.parentID"
+                  v-model="detailForm.parentID"
                   :data="[rootNode,...tableData]"
                   check-strictly
                   disabled
@@ -629,7 +629,7 @@ const enterDialog = async () => {
       })
 }
 
-const detailFrom = ref({})
+const detailForm = ref({})
 
 // 查看详情控制标记
 const detailShow = ref(false)
@@ -646,7 +646,7 @@ const getDetails = async (row) => {
   // 打开弹窗
   const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} })
   if (res.code === 0) {
-    detailFrom.value = res.data
+    detailForm.value = res.data
     openDetailShow()
   }
 }
@@ -655,7 +655,7 @@ const getDetails = async (row) => {
 // 关闭详情弹窗
 const closeDetailShow = () => {
   detailShow.value = false
-  detailFrom.value = {}
+  detailForm.value = {}
 }
 
 
diff --git a/server/resource/plugin/web/view/view.vue.tpl b/server/resource/plugin/web/view/view.vue.tpl
index 6880840a7..143a45281 100644
--- a/server/resource/plugin/web/view/view.vue.tpl
+++ b/server/resource/plugin/web/view/view.vue.tpl
@@ -229,7 +229,7 @@ getDataSourceFunc()
             {{- if .IsTree }}
             <el-descriptions-item label="父节点">
                 <el-tree-select
-                  v-model="detailFrom.parentID"
+                  v-model="detailForm.parentID"
                   :data="[rootNode,...tableData]"
                   check-strictly
                   disabled
@@ -624,7 +624,7 @@ const enterDialog = async () => {
       })
 }
 
-const detailFrom = ref({})
+const detailForm = ref({})
 
 // 查看详情控制标记
 const detailShow = ref(false)
@@ -641,7 +641,7 @@ const getDetails = async (row) => {
   // 打开弹窗
   const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} })
   if (res.code === 0) {
-    detailFrom.value = res.data
+    detailForm.value = res.data
     openDetailShow()
   }
 }
@@ -650,7 +650,7 @@ const getDetails = async (row) => {
 // 关闭详情弹窗
 const closeDetailShow = () => {
   detailShow.value = false
-  detailFrom.value = {}
+  detailForm.value = {}
 }
 
 
diff --git a/server/utils/autocode/template_funcs.go b/server/utils/autocode/template_funcs.go
index 97b48c35f..70b297886 100644
--- a/server/utils/autocode/template_funcs.go
+++ b/server/utils/autocode/template_funcs.go
@@ -575,7 +575,7 @@ func GenerateDescriptionItem(field systemReq.AutoCodeField) string {
 		result += `    <template #default="scope">
 `
 		if field.DataSource.Association == 2 {
-			result += fmt.Sprintf(`        <el-tag v-for="(item,key) in filterDataSource(dataSource.%s,detailFrom.%s)" :key="key">
+			result += fmt.Sprintf(`        <el-tag v-for="(item,key) in filterDataSource(dataSource.%s,detailForm.%s)" :key="key">
 `,
 				field.FieldJson, field.FieldJson)
 			result += `             {{ item }}
@@ -583,7 +583,7 @@ func GenerateDescriptionItem(field systemReq.AutoCodeField) string {
 			result += `        </el-tag>
 `
 		} else {
-			result += fmt.Sprintf(`        <span>{{ filterDataSource(dataSource.%s,detailFrom.%s) }}</span>
+			result += fmt.Sprintf(`        <span>{{ filterDataSource(dataSource.%s,detailForm.%s) }}</span>
 `,
 				field.FieldJson, field.FieldJson)
 		}
@@ -592,26 +592,26 @@ func GenerateDescriptionItem(field systemReq.AutoCodeField) string {
 	} else if field.FieldType != "picture" && field.FieldType != "pictures" &&
 		field.FieldType != "file" && field.FieldType != "array" &&
 		field.FieldType != "richtext" {
-		result += fmt.Sprintf(`    {{ detailFrom.%s }}
+		result += fmt.Sprintf(`    {{ detailForm.%s }}
 `, field.FieldJson)
 	} else {
 		switch field.FieldType {
 		case "picture":
-			result += fmt.Sprintf(`    <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.%s)" :src="getUrl(detailFrom.%s)" fit="cover" />
+			result += fmt.Sprintf(`    <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailForm.%s)" :src="getUrl(detailForm.%s)" fit="cover" />
 `,
 				field.FieldJson, field.FieldJson)
 		case "array":
-			result += fmt.Sprintf(`    <ArrayCtrl v-model="detailFrom.%s"/>
+			result += fmt.Sprintf(`    <ArrayCtrl v-model="detailForm.%s"/>
 `, field.FieldJson)
 		case "pictures":
-			result += fmt.Sprintf(`    <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.%s)" :initial-index="index" v-for="(item,index) in detailFrom.%s" :key="index" :src="getUrl(item)" fit="cover" />
+			result += fmt.Sprintf(`    <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailForm.%s)" :initial-index="index" v-for="(item,index) in detailForm.%s" :key="index" :src="getUrl(item)" fit="cover" />
 `,
 				field.FieldJson, field.FieldJson)
 		case "richtext":
-			result += fmt.Sprintf(`    <RichView v-model="detailFrom.%s" />
+			result += fmt.Sprintf(`    <RichView v-model="detailForm.%s" />
 `, field.FieldJson)
 		case "file":
-			result += fmt.Sprintf(`    <div class="fileBtn" v-for="(item,index) in detailFrom.%s" :key="index">
+			result += fmt.Sprintf(`    <div class="fileBtn" v-for="(item,index) in detailForm.%s" :key="index">
 `, field.FieldJson)
 			result += `        <el-button type="primary" text bg @click="onDownloadFile(item.url)">
 `
diff --git a/web/src/view/superAdmin/params/sysParams.vue b/web/src/view/superAdmin/params/sysParams.vue
index 89fe6f95e..f18520ce0 100644
--- a/web/src/view/superAdmin/params/sysParams.vue
+++ b/web/src/view/superAdmin/params/sysParams.vue
@@ -268,16 +268,16 @@
     >
       <el-descriptions :column="1" border>
         <el-descriptions-item label="参数名称">
-          {{ detailFrom.name }}
+          {{ detailForm.name }}
         </el-descriptions-item>
         <el-descriptions-item label="参数键">
-          {{ detailFrom.key }}
+          {{ detailForm.key }}
         </el-descriptions-item>
         <el-descriptions-item label="参数值">
-          {{ detailFrom.value }}
+          {{ detailForm.value }}
         </el-descriptions-item>
         <el-descriptions-item label="参数说明">
-          {{ detailFrom.desc }}
+          {{ detailForm.desc }}
         </el-descriptions-item>
       </el-descriptions>
     </el-drawer>
@@ -574,7 +574,7 @@
     })
   }
 
-  const detailFrom = ref({})
+  const detailForm = ref({})
 
   // 查看详情控制标记
   const detailShow = ref(false)
@@ -589,7 +589,7 @@
     // 打开弹窗
     const res = await findSysParams({ ID: row.ID })
     if (res.code === 0) {
-      detailFrom.value = res.data
+      detailForm.value = res.data
       openDetailShow()
     }
   }
@@ -597,7 +597,7 @@
   // 关闭详情弹窗
   const closeDetailShow = () => {
     detailShow.value = false
-    detailFrom.value = {}
+    detailForm.value = {}
   }
 </script>
 

From e19ddf66000e5642ff13cf016003dc3cadf09d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Tue, 15 Jul 2025 18:22:04 +0800
Subject: [PATCH 18/56] =?UTF-8?q?public:=20=E5=8F=91=E5=B8=832.8.3?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/server.go         |  2 +-
 server/docs/docs.go           |  2 +-
 server/main.go                |  2 +-
 web/src/core/config.js        |  2 +-
 web/src/core/gin-vue-admin.js |  2 +-
 web/src/pathInfo.json         | 12 +++++++++---
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/server/core/server.go b/server/core/server.go
index 3867a15ab..2cd19440a 100644
--- a/server/core/server.go
+++ b/server/core/server.go
@@ -35,7 +35,7 @@ func RunServer() {
 
 	fmt.Printf(`
 	欢迎使用 gin-vue-admin
-	当前版本:v2.8.2
+	当前版本:v2.8.3
 	加群方式:微信号：shouzi_1994 QQ群：470239250
 	项目地址：https://github.com/flipped-aurora/gin-vue-admin
 	插件市场:https://plugin.gin-vue-admin.com
diff --git a/server/docs/docs.go b/server/docs/docs.go
index 6f0eb2a0d..ae8960765 100644
--- a/server/docs/docs.go
+++ b/server/docs/docs.go
@@ -9296,7 +9296,7 @@ const docTemplate = `{
 
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = &swag.Spec{
-	Version:          "v2.8.2",
+	Version:          "v2.8.3",
 	Host:             "",
 	BasePath:         "",
 	Schemes:          []string{},
diff --git a/server/main.go b/server/main.go
index 0de578d4d..919a79fd9 100644
--- a/server/main.go
+++ b/server/main.go
@@ -21,7 +21,7 @@ import (
 // @Tag.Description 用户
 
 // @title                       Gin-Vue-Admin Swagger API接口文档
-// @version                     v2.8.2
+// @version                     v2.8.3
 // @description                 使用gin+vue进行极速开发的全栈开发基础平台
 // @securityDefinitions.apikey  ApiKeyAuth
 // @in                          header
diff --git a/web/src/core/config.js b/web/src/core/config.js
index bb44caffb..a58c53360 100644
--- a/web/src/core/config.js
+++ b/web/src/core/config.js
@@ -17,7 +17,7 @@ export const viteLogo = (env) => {
         `> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin`
       )
     )
-    console.log(greenText(`> 当前版本:v2.8.2`))
+    console.log(greenText(`> 当前版本:v2.8.3`))
     console.log(greenText(`> 加群方式:微信：shouzi_1994 QQ群：470239250`))
     console.log(
       greenText(`> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`)
diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js
index 0823d950b..495e0aad9 100644
--- a/web/src/core/gin-vue-admin.js
+++ b/web/src/core/gin-vue-admin.js
@@ -10,7 +10,7 @@ export default {
     register(app)
     console.log(`
        欢迎使用 Gin-Vue-Admin
-       当前版本:v2.8.2
+       当前版本:v2.8.3
        加群方式:微信：shouzi_1994 QQ群：622360840
        项目地址：https://github.com/flipped-aurora/gin-vue-admin
        插件市场:https://plugin.gin-vue-admin.com
diff --git a/web/src/pathInfo.json b/web/src/pathInfo.json
index e7c4f18fe..e991e172b 100644
--- a/web/src/pathInfo.json
+++ b/web/src/pathInfo.json
@@ -33,8 +33,14 @@
   "/src/view/layout/index.vue": "GvaLayout",
   "/src/view/layout/screenfull/index.vue": "Screenfull",
   "/src/view/layout/search/search.vue": "BtnBox",
+  "/src/view/layout/setting/components/layoutModeCard.vue": "LayoutModeCard",
+  "/src/view/layout/setting/components/settingItem.vue": "SettingItem",
+  "/src/view/layout/setting/components/themeColorPicker.vue": "ThemeColorPicker",
+  "/src/view/layout/setting/components/themeModeSelector.vue": "ThemeModeSelector",
   "/src/view/layout/setting/index.vue": "GvaSetting",
-  "/src/view/layout/setting/title.vue": "layoutSettingTitle",
+  "/src/view/layout/setting/modules/appearance/index.vue": "AppearanceSettings",
+  "/src/view/layout/setting/modules/general/index.vue": "GeneralSettings",
+  "/src/view/layout/setting/modules/layout/index.vue": "LayoutSettings",
   "/src/view/layout/tabs/index.vue": "HistoryComponent",
   "/src/view/login/index.vue": "Login",
   "/src/view/person/person.vue": "Person",
@@ -57,8 +63,8 @@
   "/src/view/systemTools/autoCode/component/fieldDialog.vue": "FieldDialog",
   "/src/view/systemTools/autoCode/component/previewCodeDialog.vue": "PreviewCodeDialog",
   "/src/view/systemTools/autoCode/index.vue": "AutoCode",
-  "/src/view/systemTools/autoCode/mcp.vue": "Mcp",
-  "/src/view/systemTools/autoCode/mcpToolsTest.vue": "McpToolsTest",
+  "/src/view/systemTools/autoCode/mcp.vue": "MCP",
+  "/src/view/systemTools/autoCode/mcpTest.vue": "MCPTest",
   "/src/view/systemTools/autoCode/picture.vue": "Picture",
   "/src/view/systemTools/autoCodeAdmin/index.vue": "AutoCodeAdmin",
   "/src/view/systemTools/autoPkg/autoPkg.vue": "AutoPkg",

From 39abc7b632ffed37b79ed5d2f380953cb1e50d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Wed, 16 Jul 2025 14:46:50 +0800
Subject: [PATCH 19/56] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 6dc2e4eb5..a5480bd02 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,7 @@
 <img src="https://img.shields.io/badge/vue-3.3.4-brightgreen"/>
 <img src="https://img.shields.io/badge/element--plus-2.3.8-green"/>
 <img src="https://img.shields.io/badge/gorm-1.25.2-red"/>
+<img src="https://gitcode.com/flipped-aurora/gin-vue-admin/star/badge.svg"/>
 </div>
 
 <div align=center>

From 273d7bd50ea4a6efd16929b64e3336f43cf21a07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Thu, 31 Jul 2025 21:21:04 +0800
Subject: [PATCH 20/56] =?UTF-8?q?V2.8.4Beta=20=E6=9E=81=E8=87=B4=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88AI=E7=BC=96=E8=BE=91=E5=99=A8=20=E8=AE=A9=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E9=80=9F=E5=BA=A6=E6=9B=B4=E8=BF=9B=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=20(#2060)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(style): 修复 border 额外的 reset 导致 tailwind border 属性生效异常的问题

* feat: 添加错误预览组件并优化请求错误处理逻辑

* optimize: select and update necessary fields in `ChangePassword` method

- Simplify `ChangePassword` method signature by removing unnecessary return type.
- Use `Select()` to fetch only the necessary fields (`id` and `password`) from the database.
- Replace `Save()` with `Update()` for more efficient password update operation.

Note: use `Save(&user)` to update the whole user record, which will cover other unchanged fields as well, causing data inconsistency when data race conditions.

* feat(menu): 版本更新为2.8.4,给菜单增加按钮和参数的预制打包

* feat(menu): 恢复空白的配置文件

* Remove unused `SideMode` field from `ChangeUserInfo` struct

Remove unused and deprecated `SideMode` field from user request model.

* feat(automation): 增加可以自动生成CURD和续写方法的MCP

* fix(mcp): 确保始终返回目录结构信息

* fix(mcp): 当不需要创建模块时提前返回目录结构信息

* feat(automation): 增加可以自动生成CURD和续写方法的MCP

* feat(mcp): 添加GAG工具用户确认流程和自动字典创建功能

实现三步工作流程：分析、确认、执行
新增自动字典创建功能，当字段使用字典类型时自动检查并创建字典
添加用户确认机制，确保创建操作前获得用户明确确认

* feat(version): 新增版本管理功能，支持创建、导入、导出和下载版本数据

新增版本管理模块，包含以下功能：
1. 版本数据的增删改查
2. 版本创建功能，可选择关联菜单和API
3. 版本导入导出功能
4. 版本JSON数据下载
5. 相关前端页面和接口实现

* refactor(version): 简化版本管理删除逻辑并移除无用字段

移除版本管理中的状态、创建者、更新者和删除者字段
简化删除和批量删除方法的实现，去除事务和用户ID参数
更新自动生成配置的默认值说明

* feat(版本管理): 新增版本管理功能模块

* fix(menu): 修复递归创建菜单时关联数据未正确处理的问题

* feat(mcp): 添加预设计模块扫描功能以支持代码自动生成

在自动化模块分析器中添加对预设计模块的扫描功能，包括：
- 新增PredesignedModuleInfo结构体存储模块信息
- 实现scanPredesignedModules方法扫描plugin和model目录
- 在分析响应中添加predesignedModules字段
- 更新帮助文档说明预设计模块的使用方式

这些修改使系统能够识别并利用现有的预设计模块，提高代码生成效率并减少重复工作。

* feat(mcp): 新增API、菜单和字典生成工具并优化自动生成模块

* docs(mcp): 更新菜单和API创建工具的描述信息

* feat(mcp): 添加字典查询工具用于AI生成逻辑时了解可用字典选项

* feat: 在创建菜单/API/模块结果中添加权限分配提醒

为菜单创建、API创建和模块创建的结果消息添加权限分配提醒，帮助用户了解后续需要进行的权限配置步骤

* refactor(mcp): 统一使用WithBoolean替换WithBool并优化错误处理

* docs(mcp): 更新API创建工具的说明和错误处理日志

* feat(mcp): 添加插件意图检测功能并增强验证逻辑

---------

Co-authored-by: Azir <2075125282@qq.com>
Co-authored-by: Feng.YJ <jxfengyijie@gmail.com>
Co-authored-by: piexlMax(奇淼 <qimiaojiangjizhao@gmail.com>
---
 server/api/v1/system/enter.go                |    2 +
 server/api/v1/system/sys_user.go             |    2 +-
 server/api/v1/system/sys_version.go          |  437 ++++++
 server/config.yaml                           |   16 +-
 server/core/server.go                        |    2 +-
 server/docs/docs.go                          |    2 +-
 server/initialize/ensure_tables.go           |    2 +-
 server/initialize/gorm.go                    |    1 +
 server/initialize/router.go                  |    1 +
 server/main.go                               |    2 +-
 server/mcp/api_creator.go                    |  197 +++
 server/mcp/dictionary_generator.go           |  310 +++++
 server/mcp/dictionary_query.go               |  234 ++++
 server/mcp/execution_plan_schema.md          |  255 ++++
 server/mcp/gag_usage_example.md              |  122 ++
 server/mcp/gva_auto_generate.go              | 1317 ++++++++++++++++++
 server/mcp/menu_creator.go                   |  283 ++++
 server/middleware/jwt.go                     |    4 +-
 server/model/system/request/sys_user.go      |    1 -
 server/model/system/request/sys_version.go   |   38 +
 server/model/system/response/sys_version.go  |   13 +
 server/model/system/sys_version.go           |   20 +
 server/router/system/enter.go                |    2 +
 server/router/system/sys_version.go          |   25 +
 server/service/system/auto_code_plugin.go    |    5 +-
 server/service/system/enter.go               |    1 +
 server/service/system/sys_user.go            |   21 +-
 server/service/system/sys_version.go         |  196 +++
 server/source/system/api.go                  |    9 +
 server/source/system/casbin.go               |    8 +
 server/source/system/menu.go                 |    1 +
 server/utils/ast/ast.go                      |   75 +
 web/package.json                             |    2 +-
 web/src/App.vue                              |   58 +-
 web/src/api/version.js                       |  114 ++
 web/src/assets/icons/close.svg               |    1 +
 web/src/assets/icons/idea.svg                |    1 +
 web/src/assets/icons/lock.svg                |    1 +
 web/src/assets/icons/server.svg              |    1 +
 web/src/assets/icons/warn.svg                |    1 +
 web/src/components/application/index.vue     |   39 +
 web/src/components/errorPreview/index.vue    |  126 ++
 web/src/core/config.js                       |    2 +-
 web/src/core/gin-vue-admin.js                |    2 +-
 web/src/pathInfo.json                        |    1 +
 web/src/style/reset.scss                     |    2 +-
 web/src/utils/request.js                     |  144 +-
 web/src/view/systemTools/version/version.vue |  905 ++++++++++++
 48 files changed, 4839 insertions(+), 165 deletions(-)
 create mode 100644 server/api/v1/system/sys_version.go
 create mode 100644 server/mcp/api_creator.go
 create mode 100644 server/mcp/dictionary_generator.go
 create mode 100644 server/mcp/dictionary_query.go
 create mode 100644 server/mcp/execution_plan_schema.md
 create mode 100644 server/mcp/gag_usage_example.md
 create mode 100644 server/mcp/gva_auto_generate.go
 create mode 100644 server/mcp/menu_creator.go
 create mode 100644 server/model/system/request/sys_version.go
 create mode 100644 server/model/system/response/sys_version.go
 create mode 100644 server/model/system/sys_version.go
 create mode 100644 server/router/system/sys_version.go
 create mode 100644 server/service/system/sys_version.go
 create mode 100644 web/src/api/version.js
 create mode 100644 web/src/assets/icons/close.svg
 create mode 100644 web/src/assets/icons/idea.svg
 create mode 100644 web/src/assets/icons/lock.svg
 create mode 100644 web/src/assets/icons/server.svg
 create mode 100644 web/src/assets/icons/warn.svg
 create mode 100644 web/src/components/application/index.vue
 create mode 100644 web/src/components/errorPreview/index.vue
 create mode 100644 web/src/view/systemTools/version/version.vue

diff --git a/server/api/v1/system/enter.go b/server/api/v1/system/enter.go
index c268ccc7b..dbc721b16 100644
--- a/server/api/v1/system/enter.go
+++ b/server/api/v1/system/enter.go
@@ -22,6 +22,7 @@ type ApiGroup struct {
 	AutoCodeHistoryApi
 	AutoCodeTemplateApi
 	SysParamsApi
+	SysVersionApi
 }
 
 var (
@@ -44,4 +45,5 @@ var (
 	autoCodePackageService  = service.ServiceGroupApp.SystemServiceGroup.AutoCodePackage
 	autoCodeHistoryService  = service.ServiceGroupApp.SystemServiceGroup.AutoCodeHistory
 	autoCodeTemplateService = service.ServiceGroupApp.SystemServiceGroup.AutoCodeTemplate
+	sysVersionService       = service.ServiceGroupApp.SystemServiceGroup.SysVersionService
 )
diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
index ae763f8bb..aae263e3f 100644
--- a/server/api/v1/system/sys_user.go
+++ b/server/api/v1/system/sys_user.go
@@ -184,7 +184,7 @@ func (b *BaseApi) ChangePassword(c *gin.Context) {
 	}
 	uid := utils.GetUserID(c)
 	u := &system.SysUser{GVA_MODEL: global.GVA_MODEL{ID: uid}, Password: req.Password}
-	_, err = userService.ChangePassword(u, req.NewPassword)
+	err = userService.ChangePassword(u, req.NewPassword)
 	if err != nil {
 		global.GVA_LOG.Error("修改失败!", zap.Error(err))
 		response.FailWithMessage("修改失败，原密码与当前账户不符", c)
diff --git a/server/api/v1/system/sys_version.go b/server/api/v1/system/sys_version.go
new file mode 100644
index 000000000..7f441c7ce
--- /dev/null
+++ b/server/api/v1/system/sys_version.go
@@ -0,0 +1,437 @@
+package system
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"sort"
+	"strconv"
+	"time"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type SysVersionApi struct{}
+
+// buildMenuTree 构建菜单树结构
+func buildMenuTree(menus []system.SysBaseMenu) []system.SysBaseMenu {
+	// 创建菜单映射
+	menuMap := make(map[uint]*system.SysBaseMenu)
+	for i := range menus {
+		menuMap[menus[i].ID] = &menus[i]
+	}
+
+	// 构建树结构
+	var rootMenus []system.SysBaseMenu
+	for _, menu := range menus {
+		if menu.ParentId == 0 {
+			// 根菜单
+			menuData := convertMenuToStruct(menu, menuMap)
+			rootMenus = append(rootMenus, menuData)
+		}
+	}
+
+	// 按sort排序根菜单
+	sort.Slice(rootMenus, func(i, j int) bool {
+		return rootMenus[i].Sort < rootMenus[j].Sort
+	})
+
+	return rootMenus
+}
+
+// convertMenuToStruct 将菜单转换为结构体并递归处理子菜单
+func convertMenuToStruct(menu system.SysBaseMenu, menuMap map[uint]*system.SysBaseMenu) system.SysBaseMenu {
+	result := system.SysBaseMenu{
+		Path:      menu.Path,
+		Name:      menu.Name,
+		Hidden:    menu.Hidden,
+		Component: menu.Component,
+		Sort:      menu.Sort,
+		Meta:      menu.Meta,
+	}
+
+	// 清理并复制参数数据
+	if len(menu.Parameters) > 0 {
+		cleanParameters := make([]system.SysBaseMenuParameter, 0, len(menu.Parameters))
+		for _, param := range menu.Parameters {
+			cleanParam := system.SysBaseMenuParameter{
+				Type:  param.Type,
+				Key:   param.Key,
+				Value: param.Value,
+				// 不复制 ID, CreatedAt, UpdatedAt, SysBaseMenuID
+			}
+			cleanParameters = append(cleanParameters, cleanParam)
+		}
+		result.Parameters = cleanParameters
+	}
+
+	// 清理并复制菜单按钮数据
+	if len(menu.MenuBtn) > 0 {
+		cleanMenuBtns := make([]system.SysBaseMenuBtn, 0, len(menu.MenuBtn))
+		for _, btn := range menu.MenuBtn {
+			cleanBtn := system.SysBaseMenuBtn{
+				Name: btn.Name,
+				Desc: btn.Desc,
+				// 不复制 ID, CreatedAt, UpdatedAt, SysBaseMenuID
+			}
+			cleanMenuBtns = append(cleanMenuBtns, cleanBtn)
+		}
+		result.MenuBtn = cleanMenuBtns
+	}
+
+	// 查找并处理子菜单
+	var children []system.SysBaseMenu
+	for _, childMenu := range menuMap {
+		if childMenu.ParentId == menu.ID {
+			childData := convertMenuToStruct(*childMenu, menuMap)
+			children = append(children, childData)
+		}
+	}
+
+	// 按sort排序子菜单
+	if len(children) > 0 {
+		sort.Slice(children, func(i, j int) bool {
+			return children[i].Sort < children[j].Sort
+		})
+		result.Children = children
+	}
+
+	return result
+}
+
+// DeleteSysVersion 删除版本管理
+// @Tags SysVersion
+// @Summary 删除版本管理
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data body system.SysVersion true "删除版本管理"
+// @Success 200 {object} response.Response{msg=string} "删除成功"
+// @Router /sysVersion/deleteSysVersion [delete]
+func (sysVersionApi *SysVersionApi) DeleteSysVersion(c *gin.Context) {
+	// 创建业务用Context
+	ctx := c.Request.Context()
+
+	ID := c.Query("ID")
+	err := sysVersionService.DeleteSysVersion(ctx, ID)
+	if err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("删除成功", c)
+}
+
+// DeleteSysVersionByIds 批量删除版本管理
+// @Tags SysVersion
+// @Summary 批量删除版本管理
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{msg=string} "批量删除成功"
+// @Router /sysVersion/deleteSysVersionByIds [delete]
+func (sysVersionApi *SysVersionApi) DeleteSysVersionByIds(c *gin.Context) {
+	// 创建业务用Context
+	ctx := c.Request.Context()
+
+	IDs := c.QueryArray("IDs[]")
+	err := sysVersionService.DeleteSysVersionByIds(ctx, IDs)
+	if err != nil {
+		global.GVA_LOG.Error("批量删除失败!", zap.Error(err))
+		response.FailWithMessage("批量删除失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("批量删除成功", c)
+}
+
+// FindSysVersion 用id查询版本管理
+// @Tags SysVersion
+// @Summary 用id查询版本管理
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param ID query uint true "用id查询版本管理"
+// @Success 200 {object} response.Response{data=system.SysVersion,msg=string} "查询成功"
+// @Router /sysVersion/findSysVersion [get]
+func (sysVersionApi *SysVersionApi) FindSysVersion(c *gin.Context) {
+	// 创建业务用Context
+	ctx := c.Request.Context()
+
+	ID := c.Query("ID")
+	resysVersion, err := sysVersionService.GetSysVersion(ctx, ID)
+	if err != nil {
+		global.GVA_LOG.Error("查询失败!", zap.Error(err))
+		response.FailWithMessage("查询失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithData(resysVersion, c)
+}
+
+// GetSysVersionList 分页获取版本管理列表
+// @Tags SysVersion
+// @Summary 分页获取版本管理列表
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data query systemReq.SysVersionSearch true "分页获取版本管理列表"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
+// @Router /sysVersion/getSysVersionList [get]
+func (sysVersionApi *SysVersionApi) GetSysVersionList(c *gin.Context) {
+	// 创建业务用Context
+	ctx := c.Request.Context()
+
+	var pageInfo systemReq.SysVersionSearch
+	err := c.ShouldBindQuery(&pageInfo)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	list, total, err := sysVersionService.GetSysVersionInfoList(ctx, pageInfo)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithDetailed(response.PageResult{
+		List:     list,
+		Total:    total,
+		Page:     pageInfo.Page,
+		PageSize: pageInfo.PageSize,
+	}, "获取成功", c)
+}
+
+// GetSysVersionPublic 不需要鉴权的版本管理接口
+// @Tags SysVersion
+// @Summary 不需要鉴权的版本管理接口
+// @Accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
+// @Router /sysVersion/getSysVersionPublic [get]
+func (sysVersionApi *SysVersionApi) GetSysVersionPublic(c *gin.Context) {
+	// 创建业务用Context
+	ctx := c.Request.Context()
+
+	// 此接口不需要鉴权
+	// 示例为返回了一个固定的消息接口，一般本接口用于C端服务，需要自己实现业务逻辑
+	sysVersionService.GetSysVersionPublic(ctx)
+	response.OkWithDetailed(gin.H{
+		"info": "不需要鉴权的版本管理接口信息",
+	}, "获取成功", c)
+}
+
+// ExportVersion 创建发版数据
+// @Tags SysVersion
+// @Summary 创建发版数据
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data body systemReq.ExportVersionRequest true "创建发版数据"
+// @Success 200 {object} response.Response{msg=string} "创建成功"
+// @Router /sysVersion/exportVersion [post]
+func (sysVersionApi *SysVersionApi) ExportVersion(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	var req systemReq.ExportVersionRequest
+	err := c.ShouldBindJSON(&req)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	// 获取选中的菜单数据
+	var menuData []system.SysBaseMenu
+	if len(req.MenuIds) > 0 {
+		menuData, err = sysVersionService.GetMenusByIds(ctx, req.MenuIds)
+		if err != nil {
+			global.GVA_LOG.Error("获取菜单数据失败!", zap.Error(err))
+			response.FailWithMessage("获取菜单数据失败:"+err.Error(), c)
+			return
+		}
+	}
+
+	// 获取选中的API数据
+	var apiData []system.SysApi
+	if len(req.ApiIds) > 0 {
+		apiData, err = sysVersionService.GetApisByIds(ctx, req.ApiIds)
+		if err != nil {
+			global.GVA_LOG.Error("获取API数据失败!", zap.Error(err))
+			response.FailWithMessage("获取API数据失败:"+err.Error(), c)
+			return
+		}
+	}
+
+	// 处理菜单数据，构建递归的children结构
+	processedMenus := buildMenuTree(menuData)
+
+	// 处理API数据，清除ID和时间戳字段
+	processedApis := make([]system.SysApi, 0, len(apiData))
+	for _, api := range apiData {
+		cleanApi := system.SysApi{
+			Path:        api.Path,
+			Description: api.Description,
+			ApiGroup:    api.ApiGroup,
+			Method:      api.Method,
+		}
+		processedApis = append(processedApis, cleanApi)
+	}
+
+	// 构建导出数据
+	exportData := systemRes.ExportVersionResponse{
+		Version: systemReq.VersionInfo{
+			Name:        req.VersionName,
+			Code:        req.VersionCode,
+			Description: req.Description,
+			ExportTime:  time.Now().Format("2006-01-02 15:04:05"),
+		},
+		Menus: processedMenus,
+		Apis:  processedApis,
+	}
+
+	// 转换为JSON
+	jsonData, err := json.MarshalIndent(exportData, "", "  ")
+	if err != nil {
+		global.GVA_LOG.Error("JSON序列化失败!", zap.Error(err))
+		response.FailWithMessage("JSON序列化失败:"+err.Error(), c)
+		return
+	}
+
+	// 保存版本记录
+	version := system.SysVersion{
+		VersionName: utils.Pointer(req.VersionName),
+		VersionCode: utils.Pointer(req.VersionCode),
+		Description: utils.Pointer(req.Description),
+		VersionData: utils.Pointer(string(jsonData)),
+	}
+
+	err = sysVersionService.CreateSysVersion(ctx, &version)
+	if err != nil {
+		global.GVA_LOG.Error("保存版本记录失败!", zap.Error(err))
+		response.FailWithMessage("保存版本记录失败:"+err.Error(), c)
+		return
+	}
+
+	response.OkWithMessage("创建发版成功", c)
+}
+
+// DownloadVersionJson 下载版本JSON数据
+// @Tags SysVersion
+// @Summary 下载版本JSON数据
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param ID query string true "版本ID"
+// @Success 200 {object} response.Response{data=object,msg=string} "下载成功"
+// @Router /sysVersion/downloadVersionJson [get]
+func (sysVersionApi *SysVersionApi) DownloadVersionJson(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	ID := c.Query("ID")
+	if ID == "" {
+		response.FailWithMessage("版本ID不能为空", c)
+		return
+	}
+
+	// 获取版本记录
+	version, err := sysVersionService.GetSysVersion(ctx, ID)
+	if err != nil {
+		global.GVA_LOG.Error("获取版本记录失败!", zap.Error(err))
+		response.FailWithMessage("获取版本记录失败:"+err.Error(), c)
+		return
+	}
+
+	// 构建JSON数据
+	var jsonData []byte
+	if version.VersionData != nil && *version.VersionData != "" {
+		jsonData = []byte(*version.VersionData)
+	} else {
+		// 如果没有存储的JSON数据，构建一个基本的结构
+		basicData := systemRes.ExportVersionResponse{
+			Version: systemReq.VersionInfo{
+				Name:        *version.VersionName,
+				Code:        *version.VersionCode,
+				Description: *version.Description,
+				ExportTime:  version.CreatedAt.Format("2006-01-02 15:04:05"),
+			},
+			Menus: []system.SysBaseMenu{},
+			Apis:  []system.SysApi{},
+		}
+		jsonData, _ = json.MarshalIndent(basicData, "", "  ")
+	}
+
+	// 设置下载响应头
+	filename := fmt.Sprintf("version_%s_%s.json", *version.VersionCode, time.Now().Format("20060102150405"))
+	c.Header("Content-Type", "application/json")
+	c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=%s", filename))
+	c.Header("Content-Length", strconv.Itoa(len(jsonData)))
+
+	c.Data(http.StatusOK, "application/json", jsonData)
+}
+
+// ImportVersion 导入版本数据
+// @Tags SysVersion
+// @Summary 导入版本数据
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data body systemReq.ImportVersionRequest true "版本JSON数据"
+// @Success 200 {object} response.Response{msg=string} "导入成功"
+// @Router /sysVersion/importVersion [post]
+func (sysVersionApi *SysVersionApi) ImportVersion(c *gin.Context) {
+	ctx := c.Request.Context()
+
+	// 获取JSON数据
+	var importData systemReq.ImportVersionRequest
+	err := c.ShouldBindJSON(&importData)
+	if err != nil {
+		response.FailWithMessage("解析JSON数据失败:"+err.Error(), c)
+		return
+	}
+
+	// 验证数据格式
+	if importData.VersionInfo.Name == "" || importData.VersionInfo.Code == "" {
+		response.FailWithMessage("版本信息格式错误", c)
+		return
+	}
+
+	// 导入菜单数据
+	if len(importData.ExportMenu) > 0 {
+		if err := sysVersionService.ImportMenus(ctx, importData.ExportMenu); err != nil {
+			global.GVA_LOG.Error("导入菜单失败!", zap.Error(err))
+			response.FailWithMessage("导入菜单失败: "+err.Error(), c)
+			return
+		}
+	}
+
+	// 导入API数据
+	if len(importData.ExportApi) > 0 {
+		if err := sysVersionService.ImportApis(importData.ExportApi); err != nil {
+			global.GVA_LOG.Error("导入API失败!", zap.Error(err))
+			response.FailWithMessage("导入API失败: "+err.Error(), c)
+			return
+		}
+	}
+
+	// 创建导入记录
+	jsonData, _ := json.Marshal(importData)
+	version := system.SysVersion{
+		VersionName: utils.Pointer(importData.VersionInfo.Name),
+		VersionCode: utils.Pointer(fmt.Sprintf("%s_imported_%s", importData.VersionInfo.Code, time.Now().Format("20060102150405"))),
+		Description: utils.Pointer(fmt.Sprintf("导入版本: %s", importData.VersionInfo.Description)),
+		VersionData: utils.Pointer(string(jsonData)),
+	}
+
+	err = sysVersionService.CreateSysVersion(ctx, &version)
+	if err != nil {
+		global.GVA_LOG.Error("保存导入记录失败!", zap.Error(err))
+		// 这里不返回错误，因为数据已经导入成功
+	}
+
+	response.OkWithMessage("导入成功", c)
+}
diff --git a/server/config.yaml b/server/config.yaml
index 758d6dcb2..35aaba3d0 100644
--- a/server/config.yaml
+++ b/server/config.yaml
@@ -196,13 +196,13 @@ qiniu:
 
 # minio oss configuration
 minio:
-  endpoint: yourEndpoint
-  access-key-id: yourAccessKeyId
-  access-key-secret: yourAccessKeySecret
-  bucket-name: yourBucketName
-  use-ssl: false
-  base-path: ""
-  bucket-url: "http://host:9000/yourBucketName"
+    endpoint: yourEndpoint
+    access-key-id: yourAccessKeyId
+    access-key-secret: yourAccessKeySecret
+    bucket-name: yourBucketName
+    use-ssl: false
+    base-path: ""
+    bucket-url: "http://host:9000/yourBucketName"
 
 # aliyun oss configuration
 aliyun-oss:
@@ -280,4 +280,4 @@ mcp:
     version: v1.0.0
     sse_path: /sse
     message_path: /message
-    url_prefix: ''
+    url_prefix: ''
\ No newline at end of file
diff --git a/server/core/server.go b/server/core/server.go
index 2cd19440a..6e386e071 100644
--- a/server/core/server.go
+++ b/server/core/server.go
@@ -35,7 +35,7 @@ func RunServer() {
 
 	fmt.Printf(`
 	欢迎使用 gin-vue-admin
-	当前版本:v2.8.3
+	当前版本:v2.8.4
 	加群方式:微信号：shouzi_1994 QQ群：470239250
 	项目地址：https://github.com/flipped-aurora/gin-vue-admin
 	插件市场:https://plugin.gin-vue-admin.com
diff --git a/server/docs/docs.go b/server/docs/docs.go
index ae8960765..669b94b6a 100644
--- a/server/docs/docs.go
+++ b/server/docs/docs.go
@@ -9296,7 +9296,7 @@ const docTemplate = `{
 
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = &swag.Spec{
-	Version:          "v2.8.3",
+	Version:          "v2.8.4",
 	Host:             "",
 	BasePath:         "",
 	Schemes:          []string{},
diff --git a/server/initialize/ensure_tables.go b/server/initialize/ensure_tables.go
index c58227e3b..7a5acf736 100644
--- a/server/initialize/ensure_tables.go
+++ b/server/initialize/ensure_tables.go
@@ -53,7 +53,7 @@ func (e *ensureTables) MigrateTable(ctx context.Context) (context.Context, error
 		sysModel.Condition{},
 		sysModel.JoinTemplate{},
 		sysModel.SysParams{},
-
+		sysModel.SysVersion{},
 		adapter.CasbinRule{},
 
 		example.ExaFile{},
diff --git a/server/initialize/gorm.go b/server/initialize/gorm.go
index e5cdfa7c7..45d8a3145 100644
--- a/server/initialize/gorm.go
+++ b/server/initialize/gorm.go
@@ -56,6 +56,7 @@ func RegisterTables() {
 		system.Condition{},
 		system.JoinTemplate{},
 		system.SysParams{},
+		system.SysVersion{},
 
 		example.ExaFile{},
 		example.ExaCustomer{},
diff --git a/server/initialize/router.go b/server/initialize/router.go
index 4e6fd083e..11ebf420f 100644
--- a/server/initialize/router.go
+++ b/server/initialize/router.go
@@ -93,6 +93,7 @@ func Routers() *gin.Engine {
 		systemRouter.InitUserRouter(PrivateGroup)                           // 注册用户路由
 		systemRouter.InitMenuRouter(PrivateGroup)                           // 注册menu路由
 		systemRouter.InitSystemRouter(PrivateGroup)                         // system相关路由
+		systemRouter.InitSysVersionRouter(PrivateGroup)                     // 发版相关路由
 		systemRouter.InitCasbinRouter(PrivateGroup)                         // 权限相关路由
 		systemRouter.InitAutoCodeRouter(PrivateGroup, PublicGroup)          // 创建自动化代码
 		systemRouter.InitAuthorityRouter(PrivateGroup)                      // 注册角色路由
diff --git a/server/main.go b/server/main.go
index 919a79fd9..f5badf750 100644
--- a/server/main.go
+++ b/server/main.go
@@ -21,7 +21,7 @@ import (
 // @Tag.Description 用户
 
 // @title                       Gin-Vue-Admin Swagger API接口文档
-// @version                     v2.8.3
+// @version                     v2.8.4
 // @description                 使用gin+vue进行极速开发的全栈开发基础平台
 // @securityDefinitions.apikey  ApiKeyAuth
 // @in                          header
diff --git a/server/mcp/api_creator.go b/server/mcp/api_creator.go
new file mode 100644
index 000000000..42a7fcd50
--- /dev/null
+++ b/server/mcp/api_creator.go
@@ -0,0 +1,197 @@
+package mcpTool
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/service"
+	"github.com/mark3labs/mcp-go/mcp"
+	"go.uber.org/zap"
+)
+
+// 注册工具
+func init() {
+	RegisterTool(&ApiCreator{})
+}
+
+// ApiCreateRequest API创建请求结构
+type ApiCreateRequest struct {
+	Path        string `json:"path"`        // API路径
+	Description string `json:"description"` // API中文描述
+	ApiGroup    string `json:"apiGroup"`    // API组
+	Method      string `json:"method"`      // HTTP方法
+}
+
+// ApiCreateResponse API创建响应结构
+type ApiCreateResponse struct {
+	Success bool   `json:"success"`
+	Message string `json:"message"`
+	ApiID   uint   `json:"apiId"`
+	Path    string `json:"path"`
+	Method  string `json:"method"`
+}
+
+// ApiCreator API创建工具
+type ApiCreator struct{}
+
+// New 创建API创建工具
+func (a *ApiCreator) New() mcp.Tool {
+	return mcp.NewTool("create_api",
+		mcp.WithDescription("创建后端API记录，用于在生成后端接口时自动创建对应的API权限记录，只要创建了API层，router下的文件产生了路径变化等，都需要调用此mcp。"),
+		mcp.WithString("path",
+			mcp.Required(),
+			mcp.Description("API路径，如：/user/create"),
+		),
+		mcp.WithString("description",
+			mcp.Required(),
+			mcp.Description("API中文描述，如：创建用户"),
+		),
+		mcp.WithString("apiGroup",
+			mcp.Required(),
+			mcp.Description("API组名称，用于分类管理，如：用户管理"),
+		),
+		mcp.WithString("method",
+			mcp.Description("HTTP方法"),
+			mcp.DefaultString("POST"),
+		),
+		mcp.WithString("apis",
+			mcp.Description("批量创建API的JSON字符串，格式：[{\"path\":\"/user/create\",\"description\":\"创建用户\",\"apiGroup\":\"用户管理\",\"method\":\"POST\"}]"),
+		),
+	)
+}
+
+// Handle 处理API创建请求
+func (a *ApiCreator) Handle(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	args := request.GetArguments()
+
+	var apis []ApiCreateRequest
+
+	// 检查是否是批量创建
+	if apisStr, ok := args["apis"].(string); ok && apisStr != "" {
+		if err := json.Unmarshal([]byte(apisStr), &apis); err != nil {
+			return nil, fmt.Errorf("apis 参数格式错误: %v", err)
+		}
+	} else {
+		// 单个API创建
+		path, ok := args["path"].(string)
+		if !ok || path == "" {
+			return nil, errors.New("path 参数是必需的")
+		}
+
+		description, ok := args["description"].(string)
+		if !ok || description == "" {
+			return nil, errors.New("description 参数是必需的")
+		}
+
+		apiGroup, ok := args["apiGroup"].(string)
+		if !ok || apiGroup == "" {
+			return nil, errors.New("apiGroup 参数是必需的")
+		}
+
+		method := "POST"
+		if val, ok := args["method"].(string); ok && val != "" {
+			method = val
+		}
+
+		apis = append(apis, ApiCreateRequest{
+			Path:        path,
+			Description: description,
+			ApiGroup:    apiGroup,
+			Method:      method,
+		})
+	}
+
+	if len(apis) == 0 {
+		return nil, errors.New("没有要创建的API")
+	}
+
+	// 创建API记录
+	apiService := service.ServiceGroupApp.SystemServiceGroup.ApiService
+	var responses []ApiCreateResponse
+	successCount := 0
+
+	for _, apiReq := range apis {
+		api := system.SysApi{
+			Path:        apiReq.Path,
+			Description: apiReq.Description,
+			ApiGroup:    apiReq.ApiGroup,
+			Method:      apiReq.Method,
+		}
+
+		err := apiService.CreateApi(api)
+		if err != nil {
+			global.GVA_LOG.Warn("创建API失败",
+				zap.String("path", apiReq.Path),
+				zap.String("method", apiReq.Method),
+				zap.Error(err))
+
+			responses = append(responses, ApiCreateResponse{
+				Success: false,
+				Message: fmt.Sprintf("创建API失败: %v", err),
+				Path:    apiReq.Path,
+				Method:  apiReq.Method,
+			})
+		} else {
+			// 获取创建的API ID
+			var createdApi system.SysApi
+			err = global.GVA_DB.Where("path = ? AND method = ?", apiReq.Path, apiReq.Method).First(&createdApi).Error
+			if err != nil {
+				global.GVA_LOG.Warn("获取创建的API ID失败", zap.Error(err))
+			}
+
+			responses = append(responses, ApiCreateResponse{
+				Success: true,
+				Message: fmt.Sprintf("成功创建API %s %s", apiReq.Method, apiReq.Path),
+				ApiID:   createdApi.ID,
+				Path:    apiReq.Path,
+				Method:  apiReq.Method,
+			})
+			successCount++
+		}
+	}
+
+	// 构建总体响应
+	var resultMessage string
+	if len(apis) == 1 {
+		resultMessage = responses[0].Message
+	} else {
+		resultMessage = fmt.Sprintf("批量创建API完成，成功 %d 个，失败 %d 个", successCount, len(apis)-successCount)
+	}
+
+	result := map[string]interface{}{
+		"success":      successCount > 0,
+		"message":      resultMessage,
+		"totalCount":   len(apis),
+		"successCount": successCount,
+		"failedCount":  len(apis) - successCount,
+		"details":      responses,
+	}
+
+	resultJSON, err := json.MarshalIndent(result, "", "  ")
+	if err != nil {
+		return nil, fmt.Errorf("序列化结果失败: %v", err)
+	}
+
+	// 添加权限分配提醒
+	permissionReminder := "\n\n⚠️ 重要提醒：\n" +
+		"API创建完成后，请前往【系统管理】->【角色管理】中为相关角色分配新创建的API权限，" +
+		"以确保用户能够正常访问新接口。\n" +
+		"具体步骤：\n" +
+		"1. 进入角色管理页面\n" +
+		"2. 选择需要授权的角色\n" +
+		"3. 在API权限中勾选新创建的API接口\n" +
+		"4. 保存权限配置"
+
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.TextContent{
+				Type: "text",
+				Text: fmt.Sprintf("API创建结果：\n\n%s%s", string(resultJSON), permissionReminder),
+			},
+		},
+	}, nil
+}
diff --git a/server/mcp/dictionary_generator.go b/server/mcp/dictionary_generator.go
new file mode 100644
index 000000000..e7c655806
--- /dev/null
+++ b/server/mcp/dictionary_generator.go
@@ -0,0 +1,310 @@
+package mcpTool
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/service"
+	"github.com/mark3labs/mcp-go/mcp"
+	"go.uber.org/zap"
+	"gorm.io/gorm"
+)
+
+func init() {
+	RegisterTool(&DictionaryOptionsGenerator{})
+}
+
+// DictionaryOptionsGenerator 字典选项生成器
+type DictionaryOptionsGenerator struct{}
+
+// DictionaryGenerateRequest 字典生成请求
+type DictionaryGenerateRequest struct {
+	DictType    string             `json:"dictType"`    // 字典类型
+	FieldDesc   string             `json:"fieldDesc"`   // 字段描述
+	Options     []DictionaryOption `json:"options"`     // AI生成的字典选项
+	DictName    string             `json:"dictName"`    // 字典名称（可选）
+	Description string             `json:"description"` // 字典描述（可选）
+}
+
+// DictionaryGenerateResponse 字典生成响应
+type DictionaryGenerateResponse struct {
+	Success      bool   `json:"success"`
+	Message      string `json:"message"`
+	DictType     string `json:"dictType"`
+	OptionsCount int    `json:"optionsCount"`
+}
+
+// New 返回工具注册信息
+func (d *DictionaryOptionsGenerator) New() mcp.Tool {
+	return mcp.NewTool("generate_dictionary_options",
+		mcp.WithDescription("智能生成字典选项并自动创建字典和字典详情"),
+		mcp.WithString("dictType",
+			mcp.Required(),
+			mcp.Description("字典类型，用于标识字典的唯一性"),
+		),
+		mcp.WithString("fieldDesc",
+			mcp.Required(),
+			mcp.Description("字段描述，用于AI理解字段含义"),
+		),
+		mcp.WithString("options",
+			mcp.Required(),
+			mcp.Description("字典选项JSON字符串，格式：[{\"label\":\"显示名\",\"value\":\"值\",\"sort\":1}]"),
+		),
+		mcp.WithString("dictName",
+			mcp.Description("字典名称，如果不提供将自动生成"),
+		),
+		mcp.WithString("description",
+			mcp.Description("字典描述"),
+		),
+	)
+}
+
+// Name 返回工具名称
+func (d *DictionaryOptionsGenerator) Name() string {
+	return "generate_dictionary_options"
+}
+
+// Description 返回工具描述
+func (d *DictionaryOptionsGenerator) Description() string {
+	return `字典选项生成工具 - 让AI生成并创建字典选项
+
+此工具允许AI根据字典类型和字段描述生成合适的字典选项，并自动创建字典和字典详情。
+
+参数说明：
+- dictType: 字典类型（必填）
+- fieldDesc: 字段描述（必填）
+- options: AI生成的字典选项数组（必填）
+  - label: 选项标签
+  - value: 选项值
+  - sort: 排序号
+- dictName: 字典名称（可选，默认根据fieldDesc生成）
+- description: 字典描述（可选）
+
+使用场景：
+1. 在创建模块时，如果字段需要字典类型，AI可以根据字段描述智能生成合适的选项
+2. 支持各种业务场景的字典选项生成，如状态、类型、等级等
+3. 自动创建字典和字典详情，无需手动配置
+
+示例调用：
+{
+  "dictType": "user_status",
+  "fieldDesc": "用户状态",
+  "options": [
+    {"label": "正常", "value": "1", "sort": 1},
+    {"label": "禁用", "value": "0", "sort": 2}
+  ],
+  "dictName": "用户状态字典",
+  "description": "用于管理用户账户状态的字典"
+}`
+}
+
+// InputSchema 返回输入参数的JSON Schema
+func (d *DictionaryOptionsGenerator) InputSchema() map[string]interface{} {
+	return map[string]interface{}{
+		"type": "object",
+		"properties": map[string]interface{}{
+			"dictType": map[string]interface{}{
+				"type":        "string",
+				"description": "字典类型，用于标识字典的唯一性",
+			},
+			"fieldDesc": map[string]interface{}{
+				"type":        "string",
+				"description": "字段描述，用于生成字典名称和理解字典用途",
+			},
+			"options": map[string]interface{}{
+				"type":        "array",
+				"description": "AI生成的字典选项数组",
+				"items": map[string]interface{}{
+					"type": "object",
+					"properties": map[string]interface{}{
+						"label": map[string]interface{}{
+							"type":        "string",
+							"description": "选项标签，显示给用户的文本",
+						},
+						"value": map[string]interface{}{
+							"type":        "string",
+							"description": "选项值，存储在数据库中的值",
+						},
+						"sort": map[string]interface{}{
+							"type":        "integer",
+							"description": "排序号，用于控制选项显示顺序",
+						},
+					},
+					"required": []string{"label", "value", "sort"},
+				},
+			},
+			"dictName": map[string]interface{}{
+				"type":        "string",
+				"description": "字典名称，可选，默认根据fieldDesc生成",
+			},
+			"description": map[string]interface{}{
+				"type":        "string",
+				"description": "字典描述，可选",
+			},
+		},
+		"required": []string{"dictType", "fieldDesc", "options"},
+	}
+}
+
+// Handle 处理工具调用
+func (d *DictionaryOptionsGenerator) Handle(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	// 解析请求参数
+	args := request.GetArguments()
+
+	dictType, ok := args["dictType"].(string)
+	if !ok || dictType == "" {
+		return nil, errors.New("dictType 参数是必需的")
+	}
+
+	fieldDesc, ok := args["fieldDesc"].(string)
+	if !ok || fieldDesc == "" {
+		return nil, errors.New("fieldDesc 参数是必需的")
+	}
+
+	optionsStr, ok := args["options"].(string)
+	if !ok || optionsStr == "" {
+		return nil, errors.New("options 参数是必需的")
+	}
+
+	// 解析options JSON字符串
+	var options []DictionaryOption
+	if err := json.Unmarshal([]byte(optionsStr), &options); err != nil {
+		return nil, fmt.Errorf("options 参数格式错误: %v", err)
+	}
+
+	if len(options) == 0 {
+		return nil, errors.New("options 不能为空")
+	}
+
+	// 可选参数
+	dictName, _ := args["dictName"].(string)
+	description, _ := args["description"].(string)
+
+	// 构建请求对象
+	req := &DictionaryGenerateRequest{
+		DictType:    dictType,
+		FieldDesc:   fieldDesc,
+		Options:     options,
+		DictName:    dictName,
+		Description: description,
+	}
+
+	// 创建字典
+	response, err := d.createDictionaryWithOptions(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	// 构建响应
+	resultJSON, err := json.MarshalIndent(response, "", "  ")
+	if err != nil {
+		return nil, fmt.Errorf("序列化结果失败: %v", err)
+	}
+
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.TextContent{
+				Type: "text",
+				Text: fmt.Sprintf("字典选项生成结果：\n\n%s", string(resultJSON)),
+			},
+		},
+	}, nil
+}
+
+// createDictionaryWithOptions 创建字典和字典选项
+func (d *DictionaryOptionsGenerator) createDictionaryWithOptions(ctx context.Context, req *DictionaryGenerateRequest) (*DictionaryGenerateResponse, error) {
+	// 检查字典是否已存在
+	exists, err := d.checkDictionaryExists(req.DictType)
+	if err != nil {
+		return nil, fmt.Errorf("检查字典是否存在失败: %v", err)
+	}
+
+	if exists {
+		return &DictionaryGenerateResponse{
+			Success:      false,
+			Message:      fmt.Sprintf("字典 %s 已存在，跳过创建", req.DictType),
+			DictType:     req.DictType,
+			OptionsCount: 0,
+		}, nil
+	}
+
+	// 生成字典名称
+	dictName := req.DictName
+	if dictName == "" {
+		dictName = d.generateDictionaryName(req.DictType, req.FieldDesc)
+	}
+
+	// 创建字典
+	dictionaryService := service.ServiceGroupApp.SystemServiceGroup.DictionaryService
+	dictionary := system.SysDictionary{
+		Name:   dictName,
+		Type:   req.DictType,
+		Status: &[]bool{true}[0], // 默认启用
+		Desc:   req.Description,
+	}
+
+	err = dictionaryService.CreateSysDictionary(dictionary)
+	if err != nil {
+		return nil, fmt.Errorf("创建字典失败: %v", err)
+	}
+
+	// 获取刚创建的字典ID
+	var createdDict system.SysDictionary
+	err = global.GVA_DB.Where("type = ?", req.DictType).First(&createdDict).Error
+	if err != nil {
+		return nil, fmt.Errorf("获取创建的字典失败: %v", err)
+	}
+
+	// 创建字典详情项
+	dictionaryDetailService := service.ServiceGroupApp.SystemServiceGroup.DictionaryDetailService
+	successCount := 0
+
+	for _, option := range req.Options {
+		dictionaryDetail := system.SysDictionaryDetail{
+			Label:           option.Label,
+			Value:           option.Value,
+			Status:          &[]bool{true}[0], // 默认启用
+			Sort:            option.Sort,
+			SysDictionaryID: int(createdDict.ID),
+		}
+
+		err = dictionaryDetailService.CreateSysDictionaryDetail(dictionaryDetail)
+		if err != nil {
+			global.GVA_LOG.Warn("创建字典详情项失败", zap.Error(err))
+		} else {
+			successCount++
+		}
+	}
+
+	return &DictionaryGenerateResponse{
+		Success:      true,
+		Message:      fmt.Sprintf("成功创建字典 %s，包含 %d 个选项", req.DictType, successCount),
+		DictType:     req.DictType,
+		OptionsCount: successCount,
+	}, nil
+}
+
+// checkDictionaryExists 检查字典是否存在
+func (d *DictionaryOptionsGenerator) checkDictionaryExists(dictType string) (bool, error) {
+	var dictionary system.SysDictionary
+	err := global.GVA_DB.Where("type = ?", dictType).First(&dictionary).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return false, nil // 字典不存在
+		}
+		return false, err // 其他错误
+	}
+	return true, nil // 字典存在
+}
+
+// generateDictionaryName 生成字典名称
+func (d *DictionaryOptionsGenerator) generateDictionaryName(dictType, fieldDesc string) string {
+	if fieldDesc != "" {
+		return fmt.Sprintf("%s字典", fieldDesc)
+	}
+	return fmt.Sprintf("%s字典", dictType)
+}
diff --git a/server/mcp/dictionary_query.go b/server/mcp/dictionary_query.go
new file mode 100644
index 000000000..aea5df48b
--- /dev/null
+++ b/server/mcp/dictionary_query.go
@@ -0,0 +1,234 @@
+package mcpTool
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/service"
+	"github.com/mark3labs/mcp-go/mcp"
+	"go.uber.org/zap"
+	"gorm.io/gorm"
+)
+
+// 注册工具
+func init() {
+	RegisterTool(&DictionaryQuery{})
+}
+
+// DictionaryInfo 字典信息结构
+type DictionaryInfo struct {
+	ID     uint   `json:"id"`
+	Name   string `json:"name"`   // 字典名（中）
+	Type   string `json:"type"`   // 字典名（英）
+	Status *bool  `json:"status"` // 状态
+	Desc   string `json:"desc"`   // 描述
+	Details []DictionaryDetailInfo `json:"details"` // 字典详情
+}
+
+// DictionaryDetailInfo 字典详情信息结构
+type DictionaryDetailInfo struct {
+	ID     uint   `json:"id"`
+	Label  string `json:"label"`  // 展示值
+	Value  string `json:"value"`  // 字典值
+	Extend string `json:"extend"` // 扩展值
+	Status *bool  `json:"status"` // 启用状态
+	Sort   int    `json:"sort"`   // 排序标记
+}
+
+// DictionaryQueryResponse 字典查询响应结构
+type DictionaryQueryResponse struct {
+	Success     bool             `json:"success"`
+	Message     string           `json:"message"`
+	Total       int              `json:"total"`
+	Dictionaries []DictionaryInfo `json:"dictionaries"`
+}
+
+// DictionaryQuery 字典查询工具
+type DictionaryQuery struct{}
+
+// New 创建字典查询工具
+func (d *DictionaryQuery) New() mcp.Tool {
+	return mcp.NewTool("query_dictionaries",
+		mcp.WithDescription("查询系统中所有的字典和字典属性，用于AI生成逻辑时了解可用的字典选项"),
+		mcp.WithString("dictType",
+			mcp.Description("可选：指定字典类型进行精确查询，如果不提供则返回所有字典"),
+		),
+		mcp.WithBoolean("includeDisabled",
+			mcp.Description("是否包含已禁用的字典和字典项，默认为false（只返回启用的）"),
+		),
+		mcp.WithBoolean("detailsOnly",
+			mcp.Description("是否只返回字典详情信息（不包含字典基本信息），默认为false"),
+		),
+	)
+}
+
+// Handle 处理字典查询请求
+func (d *DictionaryQuery) Handle(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	args := request.GetArguments()
+	
+	// 获取参数
+	dictType := ""
+	if val, ok := args["dictType"].(string); ok {
+		dictType = val
+	}
+	
+	includeDisabled := false
+	if val, ok := args["includeDisabled"].(bool); ok {
+		includeDisabled = val
+	}
+	
+	detailsOnly := false
+	if val, ok := args["detailsOnly"].(bool); ok {
+		detailsOnly = val
+	}
+	
+	// 获取字典服务
+	dictionaryService := service.ServiceGroupApp.SystemServiceGroup.DictionaryService
+	
+	var dictionaries []DictionaryInfo
+	var err error
+	
+	if dictType != "" {
+		// 查询指定类型的字典
+		var status *bool
+		if !includeDisabled {
+			status = &[]bool{true}[0]
+		}
+		
+		sysDictionary, err := dictionaryService.GetSysDictionary(dictType, 0, status)
+		if err != nil {
+			global.GVA_LOG.Error("查询字典失败", zap.Error(err))
+			return &mcp.CallToolResult{
+				Content: []mcp.Content{
+					mcp.NewTextContent(fmt.Sprintf(`{"success": false, "message": "查询字典失败: %v", "total": 0, "dictionaries": []}`, err.Error())),
+				},
+			}, nil
+		}
+		
+		// 转换为响应格式
+		dictInfo := DictionaryInfo{
+			ID:     sysDictionary.ID,
+			Name:   sysDictionary.Name,
+			Type:   sysDictionary.Type,
+			Status: sysDictionary.Status,
+			Desc:   sysDictionary.Desc,
+		}
+		
+		// 获取字典详情
+		for _, detail := range sysDictionary.SysDictionaryDetails {
+			if includeDisabled || (detail.Status != nil && *detail.Status) {
+				dictInfo.Details = append(dictInfo.Details, DictionaryDetailInfo{
+					ID:     detail.ID,
+					Label:  detail.Label,
+					Value:  detail.Value,
+					Extend: detail.Extend,
+					Status: detail.Status,
+					Sort:   detail.Sort,
+				})
+			}
+		}
+		
+		dictionaries = append(dictionaries, dictInfo)
+	} else {
+		// 查询所有字典
+		var sysDictionaries []system.SysDictionary
+		db := global.GVA_DB.Model(&system.SysDictionary{})
+		
+		if !includeDisabled {
+			db = db.Where("status = ?", true)
+		}
+		
+		err = db.Preload("SysDictionaryDetails", func(db *gorm.DB) *gorm.DB {
+			if includeDisabled {
+				return db.Order("sort")
+			} else {
+				return db.Where("status = ?", true).Order("sort")
+			}
+		}).Find(&sysDictionaries).Error
+		
+		if err != nil {
+			global.GVA_LOG.Error("查询字典列表失败", zap.Error(err))
+			return &mcp.CallToolResult{
+				Content: []mcp.Content{
+					mcp.NewTextContent(fmt.Sprintf(`{"success": false, "message": "查询字典列表失败: %v", "total": 0, "dictionaries": []}`, err.Error())),
+				},
+			}, nil
+		}
+		
+		// 转换为响应格式
+		for _, dict := range sysDictionaries {
+			dictInfo := DictionaryInfo{
+				ID:     dict.ID,
+				Name:   dict.Name,
+				Type:   dict.Type,
+				Status: dict.Status,
+				Desc:   dict.Desc,
+			}
+			
+			// 获取字典详情
+			for _, detail := range dict.SysDictionaryDetails {
+				if includeDisabled || (detail.Status != nil && *detail.Status) {
+					dictInfo.Details = append(dictInfo.Details, DictionaryDetailInfo{
+						ID:     detail.ID,
+						Label:  detail.Label,
+						Value:  detail.Value,
+						Extend: detail.Extend,
+						Status: detail.Status,
+						Sort:   detail.Sort,
+					})
+				}
+			}
+			
+			dictionaries = append(dictionaries, dictInfo)
+		}
+	}
+	
+	// 如果只需要详情信息，则提取所有详情
+	if detailsOnly {
+		var allDetails []DictionaryDetailInfo
+		for _, dict := range dictionaries {
+			allDetails = append(allDetails, dict.Details...)
+		}
+		
+		response := map[string]interface{}{
+			"success": true,
+			"message": "查询字典详情成功",
+			"total":   len(allDetails),
+			"details": allDetails,
+		}
+		
+		responseJSON, _ := json.Marshal(response)
+		return &mcp.CallToolResult{
+			Content: []mcp.Content{
+				mcp.NewTextContent(string(responseJSON)),
+			},
+		}, nil
+	}
+	
+	// 构建响应
+	response := DictionaryQueryResponse{
+		Success:      true,
+		Message:      "查询字典成功",
+		Total:        len(dictionaries),
+		Dictionaries: dictionaries,
+	}
+	
+	responseJSON, err := json.Marshal(response)
+	if err != nil {
+		global.GVA_LOG.Error("序列化响应失败", zap.Error(err))
+		return &mcp.CallToolResult{
+			Content: []mcp.Content{
+				mcp.NewTextContent(fmt.Sprintf(`{"success": false, "message": "序列化响应失败: %v", "total": 0, "dictionaries": []}`, err.Error())),
+			},
+		}, nil
+	}
+	
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.NewTextContent(string(responseJSON)),
+		},
+	}, nil
+}
\ No newline at end of file
diff --git a/server/mcp/execution_plan_schema.md b/server/mcp/execution_plan_schema.md
new file mode 100644
index 000000000..6a627f3d3
--- /dev/null
+++ b/server/mcp/execution_plan_schema.md
@@ -0,0 +1,255 @@
+# ExecutionPlan 结构体格式说明
+
+## 概述
+ExecutionPlan 是用于自动化模块创建的执行计划结构体，包含了创建包和模块所需的所有信息。
+
+## 完整结构体定义
+
+```go
+type ExecutionPlan struct {
+    PackageName        string                           `json:"packageName"`        // 包名，如："user", "order", "product"
+    ModuleName         string                           `json:"moduleName"`         // 模块名，通常与结构体名相同
+    PackageType        string                           `json:"packageType"`        // "plugin" 或 "package"
+    NeedCreatedPackage bool                             `json:"needCreatedPackage"` // 是否需要创建包
+    NeedCreatedModules bool                             `json:"needCreatedModules"` // 是否需要创建模块
+    PackageInfo        *request.SysAutoCodePackageCreate `json:"packageInfo,omitempty"`  // 包信息（当NeedCreatedPackage=true时必需）
+    ModulesInfo        *request.AutoCode                `json:"modulesInfo,omitempty"` // 模块信息（当NeedCreatedModules=true时必需）
+    Paths              map[string]string                `json:"paths,omitempty"`       // 路径信息
+}
+```
+
+## 子结构体详细说明
+
+### 1. SysAutoCodePackageCreate 结构体
+
+```go
+type SysAutoCodePackageCreate struct {
+    Desc        string `json:"desc"`        // 描述，如："用户管理模块"
+    Label       string `json:"label"`       // 展示名，如："用户管理"
+    Template    string `json:"template"`    // 模板类型："plugin" 或 "package"
+    PackageName string `json:"packageName"` // 包名，如："user"
+    Module      string `json:"-"`          // 模块名（自动填充，无需设置）
+}
+```
+
+### 2. AutoCode 结构体（核心字段）
+
+```go
+type AutoCode struct {
+    Package             string           `json:"package"`             // 包名
+    TableName           string           `json:"tableName"`           // 数据库表名
+    BusinessDB          string           `json:"businessDB"`          // 业务数据库名
+    StructName          string           `json:"structName"`          // 结构体名称
+    PackageName         string           `json:"packageName"`         // 文件名称
+    Description         string           `json:"description"`         // 结构体中文名称
+    Abbreviation        string           `json:"abbreviation"`        // 结构体简称
+    HumpPackageName     string           `json:"humpPackageName"`     // 驼峰命名的包名
+    GvaModel            bool             `json:"gvaModel"`            // 是否使用GVA默认Model
+    AutoMigrate         bool             `json:"autoMigrate"`         // 是否自动迁移表结构
+    AutoCreateResource  bool             `json:"autoCreateResource"`  // 是否自动创建资源标识
+    AutoCreateApiToSql  bool             `json:"autoCreateApiToSql"`  // 是否自动创建API
+    AutoCreateMenuToSql bool             `json:"autoCreateMenuToSql"` // 是否自动创建菜单
+    AutoCreateBtnAuth   bool             `json:"autoCreateBtnAuth"`   // 是否自动创建按钮权限
+    OnlyTemplate        bool             `json:"onlyTemplate"`        // 是否只生成模板
+    IsTree              bool             `json:"isTree"`              // 是否树形结构
+    TreeJson            string           `json:"treeJson"`            // 树形结构JSON字段
+    IsAdd               bool             `json:"isAdd"`               // 是否新增
+    Fields              []*AutoCodeField `json:"fields"`              // 字段列表
+    GenerateWeb         bool             `json:"generateWeb"`         // 是否生成前端代码
+    GenerateServer      bool             `json:"generateServer"`      // 是否生成后端代码
+    Module              string           `json:"-"`                  // 模块（自动填充）
+    DictTypes           []string         `json:"-"`                  // 字典类型（自动填充）
+}
+```
+
+### 3. AutoCodeField 结构体（字段定义）
+
+```go
+type AutoCodeField struct {
+    FieldName       string      `json:"fieldName"`       // 字段名
+    FieldDesc       string      `json:"fieldDesc"`       // 字段中文描述
+    FieldType       string      `json:"fieldType"`       // 字段类型：string, int, bool, time.Time等
+    FieldJson       string      `json:"fieldJson"`       // JSON标签名
+    DataTypeLong    string      `json:"dataTypeLong"`    // 数据库字段长度
+    Comment         string      `json:"comment"`         // 数据库字段注释
+    ColumnName      string      `json:"columnName"`      // 数据库列名
+    FieldSearchType string      `json:"fieldSearchType"` // 搜索类型：EQ, LIKE, BETWEEN等
+    FieldSearchHide bool        `json:"fieldSearchHide"` // 是否隐藏查询条件
+    DictType        string      `json:"dictType"`        // 字典类型
+    Form            bool        `json:"form"`            // 是否在表单中显示
+    Table           bool        `json:"table"`           // 是否在表格中显示
+    Desc            bool        `json:"desc"`            // 是否在详情中显示
+    Excel           bool        `json:"excel"`           // 是否支持导入导出
+    Require         bool        `json:"require"`         // 是否必填
+    DefaultValue    string      `json:"defaultValue"`    // 默认值
+    ErrorText       string      `json:"errorText"`       // 校验失败提示
+    Clearable       bool        `json:"clearable"`       // 是否可清空
+    Sort            bool        `json:"sort"`            // 是否支持排序
+    PrimaryKey      bool        `json:"primaryKey"`      // 是否主键
+    DataSource      *DataSource `json:"dataSource"`      // 数据源
+    CheckDataSource bool        `json:"checkDataSource"` // 是否检查数据源
+    FieldIndexType  string      `json:"fieldIndexType"`  // 索引类型
+}
+```
+
+## 使用示例
+
+### 示例1：创建新包和模块
+
+```json
+{
+  "packageName": "user",
+  "moduleName": "User",
+  "packageType": "package",
+  "needCreatedPackage": true,
+  "needCreatedModules": true,
+  "packageInfo": {
+    "desc": "用户管理模块",
+    "label": "用户管理",
+    "template": "package",
+    "packageName": "user"
+  },
+  "modulesInfo": {
+    "package": "user",
+    "tableName": "sys_users",
+    "businessDB": "",
+    "structName": "User",
+    "packageName": "user",
+    "description": "用户",
+    "abbreviation": "user",
+    "humpPackageName": "user",
+    "gvaModel": true,
+    "autoMigrate": true,
+    "autoCreateResource": true,
+    "autoCreateApiToSql": true,
+    "autoCreateMenuToSql": true,
+    "autoCreateBtnAuth": true,
+    "onlyTemplate": false,
+    "isTree": false,
+    "treeJson": "",
+    "isAdd": true,
+    "generateWeb": true,
+    "generateServer": true,
+    "fields": [
+      {
+        "fieldName": "Username",
+        "fieldDesc": "用户名",
+        "fieldType": "string",
+        "fieldJson": "username",
+        "dataTypeLong": "50",
+        "comment": "用户名",
+        "columnName": "username",
+        "fieldSearchType": "LIKE",
+        "fieldSearchHide": false,
+        "dictType": "",
+        "form": true,
+        "table": true,
+        "desc": true,
+        "excel": true,
+        "require": true,
+        "defaultValue": "",
+        "errorText": "请输入用户名",
+        "clearable": true,
+        "sort": false,
+        "primaryKey": false,
+        "dataSource": null,
+        "checkDataSource": false,
+        "fieldIndexType": ""
+      },
+      {
+        "fieldName": "Email",
+        "fieldDesc": "邮箱",
+        "fieldType": "string",
+        "fieldJson": "email",
+        "dataTypeLong": "100",
+        "comment": "邮箱地址",
+        "columnName": "email",
+        "fieldSearchType": "EQ",
+        "fieldSearchHide": false,
+        "dictType": "",
+        "form": true,
+        "table": true,
+        "desc": true,
+        "excel": true,
+        "require": true,
+        "defaultValue": "",
+        "errorText": "请输入邮箱",
+        "clearable": true,
+        "sort": false,
+        "primaryKey": false,
+        "dataSource": null,
+        "checkDataSource": false,
+        "fieldIndexType": "index"
+      }
+    ]
+  }
+}
+```
+
+### 示例2：仅在现有包中创建模块
+
+```json
+{
+  "packageName": "system",
+  "moduleName": "Role",
+  "packageType": "package",
+  "needCreatedPackage": false,
+  "needCreatedModules": true,
+  "packageInfo": null,
+  "modulesInfo": {
+    "package": "system",
+    "tableName": "sys_roles",
+    "businessDB": "",
+    "structName": "Role",
+    "packageName": "system",
+    "description": "角色",
+    "abbreviation": "role",
+    "humpPackageName": "system",
+    "gvaModel": true,
+    "autoMigrate": true,
+    "autoCreateResource": true,
+    "autoCreateApiToSql": true,
+    "autoCreateMenuToSql": true,
+    "autoCreateBtnAuth": true,
+    "onlyTemplate": false,
+    "isTree": false,
+    "generateWeb": true,
+    "generateServer": true,
+    "fields": [
+      {
+        "fieldName": "RoleName",
+        "fieldDesc": "角色名称",
+        "fieldType": "string",
+        "fieldJson": "roleName",
+        "dataTypeLong": "50",
+        "comment": "角色名称",
+        "columnName": "role_name",
+        "fieldSearchType": "LIKE",
+        "form": true,
+        "table": true,
+        "desc": true,
+        "require": true
+      }
+    ]
+  }
+}
+```
+
+## 重要注意事项
+
+1. **PackageType**: 只能是 "plugin" 或 "package"
+2. **NeedCreatedPackage**: 当为true时，PackageInfo必须提供
+3. **NeedCreatedModules**: 当为true时，ModulesInfo必须提供
+4. **字段类型**: FieldType支持的类型包括：string, int, int64, float64, bool, time.Time, enum, picture, video, file, pictures, array, richtext, json等
+5. **搜索类型**: FieldSearchType支持：EQ, NE, GT, GE, LT, LE, LIKE, BETWEEN等
+6. **索引类型**: FieldIndexType支持：index, unique等
+7. **GvaModel**: 设置为true时会自动包含ID、CreatedAt、UpdatedAt、DeletedAt字段
+
+## 常见错误避免
+
+1. 确保PackageName和ModuleName符合Go语言命名规范
+2. 字段名使用大写开头的驼峰命名
+3. JSON标签使用小写开头的驼峰命名
+4. 数据库列名使用下划线分隔的小写命名
+5. 必填字段不要遗漏
+6. 字段类型要与实际需求匹配
\ No newline at end of file
diff --git a/server/mcp/gag_usage_example.md b/server/mcp/gag_usage_example.md
new file mode 100644
index 000000000..4bbfa98a5
--- /dev/null
+++ b/server/mcp/gag_usage_example.md
@@ -0,0 +1,122 @@
+# GAG工具使用示例 - 带用户确认流程
+
+## 新的工作流程
+
+现在GAG工具支持三步工作流程：
+1. `analyze` - 分析现有模块信息
+2. `confirm` - 请求用户确认创建计划
+3. `execute` - 执行创建操作（需要用户确认）
+
+## 使用示例
+
+### 第一步：分析
+```json
+{
+  "action": "analyze",
+  "requirement": "创建一个图书管理功能"
+}
+```
+
+### 第二步：确认
+```json
+{
+  "action": "confirm",
+  "executionPlan": {
+    "packageName": "library",
+    "moduleName": "Book",
+    "packageType": "package",
+    "needCreatedPackage": true,
+    "needCreatedModules": true,
+    "packageInfo": {
+      "desc": "图书管理包",
+      "label": "图书管理",
+      "template": "package",
+      "packageName": "library"
+    },
+    "modulesInfo": {
+      "package": "library",
+      "tableName": "library_books",
+      "businessDB": "",
+      "structName": "Book",
+      "packageName": "library",
+      "description": "图书信息",
+      "abbreviation": "book",
+      "humpPackageName": "Library",
+      "gvaModel": true,
+      "autoMigrate": true,
+      "autoCreateResource": true,
+      "autoCreateApiToSql": true,
+      "autoCreateMenuToSql": true,
+      "autoCreateBtnAuth": true,
+      "onlyTemplate": false,
+      "isTree": false,
+      "treeJson": "",
+      "isAdd": false,
+      "generateWeb": true,
+      "generateServer": true,
+      "fields": [
+        {
+          "fieldName": "title",
+          "fieldDesc": "书名",
+          "fieldType": "string",
+          "fieldJson": "title",
+          "dataTypeLong": "255",
+          "comment": "书名",
+          "columnName": "title",
+          "fieldSearchType": "LIKE",
+          "fieldSearchHide": false,
+          "dictType": "",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "excel": true,
+          "require": true,
+          "defaultValue": "",
+          "errorText": "请输入书名",
+          "clearable": true,
+          "sort": false,
+          "primaryKey": false,
+          "dataSource": {},
+          "checkDataSource": false,
+          "fieldIndexType": ""
+        }
+      ]
+    }
+  }
+}
+```
+
+### 第三步：执行（需要确认参数）
+```json
+{
+  "action": "execute",
+  "executionPlan": {
+    // ... 同上面的executionPlan
+  },
+  "packageConfirm": "yes",  // 确认创建包
+  "modulesConfirm": "yes"   // 确认创建模块
+}
+```
+
+## 确认参数说明
+
+- `packageConfirm`: 当`needCreatedPackage`为true时必需
+  - "yes": 确认创建包
+  - "no": 取消创建包（停止后续处理）
+
+- `modulesConfirm`: 当`needCreatedModules`为true时必需
+  - "yes": 确认创建模块
+  - "no": 取消创建模块（停止后续处理）
+
+## 取消操作的行为
+
+1. 如果用户在`packageConfirm`中选择"no"，系统将停止所有后续处理
+2. 如果用户在`modulesConfirm`中选择"no"，系统将停止模块创建
+3. 任何取消操作都会返回相应的取消消息，不会执行任何创建操作
+
+## 注意事项
+
+1. 必须先调用`confirm`来获取确认信息
+2. 在`execute`时必须提供相应的确认参数
+3. 确认参数的值必须是"yes"或"no"
+4. 如果不需要创建包或模块，则不需要提供对应的确认参数
\ No newline at end of file
diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
new file mode 100644
index 000000000..cff7de7a0
--- /dev/null
+++ b/server/mcp/gva_auto_generate.go
@@ -0,0 +1,1317 @@
+package mcpTool
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	model "github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/service"
+	"github.com/mark3labs/mcp-go/mcp"
+	"gorm.io/gorm"
+)
+
+func init() {
+	RegisterTool(&AutomationModuleAnalyzer{})
+}
+
+type AutomationModuleAnalyzer struct{}
+
+// ModuleInfo 模块信息
+type ModuleInfo struct {
+	ID          uint   `json:"id"`
+	PackageName string `json:"packageName"`
+	Label       string `json:"label"`
+	Desc        string `json:"desc"`
+	Template    string `json:"template"` // "plugin" 或 "package"
+	Module      string `json:"module"`
+}
+
+// HistoryInfo 历史记录信息
+type HistoryInfo struct {
+	ID           uint   `json:"id"`
+	StructName   string `json:"structName"`
+	TableName    string `json:"tableName"`
+	PackageName  string `json:"packageName"`
+	BusinessDB   string `json:"businessDB"`
+	Description  string `json:"description"`
+	Abbreviation string `json:"abbreviation"`
+	CreatedAt    string `json:"createdAt"`
+}
+
+// PredesignedModuleInfo 预设计模块信息
+type PredesignedModuleInfo struct {
+	PackageName string   `json:"packageName"`
+	PackageType string   `json:"packageType"` // "plugin" 或 "package"
+	ModuleName  string   `json:"moduleName"`
+	Path        string   `json:"path"`
+	Modules     []string `json:"modules"` // 包含的模块列表（如api、model、service等）
+	Description string   `json:"description"`
+	StructName  string   `json:"structName,omitempty"` // 主要结构体名称
+}
+
+// AnalysisResponse 分析响应
+type AnalysisResponse struct {
+	Packages           []ModuleInfo            `json:"packages"`
+	History            []HistoryInfo           `json:"history"`
+	PredesignedModules []PredesignedModuleInfo `json:"predesignedModules"`
+	Message            string                  `json:"message"`
+}
+
+// ExecutionPlan 执行计划
+type ExecutionPlan struct {
+	PackageName        string                            `json:"packageName"`
+	ModuleName         string                            `json:"moduleName"`
+	PackageType        string                            `json:"packageType"` // "plugin" 或 "package"
+	NeedCreatedPackage bool                              `json:"needCreatedPackage"`
+	NeedCreatedModules bool                              `json:"needCreatedModules"`
+	PackageInfo        *request.SysAutoCodePackageCreate `json:"packageInfo,omitempty"`
+	ModulesInfo        *request.AutoCode                 `json:"modulesInfo,omitempty"`
+	Paths              map[string]string                 `json:"paths,omitempty"`
+}
+
+// ExecutionResult 执行结果
+type ExecutionResult struct {
+	Success     bool              `json:"success"`
+	Message     string            `json:"message"`
+	PackageID   uint              `json:"packageId,omitempty"`
+	HistoryID   uint              `json:"historyId,omitempty"`
+	Paths       map[string]string `json:"paths,omitempty"`
+	NextActions []string          `json:"nextActions,omitempty"`
+}
+
+// ConfirmationRequest 确认请求结构
+type ConfirmationRequest struct {
+	PackageName        string                            `json:"packageName"`
+	ModuleName         string                            `json:"moduleName"`
+	NeedCreatedPackage bool                              `json:"needCreatedPackage"`
+	NeedCreatedModules bool                              `json:"needCreatedModules"`
+	PackageInfo        *request.SysAutoCodePackageCreate `json:"packageInfo,omitempty"`
+	ModulesInfo        *request.AutoCode                 `json:"modulesInfo,omitempty"`
+}
+
+// ConfirmationResponse 确认响应结构
+type ConfirmationResponse struct {
+	Message         string `json:"message"`
+	PackageConfirm  bool   `json:"packageConfirm"`
+	ModulesConfirm  bool   `json:"modulesConfirm"`
+	CanProceed      bool   `json:"canProceed"`
+	ConfirmationKey string `json:"confirmationKey"`
+}
+
+// New 返回工具注册信息
+func (t *AutomationModuleAnalyzer) New() mcp.Tool {
+	return mcp.NewTool("gva_auto_generate",
+		mcp.WithDescription(`**🚀 最高优先级工具：当用户需要创建模块、包、完整功能时，必须优先使用此工具！**
+
+**优先级说明：**
+- **最高优先级**：创建完整模块、包、功能模块
+- **关键词触发**：模块、包、完整、整套、全套、功能、管理系统等
+- **适用场景**：用户说"创建订单管理模块"、"创建用户管理功能"、"创建完整的商品管理"等
+
+分步骤分析自动化模块：1) 分析现有模块信息供AI选择 2) 请求用户确认 3) 根据确认结果执行创建操作
+
+**新功能：自动字典创建**
+- 当结构体字段使用了字典类型（dictType不为空）时，系统会自动检查字典是否存在
+- 如果字典不存在，会自动创建对应的字典及默认的字典详情项
+- 字典创建包括：字典主表记录和默认的选项值（选项1、选项2等）
+
+**与其他工具的关系：**
+- 此工具创建完整模块后，会自动提示相关API和菜单创建建议
+- 如果用户只需要单个API或菜单，可以使用 smart_assistant 工具
+- create_api 和 create_menu 工具仅用于数据库记录创建
+
+重要：ExecutionPlan结构体格式要求：
+{
+  "packageName": "包名(string)",
+  "moduleName": "模块名(string)", 
+  "packageType": "package或plugin(string)",
+  "needCreatedPackage": "是否需要创建包(bool)",
+  "needCreatedModules": "是否需要创建模块(bool)",
+  "packageInfo": {
+    "desc": "描述(string)",
+    "label": "展示名(string)", 
+    "template": "package或plugin(string)",
+    "packageName": "包名(string)"
+  },
+  "modulesInfo": {
+    "package": "包名(string)",
+    "tableName": "数据库表名(string)",
+    "businessDB": "业务数据库(string)",
+    "structName": "结构体名(string)",
+    "packageName": "文件名称(string)",
+    "description": "中文描述(string)",
+    "abbreviation": "简称(string)",
+    "humpPackageName": "文件名称 一般是结构体名的小驼峰(string)",
+    "gvaModel": "是否使用GVA模型(bool) 固定为true 后续不需要创建ID created_at deleted_at updated_at",
+    "autoMigrate": "是否自动迁移(bool)",
+    "autoCreateResource": "是否创建资源(bool)",
+    "autoCreateApiToSql": "是否创建API(bool)",
+    "autoCreateMenuToSql": "是否创建菜单(bool)",
+    "autoCreateBtnAuth": "是否创建按钮权限(bool)",
+    "onlyTemplate": "是否仅模板(bool)",
+    "isTree": "是否树形结构(bool)",
+    "treeJson": "树形JSON字段(string)",
+    "isAdd": "是否新增(bool) 固定为false",
+    "generateWeb": "是否生成前端(bool)",
+    "generateServer": "是否生成后端(bool)",
+    "fields": [{
+      "fieldName": "字段名(string)",
+      "fieldDesc": "字段描述(string)",
+      "fieldType": "字段类型:string/int/bool/time.Time等(string)",
+      "fieldJson": "JSON标签(string)",
+      "dataTypeLong": "数据长度(string)",
+      "comment": "注释(string)",
+      "columnName": "数据库列名(string)",
+      "fieldSearchType": "搜索类型:=/>/</>=/<=/NOT BETWEEN/LIKE/BETWEEN/IN/NOT IN等(string)",
+      "fieldSearchHide": "是否隐藏搜索(bool)",
+      "dictType": "字典类型(string)",
+      "form": "表单显示(bool)",
+      "table": "表格显示(bool)",
+      "desc": "详情显示(bool)",
+      "excel": "导入导出(bool)",
+      "require": "是否必填(bool)",
+      "defaultValue": "默认值(string)",
+      "errorText": "错误提示(string)",
+      "clearable": "是否可清空(bool)",
+      "sort": "是否排序(bool)",
+      "primaryKey": "是否主键(bool)",
+      "dataSource": "数据源(object)",
+      "checkDataSource": "检查数据源(bool)",
+      "fieldIndexType": "索引类型(string)"
+    }]
+  }
+}
+
+注意：
+1. needCreatedPackage=true时packageInfo必需
+2. needCreatedModules=true时modulesInfo必需
+3. packageType只能是"package"或"plugin"
+4. 字段类型支持：string,int,int64,float64,bool,time.Time,enum,picture,video,file,pictures,array,richtext,json
+5. 搜索类型支持：=,!=,>,>=,<,<=,NOT BETWEEN/LIKE/BETWEEN/IN/NOT IN
+6. gvaModel=true时自动包含ID,CreatedAt,UpdatedAt,DeletedAt字段
+7. **重要**：当gvaModel=false时，必须有一个字段的primaryKey=true，否则会导致PrimaryField为nil错误
+8. **重要**：当gvaModel=true时，系统会自动设置ID字段为主键，无需手动设置primaryKey=true
+9. 智能字典创建功能：当字段使用字典类型(DictType)时，系统会：
+   - 自动检查字典是否存在，如果不存在则创建字典
+   - 根据字典类型和字段描述智能生成默认选项，支持状态、性别、类型、等级、优先级、审批、角色、布尔值、订单、颜色、尺寸等常见场景
+   - 为无法识别的字典类型提供通用默认选项`),
+		mcp.WithString("action",
+			mcp.Required(),
+			mcp.Description("执行操作：'analyze' 分析现有模块信息，'confirm' 请求用户确认创建，'execute' 执行创建操作"),
+		),
+		mcp.WithString("requirement",
+			mcp.Description("用户需求描述（action=analyze时必需）"),
+		),
+		mcp.WithObject("executionPlan",
+			mcp.Description("执行计划（action=confirm或execute时必需，必须严格按照上述格式提供完整的JSON对象）"),
+		),
+		mcp.WithString("packageConfirm",
+			mcp.Description("用户对创建包的确认（action=execute时，如果需要创建包则必需）：'yes' 或 'no'"),
+		),
+		mcp.WithString("modulesConfirm",
+			mcp.Description("用户对创建模块的确认（action=execute时，如果需要创建模块则必需）：'yes' 或 'no'"),
+		),
+	)
+}
+
+// scanPredesignedModules 扫描预设计的模块
+func (t *AutomationModuleAnalyzer) scanPredesignedModules() ([]PredesignedModuleInfo, error) {
+	var predesignedModules []PredesignedModuleInfo
+
+	// 获取autocode配置路径
+	if global.GVA_CONFIG.AutoCode.Root == "" {
+		return predesignedModules, nil // 配置不存在时返回空列表，不报错
+	}
+
+	serverPath := filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server)
+
+	// 扫描plugin目录下的各个插件模块
+	pluginPath := filepath.Join(serverPath, "plugin")
+	if pluginModules, err := t.scanPluginModules(pluginPath); err == nil {
+		predesignedModules = append(predesignedModules, pluginModules...)
+	}
+
+	// 扫描model目录下的各个包模块
+	modelPath := filepath.Join(serverPath, "model")
+	if packageModules, err := t.scanPackageModules(modelPath); err == nil {
+		predesignedModules = append(predesignedModules, packageModules...)
+	}
+
+	return predesignedModules, nil
+}
+
+// scanPluginModules 扫描plugin目录下的各个插件模块
+func (t *AutomationModuleAnalyzer) scanPluginModules(pluginPath string) ([]PredesignedModuleInfo, error) {
+	var modules []PredesignedModuleInfo
+
+	if _, err := os.Stat(pluginPath); os.IsNotExist(err) {
+		return modules, nil
+	}
+
+	entries, err := os.ReadDir(pluginPath)
+	if err != nil {
+		return modules, err
+	}
+
+	for _, entry := range entries {
+		if !entry.IsDir() {
+			continue
+		}
+
+		pluginName := entry.Name()
+		pluginDir := filepath.Join(pluginPath, pluginName)
+
+		// 扫描插件下的model目录，查找具体的模块文件
+		modelDir := filepath.Join(pluginDir, "model")
+		if _, err := os.Stat(modelDir); err == nil {
+			if pluginModules, err := t.scanModuleFiles(modelDir, pluginName, "plugin"); err == nil {
+				modules = append(modules, pluginModules...)
+			}
+		}
+	}
+
+	return modules, nil
+}
+
+// scanPackageModules 扫描model目录下的各个包模块
+func (t *AutomationModuleAnalyzer) scanPackageModules(modelPath string) ([]PredesignedModuleInfo, error) {
+	var modules []PredesignedModuleInfo
+
+	if _, err := os.Stat(modelPath); os.IsNotExist(err) {
+		return modules, nil
+	}
+
+	entries, err := os.ReadDir(modelPath)
+	if err != nil {
+		return modules, err
+	}
+
+	for _, entry := range entries {
+		if !entry.IsDir() {
+			continue
+		}
+
+		packageName := entry.Name()
+		// 跳过一些系统目录
+		if packageName == "common" || packageName == "request" || packageName == "response" {
+			continue
+		}
+
+		packageDir := filepath.Join(modelPath, packageName)
+
+		// 扫描包目录下的模块文件
+		if packageModules, err := t.scanModuleFiles(packageDir, packageName, "package"); err == nil {
+			modules = append(modules, packageModules...)
+		}
+	}
+
+	return modules, nil
+}
+
+// scanModuleFiles 扫描目录下的Go文件，识别具体的模块
+func (t *AutomationModuleAnalyzer) scanModuleFiles(dir, packageName, packageType string) ([]PredesignedModuleInfo, error) {
+	var modules []PredesignedModuleInfo
+
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return modules, err
+	}
+
+	for _, entry := range entries {
+		if entry.IsDir() {
+			continue
+		}
+
+		fileName := entry.Name()
+		if !strings.HasSuffix(fileName, ".go") {
+			continue
+		}
+
+		// 跳过一些非模块文件
+		if strings.HasSuffix(fileName, "_test.go") ||
+			fileName == "enter.go" ||
+			fileName == "request.go" ||
+			fileName == "response.go" {
+			continue
+		}
+
+		filePath := filepath.Join(dir, fileName)
+		moduleName := strings.TrimSuffix(fileName, ".go")
+
+		// 分析模块文件，提取结构体信息
+		if moduleInfo, err := t.analyzeModuleFile(filePath, packageName, moduleName, packageType); err == nil {
+			modules = append(modules, *moduleInfo)
+		}
+	}
+
+	return modules, nil
+}
+
+// analyzeModuleFile 分析具体的模块文件
+func (t *AutomationModuleAnalyzer) analyzeModuleFile(filePath, packageName, moduleName, packageType string) (*PredesignedModuleInfo, error) {
+	content, err := os.ReadFile(filePath)
+	if err != nil {
+		return nil, err
+	}
+
+	fileContent := string(content)
+
+	// 提取结构体名称和描述
+	structNames := t.extractStructNames(fileContent)
+	description := t.extractModuleDescription(fileContent, moduleName)
+
+	// 确定主要结构体名称
+	mainStruct := moduleName
+	if len(structNames) > 0 {
+		// 优先选择与文件名相关的结构体
+		for _, structName := range structNames {
+			if strings.Contains(strings.ToLower(structName), strings.ToLower(moduleName)) {
+				mainStruct = structName
+				break
+			}
+		}
+		if mainStruct == moduleName && len(structNames) > 0 {
+			mainStruct = structNames[0] // 如果没有匹配的，使用第一个
+		}
+	}
+
+	return &PredesignedModuleInfo{
+		PackageName: packageName,
+		PackageType: packageType,
+		ModuleName:  moduleName,
+		Path:        filePath,
+		Modules:     structNames,
+		Description: description,
+		StructName:  mainStruct,
+	}, nil
+}
+
+// extractStructNames 从文件内容中提取结构体名称
+func (t *AutomationModuleAnalyzer) extractStructNames(content string) []string {
+	var structNames []string
+	lines := strings.Split(content, "\n")
+
+	for _, line := range lines {
+		line = strings.TrimSpace(line)
+		if strings.HasPrefix(line, "type ") && strings.Contains(line, " struct") {
+			// 提取结构体名称
+			parts := strings.Fields(line)
+			if len(parts) >= 3 && parts[2] == "struct" {
+				structNames = append(structNames, parts[1])
+			}
+		}
+	}
+
+	return structNames
+}
+
+// extractModuleDescription 从文件内容中提取模块描述
+func (t *AutomationModuleAnalyzer) extractModuleDescription(content, moduleName string) string {
+	lines := strings.Split(content, "\n")
+
+	// 查找package注释
+	for i, line := range lines {
+		line = strings.TrimSpace(line)
+		if strings.HasPrefix(line, "package ") {
+			// 向上查找注释
+			for j := i - 1; j >= 0; j-- {
+				commentLine := strings.TrimSpace(lines[j])
+				if strings.HasPrefix(commentLine, "//") {
+					comment := strings.TrimSpace(strings.TrimPrefix(commentLine, "//"))
+					if comment != "" && len(comment) > 5 {
+						return comment
+					}
+				} else if commentLine != "" {
+					break
+				}
+			}
+			break
+		}
+	}
+
+	// 查找结构体注释
+	for i, line := range lines {
+		line = strings.TrimSpace(line)
+		if strings.HasPrefix(line, "type ") && strings.Contains(line, " struct") {
+			// 向上查找注释
+			for j := i - 1; j >= 0; j-- {
+				commentLine := strings.TrimSpace(lines[j])
+				if strings.HasPrefix(commentLine, "//") {
+					comment := strings.TrimSpace(strings.TrimPrefix(commentLine, "//"))
+					if comment != "" && len(comment) > 5 {
+						return comment
+					}
+				} else if commentLine != "" {
+					break
+				}
+			}
+			break
+		}
+	}
+
+	return fmt.Sprintf("预设计的模块：%s", moduleName)
+}
+
+// Handle 处理工具调用
+func (t *AutomationModuleAnalyzer) Handle(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	action, ok := request.GetArguments()["action"].(string)
+	if !ok || action == "" {
+		return nil, errors.New("参数错误：action 必须是非空字符串")
+	}
+
+	switch action {
+	case "analyze":
+		return t.handleAnalyze(ctx, request)
+	case "confirm":
+		return t.handleConfirm(ctx, request)
+	case "execute":
+		return t.handleExecute(ctx, request)
+	default:
+		return nil, errors.New("无效的操作：action 必须是 'analyze'、'confirm' 或 'execute'")
+	}
+}
+
+// handleAnalyze 处理分析请求
+func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	requirement, ok := request.GetArguments()["requirement"].(string)
+	if !ok || requirement == "" {
+		return nil, errors.New("参数错误：requirement 必须是非空字符串")
+	}
+
+	// 检测用户是否想要创建插件
+	suggestedType, isPlugin, confidence := t.detectPluginIntent(requirement)
+	pluginDetectionMsg := ""
+	if isPlugin {
+		pluginDetectionMsg = fmt.Sprintf("\n\n🔍 **插件检测结果**：检测到用户想要创建插件（置信度：%s）\n⚠️  **重要提醒**：当用户提到插件时，packageType和template字段都必须设置为 \"plugin\"，不能使用 \"package\"！", confidence)
+	} else {
+		pluginDetectionMsg = fmt.Sprintf("\n\n🔍 **类型检测结果**：建议使用 %s 类型", suggestedType)
+	}
+
+	// 从数据库获取所有自动化包信息
+	var packages []model.SysAutoCodePackage
+	if err := global.GVA_DB.Find(&packages).Error; err != nil {
+		return nil, fmt.Errorf("获取包信息失败: %v", err)
+	}
+
+	// 从数据库获取所有历史记录
+	var histories []model.SysAutoCodeHistory
+	if err := global.GVA_DB.Find(&histories).Error; err != nil {
+		return nil, fmt.Errorf("获取历史记录失败: %v", err)
+	}
+
+	// 扫描预设计的模块
+	predesignedModules, err := t.scanPredesignedModules()
+	if err != nil {
+		global.GVA_LOG.Warn("扫描预设计模块失败" + err.Error())
+		predesignedModules = []PredesignedModuleInfo{} // 确保不为nil
+	}
+
+	// 转换包信息
+	var moduleInfos []ModuleInfo
+	for _, pkg := range packages {
+		moduleInfos = append(moduleInfos, ModuleInfo{
+			ID:          pkg.ID,
+			PackageName: pkg.PackageName,
+			Label:       pkg.Label,
+			Desc:        pkg.Desc,
+			Template:    pkg.Template,
+			Module:      pkg.Module,
+		})
+	}
+
+	// 转换历史记录
+	var historyInfos []HistoryInfo
+	for _, history := range histories {
+		historyInfos = append(historyInfos, HistoryInfo{
+			ID:           history.ID,
+			StructName:   history.StructName,
+			TableName:    history.TableName(),
+			PackageName:  history.Package,
+			BusinessDB:   history.BusinessDB,
+			Description:  history.Description,
+			Abbreviation: history.Abbreviation,
+			CreatedAt:    history.CreatedAt.Format("2006-01-02 15:04:05"),
+		})
+	}
+
+	// 构建分析结果
+	analysisResult := AnalysisResponse{
+		Packages:           moduleInfos,
+		History:            historyInfos,
+		PredesignedModules: predesignedModules,
+		Message:            fmt.Sprintf("分析完成：获取到 %d 个包、%d 个历史记录和 %d 个预设计模块，请AI根据需求选择合适的包和模块", len(packages), len(histories), len(predesignedModules)),
+	}
+
+	resultJSON, err := json.MarshalIndent(analysisResult, "", "  ")
+	if err != nil {
+		return nil, fmt.Errorf("序列化结果失败: %v", err)
+	}
+
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.TextContent{
+				Type: "text",
+				Text: fmt.Sprintf(`分析结果：
+
+%s
+
+请AI根据用户需求：%s%s
+
+分析现有的包、历史记录和预设计模块，然后构建ExecutionPlan结构体调用execute操作。
+
+**预设计模块说明**：
+- 预设计模块是已经存在于autocode路径下的package或plugin
+- 这些模块包含了预先设计好的代码结构，可以直接使用或作为参考
+- 如果用户需求与某个预设计模块匹配，可以考虑直接使用该模块或基于它进行扩展
+
+**字典选项生成说明**：
+- 当字段需要使用字典类型时（dictType不为空），请使用 generate_dictionary_options 工具
+- 该工具允许AI根据字段描述智能生成合适的字典选项
+- 调用示例：
+  {
+    "dictType": "user_status",
+    "fieldDesc": "用户状态",
+    "options": [
+      {"label": "正常", "value": "1", "sort": 1},
+      {"label": "禁用", "value": "0", "sort": 2}
+    ],
+    "dictName": "用户状态字典",
+    "description": "用于管理用户账户状态的字典"
+  }
+- 请在创建模块之前先创建所需的字典选项
+
+重要提醒：ExecutionPlan必须严格按照以下格式：
+{
+  "packageName": "包名",
+  "moduleName": "模块名",
+  "packageType": "package或plugin", // 当用户提到插件时必须是"plugin"
+  "needCreatedPackage": true/false,
+  "needCreatedModules": true/false,
+  "packageInfo": {
+    "desc": "描述",
+    "label": "展示名",
+    "template": "package或plugin", // 必须与packageType保持一致！
+    "packageName": "包名"
+  },
+  "modulesInfo": {
+    "package": "包名",
+    "tableName": "数据库表名",
+    "businessDB": "",
+    "structName": "结构体名",
+    "packageName": "文件名称小驼峰模式 一般是结构体名的小驼峰",
+    "description": "中文描述",
+    "abbreviation": "简称 package和结构体简称不可同名 小驼峰模式",
+    "humpPackageName": "一般是结构体名的下划线分割的小驼峰 例如：sys_user",
+    "gvaModel": true,
+    "autoMigrate": true,
+    "autoCreateResource": true/false 用户不特地强调开启资源标识则为false,
+    "autoCreateApiToSql": true,
+    "autoCreateMenuToSql": true,
+    "autoCreateBtnAuth": false/true 用户不特地强调创建按钮权限则为false,
+    "onlyTemplate": false,
+    "isTree": false,
+    "treeJson": "",
+    "isAdd": false,
+    "generateWeb": true,
+    "generateServer": true,
+    "fields": [{
+      "fieldName": "字段名（必须大写开头）",
+      "fieldDesc": "字段描述",
+      "fieldType": "GO 语言的数据类型",
+      "fieldJson": "json标签",
+      "dataTypeLong": "长度",
+      "comment": "注释",
+      "columnName": "数据库列名",
+      "fieldSearchType": "=/!=/>/</>=/<=/LIKE等 可以为空",
+      "fieldSearchHide": true/false,
+      "dictType": "",
+      "form": true/false 是否前端创建输入,
+      "table": true/false 是否前端表格展示,
+      "desc": true/false 是否前端详情展示,
+      "excel": true/false 是否导出Excel,
+      "require": true/false 是否必填,
+      "defaultValue": "",
+      "errorText": "错误提示",
+      "clearable": true,
+      "sort": false,
+      "primaryKey": "当gvaModel=false时必须有一个字段设为true(bool)",
+      "dataSource": null,
+      "checkDataSource": false,
+      "fieldIndexType": ""
+    }]
+  }
+}
+
+**重要提醒**：ExecutionPlan必须严格按照以下格式和验证规则：
+
+**插件类型检测规则（最重要）**：
+1. 当用户需求中包含"插件"、"plugin"等关键词时，packageType和template都必须设置为"plugin"
+2. packageType和template字段必须保持一致，不能一个是"package"另一个是"plugin"
+3. 如果检测到插件意图但设置错误，会导致创建失败
+
+**字段完整性要求**：
+4. 所有字符串字段都不能为空（包括packageName、moduleName、structName、tableName、description等）
+5. 所有布尔字段必须明确设置true或false，不能使用默认值
+
+**主键设置规则（关键）**：
+6. 当gvaModel=false时：fields数组中必须有且仅有一个字段的primaryKey=true
+7. 当gvaModel=true时：系统自动创建ID主键，fields中所有字段的primaryKey都应为false
+8. 主键设置错误会导致模板执行时PrimaryField为nil的严重错误！
+
+**包和模块创建逻辑**：
+9. 如果存在可用的package，needCreatedPackage应设为false
+10. 如果存在可用的modules，needCreatedModules应设为false
+11. 如果发现合适的预设计模块，可以考虑基于它进行扩展而不是从零创建
+
+**字典创建流程**：
+12. 如果字段需要字典类型，请先使用 generate_dictionary_options 工具创建字典
+13. 字典创建成功后，再执行模块创建操作
+
+`, string(resultJSON), requirement, pluginDetectionMsg),
+			},
+		},
+	}, nil
+}
+
+// handleConfirm 处理确认请求
+func (t *AutomationModuleAnalyzer) handleConfirm(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	executionPlanData, ok := request.GetArguments()["executionPlan"]
+	if !ok {
+		return nil, errors.New("参数错误：executionPlan 必须提供")
+	}
+
+	// 解析执行计划
+	planJSON, err := json.Marshal(executionPlanData)
+	if err != nil {
+		return nil, fmt.Errorf("解析执行计划失败: %v", err)
+	}
+
+	var plan ExecutionPlan
+	err = json.Unmarshal(planJSON, &plan)
+	if err != nil {
+		return nil, fmt.Errorf("解析执行计划失败: %v\n\n请确保ExecutionPlan格式正确，参考工具描述中的结构体格式要求", err)
+	}
+
+	// 验证执行计划的完整性
+	if err := t.validateExecutionPlan(&plan); err != nil {
+		return nil, fmt.Errorf("执行计划验证失败: %v", err)
+	}
+
+	// 构建确认响应
+	confirmResponse := ConfirmationResponse{
+		Message:         "请确认以下创建计划：",
+		PackageConfirm:  plan.NeedCreatedPackage,
+		ModulesConfirm:  plan.NeedCreatedModules,
+		CanProceed:      true,
+		ConfirmationKey: fmt.Sprintf("%s_%s_%d", plan.PackageName, plan.ModuleName, time.Now().Unix()),
+	}
+
+	// 构建详细的确认信息
+	var confirmDetails strings.Builder
+	confirmDetails.WriteString(fmt.Sprintf("包名: %s\n", plan.PackageName))
+	confirmDetails.WriteString(fmt.Sprintf("模块名: %s\n", plan.ModuleName))
+	confirmDetails.WriteString(fmt.Sprintf("包类型: %s\n", plan.PackageType))
+
+	if plan.NeedCreatedPackage && plan.PackageInfo != nil {
+		confirmDetails.WriteString("\n需要创建包:\n")
+		confirmDetails.WriteString(fmt.Sprintf("  - 包名: %s\n", plan.PackageInfo.PackageName))
+		confirmDetails.WriteString(fmt.Sprintf("  - 标签: %s\n", plan.PackageInfo.Label))
+		confirmDetails.WriteString(fmt.Sprintf("  - 描述: %s\n", plan.PackageInfo.Desc))
+		confirmDetails.WriteString(fmt.Sprintf("  - 模板: %s\n", plan.PackageInfo.Template))
+	}
+
+	if plan.NeedCreatedModules && plan.ModulesInfo != nil {
+		confirmDetails.WriteString("\n需要创建模块:\n")
+		confirmDetails.WriteString(fmt.Sprintf("  - 结构体名: %s\n", plan.ModulesInfo.StructName))
+		confirmDetails.WriteString(fmt.Sprintf("  - 表名: %s\n", plan.ModulesInfo.TableName))
+		confirmDetails.WriteString(fmt.Sprintf("  - 描述: %s\n", plan.ModulesInfo.Description))
+		confirmDetails.WriteString(fmt.Sprintf("  - 字段数量: %d\n", len(plan.ModulesInfo.Fields)))
+		confirmDetails.WriteString("  - 字段列表:\n")
+		for _, field := range plan.ModulesInfo.Fields {
+			confirmDetails.WriteString(fmt.Sprintf("    * %s (%s): %s\n", field.FieldName, field.FieldType, field.FieldDesc))
+		}
+	}
+
+	resultJSON, err := json.MarshalIndent(confirmResponse, "", "  ")
+	if err != nil {
+		return nil, fmt.Errorf("序列化结果失败: %v", err)
+	}
+
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.TextContent{
+				Type: "text",
+				Text: fmt.Sprintf("确认信息：\n\n%s\n\n详细信息：\n%s\n\n请用户确认是否继续执行此计划。如果确认，请使用execute操作并提供相应的确认参数。", string(resultJSON), confirmDetails.String()),
+			},
+		},
+	}, nil
+}
+
+// handleExecute 处理执行请求
+func (t *AutomationModuleAnalyzer) handleExecute(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	executionPlanData, ok := request.GetArguments()["executionPlan"]
+	if !ok {
+		return nil, errors.New("参数错误：executionPlan 必须提供")
+	}
+
+	// 解析执行计划
+	planJSON, err := json.Marshal(executionPlanData)
+	if err != nil {
+		return nil, fmt.Errorf("解析执行计划失败: %v", err)
+	}
+
+	var plan ExecutionPlan
+	err = json.Unmarshal(planJSON, &plan)
+	if err != nil {
+		return nil, fmt.Errorf("解析执行计划失败: %v\n\n请确保ExecutionPlan格式正确，参考工具描述中的结构体格式要求", err)
+	}
+
+	// 验证执行计划的完整性
+	if err := t.validateExecutionPlan(&plan); err != nil {
+		return nil, fmt.Errorf("执行计划验证失败: %v", err)
+	}
+
+	// 检查用户确认
+	if plan.NeedCreatedPackage {
+		packageConfirm, ok := request.GetArguments()["packageConfirm"].(string)
+		if !ok || (packageConfirm != "yes" && packageConfirm != "no") {
+			return nil, errors.New("参数错误：当需要创建包时，packageConfirm 必须是 'yes' 或 'no'")
+		}
+		if packageConfirm == "no" {
+			return &mcp.CallToolResult{
+				Content: []mcp.Content{
+					mcp.TextContent{
+						Type: "text",
+						Text: "用户取消了包的创建操作",
+					},
+				},
+			}, nil
+		}
+	}
+
+	if plan.NeedCreatedModules {
+		modulesConfirm, ok := request.GetArguments()["modulesConfirm"].(string)
+		if !ok || (modulesConfirm != "yes" && modulesConfirm != "no") {
+			return nil, errors.New("参数错误：当需要创建模块时，modulesConfirm 必须是 'yes' 或 'no'")
+		}
+		if modulesConfirm == "no" {
+			return &mcp.CallToolResult{
+				Content: []mcp.Content{
+					mcp.TextContent{
+						Type: "text",
+						Text: "用户取消了模块的创建操作",
+					},
+				},
+			}, nil
+		}
+	}
+
+	// 执行创建操作
+	result := t.executeCreation(ctx, &plan)
+
+	resultJSON, err := json.MarshalIndent(result, "", "  ")
+	if err != nil {
+		return nil, fmt.Errorf("序列化结果失败: %v", err)
+	}
+
+	// 添加权限分配提醒
+	permissionReminder := "\n\n⚠️ 重要提醒：\n" +
+		"模块创建完成后，请前往【系统管理】->【角色管理】中为相关角色分配新创建的API和菜单权限，" +
+		"以确保用户能够正常访问新功能。\n" +
+		"具体步骤：\n" +
+		"1. 进入角色管理页面\n" +
+		"2. 选择需要授权的角色\n" +
+		"3. 在API权限中勾选新创建的API接口\n" +
+		"4. 在菜单权限中勾选新创建的菜单项\n" +
+		"5. 保存权限配置"
+
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.TextContent{
+				Type: "text",
+				Text: fmt.Sprintf("执行结果：\n\n%s%s", string(resultJSON), permissionReminder),
+			},
+		},
+	}, nil
+}
+
+// isSystemFunction 判断是否为系统功能
+func (t *AutomationModuleAnalyzer) isSystemFunction(requirement string) bool {
+	systemKeywords := []string{
+		"用户", "权限", "角色", "菜单", "系统", "配置", "字典", "参数",
+		"user", "authority", "role", "menu", "system", "config", "dictionary",
+		"认证", "授权", "登录", "注册", "JWT", "casbin",
+	}
+
+	requirementLower := strings.ToLower(requirement)
+	for _, keyword := range systemKeywords {
+		if strings.Contains(requirementLower, keyword) {
+			return true
+		}
+	}
+	return false
+}
+
+// buildDirectoryStructure 构建目录结构信息
+func (t *AutomationModuleAnalyzer) buildDirectoryStructure(plan *ExecutionPlan) map[string]string {
+	paths := make(map[string]string)
+
+	// 获取配置信息
+	autoCodeConfig := global.GVA_CONFIG.AutoCode
+
+	// 构建基础路径
+	rootPath := autoCodeConfig.Root
+	serverPath := autoCodeConfig.Server
+	webPath := autoCodeConfig.Web
+	moduleName := autoCodeConfig.Module
+
+	// 如果计划中有包名，使用计划中的包名，否则使用默认
+	packageName := "example"
+	if plan.PackageInfo != nil && plan.PackageInfo.PackageName != "" {
+		packageName = plan.PackageInfo.PackageName
+	}
+
+	// 如果计划中有模块信息，获取结构名
+	structName := "ExampleStruct"
+	if plan.ModulesInfo != nil && plan.ModulesInfo.StructName != "" {
+		structName = plan.ModulesInfo.StructName
+	}
+
+	// 根据包类型构建不同的路径结构
+	packageType := plan.PackageType
+	if packageType == "" {
+		packageType = "package" // 默认为package模式
+	}
+
+	// 构建服务端路径
+	if serverPath != "" {
+		serverBasePath := fmt.Sprintf("%s/%s", rootPath, serverPath)
+
+		if packageType == "plugin" {
+			// Plugin 模式：所有文件都在 /plugin/packageName/ 目录下
+			pluginBasePath := fmt.Sprintf("%s/plugin/%s", serverBasePath, packageName)
+
+			// API 路径
+			paths["api"] = fmt.Sprintf("%s/api", pluginBasePath)
+
+			// Service 路径
+			paths["service"] = fmt.Sprintf("%s/service", pluginBasePath)
+
+			// Model 路径
+			paths["model"] = fmt.Sprintf("%s/model", pluginBasePath)
+
+			// Router 路径
+			paths["router"] = fmt.Sprintf("%s/router", pluginBasePath)
+
+			// Request 路径
+			paths["request"] = fmt.Sprintf("%s/model/request", pluginBasePath)
+
+			// Response 路径
+			paths["response"] = fmt.Sprintf("%s/model/response", pluginBasePath)
+
+			// Plugin 特有文件
+			paths["plugin_main"] = fmt.Sprintf("%s/main.go", pluginBasePath)
+			paths["plugin_config"] = fmt.Sprintf("%s/plugin.go", pluginBasePath)
+			paths["plugin_initialize"] = fmt.Sprintf("%s/initialize", pluginBasePath)
+		} else {
+			// Package 模式：传统的目录结构
+			// API 路径
+			paths["api"] = fmt.Sprintf("%s/api/v1/%s", serverBasePath, packageName)
+
+			// Service 路径
+			paths["service"] = fmt.Sprintf("%s/service/%s", serverBasePath, packageName)
+
+			// Model 路径
+			paths["model"] = fmt.Sprintf("%s/model/%s", serverBasePath, packageName)
+
+			// Router 路径
+			paths["router"] = fmt.Sprintf("%s/router/%s", serverBasePath, packageName)
+
+			// Request 路径
+			paths["request"] = fmt.Sprintf("%s/model/%s/request", serverBasePath, packageName)
+
+			// Response 路径
+			paths["response"] = fmt.Sprintf("%s/model/%s/response", serverBasePath, packageName)
+		}
+	}
+
+	// 构建前端路径（两种模式相同）
+	if webPath != "" {
+		webBasePath := fmt.Sprintf("%s/%s", rootPath, webPath)
+
+		// Vue 页面路径
+		paths["vue_page"] = fmt.Sprintf("%s/view/%s", webBasePath, packageName)
+
+		// API 路径
+		paths["vue_api"] = fmt.Sprintf("%s/api/%s", webBasePath, packageName)
+	}
+
+	// 添加模块信息
+	paths["module"] = moduleName
+	paths["package_name"] = packageName
+	paths["package_type"] = packageType
+	paths["struct_name"] = structName
+	paths["root_path"] = rootPath
+	paths["server_path"] = serverPath
+	paths["web_path"] = webPath
+
+	return paths
+}
+
+// validateExecutionPlan 验证执行计划的完整性
+func (t *AutomationModuleAnalyzer) validateExecutionPlan(plan *ExecutionPlan) error {
+	// 验证基本字段
+	if plan.PackageName == "" {
+		return errors.New("packageName 不能为空")
+	}
+	if plan.ModuleName == "" {
+		return errors.New("moduleName 不能为空")
+	}
+	if plan.PackageType != "package" && plan.PackageType != "plugin" {
+		return errors.New("packageType 必须是 'package' 或 'plugin'")
+	}
+
+	// 验证packageType和template字段的一致性
+	if plan.NeedCreatedPackage && plan.PackageInfo != nil {
+		if plan.PackageType != plan.PackageInfo.Template {
+			return errors.New("packageType 和 packageInfo.template 必须保持一致")
+		}
+	}
+
+	// 验证包信息
+	if plan.NeedCreatedPackage {
+		if plan.PackageInfo == nil {
+			return errors.New("当 needCreatedPackage=true 时，packageInfo 不能为空")
+		}
+		if plan.PackageInfo.PackageName == "" {
+			return errors.New("packageInfo.packageName 不能为空")
+		}
+		if plan.PackageInfo.Template != "package" && plan.PackageInfo.Template != "plugin" {
+			return errors.New("packageInfo.template 必须是 'package' 或 'plugin'")
+		}
+		if plan.PackageInfo.Label == "" {
+			return errors.New("packageInfo.label 不能为空")
+		}
+		if plan.PackageInfo.Desc == "" {
+			return errors.New("packageInfo.desc 不能为空")
+		}
+	}
+
+	// 验证模块信息
+	if plan.NeedCreatedModules {
+		if plan.ModulesInfo == nil {
+			return errors.New("当 needCreatedModules=true 时，modulesInfo 不能为空")
+		}
+		if plan.ModulesInfo.Package == "" {
+			return errors.New("modulesInfo.package 不能为空")
+		}
+		if plan.ModulesInfo.StructName == "" {
+			return errors.New("modulesInfo.structName 不能为空")
+		}
+		if plan.ModulesInfo.TableName == "" {
+			return errors.New("modulesInfo.tableName 不能为空")
+		}
+		if plan.ModulesInfo.Description == "" {
+			return errors.New("modulesInfo.description 不能为空")
+		}
+		if plan.ModulesInfo.Abbreviation == "" {
+			return errors.New("modulesInfo.abbreviation 不能为空")
+		}
+		if plan.ModulesInfo.PackageName == "" {
+			return errors.New("modulesInfo.packageName 不能为空")
+		}
+		if plan.ModulesInfo.HumpPackageName == "" {
+			return errors.New("modulesInfo.humpPackageName 不能为空")
+		}
+
+		// 验证字段信息
+		if len(plan.ModulesInfo.Fields) == 0 {
+			return errors.New("modulesInfo.fields 不能为空，至少需要一个字段")
+		}
+
+		for i, field := range plan.ModulesInfo.Fields {
+			if field.FieldName == "" {
+				return fmt.Errorf("字段 %d 的 fieldName 不能为空", i+1)
+			}
+			if field.FieldDesc == "" {
+				return fmt.Errorf("字段 %d 的 fieldDesc 不能为空", i+1)
+			}
+			if field.FieldType == "" {
+				return fmt.Errorf("字段 %d 的 fieldType 不能为空", i+1)
+			}
+			if field.FieldJson == "" {
+				return fmt.Errorf("字段 %d 的 fieldJson 不能为空", i+1)
+			}
+			if field.ColumnName == "" {
+				return fmt.Errorf("字段 %d 的 columnName 不能为空", i+1)
+			}
+
+			// 验证字段类型
+			validFieldTypes := []string{"string", "int", "int64", "float64", "bool", "time.Time", "enum", "picture", "video", "file", "pictures", "array", "richtext", "json"}
+			validType := false
+			for _, validFieldType := range validFieldTypes {
+				if field.FieldType == validFieldType {
+					validType = true
+					break
+				}
+			}
+			if !validType {
+				return fmt.Errorf("字段 %d 的 fieldType '%s' 不支持，支持的类型：%v", i+1, field.FieldType, validFieldTypes)
+			}
+
+			// 验证搜索类型（如果设置了）
+			if field.FieldSearchType != "" {
+				validSearchTypes := []string{"=", "!=", ">", ">=", "<", "<=", "LIKE", "BETWEEN", "IN", "NOT IN"}
+				validSearchType := false
+				for _, validType := range validSearchTypes {
+					if field.FieldSearchType == validType {
+						validSearchType = true
+						break
+					}
+				}
+				if !validSearchType {
+					return fmt.Errorf("字段 %d 的 fieldSearchType '%s' 不支持，支持的类型：%v", i+1, field.FieldSearchType, validSearchTypes)
+				}
+			}
+		}
+
+		// 验证主键设置
+		if !plan.ModulesInfo.GvaModel {
+			// 当不使用GVA模型时，必须有且仅有一个字段设置为主键
+			primaryKeyCount := 0
+			for _, field := range plan.ModulesInfo.Fields {
+				if field.PrimaryKey {
+					primaryKeyCount++
+				}
+			}
+			if primaryKeyCount == 0 {
+				return errors.New("当 gvaModel=false 时，必须有一个字段的 primaryKey=true")
+			}
+			if primaryKeyCount > 1 {
+				return errors.New("当 gvaModel=false 时，只能有一个字段的 primaryKey=true")
+			}
+		} else {
+			// 当使用GVA模型时，所有字段的primaryKey都应该为false
+			for i, field := range plan.ModulesInfo.Fields {
+				if field.PrimaryKey {
+					return fmt.Errorf("当 gvaModel=true 时，字段 %d 的 primaryKey 应该为 false，系统会自动创建ID主键", i+1)
+				}
+			}
+		}
+	}
+
+	return nil
+}
+
+// executeCreation 执行创建操作
+func (t *AutomationModuleAnalyzer) executeCreation(ctx context.Context, plan *ExecutionPlan) *ExecutionResult {
+	result := &ExecutionResult{
+		Success: false,
+		Paths:   make(map[string]string),
+	}
+
+	// 无论如何都先构建目录结构信息，确保paths始终返回
+	result.Paths = t.buildDirectoryStructure(plan)
+
+	if !plan.NeedCreatedModules {
+		result.Success = true
+		result.Message += "已列出当前功能所涉及的目录结构信息; 请在paths中查看; 并且在对应指定文件中实现相关的业务逻辑; "
+		return result
+	}
+
+	// 创建包（如果需要）
+	if plan.NeedCreatedPackage && plan.PackageInfo != nil {
+		packageService := service.ServiceGroupApp.SystemServiceGroup.AutoCodePackage
+		err := packageService.Create(ctx, plan.PackageInfo)
+		if err != nil {
+			result.Message = fmt.Sprintf("创建包失败: %v", err)
+			// 即使创建包失败，也要返回paths信息
+			return result
+		}
+		result.Message += "包创建成功; "
+	}
+
+	// 创建字典（如果需要）
+	if plan.NeedCreatedModules && plan.ModulesInfo != nil {
+		dictResult := t.createRequiredDictionaries(ctx, plan.ModulesInfo)
+		result.Message += dictResult
+	}
+
+	// 创建模块（如果需要）
+	if plan.NeedCreatedModules && plan.ModulesInfo != nil {
+		templateService := service.ServiceGroupApp.SystemServiceGroup.AutoCodeTemplate
+
+		err := plan.ModulesInfo.Pretreatment()
+		if err != nil {
+			result.Message += fmt.Sprintf("模块信息预处理失败: %v", err)
+			// 即使预处理失败，也要返回paths信息
+			return result
+		}
+
+		err = templateService.Create(ctx, *plan.ModulesInfo)
+		if err != nil {
+			result.Message += fmt.Sprintf("创建模块失败: %v", err)
+			// 即使创建模块失败，也要返回paths信息
+			return result
+		}
+		result.Message += "模块创建成功; "
+	}
+
+	result.Message += "已构建目录结构信息; "
+	result.Success = true
+
+	if result.Message == "" {
+		result.Message = "执行计划完成"
+	}
+
+	return result
+}
+
+// createRequiredDictionaries 创建所需的字典
+func (t *AutomationModuleAnalyzer) createRequiredDictionaries(ctx context.Context, modulesInfo *request.AutoCode) string {
+	var messages []string
+	dictionaryService := service.ServiceGroupApp.SystemServiceGroup.DictionaryService
+
+	// 遍历所有字段，查找使用字典的字段
+	for _, field := range modulesInfo.Fields {
+		if field.DictType != "" {
+			// 检查字典是否存在
+			exists, err := t.checkDictionaryExists(field.DictType)
+			if err != nil {
+				messages = append(messages, fmt.Sprintf("检查字典 %s 时出错: %v; ", field.DictType, err))
+				continue
+			}
+
+			if !exists {
+				// 字典不存在，创建字典
+				dictionary := model.SysDictionary{
+					Name:   t.generateDictionaryName(field.DictType, field.FieldDesc),
+					Type:   field.DictType,
+					Status: &[]bool{true}[0], // 默认启用
+					Desc:   fmt.Sprintf("自动生成的字典，用于字段: %s (%s)", field.FieldName, field.FieldDesc),
+				}
+
+				err = dictionaryService.CreateSysDictionary(dictionary)
+				if err != nil {
+					messages = append(messages, fmt.Sprintf("创建字典 %s 失败: %v; ", field.DictType, err))
+				} else {
+					messages = append(messages, fmt.Sprintf("成功创建字典 %s (%s); ", field.DictType, dictionary.Name))
+
+					// 创建默认的字典详情项
+					t.createDefaultDictionaryDetails(ctx, field.DictType, field.FieldDesc)
+				}
+			} else {
+				messages = append(messages, fmt.Sprintf("字典 %s 已存在，跳过创建; ", field.DictType))
+			}
+		}
+	}
+
+	if len(messages) == 0 {
+		return "未发现需要创建的字典; "
+	}
+
+	return strings.Join(messages, "")
+}
+
+// checkDictionaryExists 检查字典是否存在
+func (t *AutomationModuleAnalyzer) checkDictionaryExists(dictType string) (bool, error) {
+	var dictionary model.SysDictionary
+	err := global.GVA_DB.Where("type = ?", dictType).First(&dictionary).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return false, nil // 字典不存在
+		}
+		return false, err // 其他错误
+	}
+	return true, nil // 字典存在
+}
+
+// generateDictionaryName 生成字典名称
+func (t *AutomationModuleAnalyzer) generateDictionaryName(dictType, fieldDesc string) string {
+	if fieldDesc != "" {
+		return fmt.Sprintf("%s字典", fieldDesc)
+	}
+	return fmt.Sprintf("%s字典", dictType)
+}
+
+// createDefaultDictionaryDetails 创建默认的字典详情项
+func (t *AutomationModuleAnalyzer) createDefaultDictionaryDetails(ctx context.Context, dictType, fieldDesc string) {
+	// 字典选项现在通过 generate_dictionary_options MCP工具由AI client传入
+	// 这里不再创建默认选项，只是保留方法以保持兼容性
+	global.GVA_LOG.Info(fmt.Sprintf("字典 %s 已创建，请使用 generate_dictionary_options 工具添加字典选项", dictType))
+}
+
+// DictionaryOption 字典选项结构
+type DictionaryOption struct {
+	Label string `json:"label"`
+	Value string `json:"value"`
+	Sort  int    `json:"sort"`
+}
+
+// generateSmartDictionaryOptions 通过MCP调用让AI生成字典选项
+func (t *AutomationModuleAnalyzer) generateSmartDictionaryOptions(dictType, fieldDesc string) []struct {
+	label string
+	value string
+	sort  int
+} {
+	// 返回空切片，不再使用预制选项
+	// 字典选项将通过新的MCP工具由AI client传入
+	return []struct {
+		label string
+		value string
+		sort  int
+	}{}
+}
+
+// detectPluginIntent 检测用户需求中是否包含插件相关的关键词
+func (t *AutomationModuleAnalyzer) detectPluginIntent(requirement string) (suggestedType string, isPlugin bool, confidence string) {
+	// 转换为小写进行匹配
+	requirementLower := strings.ToLower(requirement)
+	
+	// 插件相关关键词
+	pluginKeywords := []string{
+		"插件", "plugin", "扩展", "extension", "addon", "模块插件",
+		"功能插件", "业务插件", "第三方插件", "自定义插件",
+	}
+	
+	// 包相关关键词（用于排除误判）
+	packageKeywords := []string{
+		"包", "package", "模块包", "业务包", "功能包",
+	}
+	
+	// 检测插件关键词
+	pluginMatches := 0
+	for _, keyword := range pluginKeywords {
+		if strings.Contains(requirementLower, keyword) {
+			pluginMatches++
+		}
+	}
+	
+	// 检测包关键词
+	packageMatches := 0
+	for _, keyword := range packageKeywords {
+		if strings.Contains(requirementLower, keyword) {
+			packageMatches++
+		}
+	}
+	
+	// 决策逻辑
+	if pluginMatches > 0 {
+		if packageMatches == 0 || pluginMatches > packageMatches {
+			return "plugin", true, "高"
+		} else {
+			return "plugin", true, "中"
+		}
+	}
+	
+	// 默认返回package
+	return "package", false, "低"
+}
diff --git a/server/mcp/menu_creator.go b/server/mcp/menu_creator.go
new file mode 100644
index 000000000..cc8a26597
--- /dev/null
+++ b/server/mcp/menu_creator.go
@@ -0,0 +1,283 @@
+package mcpTool
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/service"
+	"github.com/mark3labs/mcp-go/mcp"
+	"go.uber.org/zap"
+)
+
+// 注册工具
+func init() {
+	RegisterTool(&MenuCreator{})
+}
+
+// MenuCreateRequest 菜单创建请求结构
+type MenuCreateRequest struct {
+	ParentId    uint                   `json:"parentId"`    // 父菜单ID，0表示根菜单
+	Path        string                 `json:"path"`        // 路由path
+	Name        string                 `json:"name"`        // 路由name
+	Hidden      bool                   `json:"hidden"`      // 是否在列表隐藏
+	Component   string                 `json:"component"`   // 对应前端文件路径
+	Sort        int                    `json:"sort"`        // 排序标记
+	Title       string                 `json:"title"`       // 菜单名
+	Icon        string                 `json:"icon"`        // 菜单图标
+	KeepAlive   bool                   `json:"keepAlive"`   // 是否缓存
+	DefaultMenu bool                   `json:"defaultMenu"` // 是否是基础路由
+	CloseTab    bool                   `json:"closeTab"`    // 自动关闭tab
+	ActiveName  string                 `json:"activeName"`  // 高亮菜单
+	Parameters  []MenuParameterRequest `json:"parameters"`  // 路由参数
+	MenuBtn     []MenuButtonRequest    `json:"menuBtn"`     // 菜单按钮
+}
+
+// MenuParameterRequest 菜单参数请求结构
+type MenuParameterRequest struct {
+	Type  string `json:"type"`  // 参数类型：params或query
+	Key   string `json:"key"`   // 参数key
+	Value string `json:"value"` // 参数值
+}
+
+// MenuButtonRequest 菜单按钮请求结构
+type MenuButtonRequest struct {
+	Name string `json:"name"` // 按钮名称
+	Desc string `json:"desc"` // 按钮描述
+}
+
+// MenuCreateResponse 菜单创建响应结构
+type MenuCreateResponse struct {
+	Success bool   `json:"success"`
+	Message string `json:"message"`
+	MenuID  uint   `json:"menuId"`
+	Name    string `json:"name"`
+	Path    string `json:"path"`
+}
+
+// MenuCreator 菜单创建工具
+type MenuCreator struct{}
+
+// New 创建菜单创建工具
+func (m *MenuCreator) New() mcp.Tool {
+	return mcp.NewTool("create_menu",
+		mcp.WithDescription("创建前端菜单记录，用于在生成前端页面时自动创建对应的菜单项，只要前端有页面生成，都需要调用此mcp。"),
+		mcp.WithNumber("parentId",
+			mcp.Description("父菜单ID，0表示根菜单"),
+			mcp.DefaultNumber(0),
+		),
+		mcp.WithString("path",
+			mcp.Required(),
+			mcp.Description("路由path，如：userList"),
+		),
+		mcp.WithString("name",
+			mcp.Required(),
+			mcp.Description("路由name，用于Vue Router，如：userList"),
+		),
+		mcp.WithBoolean("hidden",
+			mcp.Description("是否在菜单列表中隐藏"),
+		),
+		mcp.WithString("component",
+			mcp.Required(),
+			mcp.Description("对应的前端Vue组件路径，如：view/user/list.vue"),
+		),
+		mcp.WithNumber("sort",
+			mcp.Description("菜单排序号，数字越小越靠前"),
+			mcp.DefaultNumber(1),
+		),
+		mcp.WithString("title",
+			mcp.Required(),
+			mcp.Description("菜单显示标题"),
+		),
+		mcp.WithString("icon",
+			mcp.Description("菜单图标名称"),
+			mcp.DefaultString("menu"),
+		),
+		mcp.WithBoolean("keepAlive",
+			mcp.Description("是否缓存页面"),
+		),
+		mcp.WithBoolean("defaultMenu",
+			mcp.Description("是否是基础路由"),
+		),
+		mcp.WithBoolean("closeTab",
+			mcp.Description("是否自动关闭tab"),
+		),
+		mcp.WithString("activeName",
+			mcp.Description("高亮菜单名称"),
+		),
+		mcp.WithString("parameters",
+			mcp.Description("路由参数JSON字符串，格式：[{\"type\":\"params\",\"key\":\"id\",\"value\":\"1\"}]"),
+		),
+		mcp.WithString("menuBtn",
+			mcp.Description("菜单按钮JSON字符串，格式：[{\"name\":\"add\",\"desc\":\"新增\"}]"),
+		),
+	)
+}
+
+// Handle 处理菜单创建请求
+func (m *MenuCreator) Handle(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	// 解析请求参数
+	args := request.GetArguments()
+
+	// 必需参数
+	path, ok := args["path"].(string)
+	if !ok || path == "" {
+		return nil, errors.New("path 参数是必需的")
+	}
+
+	name, ok := args["name"].(string)
+	if !ok || name == "" {
+		return nil, errors.New("name 参数是必需的")
+	}
+
+	component, ok := args["component"].(string)
+	if !ok || component == "" {
+		return nil, errors.New("component 参数是必需的")
+	}
+
+	title, ok := args["title"].(string)
+	if !ok || title == "" {
+		return nil, errors.New("title 参数是必需的")
+	}
+
+	// 可选参数
+	parentId := uint(0)
+	if val, ok := args["parentId"].(float64); ok {
+		parentId = uint(val)
+	}
+
+	hidden := false
+	if val, ok := args["hidden"].(bool); ok {
+		hidden = val
+	}
+
+	sort := 1
+	if val, ok := args["sort"].(float64); ok {
+		sort = int(val)
+	}
+
+	icon := "menu"
+	if val, ok := args["icon"].(string); ok && val != "" {
+		icon = val
+	}
+
+	keepAlive := false
+	if val, ok := args["keepAlive"].(bool); ok {
+		keepAlive = val
+	}
+
+	defaultMenu := false
+	if val, ok := args["defaultMenu"].(bool); ok {
+		defaultMenu = val
+	}
+
+	closeTab := false
+	if val, ok := args["closeTab"].(bool); ok {
+		closeTab = val
+	}
+
+	activeName := ""
+	if val, ok := args["activeName"].(string); ok {
+		activeName = val
+	}
+
+	// 解析参数和按钮
+	var parameters []system.SysBaseMenuParameter
+	if parametersStr, ok := args["parameters"].(string); ok && parametersStr != "" {
+		var paramReqs []MenuParameterRequest
+		if err := json.Unmarshal([]byte(parametersStr), &paramReqs); err != nil {
+			return nil, fmt.Errorf("parameters 参数格式错误: %v", err)
+		}
+		for _, param := range paramReqs {
+			parameters = append(parameters, system.SysBaseMenuParameter{
+				Type:  param.Type,
+				Key:   param.Key,
+				Value: param.Value,
+			})
+		}
+	}
+
+	var menuBtn []system.SysBaseMenuBtn
+	if menuBtnStr, ok := args["menuBtn"].(string); ok && menuBtnStr != "" {
+		var btnReqs []MenuButtonRequest
+		if err := json.Unmarshal([]byte(menuBtnStr), &btnReqs); err != nil {
+			return nil, fmt.Errorf("menuBtn 参数格式错误: %v", err)
+		}
+		for _, btn := range btnReqs {
+			menuBtn = append(menuBtn, system.SysBaseMenuBtn{
+				Name: btn.Name,
+				Desc: btn.Desc,
+			})
+		}
+	}
+
+	// 构建菜单对象
+	menu := system.SysBaseMenu{
+		ParentId:  parentId,
+		Path:      path,
+		Name:      name,
+		Hidden:    hidden,
+		Component: component,
+		Sort:      sort,
+		Meta: system.Meta{
+			Title:       title,
+			Icon:        icon,
+			KeepAlive:   keepAlive,
+			DefaultMenu: defaultMenu,
+			CloseTab:    closeTab,
+			ActiveName:  activeName,
+		},
+		Parameters: parameters,
+		MenuBtn:    menuBtn,
+	}
+
+	// 创建菜单
+	menuService := service.ServiceGroupApp.SystemServiceGroup.MenuService
+	err := menuService.AddBaseMenu(menu)
+	if err != nil {
+		return nil, fmt.Errorf("创建菜单失败: %v", err)
+	}
+
+	// 获取创建的菜单ID
+	var createdMenu system.SysBaseMenu
+	err = global.GVA_DB.Where("name = ? AND path = ?", name, path).First(&createdMenu).Error
+	if err != nil {
+		global.GVA_LOG.Warn("获取创建的菜单ID失败", zap.Error(err))
+	}
+
+	// 构建响应
+	response := &MenuCreateResponse{
+		Success: true,
+		Message: fmt.Sprintf("成功创建菜单 %s", title),
+		MenuID:  createdMenu.ID,
+		Name:    name,
+		Path:    path,
+	}
+
+	resultJSON, err := json.MarshalIndent(response, "", "  ")
+	if err != nil {
+		return nil, fmt.Errorf("序列化结果失败: %v", err)
+	}
+
+	// 添加权限分配提醒
+	permissionReminder := "\n\n⚠️ 重要提醒：\n" +
+		"菜单创建完成后，请前往【系统管理】->【角色管理】中为相关角色分配新创建的菜单权限，" +
+		"以确保用户能够正常访问新菜单。\n" +
+		"具体步骤：\n" +
+		"1. 进入角色管理页面\n" +
+		"2. 选择需要授权的角色\n" +
+		"3. 在菜单权限中勾选新创建的菜单项\n" +
+		"4. 保存权限配置"
+
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.TextContent{
+				Type: "text",
+				Text: fmt.Sprintf("菜单创建结果：\n\n%s%s", string(resultJSON), permissionReminder),
+			},
+		},
+	}, nil
+}
diff --git a/server/middleware/jwt.go b/server/middleware/jwt.go
index db71ed6b9..7715ed9c7 100644
--- a/server/middleware/jwt.go
+++ b/server/middleware/jwt.go
@@ -17,7 +17,7 @@ func JWTAuth() gin.HandlerFunc {
 		// 我们这里jwt鉴权取头部信息 x-token 登录时回返回token信息 这里前端需要把token存储到cookie或者本地localStorage中 不过需要跟后端协商过期时间 可以约定刷新令牌或者重新登录
 		token := utils.GetToken(c)
 		if token == "" {
-			response.NoAuth("未登录或非法访问", c)
+			response.NoAuth("未登录或非法访问，请登录", c)
 			c.Abort()
 			return
 		}
@@ -32,7 +32,7 @@ func JWTAuth() gin.HandlerFunc {
 		claims, err := j.ParseToken(token)
 		if err != nil {
 			if errors.Is(err, utils.TokenExpired) {
-				response.NoAuth("授权已过期", c)
+				response.NoAuth("登录已过期，请重新登录", c)
 				utils.ClearToken(c)
 				c.Abort()
 				return
diff --git a/server/model/system/request/sys_user.go b/server/model/system/request/sys_user.go
index a48c46f2c..2cd4cf9f0 100644
--- a/server/model/system/request/sys_user.go
+++ b/server/model/system/request/sys_user.go
@@ -56,7 +56,6 @@ type ChangeUserInfo struct {
 	AuthorityIds []uint                `json:"authorityIds" gorm:"-"`                                                                // 角色ID
 	Email        string                `json:"email"  gorm:"comment:用户邮箱"`                                                           // 用户邮箱
 	HeaderImg    string                `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"` // 用户头像
-	SideMode     string                `json:"sideMode"  gorm:"comment:用户侧边主题"`                                                      // 用户侧边主题
 	Enable       int                   `json:"enable" gorm:"comment:冻结用户"`                                                           //冻结用户
 	Authorities  []system.SysAuthority `json:"-" gorm:"many2many:sys_user_authority;"`
 }
diff --git a/server/model/system/request/sys_version.go b/server/model/system/request/sys_version.go
new file mode 100644
index 000000000..23dd665b1
--- /dev/null
+++ b/server/model/system/request/sys_version.go
@@ -0,0 +1,38 @@
+package request
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"time"
+)
+
+type SysVersionSearch struct {
+	CreatedAtRange []time.Time `json:"createdAtRange" form:"createdAtRange[]"`
+	VersionName    *string     `json:"versionName" form:"versionName"`
+	VersionCode    *string     `json:"versionCode" form:"versionCode"`
+	request.PageInfo
+}
+
+// ExportVersionRequest 导出版本请求结构体
+type ExportVersionRequest struct {
+	VersionName string `json:"versionName" binding:"required"` // 版本名称
+	VersionCode string `json:"versionCode" binding:"required"` // 版本号
+	Description string `json:"description"`                    // 版本描述
+	MenuIds     []uint `json:"menuIds"`                        // 选中的菜单ID列表
+	ApiIds      []uint `json:"apiIds"`                         // 选中的API ID列表
+}
+
+// ImportVersionRequest 导入版本请求结构体
+type ImportVersionRequest struct {
+	VersionInfo VersionInfo           `json:"version" binding:"required"` // 版本信息
+	ExportMenu  []system.SysBaseMenu  `json:"menus"`                      // 菜单数据，直接复用SysBaseMenu
+	ExportApi   []system.SysApi       `json:"apis"`                       // API数据，直接复用SysApi
+}
+
+// VersionInfo 版本信息结构体
+type VersionInfo struct {
+	Name        string `json:"name" binding:"required"`        // 版本名称
+	Code        string `json:"code" binding:"required"`        // 版本号
+	Description string `json:"description"`                    // 版本描述
+	ExportTime  string `json:"exportTime"`                     // 导出时间
+}
diff --git a/server/model/system/response/sys_version.go b/server/model/system/response/sys_version.go
new file mode 100644
index 000000000..b1509b89e
--- /dev/null
+++ b/server/model/system/response/sys_version.go
@@ -0,0 +1,13 @@
+package response
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+)
+
+// ExportVersionResponse 导出版本响应结构体
+type ExportVersionResponse struct {
+	Version request.VersionInfo     `json:"version"` // 版本信息
+	Menus   []system.SysBaseMenu    `json:"menus"`   // 菜单数据，直接复用SysBaseMenu
+	Apis    []system.SysApi         `json:"apis"`    // API数据，直接复用SysApi
+}
\ No newline at end of file
diff --git a/server/model/system/sys_version.go b/server/model/system/sys_version.go
new file mode 100644
index 000000000..e20cbdf24
--- /dev/null
+++ b/server/model/system/sys_version.go
@@ -0,0 +1,20 @@
+// 自动生成模板SysVersion
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+)
+
+// 版本管理 结构体  SysVersion
+type SysVersion struct {
+	global.GVA_MODEL
+	VersionName *string `json:"versionName" form:"versionName" gorm:"comment:版本名称;column:version_name;size:255;" binding:"required"` //版本名称
+	VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"`   //版本号
+	Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"`                     //版本描述
+	VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:text;"`               //版本数据
+}
+
+// TableName 版本管理 SysVersion自定义表名 sys_versions
+func (SysVersion) TableName() string {
+	return "sys_versions"
+}
diff --git a/server/router/system/enter.go b/server/router/system/enter.go
index 7127d9e9f..a0a23f54a 100644
--- a/server/router/system/enter.go
+++ b/server/router/system/enter.go
@@ -19,6 +19,7 @@ type RouterGroup struct {
 	AuthorityBtnRouter
 	SysExportTemplateRouter
 	SysParamsRouter
+	SysVersionRouter
 }
 
 var (
@@ -41,4 +42,5 @@ var (
 	dictionaryDetailApi = api.ApiGroupApp.SystemApiGroup.DictionaryDetailApi
 	autoCodeTemplateApi = api.ApiGroupApp.SystemApiGroup.AutoCodeTemplateApi
 	exportTemplateApi   = api.ApiGroupApp.SystemApiGroup.SysExportTemplateApi
+	sysVersionApi       = api.ApiGroupApp.SystemApiGroup.SysVersionApi
 )
diff --git a/server/router/system/sys_version.go b/server/router/system/sys_version.go
new file mode 100644
index 000000000..249feb8e6
--- /dev/null
+++ b/server/router/system/sys_version.go
@@ -0,0 +1,25 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
+	"github.com/gin-gonic/gin"
+)
+
+type SysVersionRouter struct{}
+
+// InitSysVersionRouter 初始化 版本管理 路由信息
+func (s *SysVersionRouter) InitSysVersionRouter(Router *gin.RouterGroup) {
+	sysVersionRouter := Router.Group("sysVersion").Use(middleware.OperationRecord())
+	sysVersionRouterWithoutRecord := Router.Group("sysVersion")
+	{
+		sysVersionRouter.DELETE("deleteSysVersion", sysVersionApi.DeleteSysVersion)           // 删除版本管理
+		sysVersionRouter.DELETE("deleteSysVersionByIds", sysVersionApi.DeleteSysVersionByIds) // 批量删除版本管理
+		sysVersionRouter.POST("exportVersion", sysVersionApi.ExportVersion)                   // 导出版本数据
+		sysVersionRouter.POST("importVersion", sysVersionApi.ImportVersion)                   // 导入版本数据
+	}
+	{
+		sysVersionRouterWithoutRecord.GET("findSysVersion", sysVersionApi.FindSysVersion)           // 根据ID获取版本管理
+		sysVersionRouterWithoutRecord.GET("getSysVersionList", sysVersionApi.GetSysVersionList)     // 获取版本管理列表
+		sysVersionRouterWithoutRecord.GET("downloadVersionJson", sysVersionApi.DownloadVersionJson) // 下载版本JSON数据
+	}
+}
diff --git a/server/service/system/auto_code_plugin.go b/server/service/system/auto_code_plugin.go
index d2cdc5df8..3de4c6cc3 100644
--- a/server/service/system/auto_code_plugin.go
+++ b/server/service/system/auto_code_plugin.go
@@ -170,7 +170,7 @@ func (s *autoCodePlugin) PubPlug(plugName string) (zipPath string, err error) {
 	// (compression is not required; you could use Tar directly)
 	format := archives.CompressedArchive{
 		//Compression: archives.Gz{},
-		Archival:    archives.Zip{},
+		Archival: archives.Zip{},
 	}
 
 	// create the archive
@@ -208,7 +208,8 @@ func (s *autoCodePlugin) InitMenu(menuInfo request.InitMenu) (err error) {
 		},
 	}
 
-	err = global.GVA_DB.Find(&menus, "id in (?)", menuInfo.Menus).Error
+	// 查询菜单及其关联的参数和按钮
+	err = global.GVA_DB.Preload("Parameters").Preload("MenuBtn").Find(&menus, "id in (?)", menuInfo.Menus).Error
 	if err != nil {
 		return err
 	}
diff --git a/server/service/system/enter.go b/server/service/system/enter.go
index 634cd0017..d91f2796d 100644
--- a/server/service/system/enter.go
+++ b/server/service/system/enter.go
@@ -17,6 +17,7 @@ type ServiceGroup struct {
 	AuthorityBtnService
 	SysExportTemplateService
 	SysParamsService
+	SysVersionService
 	AutoCodePlugin   autoCodePlugin
 	AutoCodePackage  autoCodePackage
 	AutoCodeHistory  autoCodeHistory
diff --git a/server/service/system/sys_user.go b/server/service/system/sys_user.go
index 3b3d8e616..630f04cf8 100644
--- a/server/service/system/sys_user.go
+++ b/server/service/system/sys_user.go
@@ -3,9 +3,10 @@ package system
 import (
 	"errors"
 	"fmt"
+	"time"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common"
 	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
-	"time"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
@@ -63,20 +64,20 @@ func (userService *UserService) Login(u *system.SysUser) (userInter *system.SysU
 //@function: ChangePassword
 //@description: 修改用户密码
 //@param: u *model.SysUser, newPassword string
-//@return: userInter *model.SysUser,err error
+//@return: err error
 
-func (userService *UserService) ChangePassword(u *system.SysUser, newPassword string) (userInter *system.SysUser, err error) {
+func (userService *UserService) ChangePassword(u *system.SysUser, newPassword string) (err error) {
 	var user system.SysUser
-	if err = global.GVA_DB.Where("id = ?", u.ID).First(&user).Error; err != nil {
-		return nil, err
+	err = global.GVA_DB.Select("id, password").Where("id = ?", u.ID).First(&user).Error
+	if err != nil {
+		return err
 	}
 	if ok := utils.BcryptCheck(u.Password, user.Password); !ok {
-		return nil, errors.New("原密码错误")
+		return errors.New("原密码错误")
 	}
-	user.Password = utils.BcryptHash(newPassword)
-	err = global.GVA_DB.Save(&user).Error
-	return &user, err
-
+	pwd := utils.BcryptHash(newPassword)
+	err = global.GVA_DB.Model(&user).Update("password", pwd).Error
+	return err
 }
 
 //@author: [piexlmax](https://github.com/piexlmax)
diff --git a/server/service/system/sys_version.go b/server/service/system/sys_version.go
new file mode 100644
index 000000000..568941021
--- /dev/null
+++ b/server/service/system/sys_version.go
@@ -0,0 +1,196 @@
+package system
+
+import (
+	"context"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"gorm.io/gorm"
+)
+
+type SysVersionService struct{}
+
+// CreateSysVersion 创建版本管理记录
+// Author [yourname](https://github.com/yourname)
+func (sysVersionService *SysVersionService) CreateSysVersion(ctx context.Context, sysVersion *system.SysVersion) (err error) {
+	err = global.GVA_DB.Create(sysVersion).Error
+	return err
+}
+
+// DeleteSysVersion 删除版本管理记录
+// Author [yourname](https://github.com/yourname)
+func (sysVersionService *SysVersionService) DeleteSysVersion(ctx context.Context, ID string) (err error) {
+	err = global.GVA_DB.Delete(&system.SysVersion{}, "id = ?", ID).Error
+	return err
+}
+
+// DeleteSysVersionByIds 批量删除版本管理记录
+// Author [yourname](https://github.com/yourname)
+func (sysVersionService *SysVersionService) DeleteSysVersionByIds(ctx context.Context, IDs []string) (err error) {
+	err = global.GVA_DB.Where("id in ?", IDs).Delete(&system.SysVersion{}).Error
+	return err
+}
+
+// GetSysVersion 根据ID获取版本管理记录
+// Author [yourname](https://github.com/yourname)
+func (sysVersionService *SysVersionService) GetSysVersion(ctx context.Context, ID string) (sysVersion system.SysVersion, err error) {
+	err = global.GVA_DB.Where("id = ?", ID).First(&sysVersion).Error
+	return
+}
+
+// GetSysVersionInfoList 分页获取版本管理记录
+// Author [yourname](https://github.com/yourname)
+func (sysVersionService *SysVersionService) GetSysVersionInfoList(ctx context.Context, info systemReq.SysVersionSearch) (list []system.SysVersion, total int64, err error) {
+	limit := info.PageSize
+	offset := info.PageSize * (info.Page - 1)
+	// 创建db
+	db := global.GVA_DB.Model(&system.SysVersion{})
+	var sysVersions []system.SysVersion
+	// 如果有条件搜索 下方会自动创建搜索语句
+	if len(info.CreatedAtRange) == 2 {
+		db = db.Where("created_at BETWEEN ? AND ?", info.CreatedAtRange[0], info.CreatedAtRange[1])
+	}
+
+	if info.VersionName != nil && *info.VersionName != "" {
+		db = db.Where("version_name LIKE ?", "%"+*info.VersionName+"%")
+	}
+	if info.VersionCode != nil && *info.VersionCode != "" {
+		db = db.Where("version_code = ?", *info.VersionCode)
+	}
+	err = db.Count(&total).Error
+	if err != nil {
+		return
+	}
+
+	if limit != 0 {
+		db = db.Limit(limit).Offset(offset)
+	}
+
+	err = db.Find(&sysVersions).Error
+	return sysVersions, total, err
+}
+func (sysVersionService *SysVersionService) GetSysVersionPublic(ctx context.Context) {
+	// 此方法为获取数据源定义的数据
+	// 请自行实现
+}
+
+// GetMenusByIds 根据ID列表获取菜单数据
+func (sysVersionService *SysVersionService) GetMenusByIds(ctx context.Context, ids []uint) (menus []system.SysBaseMenu, err error) {
+	err = global.GVA_DB.Where("id in ?", ids).Preload("Parameters").Preload("MenuBtn").Find(&menus).Error
+	return
+}
+
+// GetApisByIds 根据ID列表获取API数据
+func (sysVersionService *SysVersionService) GetApisByIds(ctx context.Context, ids []uint) (apis []system.SysApi, err error) {
+	err = global.GVA_DB.Where("id in ?", ids).Find(&apis).Error
+	return
+}
+
+// ImportMenus 导入菜单数据
+func (sysVersionService *SysVersionService) ImportMenus(ctx context.Context, menus []system.SysBaseMenu) error {
+	return global.GVA_DB.Transaction(func(tx *gorm.DB) error {
+		// 递归创建菜单
+		return sysVersionService.createMenusRecursively(tx, menus, 0)
+	})
+}
+
+// createMenusRecursively 递归创建菜单
+func (sysVersionService *SysVersionService) createMenusRecursively(tx *gorm.DB, menus []system.SysBaseMenu, parentId uint) error {
+	for _, menu := range menus {
+		// 检查菜单是否已存在
+		var existingMenu system.SysBaseMenu
+		if err := tx.Where("name = ? AND path = ?", menu.Name, menu.Path).First(&existingMenu).Error; err == nil {
+			// 菜单已存在，使用现有菜单ID继续处理子菜单
+			if len(menu.Children) > 0 {
+				if err := sysVersionService.createMenusRecursively(tx, menu.Children, existingMenu.ID); err != nil {
+					return err
+				}
+			}
+			continue
+		}
+
+		// 保存参数和按钮数据，稍后处理
+		parameters := menu.Parameters
+		menuBtns := menu.MenuBtn
+		children := menu.Children
+
+		// 创建新菜单（不包含关联数据）
+		newMenu := system.SysBaseMenu{
+			ParentId:  parentId,
+			Path:      menu.Path,
+			Name:      menu.Name,
+			Hidden:    menu.Hidden,
+			Component: menu.Component,
+			Sort:      menu.Sort,
+			Meta:      menu.Meta,
+		}
+
+		if err := tx.Create(&newMenu).Error; err != nil {
+			return err
+		}
+
+		// 创建参数
+		if len(parameters) > 0 {
+			for _, param := range parameters {
+				newParam := system.SysBaseMenuParameter{
+					SysBaseMenuID: newMenu.ID,
+					Type:          param.Type,
+					Key:           param.Key,
+					Value:         param.Value,
+				}
+				if err := tx.Create(&newParam).Error; err != nil {
+					return err
+				}
+			}
+		}
+
+		// 创建菜单按钮
+		if len(menuBtns) > 0 {
+			for _, btn := range menuBtns {
+				newBtn := system.SysBaseMenuBtn{
+					SysBaseMenuID: newMenu.ID,
+					Name:          btn.Name,
+					Desc:          btn.Desc,
+				}
+				if err := tx.Create(&newBtn).Error; err != nil {
+					return err
+				}
+			}
+		}
+
+		// 递归处理子菜单
+		if len(children) > 0 {
+			if err := sysVersionService.createMenusRecursively(tx, children, newMenu.ID); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+// ImportApis 导入API数据
+func (sysVersionService *SysVersionService) ImportApis(apis []system.SysApi) error {
+	return global.GVA_DB.Transaction(func(tx *gorm.DB) error {
+		for _, api := range apis {
+			// 检查API是否已存在
+			var existingApi system.SysApi
+			if err := tx.Where("path = ? AND method = ?", api.Path, api.Method).First(&existingApi).Error; err == nil {
+				// API已存在，跳过
+				continue
+			}
+
+			// 创建新API
+			newApi := system.SysApi{
+				Path:        api.Path,
+				Description: api.Description,
+				ApiGroup:    api.ApiGroup,
+				Method:      api.Method,
+			}
+
+			if err := tx.Create(&newApi).Error; err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}
diff --git a/server/source/system/api.go b/server/source/system/api.go
index c28b37336..710dc1355 100644
--- a/server/source/system/api.go
+++ b/server/source/system/api.go
@@ -2,6 +2,7 @@ package system
 
 import (
 	"context"
+
 	sysModel "github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	"github.com/flipped-aurora/gin-vue-admin/server/service/system"
 	"github.com/pkg/errors"
@@ -188,6 +189,14 @@ func (i *initApi) InitializeData(ctx context.Context) (context.Context, error) {
 		{ApiGroup: "媒体库分类", Method: "GET", Path: "/attachmentCategory/getCategoryList", Description: "分类列表"},
 		{ApiGroup: "媒体库分类", Method: "POST", Path: "/attachmentCategory/addCategory", Description: "添加/编辑分类"},
 		{ApiGroup: "媒体库分类", Method: "POST", Path: "/attachmentCategory/deleteCategory", Description: "删除分类"},
+
+		{ApiGroup: "版本控制", Method: "GET", Path: "/sysVersion/findSysVersion", Description: "获取单一版本"},
+		{ApiGroup: "版本控制", Method: "GET", Path: "/sysVersion/getSysVersionList", Description: "获取版本列表"},
+		{ApiGroup: "版本控制", Method: "GET", Path: "/sysVersion/downloadVersionJson", Description: "下载版本json"},
+		{ApiGroup: "版本控制", Method: "POST", Path: "/sysVersion/exportVersion", Description: "创建版本"},
+		{ApiGroup: "版本控制", Method: "POST", Path: "/sysVersion/importVersion", Description: "同步版本"},
+		{ApiGroup: "版本控制", Method: "DELETE", Path: "/sysVersion/deleteSysVersion", Description: "删除版本"},
+		{ApiGroup: "版本控制", Method: "DELETE", Path: "/sysVersion/deleteSysVersionByIds", Description: "批量删除版本"},
 	}
 	if err := db.Create(&entities).Error; err != nil {
 		return ctx, errors.Wrap(err, sysModel.SysApi{}.TableName()+"表数据初始化失败!")
diff --git a/server/source/system/casbin.go b/server/source/system/casbin.go
index 4e37c1474..94e1a24c0 100644
--- a/server/source/system/casbin.go
+++ b/server/source/system/casbin.go
@@ -192,6 +192,14 @@ func (i *initCasbin) InitializeData(ctx context.Context) (context.Context, error
 		{Ptype: "p", V0: "888", V1: "/attachmentCategory/addCategory", V2: "POST"},
 		{Ptype: "p", V0: "888", V1: "/attachmentCategory/deleteCategory", V2: "POST"},
 
+		{Ptype: "p", V0: "888", V1: "/sysVersion/findSysVersion", V2: "GET"},
+		{Ptype: "p", V0: "888", V1: "/sysVersion/getSysVersionList", V2: "GET"},
+		{Ptype: "p", V0: "888", V1: "/sysVersion/downloadVersionJson", V2: "GET"},
+		{Ptype: "p", V0: "888", V1: "/sysVersion/exportVersion", V2: "POST"},
+		{Ptype: "p", V0: "888", V1: "/sysVersion/importVersion", V2: "POST"},
+		{Ptype: "p", V0: "888", V1: "/sysVersion/deleteSysVersion", V2: "DELETE"},
+		{Ptype: "p", V0: "888", V1: "/sysVersion/deleteSysVersionByIds", V2: "DELETE"},
+
 		{Ptype: "p", V0: "8881", V1: "/user/admin_register", V2: "POST"},
 		{Ptype: "p", V0: "8881", V1: "/api/createApi", V2: "POST"},
 		{Ptype: "p", V0: "8881", V1: "/api/getApiList", V2: "POST"},
diff --git a/server/source/system/menu.go b/server/source/system/menu.go
index 0fbd1dbbd..9817c13af 100644
--- a/server/source/system/menu.go
+++ b/server/source/system/menu.go
@@ -102,6 +102,7 @@ func (i *initMenu) InitializeData(ctx context.Context) (next context.Context, er
 		{MenuLevel: 1, Hidden: false, ParentId: menuNameMap["systemTools"], Path: "picture", Name: "picture", Component: "view/systemTools/autoCode/picture.vue", Sort: 6, Meta: Meta{Title: "AI页面绘制", Icon: "picture-filled"}},
 		{MenuLevel: 1, Hidden: false, ParentId: menuNameMap["systemTools"], Path: "mcpTool", Name: "mcpTool", Component: "view/systemTools/autoCode/mcp.vue", Sort: 7, Meta: Meta{Title: "Mcp Tools模板", Icon: "magnet"}},
 		{MenuLevel: 1, Hidden: false, ParentId: menuNameMap["systemTools"], Path: "mcpTest", Name: "mcpTest", Component: "view/systemTools/autoCode/mcpTest.vue", Sort: 7, Meta: Meta{Title: "Mcp Tools测试", Icon: "partly-cloudy"}},
+		{MenuLevel: 1, Hidden: false, ParentId: menuNameMap["systemTools"], Path: "sysVersion", Name: "sysVersion", Component: "view/systemTools/version/version.vue", Sort: 8, Meta: Meta{Title: "版本管理", Icon: "server"}},
 
 		{MenuLevel: 1, Hidden: false, ParentId: menuNameMap["plugin"], Path: "https://plugin.gin-vue-admin.com/", Name: "https://plugin.gin-vue-admin.com/", Component: "https://plugin.gin-vue-admin.com/", Sort: 0, Meta: Meta{Title: "插件市场", Icon: "shop"}},
 		{MenuLevel: 1, Hidden: false, ParentId: menuNameMap["plugin"], Path: "installPlugin", Name: "installPlugin", Component: "view/systemTools/installPlugin/index.vue", Sort: 1, Meta: Meta{Title: "插件安装", Icon: "box"}},
diff --git a/server/utils/ast/ast.go b/server/utils/ast/ast.go
index 1cdfa4c1e..a2636d237 100644
--- a/server/utils/ast/ast.go
+++ b/server/utils/ast/ast.go
@@ -121,6 +121,81 @@ func CreateMenuStructAst(menus []system.SysBaseMenu) *[]ast.Expr {
 				},
 			},
 		}
+
+		// 添加菜单参数
+		if len(menus[i].Parameters) > 0 {
+			var paramElts []ast.Expr
+			for _, param := range menus[i].Parameters {
+				paramElts = append(paramElts, &ast.CompositeLit{
+					Type: &ast.SelectorExpr{
+						X:   &ast.Ident{Name: "model"},
+						Sel: &ast.Ident{Name: "SysBaseMenuParameter"},
+					},
+					Elts: []ast.Expr{
+						&ast.KeyValueExpr{
+							Key:   &ast.Ident{Name: "Type"},
+							Value: &ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("\"%s\"", param.Type)},
+						},
+						&ast.KeyValueExpr{
+							Key:   &ast.Ident{Name: "Key"},
+							Value: &ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("\"%s\"", param.Key)},
+						},
+						&ast.KeyValueExpr{
+							Key:   &ast.Ident{Name: "Value"},
+							Value: &ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("\"%s\"", param.Value)},
+						},
+					},
+				})
+			}
+			elts = append(elts, &ast.KeyValueExpr{
+				Key: &ast.Ident{Name: "Parameters"},
+				Value: &ast.CompositeLit{
+					Type: &ast.ArrayType{
+						Elt: &ast.SelectorExpr{
+							X:   &ast.Ident{Name: "model"},
+							Sel: &ast.Ident{Name: "SysBaseMenuParameter"},
+						},
+					},
+					Elts: paramElts,
+				},
+			})
+		}
+
+		// 添加菜单按钮
+		if len(menus[i].MenuBtn) > 0 {
+			var btnElts []ast.Expr
+			for _, btn := range menus[i].MenuBtn {
+				btnElts = append(btnElts, &ast.CompositeLit{
+					Type: &ast.SelectorExpr{
+						X:   &ast.Ident{Name: "model"},
+						Sel: &ast.Ident{Name: "SysBaseMenuBtn"},
+					},
+					Elts: []ast.Expr{
+						&ast.KeyValueExpr{
+							Key:   &ast.Ident{Name: "Name"},
+							Value: &ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("\"%s\"", btn.Name)},
+						},
+						&ast.KeyValueExpr{
+							Key:   &ast.Ident{Name: "Desc"},
+							Value: &ast.BasicLit{Kind: token.STRING, Value: fmt.Sprintf("\"%s\"", btn.Desc)},
+						},
+					},
+				})
+			}
+			elts = append(elts, &ast.KeyValueExpr{
+				Key: &ast.Ident{Name: "MenuBtn"},
+				Value: &ast.CompositeLit{
+					Type: &ast.ArrayType{
+						Elt: &ast.SelectorExpr{
+							X:   &ast.Ident{Name: "model"},
+							Sel: &ast.Ident{Name: "SysBaseMenuBtn"},
+						},
+					},
+					Elts: btnElts,
+				},
+			})
+		}
+
 		menuElts = append(menuElts, &ast.CompositeLit{
 			Type: nil,
 			Elts: elts,
diff --git a/web/package.json b/web/package.json
index 7d0a78100..925988dec 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gin-vue-admin",
-  "version": "2.8.2",
+  "version": "2.8.4",
   "private": true,
   "scripts": {
     "serve": "node openDocument.js && vite --host --mode development",
diff --git a/web/src/App.vue b/web/src/App.vue
index 6048a3f5d..ed19e8541 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -1,41 +1,43 @@
 <template>
-  <div
-    id="app"
-    class="bg-gray-50 text-slate-700 dark:text-slate-500 dark:bg-slate-800"
-  >
+  <div id="app" class="bg-gray-50 text-slate-700 dark:text-slate-500 dark:bg-slate-800">
     <el-config-provider :locale="zhCn">
       <router-view />
+      <Application />
     </el-config-provider>
   </div>
 </template>
 
 <script setup>
-  import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
-  import { useAppStore } from '@/pinia'
-  useAppStore()
-  defineOptions({
-    name: 'App'
-  })
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import Application from '@/components/application/index.vue'
+import { useAppStore } from '@/pinia'
+
+useAppStore()
+defineOptions({
+  name: 'App'
+})
 </script>
 <style lang="scss">
-  // 引入初始化样式
-  #app {
-    height: 100vh;
-    overflow: hidden;
-    font-weight: 400 !important;
-  }
-  .el-button {
-    font-weight: 400 !important;
-  }
+// 引入初始化样式
+#app {
+  height: 100vh;
+  overflow: hidden;
+  font-weight: 400 !important;
+}
 
-  .gva-body-h {
-    min-height: calc(100% - 3rem);
-  }
+.el-button {
+  font-weight: 400 !important;
+}
 
-  .gva-container {
-    height: calc(100% - 2.5rem);
-  }
-  .gva-container2 {
-    height: calc(100% - 4.5rem);
-  }
+.gva-body-h {
+  min-height: calc(100% - 3rem);
+}
+
+.gva-container {
+  height: calc(100% - 2.5rem);
+}
+
+.gva-container2 {
+  height: calc(100% - 4.5rem);
+}
 </style>
diff --git a/web/src/api/version.js b/web/src/api/version.js
new file mode 100644
index 000000000..b5b7dccec
--- /dev/null
+++ b/web/src/api/version.js
@@ -0,0 +1,114 @@
+import service from '@/utils/request'
+
+// @Tags SysVersion
+// @Summary 删除版本管理
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data body model.SysVersion true "删除版本管理"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Router /sysVersion/deleteSysVersion [delete]
+export const deleteSysVersion = (params) => {
+  return service({
+    url: '/sysVersion/deleteSysVersion',
+    method: 'delete',
+    params
+  })
+}
+
+// @Tags SysVersion
+// @Summary 批量删除版本管理
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data body request.IdsReq true "批量删除版本管理"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Router /sysVersion/deleteSysVersion [delete]
+export const deleteSysVersionByIds = (params) => {
+  return service({
+    url: '/sysVersion/deleteSysVersionByIds',
+    method: 'delete',
+    params
+  })
+}
+
+// @Tags SysVersion
+// @Summary 用id查询版本管理
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data query model.SysVersion true "用id查询版本管理"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
+// @Router /sysVersion/findSysVersion [get]
+export const findSysVersion = (params) => {
+  return service({
+    url: '/sysVersion/findSysVersion',
+    method: 'get',
+    params
+  })
+}
+
+// @Tags SysVersion
+// @Summary 分页获取版本管理列表
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data query request.PageInfo true "分页获取版本管理列表"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Router /sysVersion/getSysVersionList [get]
+export const getSysVersionList = (params) => {
+  return service({
+    url: '/sysVersion/getSysVersionList',
+    method: 'get',
+    params
+  })
+}
+
+// @Tags SysVersion
+// @Summary 导出版本数据
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data body object true "导出版本数据"
+// @Success 200 {string} string "{\"success\":true,\"data\":{},\"msg\":\"导出成功\"}"
+// @Router /sysVersion/exportVersion [post]
+export const exportVersion = (data) => {
+  return service({
+    url: '/sysVersion/exportVersion',
+    method: 'post',
+    data
+  })
+}
+
+// @Tags SysVersion
+// @Summary 下载版本JSON数据
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param ID query string true "版本ID"
+// @Success 200 {string} string "{\"success\":true,\"data\":{},\"msg\":\"下载成功\"}"
+// @Router /sysVersion/downloadVersionJson [get]
+export const downloadVersionJson = (params) => {
+  return service({
+    url: '/sysVersion/downloadVersionJson',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}
+
+// @Tags SysVersion
+// @Summary 导入版本数据
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Param data body object true "版本JSON数据"
+// @Success 200 {string} string "{\"success\":true,\"data\":{},\"msg\":\"导入成功\"}"
+// @Router /sysVersion/importVersion [post]
+export const importVersion = (data) => {
+  return service({
+    url: '/sysVersion/importVersion',
+    method: 'post',
+    data
+  })
+}
diff --git a/web/src/assets/icons/close.svg b/web/src/assets/icons/close.svg
new file mode 100644
index 000000000..1b1f631f2
--- /dev/null
+++ b/web/src/assets/icons/close.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"><path fill="currentColor" d="M195.2 195.2a64 64 0 0 1 90.496 0L512 421.504L738.304 195.2a64 64 0 0 1 90.496 90.496L602.496 512L828.8 738.304a64 64 0 0 1-90.496 90.496L512 602.496L285.696 828.8a64 64 0 0 1-90.496-90.496L421.504 512L195.2 285.696a64 64 0 0 1 0-90.496"/></svg>
diff --git a/web/src/assets/icons/idea.svg b/web/src/assets/icons/idea.svg
new file mode 100644
index 000000000..eac5a0d75
--- /dev/null
+++ b/web/src/assets/icons/idea.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M6.09 14.999a6.9 6.9 0 0 1-.59-2.794C5.5 8.5 8.41 5.499 12 5.499s6.5 3.002 6.5 6.706a6.9 6.9 0 0 1-.59 2.794m-5.91-13v1m10 9h-1m-18 0H2m17.07-7.071l-.707.707m-12.726.001l-.707-.707m9.587 14.377c1.01-.327 1.416-1.252 1.53-2.182c.034-.278-.195-.509-.475-.509H8.477a.483.483 0 0 0-.488.534c.112.928.394 1.606 1.464 2.156m5.064 0H9.453m5.064 0c-.121 1.945-.683 2.716-2.51 2.694c-1.954.036-2.404-.916-2.554-2.693"/></svg>
diff --git a/web/src/assets/icons/lock.svg b/web/src/assets/icons/lock.svg
new file mode 100644
index 000000000..468519109
--- /dev/null
+++ b/web/src/assets/icons/lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="currentColor" d="M12 2a5 5 0 0 1 5 5v3a3 3 0 0 1 3 3v6a3 3 0 0 1-3 3H7a3 3 0 0 1-3-3v-6a3 3 0 0 1 3-3V7a5 5 0 0 1 5-5m0 12a2 2 0 0 0-1.995 1.85L10 16a2 2 0 1 0 2-2m0-10a3 3 0 0 0-3 3v3h6V7a3 3 0 0 0-3-3"/></svg>
diff --git a/web/src/assets/icons/server.svg b/web/src/assets/icons/server.svg
new file mode 100644
index 000000000..3b1375a9d
--- /dev/null
+++ b/web/src/assets/icons/server.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 14 14"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"><path d="M12.5.5h-11a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h11a1 1 0 0 0 1-1v-3a1 1 0 0 0-1-1M7.5 3H11M1.5 5.5a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h11a1 1 0 0 0 1-1v-3a1 1 0 0 0-1-1"/><path d="M3.25 8.25a.25.25 0 0 1 0-.5m0 .5a.25.25 0 0 0 0-.5m0-4.5a.25.25 0 0 1 0-.5m0 .5a.25.25 0 0 0 0-.5M7.5 8H11m-4 2.5v3m-5 0h10"/></g></svg>
diff --git a/web/src/assets/icons/warn.svg b/web/src/assets/icons/warn.svg
new file mode 100644
index 000000000..73d7a1596
--- /dev/null
+++ b/web/src/assets/icons/warn.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"><path fill="currentColor" d="M928.99 755.83L574.6 203.25c-12.89-20.16-36.76-32.58-62.6-32.58s-49.71 12.43-62.6 32.58L95.01 755.83c-12.91 20.12-12.9 44.91.01 65.03c12.92 20.12 36.78 32.51 62.59 32.49h708.78c25.82.01 49.68-12.37 62.59-32.49s12.92-44.91.01-65.03M554.67 768h-85.33v-85.33h85.33zm0-426.67v298.66h-85.33V341.32z"/></svg>
diff --git a/web/src/components/application/index.vue b/web/src/components/application/index.vue
new file mode 100644
index 000000000..4dda3ece0
--- /dev/null
+++ b/web/src/components/application/index.vue
@@ -0,0 +1,39 @@
+<template>
+  <error-preview v-if="showError" :error-data="errorInfo" @close="handleClose" @confirm="handleConfirm" />
+</template>
+
+<script setup>
+import { ref, onUnmounted } from 'vue'
+import { emitter } from '@/utils/bus'
+import ErrorPreview from '@/components/errorPreview/index.vue'
+
+const showError = ref(false)
+const errorInfo = ref(null)
+let cb = null
+
+const showErrorDialog = (data) => {
+  // 这玩意同时只允许存在一个
+  if(showError.value) return
+
+  errorInfo.value = data
+  showError.value = true
+  cb = data?.fn || null
+}
+
+const handleClose = () => {
+  showError.value = false
+  errorInfo.value = null
+  cb = null
+}
+
+const handleConfirm = (code) => {
+  cb && cb(code)
+  handleClose()
+}
+
+emitter.on('show-error', showErrorDialog)
+
+onUnmounted(() => {
+  emitter.off('show-error', showErrorDialog)
+})
+</script>
diff --git a/web/src/components/errorPreview/index.vue b/web/src/components/errorPreview/index.vue
new file mode 100644
index 000000000..dd08402af
--- /dev/null
+++ b/web/src/components/errorPreview/index.vue
@@ -0,0 +1,126 @@
+<template>
+  <div 
+    class="fixed inset-0 bg-black/40 flex items-center justify-center z-[999]"
+    @click.self="closeModal"
+  >
+    <div class="bg-white rounded-xl shadow-dialog w-full max-w-md mx-4 transform transition-all duration-300 ease-in-out">
+      <!-- 弹窗头部 -->
+      <div class="p-5 border-b border-gray-100 flex justify-between items-center">
+        <h3 class="text-lg font-semibold text-gray-800">{{ displayData.title }}</h3>
+        <button class="text-gray-400 hover:text-gray-600 transition-colors" @click="closeModal">
+          <close />
+        </button>
+      </div>
+      
+      <!-- 弹窗内容 -->
+      <div class="p-6">
+        <!-- 错误类型 -->
+        <div class="mb-4">
+          <div class="text-xs font-medium text-gray-500 uppercase mb-2">错误类型</div>
+          <div class="flex items-center gap-2">
+            <lock v-if="displayData.icon === 'lock'" class="text-red-500 w-5 h-5" />
+            <warn v-if="displayData.icon === 'warn'" class="text-red-500 w-5 h-5" />
+            <server v-if="displayData.icon === 'server'" class="text-red-500 w-5 h-5" />
+            <span class="font-medium text-gray-800">{{ displayData.type }}</span>
+          </div>
+        </div>
+        
+        <!-- 具体错误 -->
+        <div class="mb-6">
+          <div class="text-xs font-medium text-gray-500 uppercase mb-2">具体错误</div>
+          <div class="bg-gray-100 rounded-lg p-3 text-sm text-gray-700 leading-relaxed">
+            {{ displayData.message }}
+          </div>
+        </div>
+        
+        <!-- 提示信息 -->
+        <div v-if="displayData.tips">
+          <div class="text-xs font-medium text-gray-500 uppercase mb-2">提示</div>
+          <div class="flex items-center gap-2">
+            <idea class="text-blue-500 w-5 h-5" />
+            <p class="text-sm text-gray-600">{{ displayData.tips }}</p>
+          </div>
+        </div>
+      </div>
+      
+      <!-- 弹窗底部 -->
+      <div class="py-2 px-4 border-t border-gray-100 flex justify-end">
+        <button class="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors font-medium text-sm shadow-sm" @click="handleConfirm">
+          确定
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { defineProps, defineEmits, ref, computed, onMounted } from 'vue';
+
+const props = defineProps({
+  errorData: {
+    type: Object,
+    required: true
+  }
+});
+
+const emits = defineEmits(['close', 'confirm']);
+
+const presetErrors = {
+  500: {
+    title: '检测到接口错误',
+    type: '服务器发生内部错误',
+    icon: 'server',
+    color: 'text-red-500',
+    tips: '此类错误内容常见于后台panic，请先查看后台日志，如果影响您正常使用可强制登出清理缓存'
+  },
+  404: {
+    title: '资源未找到',
+    type: 'Not Found',
+    icon: 'warn',
+    color: 'text-orange-500',
+    tips: '此类错误多为接口未注册（或未重启）或者请求路径（方法）与api路径（方法）不符--如果为自动化代码请检查是否存在空格'
+  },
+  401: {
+    title: '身份认证失败',
+    type: '身份令牌无效',
+    icon: 'lock',
+    color: 'text-purple-500',
+    tips: '您的身份认证已过期或无效，请重新登录。'
+  },
+  'network': {
+    title: '网络错误',
+    type: 'Network Error',
+    icon: 'fa-wifi-slash',
+    color: 'text-gray-500',
+    tips: '无法连接到服务器，请检查您的网络连接。'
+  }
+};
+
+const displayData = computed(() => {
+  const preset = presetErrors[props.errorData.code];
+  if (preset) {
+    return {
+      ...preset,
+      message: props.errorData.message || '没有提供额外信息。'
+    };
+  }
+
+  return {
+    title: '未知错误',
+    type: '检测到请求错误',
+    icon: 'fa-question-circle',
+    color: 'text-gray-400',
+    message: props.errorData.message || '发生了一个未知错误。',
+    tips: '请检查控制台获取更多信息。'
+  };
+});
+
+const closeModal = () => {
+   emits('close')
+};
+
+const handleConfirm = () => {
+  emits('confirm', props.errorData.code);
+  closeModal();
+};
+</script>
diff --git a/web/src/core/config.js b/web/src/core/config.js
index a58c53360..24ca844ed 100644
--- a/web/src/core/config.js
+++ b/web/src/core/config.js
@@ -17,7 +17,7 @@ export const viteLogo = (env) => {
         `> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin`
       )
     )
-    console.log(greenText(`> 当前版本:v2.8.3`))
+    console.log(greenText(`> 当前版本:v2.8.4`))
     console.log(greenText(`> 加群方式:微信：shouzi_1994 QQ群：470239250`))
     console.log(
       greenText(`> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`)
diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js
index 495e0aad9..3062fc905 100644
--- a/web/src/core/gin-vue-admin.js
+++ b/web/src/core/gin-vue-admin.js
@@ -10,7 +10,7 @@ export default {
     register(app)
     console.log(`
        欢迎使用 Gin-Vue-Admin
-       当前版本:v2.8.3
+       当前版本:v2.8.4
        加群方式:微信：shouzi_1994 QQ群：622360840
        项目地址：https://github.com/flipped-aurora/gin-vue-admin
        插件市场:https://plugin.gin-vue-admin.com
diff --git a/web/src/pathInfo.json b/web/src/pathInfo.json
index e991e172b..780f9a6e3 100644
--- a/web/src/pathInfo.json
+++ b/web/src/pathInfo.json
@@ -74,6 +74,7 @@
   "/src/view/systemTools/installPlugin/index.vue": "Index",
   "/src/view/systemTools/pubPlug/pubPlug.vue": "PubPlug",
   "/src/view/systemTools/system/system.vue": "Config",
+  "/src/view/systemTools/version/version.vue": "SysVersion",
   "/src/plugin/announcement/form/info.vue": "InfoForm",
   "/src/plugin/announcement/view/info.vue": "Info",
   "/src/plugin/email/view/index.vue": "Email"
diff --git a/web/src/style/reset.scss b/web/src/style/reset.scss
index 2cd44c702..55b476fa2 100644
--- a/web/src/style/reset.scss
+++ b/web/src/style/reset.scss
@@ -393,7 +393,7 @@ fieldset,
 table,
 th,
 td {
-  border: none;
+  // border: none;
   font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB',
     'Microsoft YaHei', '微软雅黑', Arial, sans-serif;
   font-size: 14px;
diff --git a/web/src/utils/request.js b/web/src/utils/request.js
index c05bab408..1c62bd311 100644
--- a/web/src/utils/request.js
+++ b/web/src/utils/request.js
@@ -1,11 +1,8 @@
 import axios from 'axios' // 引入axios
-import { ElMessage, ElMessageBox } from 'element-plus'
 import { useUserStore } from '@/pinia/modules/user'
+import { ElLoading, ElMessage } from 'element-plus'
+import { emitter } from '@/utils/bus'
 import router from '@/router/index'
-import { ElLoading } from 'element-plus'
-
-// 添加一个状态变量，用于跟踪是否已有错误弹窗显示
-let errorBoxVisible = false
 
 const service = axios.create({
   baseURL: import.meta.env.VITE_BASE_API,
@@ -24,24 +21,24 @@ const showLoading = (
 ) => {
   const loadDom = document.getElementById('gva-base-load-dom')
   activeAxios++
-  
+
   // 清除之前的定时器
   if (timer) {
     clearTimeout(timer)
   }
-  
+
   // 清除强制关闭定时器
   if (forceCloseTimer) {
     clearTimeout(forceCloseTimer)
   }
-  
+
   timer = setTimeout(() => {
     // 再次检查activeAxios状态，防止竞态条件
     if (activeAxios > 0 && !isLoadingVisible) {
       if (!option.target) option.target = loadDom
       loadingInstance = ElLoading.service(option)
       isLoadingVisible = true
-      
+
       // 设置强制关闭定时器，防止loading永远不关闭（30秒超时）
       forceCloseTimer = setTimeout(() => {
         if (isLoadingVisible && loadingInstance) {
@@ -60,12 +57,12 @@ const closeLoading = () => {
   if (activeAxios <= 0) {
     activeAxios = 0 // 确保不会变成负数
     clearTimeout(timer)
-    
+
     if (forceCloseTimer) {
       clearTimeout(forceCloseTimer)
       forceCloseTimer = null
     }
-    
+
     if (isLoadingVisible && loadingInstance) {
       loadingInstance.close()
       isLoadingVisible = false
@@ -78,17 +75,17 @@ const closeLoading = () => {
 const resetLoading = () => {
   activeAxios = 0
   isLoadingVisible = false
-  
+
   if (timer) {
     clearTimeout(timer)
     timer = null
   }
-  
+
   if (forceCloseTimer) {
     clearTimeout(forceCloseTimer)
     forceCloseTimer = null
   }
-  
+
   if (loadingInstance) {
     try {
       loadingInstance.close()
@@ -98,6 +95,7 @@ const resetLoading = () => {
     loadingInstance = null
   }
 }
+
 // http request 拦截器
 service.interceptors.request.use(
   (config) => {
@@ -117,15 +115,18 @@ service.interceptors.request.use(
     if (!error.config.donNotShowLoading) {
       closeLoading()
     }
-    ElMessage({
-      showClose: true,
-      message: error,
-      type: 'error'
+    emitter.emit('show-error', {
+      code: 'request',
+      message: error.message || '请求发送失败'
     })
     return error
   }
 )
 
+function getErrorMessage(error) {
+  return error.response?.data?.msg || '请求失败'
+}
+
 // http response 拦截器
 service.interceptors.response.use(
   (response) => {
@@ -158,105 +159,38 @@ service.interceptors.response.use(
       closeLoading()
     }
 
-    // 如果已经有错误弹窗显示，则不再显示新的弹窗
-    if (errorBoxVisible) {
-      return error
-    }
-
     if (!error.response) {
-      // 网络错误时重置loading状态
+      // 网络错误
       resetLoading()
-      errorBoxVisible = true
-      ElMessageBox.confirm(
-        `
-        <p>检测到请求错误</p>
-        <p>${error}</p>
-        `,
-        '请求报错',
-        {
-          dangerouslyUseHTMLString: true,
-          distinguishCancelAndClose: true,
-          confirmButtonText: '稍后重试',
-          cancelButtonText: '取消'
-        }
-      ).finally(() => {
-        // 弹窗关闭后重置状态
-        errorBoxVisible = false
+      emitter.emit('show-error', {
+        code: 'network',
+        message: getErrorMessage(error)
       })
-      return
+      return Promise.reject(error)
     }
 
-    switch (error.response.status) {
-      case 500:
-        errorBoxVisible = true
-        ElMessageBox.confirm(
-          `
-        <p>检测到接口错误${error}</p>
-        <p>错误码<span style="color:red"> 500 </span>：此类错误内容常见于后台panic，请先查看后台日志，如果影响您正常使用可强制登出清理缓存</p>
-        `,
-          '接口报错',
-          {
-            dangerouslyUseHTMLString: true,
-            distinguishCancelAndClose: true,
-            confirmButtonText: '清理缓存',
-            cancelButtonText: '取消'
-          }
-        ).then(() => {
+    // HTTP 状态码错误
+    if (error.response.status === 401) {
+      emitter.emit('show-error', {
+        code: '401',
+        message: getErrorMessage(error),
+        fn: () => {
           const userStore = useUserStore()
           userStore.ClearStorage()
           router.push({ name: 'Login', replace: true })
-        }).finally(() => {
-          // 弹窗关闭后重置状态
-          errorBoxVisible = false
-        })
-        break
-      case 404:
-        errorBoxVisible = true
-        ElMessageBox.confirm(
-          `
-          <p>检测到接口错误${error}</p>
-          <p>错误码<span style="color:red"> 404 </span>：此类错误多为接口未注册（或未重启）或者请求路径（方法）与api路径（方法）不符--如果为自动化代码请检查是否存在空格</p>
-          `,
-          '接口报错',
-          {
-            dangerouslyUseHTMLString: true,
-            distinguishCancelAndClose: true,
-            confirmButtonText: '我知道了',
-            cancelButtonText: '取消'
-          }
-        ).finally(() => {
-          // 弹窗关闭后重置状态
-          errorBoxVisible = false
-        })
-        break
-      case 401:
-        errorBoxVisible = true
-        ElMessageBox.confirm(
-          `
-          <p>无效的令牌</p>
-          <p>错误码:<span style="color:red"> 401 </span>错误信息:${error}</p>
-          `,
-          '身份信息',
-          {
-            dangerouslyUseHTMLString: true,
-            distinguishCancelAndClose: true,
-            confirmButtonText: '重新登录',
-            cancelButtonText: '取消'
-          }
-        ).then(() => {
-          const userStore = useUserStore()
-          userStore.ClearStorage()
-          router.push({ name: 'Login', replace: true })
-        }).finally(() => {
-          // 弹窗关闭后重置状态
-          errorBoxVisible = false
-        })
-        break
+        }
+      })
+      return Promise.reject(error)
     }
 
-    return error
+    emitter.emit('show-error', {
+      code: error.response.status,
+      message: getErrorMessage(error)
+    })
+    return Promise.reject(error)
   }
 )
+
 // 监听页面卸载事件，确保loading被正确清理
 if (typeof window !== 'undefined') {
   window.addEventListener('beforeunload', resetLoading)
diff --git a/web/src/view/systemTools/version/version.vue b/web/src/view/systemTools/version/version.vue
new file mode 100644
index 000000000..b0ff92471
--- /dev/null
+++ b/web/src/view/systemTools/version/version.vue
@@ -0,0 +1,905 @@
+<template>
+  <div>
+    <div class="gva-search-box">
+      <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline"
+        @keyup.enter="onSubmit">
+        <el-form-item label="创建日期" prop="createdAtRange">
+          <template #label>
+            <span>
+              创建日期
+              <el-tooltip content="搜索范围是开始日期（包含）至结束日期（不包含）">
+                <el-icon>
+                  <QuestionFilled />
+                </el-icon>
+              </el-tooltip>
+            </span>
+          </template>
+
+          <el-date-picker v-model="searchInfo.createdAtRange" class="w-[380px]" type="datetimerange" range-separator="至"
+            start-placeholder="开始时间" end-placeholder="结束时间" />
+        </el-form-item>
+
+        <el-form-item label="版本名称" prop="versionName">
+          <el-input v-model="searchInfo.versionName" placeholder="搜索条件" />
+        </el-form-item>
+
+        <el-form-item label="版本号" prop="versionCode">
+          <el-input v-model="searchInfo.versionCode" placeholder="搜索条件" />
+        </el-form-item>
+
+
+
+        <template v-if="showAllQuery">
+          <!-- 将需要控制显示状态的查询条件添加到此范围内 -->
+        </template>
+
+        <el-form-item>
+          <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+          <el-button icon="refresh" @click="onReset">重置</el-button>
+          <el-button link type="primary" icon="arrow-down" @click="showAllQuery = true"
+            v-if="!showAllQuery">展开</el-button>
+          <el-button link type="primary" icon="arrow-up" @click="showAllQuery = false" v-else>收起</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="gva-table-box">
+      <div class="gva-btn-list">
+        <el-button type="success" icon="download" @click="openExportDialog">创建发版</el-button>
+        <el-button type="warning" icon="upload" @click="openImportDialog">导入版本</el-button>
+        <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length"
+          @click="onDelete">删除</el-button>
+      </div>
+      <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
+        @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+
+        <el-table-column sortable align="left" label="日期" prop="CreatedAt" width="180">
+          <template #default="scope">{{ formatDate(scope.row.CreatedAt) }}</template>
+        </el-table-column>
+
+        <el-table-column align="left" label="版本名称" prop="versionName" width="120" />
+
+        <el-table-column align="left" label="版本号" prop="versionCode" width="120" />
+
+        <el-table-column align="left" label="操作" fixed="right" min-width="320">
+          <template #default="scope">
+            <el-button type="primary" link class="table-button" @click="getDetails(scope.row)"><el-icon
+                style="margin-right: 5px">
+                <InfoFilled />
+              </el-icon>查看</el-button>
+            <el-button type="success" link icon="download" class="table-button"
+              @click="downloadJson(scope.row)">下载发版包</el-button>
+            <el-button type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="gva-pagination">
+        <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize"
+          :page-sizes="[10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange"
+          @size-change="handleSizeChange" />
+      </div>
+    </div>
+
+    <el-drawer destroy-on-close :size="appStore.drawerSize" v-model="detailShow" :show-close="true"
+      :before-close="closeDetailShow" title="查看">
+      <el-descriptions :column="1" border>
+        <el-descriptions-item label="版本名称">
+          {{ detailForm.versionName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="版本号">
+          {{ detailForm.versionCode }}
+        </el-descriptions-item>
+        <el-descriptions-item label="版本描述">
+          {{ detailForm.description }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-drawer>
+
+    <!-- 导出版本抽屉 -->
+    <el-drawer v-model="exportDialogVisible" title="创建发版" direction="rtl" size="80%" :before-close="closeExportDialog" :show-close="false">
+      <template #header>
+        <div class="flex justify-between items-center">
+          <span class="text-lg">创建发版</span>
+          <div>
+            <el-button @click="closeExportDialog">取消</el-button>
+            <el-button type="primary" @click="handleExport" :loading="exportLoading">创建发版</el-button>
+          </div>
+        </div>
+      </template>
+      <el-form :model="exportForm" label-width="100px">
+        <el-form-item label="版本名称" required>
+          <el-input v-model="exportForm.versionName" placeholder="请输入版本名称" />
+        </el-form-item>
+        <el-form-item label="版本号" required>
+          <el-input v-model="exportForm.versionCode" placeholder="请输入版本号" />
+        </el-form-item>
+        <el-form-item label="版本描述">
+          <el-input v-model="exportForm.description" type="textarea" placeholder="请输入版本描述" />
+        </el-form-item>
+        <el-form-item label="发版信息">
+          <div class="flex gap-5 w-full">
+            <!-- 菜单选择 -->
+            <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full flex-1 w-1/2">
+              <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
+                <span class="m-0 text-gray-800 text-base font-medium">选择菜单</span>
+              </div>
+              <div class="px-4 py-3 border-b border-gray-300 bg-gray-50">
+                <el-input v-model="menuFilterText" placeholder="输入关键字进行过滤" clearable size="small" />
+              </div>
+              <div class="flex-1 p-2 min-h-[300px] max-h-[400px] overflow-y-auto">
+                <el-tree ref="menuTreeRef" :data="menuTreeData" :default-checked-keys="selectedMenuIds"
+                  :props="menuTreeProps" default-expand-all highlight-current node-key="ID" show-checkbox
+                  :filter-node-method="filterMenuNode" @check="onMenuCheck" class="menu-tree">
+                  <template #default="{ node }">
+                    <span class="flex-1 flex items-center justify-between text-sm pr-2">
+                      <span>{{ node.label }}</span>
+                    </span>
+                  </template>
+                </el-tree>
+              </div>
+            </div>
+
+            <!-- API选择 -->
+            <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full flex-1 w-1/2">
+              <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
+                <span class="m-0 text-gray-800 text-base font-medium">选择API</span>
+              </div>
+              <div class="px-4 py-3 border-b border-gray-300 bg-gray-50">
+                <el-input v-model="apiFilterTextName" placeholder="按名称过滤" clearable size="small"
+                  style="margin-bottom: 8px" />
+                <el-input v-model="apiFilterTextPath" placeholder="按路径过滤" clearable size="small" />
+              </div>
+              <div class="flex-1 p-2 min-h-[300px] max-h-[400px] overflow-y-auto">
+                <el-tree ref="apiTreeRef" :data="apiTreeData" :default-checked-keys="selectedApiIds"
+                  :props="apiTreeProps" default-expand-all highlight-current node-key="onlyId" show-checkbox
+                  :filter-node-method="filterApiNode" @check="onApiCheck" class="api-tree">
+                  <template #default="{ _, data }">
+                    <div class="flex items-center justify-between w-full pr-1">
+                      <span>{{ data.description }}</span>
+                      <el-tooltip :content="data.path">
+                        <span class="max-w-[240px] break-all overflow-ellipsis overflow-hidden">
+                          {{ data.path }}
+                        </span>
+                      </el-tooltip>
+                    </div>
+                  </template>
+                </el-tree>
+              </div>
+            </div>
+          </div>
+        </el-form-item>
+      </el-form>
+    </el-drawer>
+
+    <!-- 导入版本抽屉 -->
+    <el-drawer v-model="importDialogVisible" title="导入版本" direction="rtl" size="80%" :before-close="closeImportDialog" :show-close="false">
+      <template #header>
+        <div class="flex justify-between items-center">
+          <span class="text-lg">导入版本</span>
+          <div>
+            <el-button @click="closeImportDialog">取消</el-button>
+            <el-button type="primary" @click="handleImport" :loading="importLoading"
+              :disabled="!importJsonContent.trim()">导入</el-button>
+          </div>
+        </div>
+      </template>
+      <el-form label-width="100px">
+        <el-form-item label="上传文件">
+          <el-upload
+            ref="uploadRef"
+            :auto-upload="false"
+            :show-file-list="true"
+            :limit="1"
+            accept=".json"
+            :on-change="handleFileChange"
+            :on-remove="handleFileRemove"
+            drag
+          >
+            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+            <div class="el-upload__text">
+              将JSON文件拖到此处，或<em>点击上传</em>
+            </div>
+            <template #tip>
+              <div class="el-upload__tip">
+                只能上传JSON文件
+              </div>
+            </template>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="版本JSON">
+          <el-input v-model="importJsonContent" type="textarea" :rows="20" placeholder="请粘贴版本JSON"
+            @input="handleJsonContentChange" />
+        </el-form-item>
+        <el-form-item label="预览内容" v-if="importPreviewData">
+          <div class="flex flex-col flex-1 gap-4 border border-gray-300 rounded p-4 bg-gray-50">
+            <div class="flex gap-5 w-full">
+              <div class="border border-gray-300 rounded overflow-hidden flex-1 w-1/2">
+                <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full">
+                  <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
+                    <h3 class="m-0 text-gray-800 text-base font-medium">菜单 ({{ getTotalMenuCount() }}项)</h3>
+                  </div>
+                  <div class="flex-1 p-2 min-h-[300px] max-h-[400px] overflow-y-auto">
+                    <el-tree
+                      :data="previewMenuTreeData"
+                      :props="menuTreeProps"
+                      node-key="name"
+                      :expand-on-click-node="false"
+                      :check-on-click-node="false"
+                      :show-checkbox="false"
+                      default-expand-all
+                    >
+                      <template #default="{ data }">
+                        <div class="flex-1 flex items-center justify-between text-sm pr-2">
+                          <span>{{ data.meta?.title || data.title }}</span>
+                          <span class="text-gray-500 text-xs ml-2">{{ data.path }}</span>
+                        </div>
+                      </template>
+                    </el-tree>
+                  </div>
+                </div>
+              </div>
+              <div class="border border-gray-300 rounded overflow-hidden flex-1 w-1/2">
+                <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full">
+                  <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
+                    <h3 class="m-0 text-gray-800 text-base font-medium">API ({{ importPreviewData.apis?.length || 0 }}项)</h3>
+                  </div>
+                  <div class="flex-1 p-2 min-h-[300px] max-h-[400px] overflow-y-auto">
+                    <el-tree
+                      :data="previewApiTreeData"
+                      :props="apiTreeProps"
+                      node-key="ID"
+                      :expand-on-click-node="false"
+                      :check-on-click-node="false"
+                      :show-checkbox="false"
+                      default-expand-all
+                    >
+                      <template #default="{ data }">
+                        <div class="flex-1 flex items-center justify-between text-sm pr-2">
+                          <span>{{ data.description }}</span>
+                          <span class="text-gray-500 text-xs ml-2">{{ data.path }} [{{ data.method }}]</span>
+                        </div>
+                      </template>
+                    </el-tree>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-form-item>
+      </el-form>
+    </el-drawer>
+
+  </div>
+</template>
+
+<script setup>
+import {
+  deleteSysVersion,
+  deleteSysVersionByIds,
+  findSysVersion,
+  getSysVersionList,
+  exportVersion,
+  importVersion,
+  downloadVersionJson
+} from '@/api/version'
+
+// 导入菜单和API相关接口
+import { getMenuList } from '@/api/menu'
+import { getApiList } from '@/api/api'
+
+// 全量引入格式化工具 请按需保留
+import { getDictFunc, formatDate, filterDict } from '@/utils/format'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { UploadFilled } from '@element-plus/icons-vue'
+import { ref, reactive, watch } from 'vue'
+// 引入按钮权限标识
+import { useBtnAuth } from '@/utils/btnAuth'
+import { useAppStore } from "@/pinia"
+
+defineOptions({
+  name: 'SysVersion'
+})
+
+const appStore = useAppStore()
+
+// 控制更多查询条件显示/隐藏状态
+const showAllQuery = ref(false)
+
+// 导出相关数据
+const exportDialogVisible = ref(false)
+const exportLoading = ref(false)
+const exportForm = ref({
+  versionName: '',
+  versionCode: '',
+  description: '',
+  menuIds: [],
+  apiIds: []
+})
+
+// 树形结构相关数据
+const menuTreeData = ref([])
+const apiTreeData = ref([])
+const selectedMenuIds = ref([])
+const selectedApiIds = ref([])
+const menuFilterText = ref('')
+const apiFilterTextName = ref('')
+const apiFilterTextPath = ref('')
+
+// 树形组件引用
+const menuTreeRef = ref(null)
+const apiTreeRef = ref(null)
+
+// 树形属性配置
+const menuTreeProps = ref({
+  children: 'children',
+  label: function (data) {
+    return data.meta?.title || data.title
+  }
+})
+
+const apiTreeProps = ref({
+  children: 'children',
+  label: 'description'
+})
+
+// 导入相关数据
+const importDialogVisible = ref(false)
+const importLoading = ref(false)
+const importJsonContent = ref('')
+const importPreviewData = ref(null)
+const uploadRef = ref(null)
+const previewMenuTreeData = ref([])
+const previewApiTreeData = ref([])
+
+
+
+// 验证规则
+const rule = reactive({
+  versionName: [{
+    required: true,
+    message: '请输入版本名称',
+    trigger: ['input', 'blur'],
+  },
+  {
+    whitespace: true,
+    message: '不能只输入空格',
+    trigger: ['input', 'blur'],
+  }
+  ],
+  versionCode: [{
+    required: true,
+    message: '请输入版本号',
+    trigger: ['input', 'blur'],
+  },
+  {
+    whitespace: true,
+    message: '不能只输入空格',
+    trigger: ['input', 'blur'],
+  }
+  ]
+})
+
+const elFormRef = ref()
+const elSearchFormRef = ref()
+
+// =========== 表格控制部分 ===========
+const page = ref(1)
+const total = ref(0)
+const pageSize = ref(10)
+const tableData = ref([])
+const searchInfo = ref({})
+// 重置
+const onReset = () => {
+  searchInfo.value = {}
+  getTableData()
+}
+
+// 搜索
+const onSubmit = () => {
+  elSearchFormRef.value?.validate(async (valid) => {
+    if (!valid) return
+    page.value = 1
+    getTableData()
+  })
+}
+
+// 分页
+const handleSizeChange = (val) => {
+  pageSize.value = val
+  getTableData()
+}
+
+// 修改页面容量
+const handleCurrentChange = (val) => {
+  page.value = val
+  getTableData()
+}
+
+// 查询
+const getTableData = async () => {
+  const table = await getSysVersionList({ page: page.value, pageSize: pageSize.value, ...searchInfo.value })
+  if (table.code === 0) {
+    tableData.value = table.data.list
+    total.value = table.data.total
+    page.value = table.data.page
+    pageSize.value = table.data.pageSize
+  }
+}
+
+getTableData()
+
+// ============== 表格控制部分结束 ===============
+
+// 多选数据
+const multipleSelection = ref([])
+// 多选
+const handleSelectionChange = (val) => {
+  multipleSelection.value = val
+}
+
+// 删除行
+const deleteRow = (row) => {
+  ElMessageBox.confirm('确定要删除吗?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(() => {
+    deleteSysVersionFunc(row)
+  })
+}
+
+// 多选删除
+const onDelete = async () => {
+  ElMessageBox.confirm('确定要删除吗?', '提示', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  }).then(async () => {
+    const IDs = []
+    if (multipleSelection.value.length === 0) {
+      ElMessage({
+        type: 'warning',
+        message: '请选择要删除的数据'
+      })
+      return
+    }
+    multipleSelection.value &&
+      multipleSelection.value.map(item => {
+        IDs.push(item.ID)
+      })
+    const res = await deleteSysVersionByIds({ IDs })
+    if (res.code === 0) {
+      ElMessage({
+        type: 'success',
+        message: '删除成功'
+      })
+      if (tableData.value.length === IDs.length && page.value > 1) {
+        page.value--
+      }
+      getTableData()
+    }
+  })
+}
+
+// 删除行
+const deleteSysVersionFunc = async (row) => {
+  const res = await deleteSysVersion({ ID: row.ID })
+  if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '删除成功'
+    })
+    if (tableData.value.length === 1 && page.value > 1) {
+      page.value--
+    }
+    getTableData()
+  }
+}
+
+const detailForm = ref({})
+
+// 查看详情控制标记
+const detailShow = ref(false)
+
+
+// 打开详情弹窗
+const openDetailShow = () => {
+  detailShow.value = true
+}
+
+
+// 打开详情
+const getDetails = async (row) => {
+  // 打开弹窗
+  const res = await findSysVersion({ ID: row.ID })
+  if (res.code === 0) {
+    detailForm.value = res.data
+    openDetailShow()
+  }
+}
+
+
+// 关闭详情弹窗
+const closeDetailShow = () => {
+  detailShow.value = false
+  detailForm.value = {}
+}
+
+
+
+// 获取菜单和API列表
+const getMenuAndApiList = async () => {
+  try {
+    // 获取菜单列表
+    const menuRes = await getMenuList()
+    if (menuRes.code === 0) {
+      menuTreeData.value = menuRes.data || []
+    }
+
+    // 获取API列表
+    const apiRes = await getApiList({ page: 1, pageSize: 9999 })
+    if (apiRes.code === 0) {
+      console.log('原始API数据:', apiRes.data)
+      const apis = apiRes.data.list || []
+      apiTreeData.value = buildApiTree(apis)
+    }
+  } catch (error) {
+    console.error('获取数据失败:', error)
+    ElMessage.error('获取菜单或API数据失败')
+  }
+}
+
+// 构建API树形结构
+const buildApiTree = (apis) => {
+  const apiObj = {}
+  apis.forEach((item) => {
+    item.onlyId = 'p:' + item.path + 'm:' + item.method
+    if (Object.prototype.hasOwnProperty.call(apiObj, item.apiGroup)) {
+      apiObj[item.apiGroup].push(item)
+    } else {
+      Object.assign(apiObj, { [item.apiGroup]: [item] })
+    }
+  })
+  const apiTree = []
+  for (const key in apiObj) {
+    const treeNode = {
+      ID: key,
+      description: key + '组',
+      children: apiObj[key]
+    }
+    apiTree.push(treeNode)
+  }
+  return apiTree
+}
+
+// 树形组件事件处理方法
+const filterMenuNode = (value, data) => {
+  if (!value) return true
+  const title = data.meta?.title || data.title || ''
+  return title.indexOf(value) !== -1
+}
+
+const filterApiNode = (value, data) => {
+  if (!apiFilterTextName.value && !apiFilterTextPath.value) return true
+  let matchesName, matchesPath
+  if (!apiFilterTextName.value) {
+    matchesName = true
+  } else {
+    matchesName = data.description && data.description.includes(apiFilterTextName.value)
+  }
+  if (!apiFilterTextPath.value) {
+    matchesPath = true
+  } else {
+    matchesPath = data.path && data.path.includes(apiFilterTextPath.value)
+  }
+  return matchesName && matchesPath
+}
+
+const onMenuCheck = (data, checked) => {
+  if (checked.checkedKeys) {
+    selectedMenuIds.value = checked.checkedKeys
+  }
+}
+
+const onApiCheck = (data, checked) => {
+  if (checked.checkedKeys) {
+    selectedApiIds.value = checked.checkedKeys
+  }
+}
+
+// 监听过滤文本变化
+watch(menuFilterText, (val) => {
+  if (menuTreeRef.value) {
+    menuTreeRef.value.filter(val)
+  }
+})
+
+watch([apiFilterTextName, apiFilterTextPath], () => {
+  if (apiTreeRef.value) {
+    apiTreeRef.value.filter('')
+  }
+})
+
+// 导出相关方法
+const openExportDialog = async () => {
+  exportDialogVisible.value = true
+  await getMenuAndApiList()
+}
+
+const closeExportDialog = () => {
+  exportDialogVisible.value = false
+  exportForm.value = {
+    versionName: '',
+    versionCode: '',
+    description: '',
+    menuIds: [],
+    apiIds: []
+  }
+  selectedMenuIds.value = []
+  selectedApiIds.value = []
+  menuFilterText.value = ''
+  apiFilterTextName.value = ''
+  apiFilterTextPath.value = ''
+}
+
+const handleExport = async () => {
+  if (!exportForm.value.versionName || !exportForm.value.versionCode) {
+    ElMessage.warning('请填写版本名称和版本号')
+    return
+  }
+
+  exportLoading.value = true
+  try {
+    // 获取选中的菜单和API
+    const checkedMenus = menuTreeRef.value ? menuTreeRef.value.getCheckedNodes(false, true) : []
+    const checkedApis = apiTreeRef.value ? apiTreeRef.value.getCheckedNodes(true) : []
+
+    const menuIds = checkedMenus.map(menu => menu.ID)
+    const apiIds = checkedApis.map(api => api.ID)
+
+    exportForm.value.menuIds = menuIds
+    exportForm.value.apiIds = apiIds
+
+    const res = await exportVersion(exportForm.value)
+    if (res.code !== 0) {
+      ElMessage.error(res.msg || '创建发版失败')
+      return
+    }
+
+    ElMessage.success('创建发版成功')
+    closeExportDialog()
+    getTableData() // 刷新表格数据
+  } catch (error) {
+    console.error('创建发版失败:', error)
+    ElMessage.error('创建发版失败')
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+// 导入相关方法
+const openImportDialog = () => {
+  importDialogVisible.value = true
+}
+
+const closeImportDialog = () => {
+  importDialogVisible.value = false
+  importJsonContent.value = ''
+  importPreviewData.value = null
+  previewMenuTreeData.value = []
+  previewApiTreeData.value = []
+  // 清理上传文件
+  if (uploadRef.value) {
+    uploadRef.value.clearFiles()
+  }
+}
+
+// 文件上传处理函数
+const handleFileChange = (file) => {
+  if (!file.raw) return
+  
+  // 验证文件类型
+  if (!file.name.toLowerCase().endsWith('.json')) {
+    ElMessage.error('只能上传JSON文件')
+    uploadRef.value.clearFiles()
+    return
+  }
+  
+  // 读取文件内容
+  const reader = new FileReader()
+  reader.onload = (e) => {
+    try {
+      const content = e.target.result
+      // 验证JSON格式
+      JSON.parse(content)
+      importJsonContent.value = content
+      handleJsonContentChange()
+      ElMessage.success('文件上传成功')
+    } catch (error) {
+      ElMessage.error('JSON文件格式错误')
+      uploadRef.value.clearFiles()
+    }
+  }
+  reader.readAsText(file.raw)
+}
+
+const handleFileRemove = () => {
+  importJsonContent.value = ''
+  importPreviewData.value = null
+  previewMenuTreeData.value = []
+  previewApiTreeData.value = []
+}
+
+// 计算菜单总数（递归计算所有菜单项）
+const getTotalMenuCount = () => {
+  if (!importPreviewData.value?.menus) return 0
+  
+  const countMenus = (menus) => {
+    let count = 0
+    menus.forEach(menu => {
+      count += 1 // 当前菜单
+      if (menu.children && menu.children.length > 0) {
+        count += countMenus(menu.children) // 递归计算子菜单
+      }
+    })
+    return count
+  }
+  
+  return countMenus(importPreviewData.value.menus)
+}
+
+// 构建树形结构的辅助函数
+const buildTreeData = (data, parentId = 0) => {
+  const tree = []
+  // 处理parentId可能为字符串"0"或数字0的情况
+  const targetParentId = parentId === 0 ? [0, "0"] : [parentId]
+  const items = data.filter(item => targetParentId.includes(item.parentId))
+  
+  items.forEach(item => {
+    const children = buildTreeData(data, item.ID)
+    if (children.length > 0) {
+      item.children = children
+    }
+    tree.push(item)
+  })
+  
+  return tree
+}
+
+const handleJsonContentChange = () => {
+  if (!importJsonContent.value.trim()) {
+    importPreviewData.value = null
+    previewMenuTreeData.value = []
+    previewApiTreeData.value = []
+    return
+  }
+
+  try {
+    const data = JSON.parse(importJsonContent.value)
+
+    // 构建预览数据
+    importPreviewData.value = {
+      menus: data.menus || [],
+      apis: data.apis || []
+    }
+
+    // 直接使用菜单数据，因为它已经是树形结构（包含children字段）
+    if (data.menus && data.menus.length > 0) {
+      previewMenuTreeData.value = data.menus
+    } else {
+      previewMenuTreeData.value = []
+    }
+
+    // 构建API树形数据（按分组组织）
+    if (data.apis && data.apis.length > 0) {
+      const apiGroups = {}
+      data.apis.forEach(api => {
+        const group = api.apiGroup || '未分组'
+        if (!apiGroups[group]) {
+          apiGroups[group] = {
+            ID: `group_${group}`,
+            description: group,
+            path: '',
+            method: '',
+            children: []
+          }
+        }
+        apiGroups[group].children.push(api)
+      })
+      previewApiTreeData.value = Object.values(apiGroups)
+    } else {
+      previewApiTreeData.value = []
+    }
+  } catch (error) {
+    console.error('JSON解析失败:', error)
+    importPreviewData.value = null
+    previewMenuTreeData.value = []
+    previewApiTreeData.value = []
+  }
+}
+
+const handleImport = async () => {
+  if (!importJsonContent.value.trim()) {
+    ElMessage.warning('请输入版本JSON')
+    return
+  }
+
+  try {
+    JSON.parse(importJsonContent.value)
+  } catch (error) {
+    ElMessage.error('JSON格式错误，请检查输入内容')
+    return
+  }
+
+  importLoading.value = true
+  try {
+    const data = JSON.parse(importJsonContent.value)
+    const res = await importVersion(data)
+    if (res.code === 0) {
+      ElMessage.success('导入成功')
+      closeImportDialog()
+      getTableData() // 刷新表格数据
+    } else {
+      ElMessage.error(res.msg || '导入失败')
+    }
+  } catch (error) {
+    console.error('导入失败:', error)
+    ElMessage.error('导入失败')
+  } finally {
+    importLoading.value = false
+  }
+}
+
+// 下载版本JSON
+const downloadJson = async (row) => {
+  try {
+    const res = await downloadVersionJson({ ID: row.ID })
+    // 处理axios响应，获取实际的blob数据
+    // 当responseType为blob时，axios拦截器会返回完整的response对象
+    let blob
+    if (res instanceof Blob) {
+      blob = res
+    } else if (res.data instanceof Blob) {
+      blob = res.data
+    } else {
+      // 如果不是blob，可能是错误响应，尝试从response中获取
+      blob = res
+    }
+
+    const url = window.URL.createObjectURL(blob)
+    const link = document.createElement('a')
+    link.href = url
+    link.download = `${row.versionName}_${row.versionCode}.json`
+    document.body.appendChild(link)
+    link.click()
+    document.body.removeChild(link)
+    window.URL.revokeObjectURL(url)
+
+    ElMessage.success('下载成功')
+  } catch (error) {
+    console.error('下载失败:', error)
+    ElMessage.error('下载失败')
+  }
+}
+
+</script>
+
+<style scoped>
+/* Element Plus 树形组件样式优化 */
+:deep(.el-tree) {
+  background-color: transparent;
+}
+
+:deep(.el-tree-node__content) {
+  height: 32px;
+  line-height: 32px;
+}
+
+:deep(.el-tree-node__label) {
+  font-size: 14px;
+}
+
+:deep(.el-scrollbar__view) {
+  padding: 0;
+}
+</style>

From 877f8f4fcfd466460cba852f3b23d29b1c09f6c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Fri, 1 Aug 2025 13:22:40 +0800
Subject: [PATCH 21/56] =?UTF-8?q?feat(autoCode):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A9=BA=E5=8C=85=E6=A3=80=E6=B5=8B=E4=B8=8E=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=B8=85=E7=90=86=E5=8A=9F=E8=83=BD=20(#2061)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(analyzer): 重构模块分析逻辑，增加空包检测

Co-authored-by: piexlMax(奇淼 <qimiaojiangjizhao@gmail.com>
---
 server/mcp/gva_auto_generate.go            | 368 +++++++++++++++++++--
 server/service/system/auto_code_package.go |  14 +
 web/package.json                           |   2 +-
 3 files changed, 362 insertions(+), 22 deletions(-)

diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
index cff7de7a0..e2a55b230 100644
--- a/server/mcp/gva_auto_generate.go
+++ b/server/mcp/gva_auto_generate.go
@@ -11,9 +11,11 @@ import (
 	"time"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	model "github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/service"
+	systemService "github.com/flipped-aurora/gin-vue-admin/server/service/system"
 	"github.com/mark3labs/mcp-go/mcp"
 	"gorm.io/gorm"
 )
@@ -507,16 +509,49 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 		return nil, fmt.Errorf("获取历史记录失败: %v", err)
 	}
 
-	// 扫描预设计的模块
-	predesignedModules, err := t.scanPredesignedModules()
-	if err != nil {
-		global.GVA_LOG.Warn("扫描预设计模块失败" + err.Error())
-		predesignedModules = []PredesignedModuleInfo{} // 确保不为nil
-	}
-
-	// 转换包信息
+	// 转换包信息并检查空文件夹
 	var moduleInfos []ModuleInfo
+	var validPackages []model.SysAutoCodePackage
+	var emptyPackageIDs []uint
+	var emptyPackageNames []string
+	
 	for _, pkg := range packages {
+		// 检查包对应的文件夹是否为空
+		isEmpty, err := t.isPackageFolderEmpty(pkg.PackageName, pkg.Template)
+		if err != nil {
+			global.GVA_LOG.Warn(fmt.Sprintf("检查包 %s 文件夹失败: %v", pkg.PackageName, err))
+			// 如果检查失败，仍然保留该包
+			validPackages = append(validPackages, pkg)
+			continue
+		}
+		
+		if isEmpty {
+			// 记录需要删除的包ID和包名
+			emptyPackageIDs = append(emptyPackageIDs, pkg.ID)
+			emptyPackageNames = append(emptyPackageNames, pkg.PackageName)
+			global.GVA_LOG.Info(fmt.Sprintf("发现空包文件夹: %s，将删除数据库记录和文件夹", pkg.PackageName))
+			
+			// 删除空文件夹
+			if err := t.removeEmptyPackageFolder(pkg.PackageName, pkg.Template); err != nil {
+				global.GVA_LOG.Warn(fmt.Sprintf("删除空包文件夹 %s 失败: %v", pkg.PackageName, err))
+			}
+		} else {
+			// 文件夹不为空，保留该包
+			validPackages = append(validPackages, pkg)
+		}
+	}
+	
+	// 批量删除空包的数据库记录
+	if len(emptyPackageIDs) > 0 {
+		if err := global.GVA_DB.Where("id IN ?", emptyPackageIDs).Delete(&model.SysAutoCodePackage{}).Error; err != nil {
+			global.GVA_LOG.Warn(fmt.Sprintf("删除空包数据库记录失败: %v", err))
+		} else {
+			global.GVA_LOG.Info(fmt.Sprintf("成功删除 %d 个空包的数据库记录", len(emptyPackageIDs)))
+		}
+	}
+	
+	// 转换有效的包信息
+	for _, pkg := range validPackages {
 		moduleInfos = append(moduleInfos, ModuleInfo{
 			ID:          pkg.ID,
 			PackageName: pkg.PackageName,
@@ -527,27 +562,150 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 		})
 	}
 
-	// 转换历史记录
+	// 删除与空包相关的历史记录
+	var emptyHistoryIDs []uint
+	if len(emptyPackageNames) > 0 {
+		for _, history := range histories {
+			for _, emptyPackageName := range emptyPackageNames {
+				if history.Package == emptyPackageName {
+					emptyHistoryIDs = append(emptyHistoryIDs, history.ID)
+					break
+				}
+			}
+		}
+		
+		// 清理相关的API和菜单记录
+		if len(emptyHistoryIDs) > 0 {
+			if err := t.cleanupRelatedApiAndMenus(emptyHistoryIDs); err != nil {
+				global.GVA_LOG.Warn(fmt.Sprintf("清理空包相关API和菜单失败: %v", err))
+			}
+		}
+		
+		// 批量删除相关历史记录
+		if len(emptyHistoryIDs) > 0 {
+			if err := global.GVA_DB.Where("id IN ?", emptyHistoryIDs).Delete(&model.SysAutoCodeHistory{}).Error; err != nil {
+				global.GVA_LOG.Warn(fmt.Sprintf("删除空包相关历史记录失败: %v", err))
+			} else {
+				global.GVA_LOG.Info(fmt.Sprintf("成功删除 %d 个空包相关的历史记录", len(emptyHistoryIDs)))
+			}
+		}
+	}
+	
+	// 创建有效包名的映射，用于快速查找
+	validPackageNames := make(map[string]bool)
+	for _, pkg := range validPackages {
+		validPackageNames[pkg.PackageName] = true
+	}
+	
+	// 收集需要删除的脏历史记录ID（包名不在有效包列表中的历史记录）
+	var dirtyHistoryIDs []uint
+	for _, history := range histories {
+		if !validPackageNames[history.Package] {
+			dirtyHistoryIDs = append(dirtyHistoryIDs, history.ID)
+		}
+	}
+	
+	// 删除脏历史记录
+	if len(dirtyHistoryIDs) > 0 {
+		// 清理相关的API和菜单记录
+		if err := t.cleanupRelatedApiAndMenus(dirtyHistoryIDs); err != nil {
+			global.GVA_LOG.Warn(fmt.Sprintf("清理脏历史记录相关API和菜单失败: %v", err))
+		}
+		
+		if err := global.GVA_DB.Where("id IN ?", dirtyHistoryIDs).Delete(&model.SysAutoCodeHistory{}).Error; err != nil {
+			global.GVA_LOG.Warn(fmt.Sprintf("删除脏历史记录失败: %v", err))
+		} else {
+			global.GVA_LOG.Info(fmt.Sprintf("成功删除 %d 个脏历史记录（包名不在有效包列表中）", len(dirtyHistoryIDs)))
+		}
+	}
+	
+	// 转换有效的历史记录（只保留包名存在于有效包列表中的历史记录）
 	var historyInfos []HistoryInfo
 	for _, history := range histories {
-		historyInfos = append(historyInfos, HistoryInfo{
-			ID:           history.ID,
-			StructName:   history.StructName,
-			TableName:    history.TableName(),
-			PackageName:  history.Package,
-			BusinessDB:   history.BusinessDB,
-			Description:  history.Description,
-			Abbreviation: history.Abbreviation,
-			CreatedAt:    history.CreatedAt.Format("2006-01-02 15:04:05"),
-		})
+		// 只保留包名存在于有效包列表中的历史记录
+		if validPackageNames[history.Package] {
+			historyInfos = append(historyInfos, HistoryInfo{
+				ID:           history.ID,
+				StructName:   history.StructName,
+				TableName:    history.TableName(),
+				PackageName:  history.Package,
+				BusinessDB:   history.BusinessDB,
+				Description:  history.Description,
+				Abbreviation: history.Abbreviation,
+				CreatedAt:    history.CreatedAt.Format("2006-01-02 15:04:05"),
+			})
+		}
 	}
 
+	// 扫描预设计的模块
+	allPredesignedModules, err := t.scanPredesignedModules()
+	if err != nil {
+		global.GVA_LOG.Warn("扫描预设计模块失败" + err.Error())
+		allPredesignedModules = []PredesignedModuleInfo{} // 确保不为nil
+	}
+	
+	// 过滤掉与已删除包相关的预设计模块
+	var predesignedModules []PredesignedModuleInfo
+	for _, module := range allPredesignedModules {
+		isDeleted := false
+		for _, emptyPackageName := range emptyPackageNames {
+			if module.PackageName == emptyPackageName {
+				isDeleted = true
+				break
+			}
+		}
+		
+		// 只保留未被删除包的预设计模块
+		if !isDeleted {
+			predesignedModules = append(predesignedModules, module)
+		}
+	}
+
+	// 构建分析结果消息
+	var message string
+	var deletionDetails []string
+	
+	// 收集删除信息
+	if len(emptyHistoryIDs) > 0 {
+		deletionDetails = append(deletionDetails, fmt.Sprintf("%d个空包相关历史记录", len(emptyHistoryIDs)))
+	}
+	if len(dirtyHistoryIDs) > 0 {
+		deletionDetails = append(deletionDetails, fmt.Sprintf("%d个脏历史记录", len(dirtyHistoryIDs)))
+	}
+	if len(allPredesignedModules) > len(predesignedModules) {
+		deletionDetails = append(deletionDetails, fmt.Sprintf("%d个相关预设计模块", len(allPredesignedModules)-len(predesignedModules)))
+	}
+	
+	if len(emptyPackageNames) > 0 || len(deletionDetails) > 0 {
+		var cleanupInfo string
+		if len(emptyPackageNames) > 0 {
+			cleanupInfo = fmt.Sprintf("检测到存在 %s 包但内容为空，我已经删除这些包的文件夹（包括model、api、service、router目录）和数据库记录", strings.Join(emptyPackageNames, "、"))
+		}
+		
+		deletionInfo := ""
+		if len(deletionDetails) > 0 {
+			if cleanupInfo != "" {
+				deletionInfo = fmt.Sprintf("，同时删除了%s", strings.Join(deletionDetails, "、"))
+			} else {
+				deletionInfo = fmt.Sprintf("检测到脏数据，已删除%s", strings.Join(deletionDetails, "、"))
+			}
+		}
+		
+		if cleanupInfo != "" {
+			message = fmt.Sprintf("分析完成：获取到 %d 个有效包、%d 个历史记录和 %d 个预设计模块。%s%s，如果需要使用这些包名，需要重新创建。请AI根据需求选择合适的包和模块", len(validPackages), len(historyInfos), len(predesignedModules), cleanupInfo, deletionInfo)
+		} else {
+			message = fmt.Sprintf("分析完成：获取到 %d 个有效包、%d 个历史记录和 %d 个预设计模块。%s。请AI根据需求选择合适的包和模块", len(validPackages), len(historyInfos), len(predesignedModules), deletionInfo)
+		}
+	} else {
+		message = fmt.Sprintf("分析完成：获取到 %d 个有效包、%d 个历史记录和 %d 个预设计模块，请AI根据需求选择合适的包和模块", len(validPackages), len(historyInfos), len(predesignedModules))
+	}
+	
 	// 构建分析结果
 	analysisResult := AnalysisResponse{
 		Packages:           moduleInfos,
 		History:            historyInfos,
 		PredesignedModules: predesignedModules,
-		Message:            fmt.Sprintf("分析完成：获取到 %d 个包、%d 个历史记录和 %d 个预设计模块，请AI根据需求选择合适的包和模块", len(packages), len(histories), len(predesignedModules)),
+		Message:            message,
 	}
 
 	resultJSON, err := json.MarshalIndent(analysisResult, "", "  ")
@@ -565,6 +723,8 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 
 请AI根据用户需求：%s%s
 
+%s
+
 分析现有的包、历史记录和预设计模块，然后构建ExecutionPlan结构体调用execute操作。
 
 **预设计模块说明**：
@@ -675,7 +835,13 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 12. 如果字段需要字典类型，请先使用 generate_dictionary_options 工具创建字典
 13. 字典创建成功后，再执行模块创建操作
 
-`, string(resultJSON), requirement, pluginDetectionMsg),
+`, string(resultJSON), requirement, pluginDetectionMsg, 
+			func() string {
+				if len(emptyPackageNames) > 0 {
+					return fmt.Sprintf("**重要提醒**：检测到 %s 包存在但内容为空，已自动删除相关文件夹和数据库记录。如果用户需求涉及这些包名，请设置 needCreatedPackage=true 重新创建。", strings.Join(emptyPackageNames, "、"))
+				}
+				return ""
+			}()),
 			},
 		},
 	}, nil
@@ -1315,3 +1481,163 @@ func (t *AutomationModuleAnalyzer) detectPluginIntent(requirement string) (sugge
 	// 默认返回package
 	return "package", false, "低"
 }
+
+// isPackageFolderEmpty 检查包对应的文件夹是否为空
+func (t *AutomationModuleAnalyzer) isPackageFolderEmpty(packageName, template string) (bool, error) {
+	// 根据模板类型确定基础路径
+	var basePath string
+	if template == "plugin" {
+		basePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", packageName)
+	} else {
+		// package 类型
+		basePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "model", packageName)
+	}
+	
+	// 检查文件夹是否存在
+	if _, err := os.Stat(basePath); os.IsNotExist(err) {
+		// 文件夹不存在，认为是空的
+		return true, nil
+	} else if err != nil {
+		return false, fmt.Errorf("检查文件夹状态失败: %v", err)
+	}
+	
+	// 读取文件夹内容
+	entries, err := os.ReadDir(basePath)
+	if err != nil {
+		return false, fmt.Errorf("读取文件夹内容失败: %v", err)
+	}
+	
+	// 检查目录下是否有 .go 文件
+	hasGoFiles := false
+	for _, entry := range entries {
+		name := entry.Name()
+		// 跳过隐藏文件、.DS_Store 等系统文件
+		if strings.HasPrefix(name, ".") {
+			continue
+		}
+		// 如果是目录，递归检查子目录中的 .go 文件
+		if entry.IsDir() {
+			subPath := filepath.Join(basePath, name)
+			subEntries, err := os.ReadDir(subPath)
+			if err != nil {
+				continue
+			}
+			for _, subEntry := range subEntries {
+				if !subEntry.IsDir() && strings.HasSuffix(subEntry.Name(), ".go") {
+					hasGoFiles = true
+					break
+				}
+			}
+			if hasGoFiles {
+				break
+			}
+		} else if strings.HasSuffix(name, ".go") {
+			// 如果是 .go 文件
+			hasGoFiles = true
+			break
+		}
+	}
+	
+	// 如果没有 .go 文件，认为是空包
+	return !hasGoFiles, nil
+}
+
+// removeEmptyPackageFolder 删除空的包文件夹
+func (t *AutomationModuleAnalyzer) removeEmptyPackageFolder(packageName, template string) error {
+	var errors []string
+	
+	if template == "plugin" {
+		// plugin 类型只删除 plugin 目录下的文件夹
+		basePath := filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", packageName)
+		if err := t.removeDirectoryIfExists(basePath); err != nil {
+			errors = append(errors, fmt.Sprintf("删除plugin文件夹失败: %v", err))
+		}
+	} else {
+		// package 类型需要删除多个目录下的相关文件
+		paths := []string{
+			filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "model", packageName),
+			filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "api", "v1", packageName),
+			filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "service", packageName),
+			filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "router", packageName),
+		}
+		
+		for _, path := range paths {
+			if err := t.removeDirectoryIfExists(path); err != nil {
+				errors = append(errors, fmt.Sprintf("删除%s失败: %v", path, err))
+			}
+		}
+	}
+	
+	if len(errors) > 0 {
+		return fmt.Errorf("删除过程中出现错误: %s", strings.Join(errors, "; "))
+	}
+	
+	return nil
+}
+
+// removeDirectoryIfExists 删除目录（如果存在）
+func (t *AutomationModuleAnalyzer) removeDirectoryIfExists(dirPath string) error {
+	// 检查文件夹是否存在
+	if _, err := os.Stat(dirPath); os.IsNotExist(err) {
+		// 文件夹不存在，无需删除
+		return nil
+	} else if err != nil {
+		return fmt.Errorf("检查文件夹状态失败: %v", err)
+	}
+	
+	// 删除文件夹及其所有内容
+	if err := os.RemoveAll(dirPath); err != nil {
+		return fmt.Errorf("删除文件夹失败: %v", err)
+	}
+	
+	global.GVA_LOG.Info(fmt.Sprintf("成功删除目录: %s", dirPath))
+	return nil
+}
+
+// cleanupRelatedApiAndMenus 清理与删除的模块相关的API和菜单记录
+func (t *AutomationModuleAnalyzer) cleanupRelatedApiAndMenus(historyIDs []uint) error {
+	if len(historyIDs) == 0 {
+		return nil
+	}
+	
+	// 获取要删除的历史记录信息
+	var histories []model.SysAutoCodeHistory
+	if err := global.GVA_DB.Where("id IN ?", historyIDs).Find(&histories).Error; err != nil {
+		return fmt.Errorf("获取历史记录失败: %v", err)
+	}
+	
+	var deletedApiCount, deletedMenuCount int
+	
+	for _, history := range histories {
+		// 删除相关的API记录（使用存储的API IDs）
+			if len(history.ApiIDs) > 0 {
+				ids := make([]int, 0, len(history.ApiIDs))
+				for _, id := range history.ApiIDs {
+					ids = append(ids, int(id))
+				}
+				idsReq := common.IdsReq{Ids: ids}
+				if err := systemService.ApiServiceApp.DeleteApisByIds(idsReq); err != nil {
+					global.GVA_LOG.Warn(fmt.Sprintf("删除API记录失败 (模块: %s): %v", history.StructName, err))
+				} else {
+					deletedApiCount += len(ids)
+					global.GVA_LOG.Info(fmt.Sprintf("成功删除API记录 (模块: %s, 数量: %d)", history.StructName, len(ids)))
+				}
+			}
+		
+		// 删除相关的菜单记录（使用存储的菜单ID）
+		if history.MenuID != 0 {
+			if err := systemService.BaseMenuServiceApp.DeleteBaseMenu(int(history.MenuID)); err != nil {
+				global.GVA_LOG.Warn(fmt.Sprintf("删除菜单记录失败 (模块: %s, 菜单ID: %d): %v", history.StructName, history.MenuID, err))
+			} else {
+				deletedMenuCount++
+				global.GVA_LOG.Info(fmt.Sprintf("成功删除菜单记录 (模块: %s, 菜单ID: %d)", history.StructName, history.MenuID))
+			}
+		}
+	}
+	
+	if deletedApiCount > 0 || deletedMenuCount > 0 {
+		global.GVA_LOG.Info(fmt.Sprintf("清理完成：删除了 %d 个API记录和 %d 个菜单记录", deletedApiCount, deletedMenuCount))
+	}
+	
+	return nil
+}
diff --git a/server/service/system/auto_code_package.go b/server/service/system/auto_code_package.go
index 4e184b1cc..e8abcb795 100644
--- a/server/service/system/auto_code_package.go
+++ b/server/service/system/auto_code_package.go
@@ -114,6 +114,20 @@ func (s *autoCodePackage) Delete(ctx context.Context, info common.GetById) error
 	return nil
 }
 
+// DeleteByNames
+// @author: [piexlmax](https://github.com/piexlmax)
+// @author: [SliverHorn](https://github.com/SliverHorn)
+func (s *autoCodePackage) DeleteByNames(ctx context.Context, names []string) error {
+	if len(names) == 0 {
+		return nil
+	}
+	err := global.GVA_DB.WithContext(ctx).Where("package_name IN ?", names).Delete(&model.SysAutoCodePackage{}).Error
+	if err != nil {
+		return errors.Wrap(err, "删除失败!")
+	}
+	return nil
+}
+
 // All 获取所有包
 // @author: [piexlmax](https://github.com/piexlmax)
 // @author: [SliverHorn](https://github.com/SliverHorn)
diff --git a/web/package.json b/web/package.json
index 925988dec..3e2bb3e24 100644
--- a/web/package.json
+++ b/web/package.json
@@ -42,7 +42,7 @@
     "tailwindcss": "^3.4.10",
     "universal-cookie": "^7",
     "vform3-builds": "^3.0.10",
-    "vite-auto-import-svg": "^1.5.0",
+    "vite-auto-import-svg": "^1.6.0",
     "vue": "^3.5.7",
     "vue-cropper": "^1.1.4",
     "vue-echarts": "^7.0.3",

From 9260111312ecc477ad7f043d2c52af3c8858a61d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Fri, 1 Aug 2025 13:31:50 +0800
Subject: [PATCH 22/56] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a5480bd02..d5ca7e243 100644
--- a/README.md
+++ b/README.md
@@ -378,7 +378,7 @@ fmt.Println(decodeBytes, err)
 
 如果你觉得这个项目对你有帮助，你可以请作者喝饮料 :tropical_drink: [点我](https://www.gin-vue-admin.com/coffee/index.html)
 
-## 10. 商用注意事项
+## 10. 注意事项
 
-请严格遵守Apache 2.0协议并保留作品声明，商业用途请务必[获取授权](https://www.gin-vue-admin.com/empower/)  
-未授权商用将依法追究法律责任
+请严格遵守Apache 2.0协议并保留作品声明，去除版权信息请务必[获取授权](https://www.gin-vue-admin.com/empower/)  
+未授权去除版权信息将依法追究法律责任

From 31e6316916ab7e59bd42a902761a004785aae07b Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Sun, 3 Aug 2025 23:58:47 +0800
Subject: [PATCH 23/56] =?UTF-8?q?feat(mcp):=20=E5=AE=9E=E7=8E=B0=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E5=88=86=E6=9E=90=E5=B7=A5=E5=85=B7=E5=B9=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=89=B9=E9=87=8F=E5=88=9B=E5=BB=BA=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 新增requirement_analyzer工具，用于将用户需求转换为结构化提示词
2. 修改gva_auto_generate工具支持批量创建多个模块
3. 更新文档示例和schema以反映批量创建功能
4. 优化执行计划验证逻辑，支持模块数组校验
5. 改进字典创建流程，避免重复创建相同字典类型
---
 server/mcp/execution_plan_schema.md | 357 +++++++++++++-------
 server/mcp/gag_usage_example.md     | 152 ++++++---
 server/mcp/gva_auto_generate.go     | 494 +++++++++++++++-------------
 server/mcp/requirement_analyzer.go  | 139 ++++++++
 4 files changed, 752 insertions(+), 390 deletions(-)
 create mode 100644 server/mcp/requirement_analyzer.go

diff --git a/server/mcp/execution_plan_schema.md b/server/mcp/execution_plan_schema.md
index 6a627f3d3..05dc72c4d 100644
--- a/server/mcp/execution_plan_schema.md
+++ b/server/mcp/execution_plan_schema.md
@@ -8,12 +8,11 @@ ExecutionPlan 是用于自动化模块创建的执行计划结构体，包含了
 ```go
 type ExecutionPlan struct {
     PackageName        string                           `json:"packageName"`        // 包名，如："user", "order", "product"
-    ModuleName         string                           `json:"moduleName"`         // 模块名，通常与结构体名相同
     PackageType        string                           `json:"packageType"`        // "plugin" 或 "package"
     NeedCreatedPackage bool                             `json:"needCreatedPackage"` // 是否需要创建包
     NeedCreatedModules bool                             `json:"needCreatedModules"` // 是否需要创建模块
     PackageInfo        *request.SysAutoCodePackageCreate `json:"packageInfo,omitempty"`  // 包信息（当NeedCreatedPackage=true时必需）
-    ModulesInfo        *request.AutoCode                `json:"modulesInfo,omitempty"` // 模块信息（当NeedCreatedModules=true时必需）
+    ModulesInfo        []*request.AutoCode              `json:"modulesInfo,omitempty"` // 模块信息数组（当NeedCreatedModules=true时必需，支持批量创建）
     Paths              map[string]string                `json:"paths,omitempty"`       // 路径信息
 }
 ```
@@ -94,12 +93,11 @@ type AutoCodeField struct {
 
 ## 使用示例
 
-### 示例1：创建新包和模块
+### 示例1：创建新包和批量创建多个模块
 
 ```json
 {
   "packageName": "user",
-  "moduleName": "User",
   "packageType": "package",
   "needCreatedPackage": true,
   "needCreatedModules": true,
@@ -109,129 +107,256 @@ type AutoCodeField struct {
     "template": "package",
     "packageName": "user"
   },
-  "modulesInfo": {
-    "package": "user",
-    "tableName": "sys_users",
-    "businessDB": "",
-    "structName": "User",
-    "packageName": "user",
-    "description": "用户",
-    "abbreviation": "user",
-    "humpPackageName": "user",
-    "gvaModel": true,
-    "autoMigrate": true,
-    "autoCreateResource": true,
-    "autoCreateApiToSql": true,
-    "autoCreateMenuToSql": true,
-    "autoCreateBtnAuth": true,
-    "onlyTemplate": false,
-    "isTree": false,
-    "treeJson": "",
-    "isAdd": true,
-    "generateWeb": true,
-    "generateServer": true,
-    "fields": [
-      {
-        "fieldName": "Username",
-        "fieldDesc": "用户名",
-        "fieldType": "string",
-        "fieldJson": "username",
-        "dataTypeLong": "50",
-        "comment": "用户名",
-        "columnName": "username",
-        "fieldSearchType": "LIKE",
-        "fieldSearchHide": false,
-        "dictType": "",
-        "form": true,
-        "table": true,
-        "desc": true,
-        "excel": true,
-        "require": true,
-        "defaultValue": "",
-        "errorText": "请输入用户名",
-        "clearable": true,
-        "sort": false,
-        "primaryKey": false,
-        "dataSource": null,
-        "checkDataSource": false,
-        "fieldIndexType": ""
-      },
-      {
-        "fieldName": "Email",
-        "fieldDesc": "邮箱",
-        "fieldType": "string",
-        "fieldJson": "email",
-        "dataTypeLong": "100",
-        "comment": "邮箱地址",
-        "columnName": "email",
-        "fieldSearchType": "EQ",
-        "fieldSearchHide": false,
-        "dictType": "",
-        "form": true,
-        "table": true,
-        "desc": true,
-        "excel": true,
-        "require": true,
-        "defaultValue": "",
-        "errorText": "请输入邮箱",
-        "clearable": true,
-        "sort": false,
-        "primaryKey": false,
-        "dataSource": null,
-        "checkDataSource": false,
-        "fieldIndexType": "index"
-      }
-    ]
-  }
+  "modulesInfo": [
+    {
+      "package": "user",
+      "tableName": "sys_users",
+      "businessDB": "",
+      "structName": "User",
+      "packageName": "user",
+      "description": "用户",
+      "abbreviation": "user",
+      "humpPackageName": "user",
+      "gvaModel": true,
+      "autoMigrate": true,
+      "autoCreateResource": true,
+      "autoCreateApiToSql": true,
+      "autoCreateMenuToSql": true,
+      "autoCreateBtnAuth": true,
+      "onlyTemplate": false,
+      "isTree": false,
+      "treeJson": "",
+      "isAdd": true,
+      "generateWeb": true,
+      "generateServer": true,
+      "fields": [
+        {
+          "fieldName": "Username",
+          "fieldDesc": "用户名",
+          "fieldType": "string",
+          "fieldJson": "username",
+          "dataTypeLong": "50",
+          "comment": "用户名",
+          "columnName": "username",
+          "fieldSearchType": "LIKE",
+          "fieldSearchHide": false,
+          "dictType": "",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "excel": true,
+          "require": true,
+          "defaultValue": "",
+          "errorText": "请输入用户名",
+          "clearable": true,
+          "sort": false,
+          "primaryKey": false,
+          "dataSource": null,
+          "checkDataSource": false,
+          "fieldIndexType": ""
+        },
+        {
+          "fieldName": "Email",
+          "fieldDesc": "邮箱",
+          "fieldType": "string",
+          "fieldJson": "email",
+          "dataTypeLong": "100",
+          "comment": "邮箱地址",
+          "columnName": "email",
+          "fieldSearchType": "EQ",
+          "fieldSearchHide": false,
+          "dictType": "",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "excel": true,
+          "require": true,
+          "defaultValue": "",
+          "errorText": "请输入邮箱",
+          "clearable": true,
+          "sort": false,
+          "primaryKey": false,
+          "dataSource": null,
+          "checkDataSource": false,
+          "fieldIndexType": "index"
+        }
+      ]
+    },
+    {
+      "package": "user",
+      "tableName": "user_profiles",
+      "businessDB": "",
+      "structName": "UserProfile",
+      "packageName": "user",
+      "description": "用户档案",
+      "abbreviation": "userProfile",
+      "humpPackageName": "user",
+      "gvaModel": true,
+      "autoMigrate": true,
+      "autoCreateResource": true,
+      "autoCreateApiToSql": true,
+      "autoCreateMenuToSql": true,
+      "autoCreateBtnAuth": true,
+      "onlyTemplate": false,
+      "isTree": false,
+      "treeJson": "",
+      "isAdd": true,
+      "generateWeb": true,
+      "generateServer": true,
+      "fields": [
+        {
+          "fieldName": "UserID",
+          "fieldDesc": "用户ID",
+          "fieldType": "int",
+          "fieldJson": "userId",
+          "dataTypeLong": "",
+          "comment": "关联用户ID",
+          "columnName": "user_id",
+          "fieldSearchType": "EQ",
+          "fieldSearchHide": false,
+          "dictType": "",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "excel": true,
+          "require": true,
+          "defaultValue": "",
+          "errorText": "请选择用户",
+          "clearable": true,
+          "sort": false,
+          "primaryKey": false,
+          "dataSource": null,
+          "checkDataSource": false,
+          "fieldIndexType": "index"
+        },
+        {
+          "fieldName": "Avatar",
+          "fieldDesc": "头像",
+          "fieldType": "string",
+          "fieldJson": "avatar",
+          "dataTypeLong": "255",
+          "comment": "用户头像URL",
+          "columnName": "avatar",
+          "fieldSearchType": "",
+          "fieldSearchHide": true,
+          "dictType": "",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "excel": false,
+          "require": false,
+          "defaultValue": "",
+          "errorText": "",
+          "clearable": true,
+          "sort": false,
+          "primaryKey": false,
+          "dataSource": null,
+          "checkDataSource": false,
+          "fieldIndexType": ""
+        }
+      ]
+    }
+  ]
 }
 ```
 
-### 示例2：仅在现有包中创建模块
+### 示例2：仅在现有包中批量创建多个模块
 
 ```json
 {
   "packageName": "system",
-  "moduleName": "Role",
   "packageType": "package",
   "needCreatedPackage": false,
   "needCreatedModules": true,
   "packageInfo": null,
-  "modulesInfo": {
-    "package": "system",
-    "tableName": "sys_roles",
-    "businessDB": "",
-    "structName": "Role",
-    "packageName": "system",
-    "description": "角色",
-    "abbreviation": "role",
-    "humpPackageName": "system",
-    "gvaModel": true,
-    "autoMigrate": true,
-    "autoCreateResource": true,
-    "autoCreateApiToSql": true,
-    "autoCreateMenuToSql": true,
-    "autoCreateBtnAuth": true,
-    "onlyTemplate": false,
-    "isTree": false,
-    "generateWeb": true,
-    "generateServer": true,
-    "fields": [
-      {
-        "fieldName": "RoleName",
-        "fieldDesc": "角色名称",
-        "fieldType": "string",
-        "fieldJson": "roleName",
-        "dataTypeLong": "50",
-        "comment": "角色名称",
-        "columnName": "role_name",
-        "fieldSearchType": "LIKE",
-        "form": true,
-        "table": true,
-        "desc": true,
-        "require": true
-      }
-    ]
-  }
+  "modulesInfo": [
+    {
+      "package": "system",
+      "tableName": "sys_roles",
+      "businessDB": "",
+      "structName": "Role",
+      "packageName": "system",
+      "description": "角色",
+      "abbreviation": "role",
+      "humpPackageName": "system",
+      "gvaModel": true,
+      "autoMigrate": true,
+      "autoCreateResource": true,
+      "autoCreateApiToSql": true,
+      "autoCreateMenuToSql": true,
+      "autoCreateBtnAuth": true,
+      "onlyTemplate": false,
+      "isTree": false,
+      "generateWeb": true,
+      "generateServer": true,
+      "fields": [
+        {
+          "fieldName": "RoleName",
+          "fieldDesc": "角色名称",
+          "fieldType": "string",
+          "fieldJson": "roleName",
+          "dataTypeLong": "50",
+          "comment": "角色名称",
+          "columnName": "role_name",
+          "fieldSearchType": "LIKE",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "require": true
+        }
+      ]
+    },
+    {
+      "package": "system",
+      "tableName": "sys_permissions",
+      "businessDB": "",
+      "structName": "Permission",
+      "packageName": "system",
+      "description": "权限",
+      "abbreviation": "permission",
+      "humpPackageName": "system",
+      "gvaModel": true,
+      "autoMigrate": true,
+      "autoCreateResource": true,
+      "autoCreateApiToSql": true,
+      "autoCreateMenuToSql": true,
+      "autoCreateBtnAuth": true,
+      "onlyTemplate": false,
+      "isTree": false,
+      "generateWeb": true,
+      "generateServer": true,
+      "fields": [
+        {
+          "fieldName": "PermissionName",
+          "fieldDesc": "权限名称",
+          "fieldType": "string",
+          "fieldJson": "permissionName",
+          "dataTypeLong": "100",
+          "comment": "权限名称",
+          "columnName": "permission_name",
+          "fieldSearchType": "LIKE",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "require": true
+        },
+        {
+          "fieldName": "PermissionCode",
+          "fieldDesc": "权限代码",
+          "fieldType": "string",
+          "fieldJson": "permissionCode",
+          "dataTypeLong": "50",
+          "comment": "权限代码",
+          "columnName": "permission_code",
+          "fieldSearchType": "=",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "require": true
+        }
+      ]
+    }
+  ]
 }
 ```
 
diff --git a/server/mcp/gag_usage_example.md b/server/mcp/gag_usage_example.md
index 4bbfa98a5..0b75d40fa 100644
--- a/server/mcp/gag_usage_example.md
+++ b/server/mcp/gag_usage_example.md
@@ -17,13 +17,12 @@
 }
 ```
 
-### 第二步：确认
+### 第二步：确认（支持批量创建多个模块）
 ```json
 {
   "action": "confirm",
   "executionPlan": {
     "packageName": "library",
-    "moduleName": "Book",
     "packageType": "package",
     "needCreatedPackage": true,
     "needCreatedModules": true,
@@ -33,55 +32,106 @@
       "template": "package",
       "packageName": "library"
     },
-    "modulesInfo": {
-      "package": "library",
-      "tableName": "library_books",
-      "businessDB": "",
-      "structName": "Book",
-      "packageName": "library",
-      "description": "图书信息",
-      "abbreviation": "book",
-      "humpPackageName": "Library",
-      "gvaModel": true,
-      "autoMigrate": true,
-      "autoCreateResource": true,
-      "autoCreateApiToSql": true,
-      "autoCreateMenuToSql": true,
-      "autoCreateBtnAuth": true,
-      "onlyTemplate": false,
-      "isTree": false,
-      "treeJson": "",
-      "isAdd": false,
-      "generateWeb": true,
-      "generateServer": true,
-      "fields": [
-        {
-          "fieldName": "title",
-          "fieldDesc": "书名",
-          "fieldType": "string",
-          "fieldJson": "title",
-          "dataTypeLong": "255",
-          "comment": "书名",
-          "columnName": "title",
-          "fieldSearchType": "LIKE",
-          "fieldSearchHide": false,
-          "dictType": "",
-          "form": true,
-          "table": true,
-          "desc": true,
-          "excel": true,
-          "require": true,
-          "defaultValue": "",
-          "errorText": "请输入书名",
-          "clearable": true,
-          "sort": false,
-          "primaryKey": false,
-          "dataSource": {},
-          "checkDataSource": false,
-          "fieldIndexType": ""
-        }
-      ]
-    }
+    "modulesInfo": [
+      {
+        "package": "library",
+        "tableName": "library_books",
+        "businessDB": "",
+        "structName": "Book",
+        "packageName": "library",
+        "description": "图书信息",
+        "abbreviation": "book",
+        "humpPackageName": "Library",
+        "gvaModel": true,
+        "autoMigrate": true,
+        "autoCreateResource": true,
+        "autoCreateApiToSql": true,
+        "autoCreateMenuToSql": true,
+        "autoCreateBtnAuth": true,
+        "onlyTemplate": false,
+        "isTree": false,
+        "treeJson": "",
+        "isAdd": false,
+        "generateWeb": true,
+        "generateServer": true,
+        "fields": [
+          {
+            "fieldName": "title",
+            "fieldDesc": "书名",
+            "fieldType": "string",
+            "fieldJson": "title",
+            "dataTypeLong": "255",
+            "comment": "书名",
+            "columnName": "title",
+            "fieldSearchType": "LIKE",
+            "fieldSearchHide": false,
+            "dictType": "",
+            "form": true,
+            "table": true,
+            "desc": true,
+            "excel": true,
+            "require": true,
+            "defaultValue": "",
+            "errorText": "请输入书名",
+            "clearable": true,
+            "sort": false,
+            "primaryKey": false,
+            "dataSource": {},
+            "checkDataSource": false,
+            "fieldIndexType": ""
+          }
+        ]
+      },
+      {
+        "package": "library",
+        "tableName": "library_authors",
+        "businessDB": "",
+        "structName": "Author",
+        "packageName": "library",
+        "description": "作者信息",
+        "abbreviation": "author",
+        "humpPackageName": "Library",
+        "gvaModel": true,
+        "autoMigrate": true,
+        "autoCreateResource": true,
+        "autoCreateApiToSql": true,
+        "autoCreateMenuToSql": true,
+        "autoCreateBtnAuth": true,
+        "onlyTemplate": false,
+        "isTree": false,
+        "treeJson": "",
+        "isAdd": false,
+        "generateWeb": true,
+        "generateServer": true,
+        "fields": [
+          {
+            "fieldName": "name",
+            "fieldDesc": "作者姓名",
+            "fieldType": "string",
+            "fieldJson": "name",
+            "dataTypeLong": "100",
+            "comment": "作者姓名",
+            "columnName": "name",
+            "fieldSearchType": "LIKE",
+            "fieldSearchHide": false,
+            "dictType": "",
+            "form": true,
+            "table": true,
+            "desc": true,
+            "excel": true,
+            "require": true,
+            "defaultValue": "",
+            "errorText": "请输入作者姓名",
+            "clearable": true,
+            "sort": false,
+            "primaryKey": false,
+            "dataSource": {},
+            "checkDataSource": false,
+            "fieldIndexType": ""
+          }
+        ]
+      }
+    ]
   }
 }
 ```
diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
index e2a55b230..1de0329e6 100644
--- a/server/mcp/gva_auto_generate.go
+++ b/server/mcp/gva_auto_generate.go
@@ -67,15 +67,14 @@ type AnalysisResponse struct {
 	Message            string                  `json:"message"`
 }
 
-// ExecutionPlan 执行计划
+// ExecutionPlan 执行计划 - 支持批量创建
 type ExecutionPlan struct {
 	PackageName        string                            `json:"packageName"`
-	ModuleName         string                            `json:"moduleName"`
 	PackageType        string                            `json:"packageType"` // "plugin" 或 "package"
 	NeedCreatedPackage bool                              `json:"needCreatedPackage"`
 	NeedCreatedModules bool                              `json:"needCreatedModules"`
 	PackageInfo        *request.SysAutoCodePackageCreate `json:"packageInfo,omitempty"`
-	ModulesInfo        *request.AutoCode                 `json:"modulesInfo,omitempty"`
+	ModulesInfo        []*request.AutoCode               `json:"modulesInfo,omitempty"` // 改为数组支持多个模块
 	Paths              map[string]string                 `json:"paths,omitempty"`
 }
 
@@ -111,12 +110,18 @@ type ConfirmationResponse struct {
 // New 返回工具注册信息
 func (t *AutomationModuleAnalyzer) New() mcp.Tool {
 	return mcp.NewTool("gva_auto_generate",
-		mcp.WithDescription(`**🚀 最高优先级工具：当用户需要创建模块、包、完整功能时，必须优先使用此工具！**
+		mcp.WithDescription(`**🔧 核心执行工具：接收requirement_analyzer分析结果，执行具体的模块创建操作**
 
-**优先级说明：**
-- **最高优先级**：创建完整模块、包、功能模块
-- **关键词触发**：模块、包、完整、整套、全套、功能、管理系统等
-- **适用场景**：用户说"创建订单管理模块"、"创建用户管理功能"、"创建完整的商品管理"等
+**工作流位置：**
+- **第二优先级**：在requirement_analyzer之后使用
+- **接收输入**：来自requirement_analyzer的1xxx2xxx格式分析结果
+- **执行操作**：根据分析结果创建完整模块、包、功能模块
+
+**批量创建功能：**
+- 支持在单个ExecutionPlan中创建多个模块
+- modulesInfo字段为数组，可包含多个模块配置
+- 一次性处理多个模块的创建和字典生成
+- 与requirement_analyzer配合实现完整工作流
 
 分步骤分析自动化模块：1) 分析现有模块信息供AI选择 2) 请求用户确认 3) 根据确认结果执行创建操作
 
@@ -125,15 +130,14 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
 - 如果字典不存在，会自动创建对应的字典及默认的字典详情项
 - 字典创建包括：字典主表记录和默认的选项值（选项1、选项2等）
 
-**与其他工具的关系：**
-- 此工具创建完整模块后，会自动提示相关API和菜单创建建议
-- 如果用户只需要单个API或菜单，可以使用 smart_assistant 工具
-- create_api 和 create_menu 工具仅用于数据库记录创建
+**推荐工作流：**
+1. 用户提出需求 → requirement_analyzer（最高优先级）
+2. AI分析需求为1xxx2xxx格式 → gva_auto_generate（执行创建）
+3. 创建完成后，根据需要使用其他辅助工具
 
-重要：ExecutionPlan结构体格式要求：
+重要：ExecutionPlan结构体格式要求（支持批量创建）：
 {
   "packageName": "包名(string)",
-  "moduleName": "模块名(string)", 
   "packageType": "package或plugin(string)",
   "needCreatedPackage": "是否需要创建包(bool)",
   "needCreatedModules": "是否需要创建模块(bool)",
@@ -143,7 +147,7 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
     "template": "package或plugin(string)",
     "packageName": "包名(string)"
   },
-  "modulesInfo": {
+  "modulesInfo": [{
     "package": "包名(string)",
     "tableName": "数据库表名(string)",
     "businessDB": "业务数据库(string)",
@@ -189,7 +193,13 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
       "checkDataSource": "检查数据源(bool)",
       "fieldIndexType": "索引类型(string)"
     }]
-  }
+  }, {
+    "package": "包名(string)",
+    "tableName": "第二个模块的表名(string)",
+    "structName": "第二个模块的结构体名(string)",
+    "description": "第二个模块的描述(string)",
+    "...": "更多模块配置..."
+  }]
 }
 
 注意：
@@ -207,7 +217,7 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
    - 为无法识别的字典类型提供通用默认选项`),
 		mcp.WithString("action",
 			mcp.Required(),
-			mcp.Description("执行操作：'analyze' 分析现有模块信息，'confirm' 请求用户确认创建，'execute' 执行创建操作"),
+			mcp.Description("执行操作：'analyze' 分析现有模块信息，'confirm' 请求用户确认创建，'execute' 执行创建操作（支持批量创建多个模块）"),
 		),
 		mcp.WithString("requirement",
 			mcp.Description("用户需求描述（action=analyze时必需）"),
@@ -514,7 +524,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 	var validPackages []model.SysAutoCodePackage
 	var emptyPackageIDs []uint
 	var emptyPackageNames []string
-	
+
 	for _, pkg := range packages {
 		// 检查包对应的文件夹是否为空
 		isEmpty, err := t.isPackageFolderEmpty(pkg.PackageName, pkg.Template)
@@ -524,13 +534,13 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 			validPackages = append(validPackages, pkg)
 			continue
 		}
-		
+
 		if isEmpty {
 			// 记录需要删除的包ID和包名
 			emptyPackageIDs = append(emptyPackageIDs, pkg.ID)
 			emptyPackageNames = append(emptyPackageNames, pkg.PackageName)
 			global.GVA_LOG.Info(fmt.Sprintf("发现空包文件夹: %s，将删除数据库记录和文件夹", pkg.PackageName))
-			
+
 			// 删除空文件夹
 			if err := t.removeEmptyPackageFolder(pkg.PackageName, pkg.Template); err != nil {
 				global.GVA_LOG.Warn(fmt.Sprintf("删除空包文件夹 %s 失败: %v", pkg.PackageName, err))
@@ -540,7 +550,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 			validPackages = append(validPackages, pkg)
 		}
 	}
-	
+
 	// 批量删除空包的数据库记录
 	if len(emptyPackageIDs) > 0 {
 		if err := global.GVA_DB.Where("id IN ?", emptyPackageIDs).Delete(&model.SysAutoCodePackage{}).Error; err != nil {
@@ -549,7 +559,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 			global.GVA_LOG.Info(fmt.Sprintf("成功删除 %d 个空包的数据库记录", len(emptyPackageIDs)))
 		}
 	}
-	
+
 	// 转换有效的包信息
 	for _, pkg := range validPackages {
 		moduleInfos = append(moduleInfos, ModuleInfo{
@@ -573,14 +583,14 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 				}
 			}
 		}
-		
+
 		// 清理相关的API和菜单记录
 		if len(emptyHistoryIDs) > 0 {
 			if err := t.cleanupRelatedApiAndMenus(emptyHistoryIDs); err != nil {
 				global.GVA_LOG.Warn(fmt.Sprintf("清理空包相关API和菜单失败: %v", err))
 			}
 		}
-		
+
 		// 批量删除相关历史记录
 		if len(emptyHistoryIDs) > 0 {
 			if err := global.GVA_DB.Where("id IN ?", emptyHistoryIDs).Delete(&model.SysAutoCodeHistory{}).Error; err != nil {
@@ -590,13 +600,13 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 			}
 		}
 	}
-	
+
 	// 创建有效包名的映射，用于快速查找
 	validPackageNames := make(map[string]bool)
 	for _, pkg := range validPackages {
 		validPackageNames[pkg.PackageName] = true
 	}
-	
+
 	// 收集需要删除的脏历史记录ID（包名不在有效包列表中的历史记录）
 	var dirtyHistoryIDs []uint
 	for _, history := range histories {
@@ -604,21 +614,21 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 			dirtyHistoryIDs = append(dirtyHistoryIDs, history.ID)
 		}
 	}
-	
+
 	// 删除脏历史记录
 	if len(dirtyHistoryIDs) > 0 {
 		// 清理相关的API和菜单记录
 		if err := t.cleanupRelatedApiAndMenus(dirtyHistoryIDs); err != nil {
 			global.GVA_LOG.Warn(fmt.Sprintf("清理脏历史记录相关API和菜单失败: %v", err))
 		}
-		
+
 		if err := global.GVA_DB.Where("id IN ?", dirtyHistoryIDs).Delete(&model.SysAutoCodeHistory{}).Error; err != nil {
 			global.GVA_LOG.Warn(fmt.Sprintf("删除脏历史记录失败: %v", err))
 		} else {
 			global.GVA_LOG.Info(fmt.Sprintf("成功删除 %d 个脏历史记录（包名不在有效包列表中）", len(dirtyHistoryIDs)))
 		}
 	}
-	
+
 	// 转换有效的历史记录（只保留包名存在于有效包列表中的历史记录）
 	var historyInfos []HistoryInfo
 	for _, history := range histories {
@@ -643,7 +653,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 		global.GVA_LOG.Warn("扫描预设计模块失败" + err.Error())
 		allPredesignedModules = []PredesignedModuleInfo{} // 确保不为nil
 	}
-	
+
 	// 过滤掉与已删除包相关的预设计模块
 	var predesignedModules []PredesignedModuleInfo
 	for _, module := range allPredesignedModules {
@@ -654,7 +664,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 				break
 			}
 		}
-		
+
 		// 只保留未被删除包的预设计模块
 		if !isDeleted {
 			predesignedModules = append(predesignedModules, module)
@@ -664,7 +674,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 	// 构建分析结果消息
 	var message string
 	var deletionDetails []string
-	
+
 	// 收集删除信息
 	if len(emptyHistoryIDs) > 0 {
 		deletionDetails = append(deletionDetails, fmt.Sprintf("%d个空包相关历史记录", len(emptyHistoryIDs)))
@@ -675,13 +685,13 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 	if len(allPredesignedModules) > len(predesignedModules) {
 		deletionDetails = append(deletionDetails, fmt.Sprintf("%d个相关预设计模块", len(allPredesignedModules)-len(predesignedModules)))
 	}
-	
+
 	if len(emptyPackageNames) > 0 || len(deletionDetails) > 0 {
 		var cleanupInfo string
 		if len(emptyPackageNames) > 0 {
 			cleanupInfo = fmt.Sprintf("检测到存在 %s 包但内容为空，我已经删除这些包的文件夹（包括model、api、service、router目录）和数据库记录", strings.Join(emptyPackageNames, "、"))
 		}
-		
+
 		deletionInfo := ""
 		if len(deletionDetails) > 0 {
 			if cleanupInfo != "" {
@@ -690,7 +700,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 				deletionInfo = fmt.Sprintf("检测到脏数据，已删除%s", strings.Join(deletionDetails, "、"))
 			}
 		}
-		
+
 		if cleanupInfo != "" {
 			message = fmt.Sprintf("分析完成：获取到 %d 个有效包、%d 个历史记录和 %d 个预设计模块。%s%s，如果需要使用这些包名，需要重新创建。请AI根据需求选择合适的包和模块", len(validPackages), len(historyInfos), len(predesignedModules), cleanupInfo, deletionInfo)
 		} else {
@@ -699,7 +709,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 	} else {
 		message = fmt.Sprintf("分析完成：获取到 %d 个有效包、%d 个历史记录和 %d 个预设计模块，请AI根据需求选择合适的包和模块", len(validPackages), len(historyInfos), len(predesignedModules))
 	}
-	
+
 	// 构建分析结果
 	analysisResult := AnalysisResponse{
 		Packages:           moduleInfos,
@@ -748,10 +758,9 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
   }
 - 请在创建模块之前先创建所需的字典选项
 
-重要提醒：ExecutionPlan必须严格按照以下格式：
+重要提醒：ExecutionPlan必须严格按照以下格式（支持批量创建多个模块）：
 {
   "packageName": "包名",
-  "moduleName": "模块名",
   "packageType": "package或plugin", // 当用户提到插件时必须是"plugin"
   "needCreatedPackage": true/false,
   "needCreatedModules": true/false,
@@ -761,7 +770,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
     "template": "package或plugin", // 必须与packageType保持一致！
     "packageName": "包名"
   },
-  "modulesInfo": {
+  "modulesInfo": [{
     "package": "包名",
     "tableName": "数据库表名",
     "businessDB": "",
@@ -807,7 +816,13 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
       "checkDataSource": false,
       "fieldIndexType": ""
     }]
-  }
+  }, {
+    "package": "包名",
+    "tableName": "第二个模块的表名",
+    "structName": "第二个模块的结构体名",
+    "description": "第二个模块的描述",
+    "...": "更多模块配置..."
+  }]
 }
 
 **重要提醒**：ExecutionPlan必须严格按照以下格式和验证规则：
@@ -835,13 +850,13 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
 12. 如果字段需要字典类型，请先使用 generate_dictionary_options 工具创建字典
 13. 字典创建成功后，再执行模块创建操作
 
-`, string(resultJSON), requirement, pluginDetectionMsg, 
-			func() string {
-				if len(emptyPackageNames) > 0 {
-					return fmt.Sprintf("**重要提醒**：检测到 %s 包存在但内容为空，已自动删除相关文件夹和数据库记录。如果用户需求涉及这些包名，请设置 needCreatedPackage=true 重新创建。", strings.Join(emptyPackageNames, "、"))
-				}
-				return ""
-			}()),
+`, string(resultJSON), requirement, pluginDetectionMsg,
+					func() string {
+						if len(emptyPackageNames) > 0 {
+							return fmt.Sprintf("**重要提醒**：检测到 %s 包存在但内容为空，已自动删除相关文件夹和数据库记录。如果用户需求涉及这些包名，请设置 needCreatedPackage=true 重新创建。", strings.Join(emptyPackageNames, "、"))
+						}
+						return ""
+					}()),
 			},
 		},
 	}, nil
@@ -872,18 +887,23 @@ func (t *AutomationModuleAnalyzer) handleConfirm(ctx context.Context, request mc
 	}
 
 	// 构建确认响应
+	var moduleNames []string
+	for _, moduleInfo := range plan.ModulesInfo {
+		moduleNames = append(moduleNames, moduleInfo.StructName)
+	}
+	moduleNamesStr := strings.Join(moduleNames, "_")
+
 	confirmResponse := ConfirmationResponse{
 		Message:         "请确认以下创建计划：",
 		PackageConfirm:  plan.NeedCreatedPackage,
 		ModulesConfirm:  plan.NeedCreatedModules,
 		CanProceed:      true,
-		ConfirmationKey: fmt.Sprintf("%s_%s_%d", plan.PackageName, plan.ModuleName, time.Now().Unix()),
+		ConfirmationKey: fmt.Sprintf("%s_%s_%d", plan.PackageName, moduleNamesStr, time.Now().Unix()),
 	}
 
 	// 构建详细的确认信息
 	var confirmDetails strings.Builder
 	confirmDetails.WriteString(fmt.Sprintf("包名: %s\n", plan.PackageName))
-	confirmDetails.WriteString(fmt.Sprintf("模块名: %s\n", plan.ModuleName))
 	confirmDetails.WriteString(fmt.Sprintf("包类型: %s\n", plan.PackageType))
 
 	if plan.NeedCreatedPackage && plan.PackageInfo != nil {
@@ -894,15 +914,18 @@ func (t *AutomationModuleAnalyzer) handleConfirm(ctx context.Context, request mc
 		confirmDetails.WriteString(fmt.Sprintf("  - 模板: %s\n", plan.PackageInfo.Template))
 	}
 
-	if plan.NeedCreatedModules && plan.ModulesInfo != nil {
-		confirmDetails.WriteString("\n需要创建模块:\n")
-		confirmDetails.WriteString(fmt.Sprintf("  - 结构体名: %s\n", plan.ModulesInfo.StructName))
-		confirmDetails.WriteString(fmt.Sprintf("  - 表名: %s\n", plan.ModulesInfo.TableName))
-		confirmDetails.WriteString(fmt.Sprintf("  - 描述: %s\n", plan.ModulesInfo.Description))
-		confirmDetails.WriteString(fmt.Sprintf("  - 字段数量: %d\n", len(plan.ModulesInfo.Fields)))
-		confirmDetails.WriteString("  - 字段列表:\n")
-		for _, field := range plan.ModulesInfo.Fields {
-			confirmDetails.WriteString(fmt.Sprintf("    * %s (%s): %s\n", field.FieldName, field.FieldType, field.FieldDesc))
+	if plan.NeedCreatedModules && len(plan.ModulesInfo) > 0 {
+		confirmDetails.WriteString(fmt.Sprintf("\n需要创建模块 (共%d个):\n", len(plan.ModulesInfo)))
+		for i, moduleInfo := range plan.ModulesInfo {
+			confirmDetails.WriteString(fmt.Sprintf("\n模块 %d:\n", i+1))
+			confirmDetails.WriteString(fmt.Sprintf("  - 结构体名: %s\n", moduleInfo.StructName))
+			confirmDetails.WriteString(fmt.Sprintf("  - 表名: %s\n", moduleInfo.TableName))
+			confirmDetails.WriteString(fmt.Sprintf("  - 描述: %s\n", moduleInfo.Description))
+			confirmDetails.WriteString(fmt.Sprintf("  - 字段数量: %d\n", len(moduleInfo.Fields)))
+			confirmDetails.WriteString("  - 字段列表:\n")
+			for _, field := range moduleInfo.Fields {
+				confirmDetails.WriteString(fmt.Sprintf("    * %s (%s): %s\n", field.FieldName, field.FieldType, field.FieldDesc))
+			}
 		}
 	}
 
@@ -1045,10 +1068,10 @@ func (t *AutomationModuleAnalyzer) buildDirectoryStructure(plan *ExecutionPlan)
 		packageName = plan.PackageInfo.PackageName
 	}
 
-	// 如果计划中有模块信息，获取结构名
+	// 如果计划中有模块信息，获取第一个模块的结构名作为默认值
 	structName := "ExampleStruct"
-	if plan.ModulesInfo != nil && plan.ModulesInfo.StructName != "" {
-		structName = plan.ModulesInfo.StructName
+	if len(plan.ModulesInfo) > 0 && plan.ModulesInfo[0].StructName != "" {
+		structName = plan.ModulesInfo[0].StructName
 	}
 
 	// 根据包类型构建不同的路径结构
@@ -1138,9 +1161,6 @@ func (t *AutomationModuleAnalyzer) validateExecutionPlan(plan *ExecutionPlan) er
 	if plan.PackageName == "" {
 		return errors.New("packageName 不能为空")
 	}
-	if plan.ModuleName == "" {
-		return errors.New("moduleName 不能为空")
-	}
 	if plan.PackageType != "package" && plan.PackageType != "plugin" {
 		return errors.New("packageType 必须是 'package' 或 'plugin'")
 	}
@@ -1171,104 +1191,108 @@ func (t *AutomationModuleAnalyzer) validateExecutionPlan(plan *ExecutionPlan) er
 		}
 	}
 
-	// 验证模块信息
+	// 验证模块信息（批量验证）
 	if plan.NeedCreatedModules {
-		if plan.ModulesInfo == nil {
+		if len(plan.ModulesInfo) == 0 {
 			return errors.New("当 needCreatedModules=true 时，modulesInfo 不能为空")
 		}
-		if plan.ModulesInfo.Package == "" {
-			return errors.New("modulesInfo.package 不能为空")
-		}
-		if plan.ModulesInfo.StructName == "" {
-			return errors.New("modulesInfo.structName 不能为空")
-		}
-		if plan.ModulesInfo.TableName == "" {
-			return errors.New("modulesInfo.tableName 不能为空")
-		}
-		if plan.ModulesInfo.Description == "" {
-			return errors.New("modulesInfo.description 不能为空")
-		}
-		if plan.ModulesInfo.Abbreviation == "" {
-			return errors.New("modulesInfo.abbreviation 不能为空")
-		}
-		if plan.ModulesInfo.PackageName == "" {
-			return errors.New("modulesInfo.packageName 不能为空")
-		}
-		if plan.ModulesInfo.HumpPackageName == "" {
-			return errors.New("modulesInfo.humpPackageName 不能为空")
-		}
 
-		// 验证字段信息
-		if len(plan.ModulesInfo.Fields) == 0 {
-			return errors.New("modulesInfo.fields 不能为空，至少需要一个字段")
-		}
-
-		for i, field := range plan.ModulesInfo.Fields {
-			if field.FieldName == "" {
-				return fmt.Errorf("字段 %d 的 fieldName 不能为空", i+1)
+		// 遍历验证每个模块
+		for moduleIndex, moduleInfo := range plan.ModulesInfo {
+			if moduleInfo.Package == "" {
+				return fmt.Errorf("模块 %d 的 package 不能为空", moduleIndex+1)
 			}
-			if field.FieldDesc == "" {
-				return fmt.Errorf("字段 %d 的 fieldDesc 不能为空", i+1)
+			if moduleInfo.StructName == "" {
+				return fmt.Errorf("模块 %d 的 structName 不能为空", moduleIndex+1)
 			}
-			if field.FieldType == "" {
-				return fmt.Errorf("字段 %d 的 fieldType 不能为空", i+1)
+			if moduleInfo.TableName == "" {
+				return fmt.Errorf("模块 %d 的 tableName 不能为空", moduleIndex+1)
 			}
-			if field.FieldJson == "" {
-				return fmt.Errorf("字段 %d 的 fieldJson 不能为空", i+1)
+			if moduleInfo.Description == "" {
+				return fmt.Errorf("模块 %d 的 description 不能为空", moduleIndex+1)
 			}
-			if field.ColumnName == "" {
-				return fmt.Errorf("字段 %d 的 columnName 不能为空", i+1)
+			if moduleInfo.Abbreviation == "" {
+				return fmt.Errorf("模块 %d 的 abbreviation 不能为空", moduleIndex+1)
+			}
+			if moduleInfo.PackageName == "" {
+				return fmt.Errorf("模块 %d 的 packageName 不能为空", moduleIndex+1)
+			}
+			if moduleInfo.HumpPackageName == "" {
+				return fmt.Errorf("模块 %d 的 humpPackageName 不能为空", moduleIndex+1)
 			}
 
-			// 验证字段类型
-			validFieldTypes := []string{"string", "int", "int64", "float64", "bool", "time.Time", "enum", "picture", "video", "file", "pictures", "array", "richtext", "json"}
-			validType := false
-			for _, validFieldType := range validFieldTypes {
-				if field.FieldType == validFieldType {
-					validType = true
-					break
+			// 验证字段信息
+			if len(moduleInfo.Fields) == 0 {
+				return fmt.Errorf("模块 %d 的 fields 不能为空，至少需要一个字段", moduleIndex+1)
+			}
+
+			for i, field := range moduleInfo.Fields {
+				if field.FieldName == "" {
+					return fmt.Errorf("模块 %d 字段 %d 的 fieldName 不能为空", moduleIndex+1, i+1)
+				}
+				if field.FieldDesc == "" {
+					return fmt.Errorf("模块 %d 字段 %d 的 fieldDesc 不能为空", moduleIndex+1, i+1)
+				}
+				if field.FieldType == "" {
+					return fmt.Errorf("模块 %d 字段 %d 的 fieldType 不能为空", moduleIndex+1, i+1)
+				}
+				if field.FieldJson == "" {
+					return fmt.Errorf("模块 %d 字段 %d 的 fieldJson 不能为空", moduleIndex+1, i+1)
+				}
+				if field.ColumnName == "" {
+					return fmt.Errorf("模块 %d 字段 %d 的 columnName 不能为空", moduleIndex+1, i+1)
 				}
-			}
-			if !validType {
-				return fmt.Errorf("字段 %d 的 fieldType '%s' 不支持，支持的类型：%v", i+1, field.FieldType, validFieldTypes)
-			}
 
-			// 验证搜索类型（如果设置了）
-			if field.FieldSearchType != "" {
-				validSearchTypes := []string{"=", "!=", ">", ">=", "<", "<=", "LIKE", "BETWEEN", "IN", "NOT IN"}
-				validSearchType := false
-				for _, validType := range validSearchTypes {
-					if field.FieldSearchType == validType {
-						validSearchType = true
+				// 验证字段类型
+				validFieldTypes := []string{"string", "int", "int64", "float64", "bool", "time.Time", "enum", "picture", "video", "file", "pictures", "array", "richtext", "json"}
+				validType := false
+				for _, validFieldType := range validFieldTypes {
+					if field.FieldType == validFieldType {
+						validType = true
 						break
 					}
 				}
-				if !validSearchType {
-					return fmt.Errorf("字段 %d 的 fieldSearchType '%s' 不支持，支持的类型：%v", i+1, field.FieldSearchType, validSearchTypes)
+				if !validType {
+					return fmt.Errorf("模块 %d 字段 %d 的 fieldType '%s' 不支持，支持的类型：%v", moduleIndex+1, i+1, field.FieldType, validFieldTypes)
 				}
-			}
-		}
 
-		// 验证主键设置
-		if !plan.ModulesInfo.GvaModel {
-			// 当不使用GVA模型时，必须有且仅有一个字段设置为主键
-			primaryKeyCount := 0
-			for _, field := range plan.ModulesInfo.Fields {
-				if field.PrimaryKey {
-					primaryKeyCount++
+				// 验证搜索类型（如果设置了）
+				if field.FieldSearchType != "" {
+					validSearchTypes := []string{"=", "!=", ">", ">=", "<", "<=", "LIKE", "BETWEEN", "IN", "NOT IN"}
+					validSearchType := false
+					for _, validType := range validSearchTypes {
+						if field.FieldSearchType == validType {
+							validSearchType = true
+							break
+						}
+					}
+					if !validSearchType {
+						return fmt.Errorf("模块 %d 字段 %d 的 fieldSearchType '%s' 不支持，支持的类型：%v", moduleIndex+1, i+1, field.FieldSearchType, validSearchTypes)
+					}
 				}
 			}
-			if primaryKeyCount == 0 {
-				return errors.New("当 gvaModel=false 时，必须有一个字段的 primaryKey=true")
-			}
-			if primaryKeyCount > 1 {
-				return errors.New("当 gvaModel=false 时，只能有一个字段的 primaryKey=true")
-			}
-		} else {
-			// 当使用GVA模型时，所有字段的primaryKey都应该为false
-			for i, field := range plan.ModulesInfo.Fields {
-				if field.PrimaryKey {
-					return fmt.Errorf("当 gvaModel=true 时，字段 %d 的 primaryKey 应该为 false，系统会自动创建ID主键", i+1)
+
+			// 验证主键设置
+			if !moduleInfo.GvaModel {
+				// 当不使用GVA模型时，必须有且仅有一个字段设置为主键
+				primaryKeyCount := 0
+				for _, field := range moduleInfo.Fields {
+					if field.PrimaryKey {
+						primaryKeyCount++
+					}
+				}
+				if primaryKeyCount == 0 {
+					return fmt.Errorf("模块 %d：当 gvaModel=false 时，必须有一个字段的 primaryKey=true", moduleIndex+1)
+				}
+				if primaryKeyCount > 1 {
+					return fmt.Errorf("模块 %d：当 gvaModel=false 时，只能有一个字段的 primaryKey=true", moduleIndex+1)
+				}
+			} else {
+				// 当使用GVA模型时，所有字段的primaryKey都应该为false
+				for i, field := range moduleInfo.Fields {
+					if field.PrimaryKey {
+						return fmt.Errorf("模块 %d：当 gvaModel=true 时，字段 %d 的 primaryKey 应该为 false，系统会自动创建ID主键", moduleIndex+1, i+1)
+					}
 				}
 			}
 		}
@@ -1305,30 +1329,33 @@ func (t *AutomationModuleAnalyzer) executeCreation(ctx context.Context, plan *Ex
 		result.Message += "包创建成功; "
 	}
 
-	// 创建字典（如果需要）
-	if plan.NeedCreatedModules && plan.ModulesInfo != nil {
-		dictResult := t.createRequiredDictionaries(ctx, plan.ModulesInfo)
-		result.Message += dictResult
-	}
-
-	// 创建模块（如果需要）
-	if plan.NeedCreatedModules && plan.ModulesInfo != nil {
+	// 批量创建字典和模块（如果需要）
+	if plan.NeedCreatedModules && len(plan.ModulesInfo) > 0 {
 		templateService := service.ServiceGroupApp.SystemServiceGroup.AutoCodeTemplate
 
-		err := plan.ModulesInfo.Pretreatment()
-		if err != nil {
-			result.Message += fmt.Sprintf("模块信息预处理失败: %v", err)
-			// 即使预处理失败，也要返回paths信息
-			return result
+		// 先批量创建所有模块需要的字典
+		dictResult := t.createRequiredDictionaries(ctx, plan.ModulesInfo)
+		result.Message += dictResult
+
+		// 遍历所有模块进行创建
+		for _, moduleInfo := range plan.ModulesInfo {
+
+			// 创建模块
+			err := moduleInfo.Pretreatment()
+			if err != nil {
+				result.Message += fmt.Sprintf("模块 %s 信息预处理失败: %v; ", moduleInfo.StructName, err)
+				continue // 继续处理下一个模块
+			}
+
+			err = templateService.Create(ctx, *moduleInfo)
+			if err != nil {
+				result.Message += fmt.Sprintf("创建模块 %s 失败: %v; ", moduleInfo.StructName, err)
+				continue // 继续处理下一个模块
+			}
+			result.Message += fmt.Sprintf("模块 %s 创建成功; ", moduleInfo.StructName)
 		}
 
-		err = templateService.Create(ctx, *plan.ModulesInfo)
-		if err != nil {
-			result.Message += fmt.Sprintf("创建模块失败: %v", err)
-			// 即使创建模块失败，也要返回paths信息
-			return result
-		}
-		result.Message += "模块创建成功; "
+		result.Message += fmt.Sprintf("批量创建完成，共处理 %d 个模块; ", len(plan.ModulesInfo))
 	}
 
 	result.Message += "已构建目录结构信息; "
@@ -1341,43 +1368,64 @@ func (t *AutomationModuleAnalyzer) executeCreation(ctx context.Context, plan *Ex
 	return result
 }
 
-// createRequiredDictionaries 创建所需的字典
-func (t *AutomationModuleAnalyzer) createRequiredDictionaries(ctx context.Context, modulesInfo *request.AutoCode) string {
+// createRequiredDictionaries 创建所需的字典（批量处理）
+func (t *AutomationModuleAnalyzer) createRequiredDictionaries(ctx context.Context, modulesInfoList []*request.AutoCode) string {
 	var messages []string
 	dictionaryService := service.ServiceGroupApp.SystemServiceGroup.DictionaryService
+	createdDictTypes := make(map[string]bool) // 用于避免重复创建相同的字典
 
-	// 遍历所有字段，查找使用字典的字段
-	for _, field := range modulesInfo.Fields {
-		if field.DictType != "" {
-			// 检查字典是否存在
-			exists, err := t.checkDictionaryExists(field.DictType)
-			if err != nil {
-				messages = append(messages, fmt.Sprintf("检查字典 %s 时出错: %v; ", field.DictType, err))
-				continue
-			}
+	// 遍历所有模块
+	for moduleIndex, modulesInfo := range modulesInfoList {
+		messages = append(messages, fmt.Sprintf("处理模块 %d (%s) 的字典: ", moduleIndex+1, modulesInfo.StructName))
 
-			if !exists {
-				// 字典不存在，创建字典
-				dictionary := model.SysDictionary{
-					Name:   t.generateDictionaryName(field.DictType, field.FieldDesc),
-					Type:   field.DictType,
-					Status: &[]bool{true}[0], // 默认启用
-					Desc:   fmt.Sprintf("自动生成的字典，用于字段: %s (%s)", field.FieldName, field.FieldDesc),
+		// 遍历当前模块的所有字段，查找使用字典的字段
+		moduleHasDictFields := false
+		for _, field := range modulesInfo.Fields {
+			if field.DictType != "" {
+				moduleHasDictFields = true
+
+				// 如果这个字典类型已经在之前的模块中创建过，跳过
+				if createdDictTypes[field.DictType] {
+					messages = append(messages, fmt.Sprintf("字典 %s 已在前面的模块中创建，跳过; ", field.DictType))
+					continue
 				}
 
-				err = dictionaryService.CreateSysDictionary(dictionary)
+				// 检查字典是否存在
+				exists, err := t.checkDictionaryExists(field.DictType)
 				if err != nil {
-					messages = append(messages, fmt.Sprintf("创建字典 %s 失败: %v; ", field.DictType, err))
+					messages = append(messages, fmt.Sprintf("检查字典 %s 时出错: %v; ", field.DictType, err))
+					continue
+				}
+
+				if !exists {
+					// 字典不存在，创建字典
+					dictionary := model.SysDictionary{
+						Name:   t.generateDictionaryName(field.DictType, field.FieldDesc),
+						Type:   field.DictType,
+						Status: &[]bool{true}[0], // 默认启用
+						Desc:   fmt.Sprintf("自动生成的字典，用于模块 %s 字段: %s (%s)", modulesInfo.StructName, field.FieldName, field.FieldDesc),
+					}
+
+					err = dictionaryService.CreateSysDictionary(dictionary)
+					if err != nil {
+						messages = append(messages, fmt.Sprintf("创建字典 %s 失败: %v; ", field.DictType, err))
+					} else {
+						messages = append(messages, fmt.Sprintf("成功创建字典 %s (%s); ", field.DictType, dictionary.Name))
+						createdDictTypes[field.DictType] = true // 标记为已创建
+
+						// 创建默认的字典详情项
+						t.createDefaultDictionaryDetails(ctx, field.DictType, field.FieldDesc)
+					}
 				} else {
-					messages = append(messages, fmt.Sprintf("成功创建字典 %s (%s); ", field.DictType, dictionary.Name))
-
-					// 创建默认的字典详情项
-					t.createDefaultDictionaryDetails(ctx, field.DictType, field.FieldDesc)
+					messages = append(messages, fmt.Sprintf("字典 %s 已存在，跳过创建; ", field.DictType))
+					createdDictTypes[field.DictType] = true // 标记为已存在
 				}
-			} else {
-				messages = append(messages, fmt.Sprintf("字典 %s 已存在，跳过创建; ", field.DictType))
 			}
 		}
+
+		if !moduleHasDictFields {
+			messages = append(messages, "无需创建字典; ")
+		}
 	}
 
 	if len(messages) == 0 {
@@ -1441,18 +1489,18 @@ func (t *AutomationModuleAnalyzer) generateSmartDictionaryOptions(dictType, fiel
 func (t *AutomationModuleAnalyzer) detectPluginIntent(requirement string) (suggestedType string, isPlugin bool, confidence string) {
 	// 转换为小写进行匹配
 	requirementLower := strings.ToLower(requirement)
-	
+
 	// 插件相关关键词
 	pluginKeywords := []string{
 		"插件", "plugin", "扩展", "extension", "addon", "模块插件",
 		"功能插件", "业务插件", "第三方插件", "自定义插件",
 	}
-	
+
 	// 包相关关键词（用于排除误判）
 	packageKeywords := []string{
 		"包", "package", "模块包", "业务包", "功能包",
 	}
-	
+
 	// 检测插件关键词
 	pluginMatches := 0
 	for _, keyword := range pluginKeywords {
@@ -1460,7 +1508,7 @@ func (t *AutomationModuleAnalyzer) detectPluginIntent(requirement string) (sugge
 			pluginMatches++
 		}
 	}
-	
+
 	// 检测包关键词
 	packageMatches := 0
 	for _, keyword := range packageKeywords {
@@ -1468,7 +1516,7 @@ func (t *AutomationModuleAnalyzer) detectPluginIntent(requirement string) (sugge
 			packageMatches++
 		}
 	}
-	
+
 	// 决策逻辑
 	if pluginMatches > 0 {
 		if packageMatches == 0 || pluginMatches > packageMatches {
@@ -1477,7 +1525,7 @@ func (t *AutomationModuleAnalyzer) detectPluginIntent(requirement string) (sugge
 			return "plugin", true, "中"
 		}
 	}
-	
+
 	// 默认返回package
 	return "package", false, "低"
 }
@@ -1492,7 +1540,7 @@ func (t *AutomationModuleAnalyzer) isPackageFolderEmpty(packageName, template st
 		// package 类型
 		basePath = filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "model", packageName)
 	}
-	
+
 	// 检查文件夹是否存在
 	if _, err := os.Stat(basePath); os.IsNotExist(err) {
 		// 文件夹不存在，认为是空的
@@ -1500,13 +1548,13 @@ func (t *AutomationModuleAnalyzer) isPackageFolderEmpty(packageName, template st
 	} else if err != nil {
 		return false, fmt.Errorf("检查文件夹状态失败: %v", err)
 	}
-	
+
 	// 读取文件夹内容
 	entries, err := os.ReadDir(basePath)
 	if err != nil {
 		return false, fmt.Errorf("读取文件夹内容失败: %v", err)
 	}
-	
+
 	// 检查目录下是否有 .go 文件
 	hasGoFiles := false
 	for _, entry := range entries {
@@ -1537,7 +1585,7 @@ func (t *AutomationModuleAnalyzer) isPackageFolderEmpty(packageName, template st
 			break
 		}
 	}
-	
+
 	// 如果没有 .go 文件，认为是空包
 	return !hasGoFiles, nil
 }
@@ -1545,7 +1593,7 @@ func (t *AutomationModuleAnalyzer) isPackageFolderEmpty(packageName, template st
 // removeEmptyPackageFolder 删除空的包文件夹
 func (t *AutomationModuleAnalyzer) removeEmptyPackageFolder(packageName, template string) error {
 	var errors []string
-	
+
 	if template == "plugin" {
 		// plugin 类型只删除 plugin 目录下的文件夹
 		basePath := filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "plugin", packageName)
@@ -1560,18 +1608,18 @@ func (t *AutomationModuleAnalyzer) removeEmptyPackageFolder(packageName, templat
 			filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "service", packageName),
 			filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server, "router", packageName),
 		}
-		
+
 		for _, path := range paths {
 			if err := t.removeDirectoryIfExists(path); err != nil {
 				errors = append(errors, fmt.Sprintf("删除%s失败: %v", path, err))
 			}
 		}
 	}
-	
+
 	if len(errors) > 0 {
 		return fmt.Errorf("删除过程中出现错误: %s", strings.Join(errors, "; "))
 	}
-	
+
 	return nil
 }
 
@@ -1584,12 +1632,12 @@ func (t *AutomationModuleAnalyzer) removeDirectoryIfExists(dirPath string) error
 	} else if err != nil {
 		return fmt.Errorf("检查文件夹状态失败: %v", err)
 	}
-	
+
 	// 删除文件夹及其所有内容
 	if err := os.RemoveAll(dirPath); err != nil {
 		return fmt.Errorf("删除文件夹失败: %v", err)
 	}
-	
+
 	global.GVA_LOG.Info(fmt.Sprintf("成功删除目录: %s", dirPath))
 	return nil
 }
@@ -1599,31 +1647,31 @@ func (t *AutomationModuleAnalyzer) cleanupRelatedApiAndMenus(historyIDs []uint)
 	if len(historyIDs) == 0 {
 		return nil
 	}
-	
+
 	// 获取要删除的历史记录信息
 	var histories []model.SysAutoCodeHistory
 	if err := global.GVA_DB.Where("id IN ?", historyIDs).Find(&histories).Error; err != nil {
 		return fmt.Errorf("获取历史记录失败: %v", err)
 	}
-	
+
 	var deletedApiCount, deletedMenuCount int
-	
+
 	for _, history := range histories {
 		// 删除相关的API记录（使用存储的API IDs）
-			if len(history.ApiIDs) > 0 {
-				ids := make([]int, 0, len(history.ApiIDs))
-				for _, id := range history.ApiIDs {
-					ids = append(ids, int(id))
-				}
-				idsReq := common.IdsReq{Ids: ids}
-				if err := systemService.ApiServiceApp.DeleteApisByIds(idsReq); err != nil {
-					global.GVA_LOG.Warn(fmt.Sprintf("删除API记录失败 (模块: %s): %v", history.StructName, err))
-				} else {
-					deletedApiCount += len(ids)
-					global.GVA_LOG.Info(fmt.Sprintf("成功删除API记录 (模块: %s, 数量: %d)", history.StructName, len(ids)))
-				}
+		if len(history.ApiIDs) > 0 {
+			ids := make([]int, 0, len(history.ApiIDs))
+			for _, id := range history.ApiIDs {
+				ids = append(ids, int(id))
 			}
-		
+			idsReq := common.IdsReq{Ids: ids}
+			if err := systemService.ApiServiceApp.DeleteApisByIds(idsReq); err != nil {
+				global.GVA_LOG.Warn(fmt.Sprintf("删除API记录失败 (模块: %s): %v", history.StructName, err))
+			} else {
+				deletedApiCount += len(ids)
+				global.GVA_LOG.Info(fmt.Sprintf("成功删除API记录 (模块: %s, 数量: %d)", history.StructName, len(ids)))
+			}
+		}
+
 		// 删除相关的菜单记录（使用存储的菜单ID）
 		if history.MenuID != 0 {
 			if err := systemService.BaseMenuServiceApp.DeleteBaseMenu(int(history.MenuID)); err != nil {
@@ -1634,10 +1682,10 @@ func (t *AutomationModuleAnalyzer) cleanupRelatedApiAndMenus(historyIDs []uint)
 			}
 		}
 	}
-	
+
 	if deletedApiCount > 0 || deletedMenuCount > 0 {
 		global.GVA_LOG.Info(fmt.Sprintf("清理完成：删除了 %d 个API记录和 %d 个菜单记录", deletedApiCount, deletedMenuCount))
 	}
-	
+
 	return nil
 }
diff --git a/server/mcp/requirement_analyzer.go b/server/mcp/requirement_analyzer.go
new file mode 100644
index 000000000..541b925ba
--- /dev/null
+++ b/server/mcp/requirement_analyzer.go
@@ -0,0 +1,139 @@
+package mcpTool
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+
+	"github.com/mark3labs/mcp-go/mcp"
+)
+
+func init() {
+	RegisterTool(&RequirementAnalyzer{})
+}
+
+type RequirementAnalyzer struct{}
+
+// RequirementAnalysisRequest 需求分析请求
+type RequirementAnalysisRequest struct {
+	UserRequirement string `json:"userRequirement"`
+}
+
+
+
+// RequirementAnalysisResponse 需求分析响应
+type RequirementAnalysisResponse struct {
+	AIPrompt string `json:"aiPrompt"` // 给AI的提示词
+}
+
+// New 返回工具注册信息
+func (t *RequirementAnalyzer) New() mcp.Tool {
+	return mcp.NewTool("requirement_analyzer",
+		mcp.WithDescription(`**🚀 需求分析工具 - 首选入口工具（最高优先级）**
+
+**⭐ 重要提示：这是所有MCP工具的首选入口，请优先使用！**
+
+**🎯 核心职责：**
+将用户的自然语言需求转换为AI可理解的结构化提示词
+
+**📋 工作流程：**
+1. 接收用户自然语言需求描述
+2. 生成专业的AI提示词，要求AI将需求梳理为清晰的逻辑步骤：
+   - **1. 第一步功能描述**
+   - **2. 第二步功能描述** 
+   - **3. 第三步功能描述**
+   - **...**
+3. 指导后续使用 gva_auto_generate 工具进行代码生成
+
+**✅ 适用场景：**
+- 用户有新的业务需求需要开发
+- 需要创建新的功能模块
+- 想要快速搭建业务系统
+- 需求描述比较模糊，需要AI帮助梳理
+
+**❌ 不负责的事情：**
+- 不生成具体的包名和模块名（交给 gva_auto_generate）
+- 不进行代码生成（交给 gva_auto_generate）
+- 不创建数据库表结构（交给 gva_auto_generate）
+
+**🔄 推荐工作流：**
+requirement_analyzer → gva_auto_generate → 其他辅助工具
+
+`),
+		mcp.WithString("userRequirement",
+			mcp.Required(),
+			mcp.Description("用户的需求描述，支持自然语言，如：'我要做一个猫舍管理系统，用来录入猫的信息，并且记录每只猫每天的活动信息'"),
+		),
+	)
+}
+
+// Handle 处理工具调用
+func (t *RequirementAnalyzer) Handle(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	userRequirement, ok := request.GetArguments()["userRequirement"].(string)
+	if !ok || userRequirement == "" {
+		return nil, errors.New("参数错误：userRequirement 必须是非空字符串")
+	}
+
+	// 分析用户需求
+	analysisResponse, err := t.analyzeRequirement(userRequirement)
+	if err != nil {
+		return nil, fmt.Errorf("需求分析失败: %v", err)
+	}
+
+	// 序列化响应
+	responseData, err := json.Marshal(analysisResponse)
+	if err != nil {
+		return nil, fmt.Errorf("序列化响应失败: %v", err)
+	}
+
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.NewTextContent(string(responseData)),
+		},
+	}, nil
+}
+
+// analyzeRequirement 分析用户需求 - 专注于AI需求传递
+func (t *RequirementAnalyzer) analyzeRequirement(userRequirement string) (*RequirementAnalysisResponse, error) {
+	// 生成AI提示词 - 这是唯一功能
+	aiPrompt := t.generateAIPrompt(userRequirement)
+
+	return &RequirementAnalysisResponse{
+		AIPrompt: aiPrompt,
+	}, nil
+}
+
+// generateAIPrompt 生成AI提示词 - 要求AI梳理逻辑为1xxx2xxx格式
+func (t *RequirementAnalyzer) generateAIPrompt(userRequirement string) string {
+	prompt := fmt.Sprintf(`# 🤖 AI需求逻辑梳理任务
+
+## 📝 用户原始需求
+%s
+
+## 🎯 AI任务要求
+请将上述用户需求梳理成清晰的逻辑步骤，格式要求：
+
+**1. 第一步功能描述**
+**2. 第二步功能描述**  
+**3. 第三步功能描述**
+**...**
+
+## 📋 梳理要求
+- 将需求拆解为具体的功能步骤
+- 每个步骤用数字编号（1、2、3...）
+- 步骤描述要清晰、具体、可执行
+- 按照业务逻辑顺序排列
+- 考虑数据流和用户操作流程
+
+## 🔄 后续流程
+梳理完成后，请使用 gva_auto_generate 工具进行代码生成：
+- gva_auto_generate 会根据梳理的逻辑步骤自动生成包名、模块名
+- gva_auto_generate 会设计数据表结构和API接口
+- gva_auto_generate 会生成完整的前后端代码
+
+
+现在请开始梳理用户需求："%s"`, userRequirement, userRequirement)
+
+	return prompt
+}

From 311e1ddb9f88e4424da2096346e224c7751256b6 Mon Sep 17 00:00:00 2001
From: "Feng.YJ" <jxfengyijie@gmail.com>
Date: Mon, 4 Aug 2025 13:39:51 +0800
Subject: [PATCH 24/56] Optimize captcha related fields verification

- Add `Captcha` field validation to `LoginVerify` rules, ensuring that the captcha isn't empty while prechecking the data.
- Remove redundant checks for empty values for `Captcha` and `CaptchaId`, as they are already validated in the `LoginVerify` struct.
- Move client IP key retrieval after input validation for better flow.
---
 server/api/v1/system/sys_user.go | 5 ++---
 server/utils/verify.go           | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
index aae263e3f..3d1c68e29 100644
--- a/server/api/v1/system/sys_user.go
+++ b/server/api/v1/system/sys_user.go
@@ -27,8 +27,6 @@ import (
 func (b *BaseApi) Login(c *gin.Context) {
 	var l systemReq.Login
 	err := c.ShouldBindJSON(&l)
-	key := c.ClientIP()
-
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
@@ -39,6 +37,7 @@ func (b *BaseApi) Login(c *gin.Context) {
 		return
 	}
 
+	key := c.ClientIP()
 	// 判断验证码是否开启
 	openCaptcha := global.GVA_CONFIG.Captcha.OpenCaptcha               // 是否开启防爆次数
 	openCaptchaTimeOut := global.GVA_CONFIG.Captcha.OpenCaptchaTimeOut // 缓存超时时间
@@ -49,7 +48,7 @@ func (b *BaseApi) Login(c *gin.Context) {
 
 	var oc bool = openCaptcha == 0 || openCaptcha < interfaceToInt(v)
 
-	if !oc || (l.CaptchaId != "" && l.Captcha != "" && store.Verify(l.CaptchaId, l.Captcha, true)) {
+	if !oc || store.Verify(l.CaptchaId, l.Captcha, true) {
 		u := &system.SysUser{Username: l.Username, Password: l.Password}
 		user, err := userService.Login(u)
 		if err != nil {
diff --git a/server/utils/verify.go b/server/utils/verify.go
index 43a86725f..e81c1f194 100644
--- a/server/utils/verify.go
+++ b/server/utils/verify.go
@@ -5,7 +5,7 @@ var (
 	ApiVerify              = Rules{"Path": {NotEmpty()}, "Description": {NotEmpty()}, "ApiGroup": {NotEmpty()}, "Method": {NotEmpty()}}
 	MenuVerify             = Rules{"Path": {NotEmpty()}, "Name": {NotEmpty()}, "Component": {NotEmpty()}, "Sort": {Ge("0")}}
 	MenuMetaVerify         = Rules{"Title": {NotEmpty()}}
-	LoginVerify            = Rules{"CaptchaId": {NotEmpty()}, "Username": {NotEmpty()}, "Password": {NotEmpty()}}
+	LoginVerify            = Rules{"CaptchaId": {NotEmpty()}, "Captcha": {NotEmpty()}, "Username": {NotEmpty()}, "Password": {NotEmpty()}}
 	RegisterVerify         = Rules{"Username": {NotEmpty()}, "NickName": {NotEmpty()}, "Password": {NotEmpty()}, "AuthorityId": {NotEmpty()}}
 	PageInfoVerify         = Rules{"Page": {NotEmpty()}, "PageSize": {NotEmpty()}}
 	CustomerVerify         = Rules{"CustomerName": {NotEmpty()}, "CustomerPhoneData": {NotEmpty()}}

From a033ab9abed0ff241cb468f850594d2da96139e4 Mon Sep 17 00:00:00 2001
From: "Feng.YJ" <jxfengyijie@gmail.com>
Date: Mon, 4 Aug 2025 13:43:03 +0800
Subject: [PATCH 25/56] refactor: simplify login captcha validation flow for
 cleaner code

---
 server/api/v1/system/sys_user.go | 44 ++++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
index 3d1c68e29..40f09341b 100644
--- a/server/api/v1/system/sys_user.go
+++ b/server/api/v1/system/sys_user.go
@@ -47,30 +47,30 @@ func (b *BaseApi) Login(c *gin.Context) {
 	}
 
 	var oc bool = openCaptcha == 0 || openCaptcha < interfaceToInt(v)
-
-	if !oc || store.Verify(l.CaptchaId, l.Captcha, true) {
-		u := &system.SysUser{Username: l.Username, Password: l.Password}
-		user, err := userService.Login(u)
-		if err != nil {
-			global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Error(err))
-			// 验证码次数+1
-			global.BlackCache.Increment(key, 1)
-			response.FailWithMessage("用户名不存在或者密码错误", c)
-			return
-		}
-		if user.Enable != 1 {
-			global.GVA_LOG.Error("登陆失败! 用户被禁止登录!")
-			// 验证码次数+1
-			global.BlackCache.Increment(key, 1)
-			response.FailWithMessage("用户被禁止登录", c)
-			return
-		}
-		b.TokenNext(c, *user)
+	if oc && !store.Verify(l.CaptchaId, l.Captcha, true) {
+		// 验证码次数+1
+		global.BlackCache.Increment(key, 1)
+		response.FailWithMessage("验证码错误", c)
 		return
 	}
-	// 验证码次数+1
-	global.BlackCache.Increment(key, 1)
-	response.FailWithMessage("验证码错误", c)
+
+	u := &system.SysUser{Username: l.Username, Password: l.Password}
+	user, err := userService.Login(u)
+	if err != nil {
+		global.GVA_LOG.Error("登陆失败! 用户名不存在或者密码错误!", zap.Error(err))
+		// 验证码次数+1
+		global.BlackCache.Increment(key, 1)
+		response.FailWithMessage("用户名不存在或者密码错误", c)
+		return
+	}
+	if user.Enable != 1 {
+		global.GVA_LOG.Error("登陆失败! 用户被禁止登录!")
+		// 验证码次数+1
+		global.BlackCache.Increment(key, 1)
+		response.FailWithMessage("用户被禁止登录", c)
+		return
+	}
+	b.TokenNext(c, *user)
 }
 
 // TokenNext 登录以后签发jwt

From b71ad7b6f4db35795d1d9cc20a1554886084e824 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Tue, 5 Aug 2025 18:14:27 +0800
Subject: [PATCH 26/56] =?UTF-8?q?docs(mcp):=20=E5=AE=8C=E5=96=84=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=85=B3=E8=81=94=E9=85=8D=E7=BD=AE=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=92=8C=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit e042d0464c47ab8441f363df1a1242e26a9c13f7)
---
 server/mcp/execution_plan_schema.md | 142 +++++++++++++++++++++++++++-
 server/mcp/gag_usage_example.md     |  32 +++++++
 server/mcp/gva_auto_generate.go     |  15 ++-
 3 files changed, 183 insertions(+), 6 deletions(-)

diff --git a/server/mcp/execution_plan_schema.md b/server/mcp/execution_plan_schema.md
index 05dc72c4d..f2ed80a1c 100644
--- a/server/mcp/execution_plan_schema.md
+++ b/server/mcp/execution_plan_schema.md
@@ -85,12 +85,25 @@ type AutoCodeField struct {
     Clearable       bool        `json:"clearable"`       // 是否可清空
     Sort            bool        `json:"sort"`            // 是否支持排序
     PrimaryKey      bool        `json:"primaryKey"`      // 是否主键
-    DataSource      *DataSource `json:"dataSource"`      // 数据源
+    DataSource      *DataSource `json:"dataSource"`      // 数据源配置（用于关联其他表）
     CheckDataSource bool        `json:"checkDataSource"` // 是否检查数据源
     FieldIndexType  string      `json:"fieldIndexType"`  // 索引类型
 }
 ```
 
+### 4. DataSource 结构体（关联表配置）
+
+```go
+type DataSource struct {
+    DBName       string `json:"dbName"`       // 关联的数据库名称
+    Table        string `json:"table"`        // 关联的表名
+    Label        string `json:"label"`        // 用于显示的字段名（如name、title等）
+    Value        string `json:"value"`        // 用于存储的值字段名（通常是id）
+    Association  int    `json:"association"`  // 关联关系：1=一对一，2=一对多
+    HasDeletedAt bool   `json:"hasDeletedAt"` // 关联表是否有软删除字段
+}
+```
+
 ## 使用示例
 
 ### 示例1：创建新包和批量创建多个模块
@@ -151,8 +164,15 @@ type AutoCodeField struct {
           "clearable": true,
           "sort": false,
           "primaryKey": false,
-          "dataSource": null,
-          "checkDataSource": false,
+          "dataSource": {
+            "dbName": "gva",
+            "table": "sys_users",
+            "label": "username",
+            "value": "id",
+            "association": 2,
+            "hasDeletedAt": true
+          },
+          "checkDataSource": true,
           "fieldIndexType": ""
         },
         {
@@ -360,6 +380,121 @@ type AutoCodeField struct {
 }
 ```
 
+### 示例3：模块关联关系配置详解
+
+以下示例展示了如何配置不同类型的关联关系：
+
+```json
+{
+  "packageName": "order",
+  "packageType": "package",
+  "needCreatedPackage": true,
+  "needCreatedModules": true,
+  "packageInfo": {
+    "desc": "订单管理模块",
+    "label": "订单管理",
+    "template": "package",
+    "packageName": "order"
+  },
+  "modulesInfo": [
+    {
+      "package": "order",
+      "tableName": "orders",
+      "structName": "Order",
+      "packageName": "order",
+      "description": "订单",
+      "abbreviation": "order",
+      "humpPackageName": "order",
+      "gvaModel": true,
+      "autoMigrate": true,
+      "autoCreateResource": true,
+      "autoCreateApiToSql": true,
+      "autoCreateMenuToSql": true,
+      "autoCreateBtnAuth": true,
+      "generateWeb": true,
+      "generateServer": true,
+      "fields": [
+        {
+          "fieldName": "UserID",
+          "fieldDesc": "下单用户",
+          "fieldType": "uint",
+          "fieldJson": "userId",
+          "columnName": "user_id",
+          "fieldSearchType": "EQ",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "require": true,
+          "dataSource": {
+            "dbName": "gva",
+            "table": "sys_users",
+            "label": "username",
+            "value": "id",
+            "association": 2,
+            "hasDeletedAt": true
+          },
+          "checkDataSource": true
+        },
+        {
+          "fieldName": "ProductID",
+          "fieldDesc": "商品",
+          "fieldType": "uint",
+          "fieldJson": "productId",
+          "columnName": "product_id",
+          "fieldSearchType": "EQ",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "require": true,
+          "dataSource": {
+            "dbName": "gva",
+            "table": "products",
+            "label": "name",
+            "value": "id",
+            "association": 2,
+            "hasDeletedAt": false
+          },
+          "checkDataSource": true
+        },
+        {
+          "fieldName": "Status",
+          "fieldDesc": "订单状态",
+          "fieldType": "int",
+          "fieldJson": "status",
+          "columnName": "status",
+          "fieldSearchType": "EQ",
+          "form": true,
+          "table": true,
+          "desc": true,
+          "require": true,
+          "dictType": "order_status"
+        }
+      ]
+    }
+  ]
+}
+```
+
+## DataSource 配置说明
+
+### 关联关系类型
+- **association: 1** - 一对一关联（如用户与用户档案）
+- **association: 2** - 一对多关联（如用户与订单）
+
+### 配置要点
+1. **dbName**: 通常为 "gva"（默认数据库）
+2. **table**: 关联表的实际表名
+3. **label**: 用于前端显示的字段（如用户名、商品名称）
+4. **value**: 用于存储关联ID的字段（通常是 "id"）
+5. **hasDeletedAt**: 关联表是否支持软删除
+6. **checkDataSource**: 建议设为true，会验证关联表是否存在
+
+### 常见关联场景
+- 用户关联：`{"table": "sys_users", "label": "username", "value": "id"}`
+- 角色关联：`{"table": "sys_authorities", "label": "authorityName", "value": "authorityId"}`
+- 部门关联：`{"table": "sys_departments", "label": "name", "value": "id"}`
+- 分类关联：`{"table": "categories", "label": "name", "value": "id"}`
+
 ## 重要注意事项
 
 1. **PackageType**: 只能是 "plugin" 或 "package"
@@ -369,6 +504,7 @@ type AutoCodeField struct {
 5. **搜索类型**: FieldSearchType支持：EQ, NE, GT, GE, LT, LE, LIKE, BETWEEN等
 6. **索引类型**: FieldIndexType支持：index, unique等
 7. **GvaModel**: 设置为true时会自动包含ID、CreatedAt、UpdatedAt、DeletedAt字段
+8. **关联配置**: 使用dataSource时，确保关联表已存在，建议开启checkDataSource验证
 
 ## 常见错误避免
 
diff --git a/server/mcp/gag_usage_example.md b/server/mcp/gag_usage_example.md
index 0b75d40fa..0bc9366b7 100644
--- a/server/mcp/gag_usage_example.md
+++ b/server/mcp/gag_usage_example.md
@@ -79,6 +79,38 @@
             "dataSource": {},
             "checkDataSource": false,
             "fieldIndexType": ""
+          },
+          {
+            "fieldName": "AuthorID",
+            "fieldDesc": "作者",
+            "fieldType": "uint",
+            "fieldJson": "authorId",
+            "dataTypeLong": "",
+            "comment": "作者ID",
+            "columnName": "author_id",
+            "fieldSearchType": "EQ",
+            "fieldSearchHide": false,
+            "dictType": "",
+            "form": true,
+            "table": true,
+            "desc": true,
+            "excel": true,
+            "require": true,
+            "defaultValue": "",
+            "errorText": "请选择作者",
+            "clearable": true,
+            "sort": false,
+            "primaryKey": false,
+            "dataSource": {
+              "dbName": "gva",
+              "table": "library_authors",
+              "label": "name",
+              "value": "id",
+              "association": 2,
+              "hasDeletedAt": true
+            },
+            "checkDataSource": true,
+            "fieldIndexType": ""
           }
         ]
       },
diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
index 1de0329e6..6999cbb54 100644
--- a/server/mcp/gva_auto_generate.go
+++ b/server/mcp/gva_auto_generate.go
@@ -189,8 +189,8 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
       "clearable": "是否可清空(bool)",
       "sort": "是否排序(bool)",
       "primaryKey": "是否主键(bool)",
-      "dataSource": "数据源(object)",
-      "checkDataSource": "检查数据源(bool)",
+      "dataSource": "数据源配置(object) - 用于配置字段的关联表信息，结构：{\"dbName\":\"数据库名\",\"table\":\"关联表名\",\"label\":\"显示字段\",\"value\":\"值字段\",\"association\":1或2(1=一对一,2=一对多),\"hasDeletedAt\":true/false}。\n\n**获取表名提示：**\n- 可在 server/model 和 plugin/xxx/model 目录下查看对应模块的 TableName() 接口实现获取实际表名\n- 例如：SysUser 的表名为 \"sys_users\"，ExaFileUploadAndDownload 的表名为 \"exa_file_upload_and_downloads\"\n- 插件模块示例：Info 的表名为 \"gva_announcements_info\"\n\n**获取数据库名提示：**\n- 主数据库：通常使用 \"gva\"（默认数据库标识）\n- 多数据库：可在 config.yaml 的 db-list 配置中查看可用数据库的 alias-name 字段\n- 如果用户未提及关联多数据库信息 则使用默认数据库 默认数据库的情况下 dbName此处填写为空",
+      "checkDataSource": "是否检查数据源(bool) - 启用后会验证关联表的存在性",
       "fieldIndexType": "索引类型(string)"
     }]
   }, {
@@ -214,7 +214,16 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
 9. 智能字典创建功能：当字段使用字典类型(DictType)时，系统会：
    - 自动检查字典是否存在，如果不存在则创建字典
    - 根据字典类型和字段描述智能生成默认选项，支持状态、性别、类型、等级、优先级、审批、角色、布尔值、订单、颜色、尺寸等常见场景
-   - 为无法识别的字典类型提供通用默认选项`),
+   - 为无法识别的字典类型提供通用默认选项
+10. **模块关联配置**：当需要配置模块间的关联关系时，使用dataSource字段：
+   - **dbName**: 关联的数据库名称
+   - **table**: 关联的表名
+   - **label**: 用于显示的字段名（如name、title等）
+   - **value**: 用于存储的值字段名（通常是id）
+   - **association**: 关联关系类型（1=一对一关联，2=一对多关联）
+   - **hasDeletedAt**: 关联表是否有软删除字段
+   - **checkDataSource**: 设为true时会验证关联表的存在性
+   - 示例：{"dbName":"gva","table":"sys_users","label":"username","value":"id","association":2,"hasDeletedAt":true}`),
 		mcp.WithString("action",
 			mcp.Required(),
 			mcp.Description("执行操作：'analyze' 分析现有模块信息，'confirm' 请求用户确认创建，'execute' 执行创建操作（支持批量创建多个模块）"),

From 0d900293eb0109c96f4912a97a39a9a2b7972ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Tue, 5 Aug 2025 18:33:02 +0800
Subject: [PATCH 27/56] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E4=B8=AD=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E5=B9=B6=E4=BC=98=E5=8C=96=E5=B7=A5=E5=85=B7=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新多个文档和工具描述文件，统一字段类型的详细说明格式
优化菜单创建工具和API创建工具的描述，明确使用场景
补充执行计划schema中字段类型的详细说明

(cherry picked from commit d9448aa25cca717e01a00aec2c38a24da7b28f6f)
---
 server/mcp/api_creator.go           |  2 +-
 server/mcp/execution_plan_schema.md | 15 ++++++++++++++-
 server/mcp/gag_usage_example.md     |  3 ++-
 server/mcp/gva_auto_generate.go     |  2 +-
 server/mcp/menu_creator.go          |  2 +-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/server/mcp/api_creator.go b/server/mcp/api_creator.go
index 42a7fcd50..d2de59b50 100644
--- a/server/mcp/api_creator.go
+++ b/server/mcp/api_creator.go
@@ -41,7 +41,7 @@ type ApiCreator struct{}
 // New 创建API创建工具
 func (a *ApiCreator) New() mcp.Tool {
 	return mcp.NewTool("create_api",
-		mcp.WithDescription("创建后端API记录，用于在生成后端接口时自动创建对应的API权限记录，只要创建了API层，router下的文件产生了路径变化等，都需要调用此mcp。"),
+		mcp.WithDescription("创建后端API记录，用于AI编辑器自动添加API接口时自动创建对应的API权限记录。注意：使用gva_auto_generate创建的包和模块会自动创建API权限，无需调用此工具。仅在AI编辑器自动添加API或router下的文件产生路径变化时使用。"),
 		mcp.WithString("path",
 			mcp.Required(),
 			mcp.Description("API路径，如：/user/create"),
diff --git a/server/mcp/execution_plan_schema.md b/server/mcp/execution_plan_schema.md
index f2ed80a1c..622e83d09 100644
--- a/server/mcp/execution_plan_schema.md
+++ b/server/mcp/execution_plan_schema.md
@@ -500,7 +500,20 @@ type DataSource struct {
 1. **PackageType**: 只能是 "plugin" 或 "package"
 2. **NeedCreatedPackage**: 当为true时，PackageInfo必须提供
 3. **NeedCreatedModules**: 当为true时，ModulesInfo必须提供
-4. **字段类型**: FieldType支持的类型包括：string, int, int64, float64, bool, time.Time, enum, picture, video, file, pictures, array, richtext, json等
+4. **字段类型**: FieldType支持的类型包括：
+   - string（字符串）
+   - richtext（富文本）
+   - int（整型）
+   - bool（布尔值）
+   - float64（浮点型）
+   - time.Time（时间）
+   - enum（枚举）
+   - picture（单图片，字符串）
+   - pictures（多图片，json字符串）
+   - video（视频，字符串）
+   - file（文件，json字符串）
+   - json（JSON）
+   - array（数组）
 5. **搜索类型**: FieldSearchType支持：EQ, NE, GT, GE, LT, LE, LIKE, BETWEEN等
 6. **索引类型**: FieldIndexType支持：index, unique等
 7. **GvaModel**: 设置为true时会自动包含ID、CreatedAt、UpdatedAt、DeletedAt字段
diff --git a/server/mcp/gag_usage_example.md b/server/mcp/gag_usage_example.md
index 0bc9366b7..cfc7fdcb3 100644
--- a/server/mcp/gag_usage_example.md
+++ b/server/mcp/gag_usage_example.md
@@ -201,4 +201,5 @@
 1. 必须先调用`confirm`来获取确认信息
 2. 在`execute`时必须提供相应的确认参数
 3. 确认参数的值必须是"yes"或"no"
-4. 如果不需要创建包或模块，则不需要提供对应的确认参数
\ No newline at end of file
+4. 如果不需要创建包或模块，则不需要提供对应的确认参数
+5. 字段类型支持：string（字符串）,richtext（富文本）,int（整型）,bool（布尔值）,float64（浮点型）,time.Time（时间）,enum（枚举）,picture（单图片，字符串）,pictures（多图片，json字符串）,video（视频，字符串）,file（文件，json字符串）,json（JSON）,array（数组）
\ No newline at end of file
diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
index 6999cbb54..c8b4c0f5d 100644
--- a/server/mcp/gva_auto_generate.go
+++ b/server/mcp/gva_auto_generate.go
@@ -206,7 +206,7 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
 1. needCreatedPackage=true时packageInfo必需
 2. needCreatedModules=true时modulesInfo必需
 3. packageType只能是"package"或"plugin"
-4. 字段类型支持：string,int,int64,float64,bool,time.Time,enum,picture,video,file,pictures,array,richtext,json
+4. 字段类型支持：string（字符串）,richtext（富文本）,int（整型）,bool（布尔值）,float64（浮点型）,time.Time（时间）,enum（枚举）,picture（单图片，字符串）,pictures（多图片，json字符串）,video（视频，字符串）,file（文件，json字符串）,json（JSON）,array（数组）
 5. 搜索类型支持：=,!=,>,>=,<,<=,NOT BETWEEN/LIKE/BETWEEN/IN/NOT IN
 6. gvaModel=true时自动包含ID,CreatedAt,UpdatedAt,DeletedAt字段
 7. **重要**：当gvaModel=false时，必须有一个字段的primaryKey=true，否则会导致PrimaryField为nil错误
diff --git a/server/mcp/menu_creator.go b/server/mcp/menu_creator.go
index cc8a26597..4add855c5 100644
--- a/server/mcp/menu_creator.go
+++ b/server/mcp/menu_creator.go
@@ -64,7 +64,7 @@ type MenuCreator struct{}
 // New 创建菜单创建工具
 func (m *MenuCreator) New() mcp.Tool {
 	return mcp.NewTool("create_menu",
-		mcp.WithDescription("创建前端菜单记录，用于在生成前端页面时自动创建对应的菜单项，只要前端有页面生成，都需要调用此mcp。"),
+		mcp.WithDescription("创建前端菜单记录，用于AI编辑器自动添加前端页面时自动创建对应的菜单项。注意：使用gva_auto_generate创建的包和模块会自动创建菜单项，无需调用此工具。仅在AI编辑器自动添加前端页面时使用。"),
 		mcp.WithNumber("parentId",
 			mcp.Description("父菜单ID，0表示根菜单"),
 			mcp.DefaultNumber(0),

From 3f21d7f8dd9a8df37c7a2ab151032767bed50ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Tue, 5 Aug 2025 18:53:35 +0800
Subject: [PATCH 28/56] =?UTF-8?q?docs(mcp):=20=E6=9B=B4=E6=96=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E7=B1=BB=E5=9E=8B=E7=9A=84=E6=94=AF=E6=8C=81=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/mcp/gva_auto_generate.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
index c8b4c0f5d..527298dd3 100644
--- a/server/mcp/gva_auto_generate.go
+++ b/server/mcp/gva_auto_generate.go
@@ -171,7 +171,7 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
     "fields": [{
       "fieldName": "字段名(string)",
       "fieldDesc": "字段描述(string)",
-      "fieldType": "字段类型:string/int/bool/time.Time等(string)",
+      "fieldType": "字段类型支持：string（字符串）,richtext（富文本）,int（整型）,bool（布尔值）,float64（浮点型）,time.Time（时间）,enum（枚举）,picture（单图片，字符串）,pictures（多图片，json字符串）,video（视频，字符串）,file（文件，json字符串）,json（JSON）,array（数组）",
       "fieldJson": "JSON标签(string)",
       "dataTypeLong": "数据长度(string)",
       "comment": "注释(string)",
@@ -803,7 +803,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
     "fields": [{
       "fieldName": "字段名（必须大写开头）",
       "fieldDesc": "字段描述",
-      "fieldType": "GO 语言的数据类型",
+      "fieldType": "字段类型支持：string（字符串）,richtext（富文本）,int（整型）,bool（布尔值）,float64（浮点型）,time.Time（时间）,enum（枚举）,picture（单图片，字符串）,pictures（多图片，json字符串）,video（视频，字符串）,file（文件，json字符串）,json（JSON）,array（数组）",
       "fieldJson": "json标签",
       "dataTypeLong": "长度",
       "comment": "注释",

From 76fe71a8ddd8a4ff0ca0fa0126fa5ad36f372787 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Tue, 5 Aug 2025 20:35:12 +0800
Subject: [PATCH 29/56] =?UTF-8?q?docs(mcp):=20=E5=AE=8C=E5=96=84=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=8F=8F=E8=BF=B0=E5=B9=B6=E6=B7=BB=E5=8A=A0=E9=87=8D?=
 =?UTF-8?q?=E8=A6=81=E9=99=90=E5=88=B6=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/mcp/api_creator.go       |  6 +++++-
 server/mcp/gva_auto_generate.go | 11 +++++++++++
 server/mcp/menu_creator.go      |  6 +++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/server/mcp/api_creator.go b/server/mcp/api_creator.go
index d2de59b50..1a1503d91 100644
--- a/server/mcp/api_creator.go
+++ b/server/mcp/api_creator.go
@@ -41,7 +41,11 @@ type ApiCreator struct{}
 // New 创建API创建工具
 func (a *ApiCreator) New() mcp.Tool {
 	return mcp.NewTool("create_api",
-		mcp.WithDescription("创建后端API记录，用于AI编辑器自动添加API接口时自动创建对应的API权限记录。注意：使用gva_auto_generate创建的包和模块会自动创建API权限，无需调用此工具。仅在AI编辑器自动添加API或router下的文件产生路径变化时使用。"),
+		mcp.WithDescription(`创建后端API记录，用于AI编辑器自动添加API接口时自动创建对应的API权限记录。
+
+**重要限制：**
+- 当使用gva_auto_generate工具且needCreatedModules=true时，模块创建会自动生成API权限，不应调用此工具
+- 仅在以下情况使用：1) 单独创建API（不涉及模块创建）；2) AI编辑器自动添加API；3) router下的文件产生路径变化时`),
 		mcp.WithString("path",
 			mcp.Required(),
 			mcp.Description("API路径，如：/user/create"),
diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
index 527298dd3..a710567c1 100644
--- a/server/mcp/gva_auto_generate.go
+++ b/server/mcp/gva_auto_generate.go
@@ -135,6 +135,10 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
 2. AI分析需求为1xxx2xxx格式 → gva_auto_generate（执行创建）
 3. 创建完成后，根据需要使用其他辅助工具
 
+**重要限制：**
+- 当needCreatedModules=true时，模块创建会自动生成API和菜单，因此不应再调用api_creator和menu_creator工具
+- 只有在单独创建API或菜单（不涉及模块创建）时才使用api_creator和menu_creator工具
+
 重要：ExecutionPlan结构体格式要求（支持批量创建）：
 {
   "packageName": "包名(string)",
@@ -1365,6 +1369,13 @@ func (t *AutomationModuleAnalyzer) executeCreation(ctx context.Context, plan *Ex
 		}
 
 		result.Message += fmt.Sprintf("批量创建完成，共处理 %d 个模块; ", len(plan.ModulesInfo))
+		
+		// 添加重要提醒：不要使用其他MCP工具
+		result.Message += "\n\n⚠️ 重要提醒：\n"
+		result.Message += "模块创建已完成，API和菜单已自动生成。请不要再调用以下MCP工具：\n"
+		result.Message += "- api_creator：API权限已在模块创建时自动生成\n"
+		result.Message += "- menu_creator：前端菜单已在模块创建时自动生成\n"
+		result.Message += "如需修改API或菜单，请直接在系统管理界面中进行配置。\n"
 	}
 
 	result.Message += "已构建目录结构信息; "
diff --git a/server/mcp/menu_creator.go b/server/mcp/menu_creator.go
index 4add855c5..a5f83545b 100644
--- a/server/mcp/menu_creator.go
+++ b/server/mcp/menu_creator.go
@@ -64,7 +64,11 @@ type MenuCreator struct{}
 // New 创建菜单创建工具
 func (m *MenuCreator) New() mcp.Tool {
 	return mcp.NewTool("create_menu",
-		mcp.WithDescription("创建前端菜单记录，用于AI编辑器自动添加前端页面时自动创建对应的菜单项。注意：使用gva_auto_generate创建的包和模块会自动创建菜单项，无需调用此工具。仅在AI编辑器自动添加前端页面时使用。"),
+		mcp.WithDescription(`创建前端菜单记录，用于AI编辑器自动添加前端页面时自动创建对应的菜单项。
+
+**重要限制：**
+- 当使用gva_auto_generate工具且needCreatedModules=true时，模块创建会自动生成菜单项，不应调用此工具
+- 仅在以下情况使用：1) 单独创建菜单（不涉及模块创建）；2) AI编辑器自动添加前端页面时`),
 		mcp.WithNumber("parentId",
 			mcp.Description("父菜单ID，0表示根菜单"),
 			mcp.DefaultNumber(0),

From 7a69b88885d69c138266dcf4295b2523bf6c4671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Wed, 6 Aug 2025 13:47:09 +0800
Subject: [PATCH 30/56] =?UTF-8?q?refactor(config):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=A0=BC=E5=BC=8F=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/config.docker.yaml | 373 ++++++++++++++++++++++----------------
 1 file changed, 218 insertions(+), 155 deletions(-)

diff --git a/server/config.docker.yaml b/server/config.docker.yaml
index a7783716f..662c5cad1 100644
--- a/server/config.docker.yaml
+++ b/server/config.docker.yaml
@@ -2,107 +2,103 @@
 
 # jwt configuration
 jwt:
-  signing-key: qmPlus
-  expires-time: 7d
-  buffer-time: 1d
-  issuer: qmPlus
+    signing-key: qmPlus
+    expires-time: 7d
+    buffer-time: 1d
+    issuer: qmPlus
 # zap logger configuration
 zap:
-  level: info
-  format: console
-  prefix: "[github.com/flipped-aurora/gin-vue-admin/server]"
-  director: log
-  show-line: true
-  encode-level: LowercaseColorLevelEncoder
-  stacktrace-key: stacktrace
-  log-in-console: true
+    level: info
+    format: console
+    prefix: "[github.com/flipped-aurora/gin-vue-admin/server]"
+    director: log
+    show-line: true
+    encode-level: LowercaseColorLevelEncoder
+    stacktrace-key: stacktrace
+    log-in-console: true
+    retention-day: -1
 
 # redis configuration
 redis:
-  db: 0
-  addr: 177.7.0.14:6379
-  password: ""
+    #是否使用redis集群模式
+    useCluster: false
+    #使用集群模式addr和db默认无效
+    addr: 177.7.0.14:6379
+    password: ""
+    db: 0
+    clusterAddrs:
+        - "177.7.0.14:7000"
+        - "177.7.0.15:7001"
+        - "177.7.0.13:7002"
+
+# redis-list configuration
+redis-list:
+    - name: cache           # 数据库的名称,注意: name 需要在 redis-list 中唯一
+      useCluster: false     # 是否使用redis集群模式
+      addr: 177.7.0.14:6379  # 使用集群模式addr和db默认无效
+      password: ""
+      db: 0
+      clusterAddrs:
+          - "177.7.0.14:7000"
+          - "177.7.0.15:7001"
+          - "177.7.0.13:7002"
 
 # mongo configuration
 mongo:
-  coll: ''
-  options: ''
-  database: ''
-  username: ''
-  password: ''
-  min-pool-size: 0
-  max-pool-size: 100
-  socket-timeout-ms: 0
-  connect-timeout-ms: 0
-  is-zap: false
-  hosts:
-    - host: ''
-      port: ''
+    coll: ''
+    options: ''
+    database: ''
+    username: ''
+    password: ''
+    auth-source: ''
+    min-pool-size: 0
+    max-pool-size: 100
+    socket-timeout-ms: 0
+    connect-timeout-ms: 0
+    is-zap: false
+    hosts:
+        - host: ''
+          port: ''
 
 # email configuration
 email:
-  to: xxx@qq.com
-  port: 465
-  from: xxx@163.com
-  host: smtp.163.com
-  is-ssl: true
-  secret: xxx
-  nickname: test
+    to: xxx@qq.com
+    port: 465
+    from: xxx@163.com
+    host: smtp.163.com
+    is-ssl: true
+    secret: xxx
+    nickname: test
 
 # system configuration
 system:
-  env: public  # Change to "develop" to skip authentication for development mode
-  addr: 8888
-  db-type: mysql
-  oss-type: local    # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
-  use-redis: false     # 使用redis
-  use-mongo: false     # 使用mongo
-  use-multipoint: false
-  # IP限制次数 一个小时15000次
-  iplimit-count: 15000
-  #  IP限制一个小时
-  iplimit-time: 3600
+    env: local # 修改为public可以关闭路由日志输出
+    addr: 8888
+    db-type: mysql
+    oss-type: local # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+    use-redis: false # 使用redis
+    use-mongo: false     # 使用mongo
+    use-multipoint: false
+    # IP限制次数 一个小时15000次
+    iplimit-count: 15000
+    #  IP限制一个小时
+    iplimit-time: 3600
+    #  路由全局前缀
+    router-prefix: ""
+    #  严格角色模式 打开后权限将会存在上下级关系
+    use-strict-auth: false
 
 # captcha configuration
 captcha:
-  key-long: 6
-  img-width: 240
-  img-height: 80
-  open-captcha: 0 # 0代表一直开启，大于0代表限制次数
-  open-captcha-timeout: 3600 # open-captcha大于0时才生效
+    key-long: 6
+    img-width: 240
+    img-height: 80
+    open-captcha: 0 # 0代表一直开启，大于0代表限制次数
+    open-captcha-timeout: 3600 # open-captcha大于0时才生效
 
 # mysql connect configuration
 # 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
 mysql:
-  path: ""
-  port: ""
-  config: ""
-  db-name: ""
-  username: ""
-  password: ""
-  max-idle-conns: 10
-  max-open-conns: 100
-  log-mode: ""
-  log-zap: false
-
-# pgsql connect configuration
-# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
-pgsql:
-  path: ""
-  port: ""
-  config: ""
-  db-name: ""
-  username: ""
-  password: ""
-  max-idle-conns: 10
-  max-open-conns: 100
-  log-mode: ""
-  log-zap: false
-
-db-list:
-  - disable: true # 是否禁用
-    type: "" # 数据库的类型,目前支持mysql、pgsql
-    alias-name: "" # 数据库的名称,注意: alias-name 需要在db-list中唯一
     path: ""
     port: ""
     config: ""
@@ -114,107 +110,174 @@ db-list:
     log-mode: ""
     log-zap: false
 
+# pgsql connect configuration
+# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
+pgsql:
+    path: ""
+    port: ""
+    config: ""
+    db-name: ""
+    username: ""
+    password: ""
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+oracle:
+    path: ""
+    port: ""
+    config: ""
+    db-name: ""
+    username: ""
+    password: ""
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+mssql:
+    path: ""
+    port: ""
+    config: ""
+    db-name: ""
+    username: ""
+    password: ""
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+sqlite:
+    path: ""
+    port: ""
+    config: ""
+    db-name: ""
+    username: ""
+    password: ""
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+db-list:
+    - disable: true # 是否禁用
+      type: "" # 数据库的类型,目前支持mysql、pgsql、mssql、oracle
+      alias-name: "" # 数据库的名称,注意: alias-name 需要在db-list中唯一
+      path: ""
+      port: ""
+      config: ""
+      db-name: ""
+      username: ""
+      password: ""
+      max-idle-conns: 10
+      max-open-conns: 100
+      log-mode: ""
+      log-zap: false
 
 # local configuration
 local:
-  path: uploads/file
-  store-path: uploads/file
+    path: uploads/file
+    store-path: uploads/file
 
 # autocode configuration
 autocode:
-  transfer-restart: true
-  # root 自动适配项目根目录
-  # 请不要手动配置,他会在项目加载的时候识别出根路径
-  root: ""
-  server: /server
-  server-plug: /plugin/%s
-  server-api: /api/v1/%s
-  server-initialize: /initialize
-  server-model: /model/%s
-  server-request: /model/%s/request/
-  server-router: /router/%s
-  server-service: /service/%s
-  web: /web/src
-  web-api: /api
-  web-form: /view
-  web-table: /view
+    web: web/src
+    root: "" # root 自动适配项目根目录, 请不要手动配置,他会在项目加载的时候识别出根路径
+    server: server
+    module: 'github.com/flipped-aurora/gin-vue-admin/server'
+    ai-path: ""  # AI服务路径
 
 # qiniu configuration (请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址)
 qiniu:
-  zone: ZoneHuaDong
-  bucket: ""
-  img-path: ""
-  use-https: false
-  access-key: ""
-  secret-key: ""
-  use-cdn-domains: false
+    zone: ZoneHuaDong
+    bucket: ""
+    img-path: ""
+    use-https: false
+    access-key: ""
+    secret-key: ""
+    use-cdn-domains: false
+
+# minio oss configuration
+minio:
+    endpoint: yourEndpoint
+    access-key-id: yourAccessKeyId
+    access-key-secret: yourAccessKeySecret
+    bucket-name: yourBucketName
+    use-ssl: false
+    base-path: ""
+    bucket-url: "http://host:9000/yourBucketName"
 
 # aliyun oss configuration
 aliyun-oss:
-  endpoint: yourEndpoint
-  access-key-id: yourAccessKeyId
-  access-key-secret: yourAccessKeySecret
-  bucket-name: yourBucketName
-  bucket-url: yourBucketUrl
-  base-path: yourBasePath
+    endpoint: yourEndpoint
+    access-key-id: yourAccessKeyId
+    access-key-secret: yourAccessKeySecret
+    bucket-name: yourBucketName
+    bucket-url: yourBucketUrl
+    base-path: yourBasePath
 
 # tencent cos configuration
 tencent-cos:
-  bucket: xxxxx-10005608
-  region: ap-shanghai
-  secret-id: your-secret-id
-  secret-key: your-secret-key
-  base-url: https://gin.vue.admin
-  path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+    bucket: xxxxx-10005608
+    region: ap-shanghai
+    secret-id: your-secret-id
+    secret-key: your-secret-key
+    base-url: https://gin.vue.admin
+    path-prefix: github.com/flipped-aurora/gin-vue-admin/server
 
 # aws s3 configuration (minio compatible)
 aws-s3:
-  bucket: xxxxx-10005608
-  region: ap-shanghai
-  endpoint: ""
-  s3-force-path-style: false
-  disable-ssl: false
-  secret-id: your-secret-id
-  secret-key: your-secret-key
-  base-url: https://gin.vue.admin
-  path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+    bucket: xxxxx-10005608
+    region: ap-shanghai
+    endpoint: ""
+    s3-force-path-style: false
+    disable-ssl: false
+    secret-id: your-secret-id
+    secret-key: your-secret-key
+    base-url: https://gin.vue.admin
+    path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+
+# cloudflare r2 configuration
+cloudflare-r2:
+    bucket: xxxx0bucket
+    base-url: https://gin.vue.admin.com
+    path: uploads
+    account-id: xxx_account_id
+    access-key-id: xxx_key_id
+    secret-access-key: xxx_secret_key
 
 # huawei obs configuration
 hua-wei-obs:
-  path: you-path
-  bucket: you-bucket
-  endpoint: you-endpoint
-  access-key: you-access-key
-  secret-key: you-secret-key
+    path: you-path
+    bucket: you-bucket
+    endpoint: you-endpoint
+    access-key: you-access-key
+    secret-key: you-secret-key
 
 # excel configuration
 excel:
-  dir: ./resource/excel/
+    dir: ./resource/excel/
 
-# timer task db clear table
-Timer:
-  start: true
-  spec: "@daily"  # 定时任务详细配置参考 https://pkg.go.dev/github.com/robfig/cron/v3
-  detail:
-    - tableName: sys_operation_records
-      compareField: created_at
-      interval: 2160h
-    - tableName: jwt_blacklists
-      compareField: created_at
-      interval: 168h
+# disk usage configuration
+disk-list:
+    - mount-point: "/"
 
 # 跨域配置
 # 需要配合 server/initialize/router.go -> `Router.Use(middleware.CorsByRules())` 使用
 cors:
-  mode: whitelist # 放行模式: allow-all, 放行全部; whitelist, 白名单模式, 来自白名单内域名的请求添加 cors 头; strict-whitelist 严格白名单模式, 白名单外的请求一律拒绝
-  whitelist:
-    - allow-origin: example1.com
-      allow-headers: content-type
-      allow-methods: GET, POST
-      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
-      allow-credentials: true # 布尔值
-    - allow-origin: example2.com
-      allow-headers: content-type
-      allow-methods: GET, POST
-      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
-      allow-credentials: true # 布尔值
\ No newline at end of file
+    mode: strict-whitelist # 放行模式: allow-all, 放行全部; whitelist, 白名单模式, 来自白名单内域名的请求添加 cors 头; strict-whitelist 严格白名单模式, 白名单外的请求一律拒绝
+    whitelist:
+        - allow-origin: example1.com
+          allow-headers: Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id
+          allow-methods: POST, GET
+          expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+
+          allow-credentials: true # 布尔值
+        - allow-origin: example2.com
+          allow-headers: content-type
+          allow-methods: GET, POST
+          expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+          allow-credentials: true # 布尔值
+mcp:
+    name: GVA_MCP
+    version: v1.0.0
+    sse_path: /sse
+    message_path: /message
+    url_prefix: ''
\ No newline at end of file

From 9f958addc89af8d9e201f7d83eb9ad3bf64e9625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Wed, 6 Aug 2025 15:18:03 +0800
Subject: [PATCH 31/56] =?UTF-8?q?fix(verify):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81=E4=B8=AD=E7=9A=84Captcha?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=A0=A1=E9=AA=8C=20refactor(validation):=20?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E5=AD=97=E6=AE=B5=E5=90=8D=E9=A6=96=E5=AD=97?=
 =?UTF-8?q?=E6=AF=8D=E5=A4=A7=E5=86=99=E5=B9=B6=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/mcp/gva_auto_generate.go | 10 +++++++++-
 server/utils/verify.go          |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
index a710567c1..6c48a14ed 100644
--- a/server/mcp/gva_auto_generate.go
+++ b/server/mcp/gva_auto_generate.go
@@ -173,7 +173,7 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
     "generateWeb": "是否生成前端(bool)",
     "generateServer": "是否生成后端(bool)",
     "fields": [{
-      "fieldName": "字段名(string)",
+      "fieldName": "字段名(string)必须大写开头",
       "fieldDesc": "字段描述(string)",
       "fieldType": "字段类型支持：string（字符串）,richtext（富文本）,int（整型）,bool（布尔值）,float64（浮点型）,time.Time（时间）,enum（枚举）,picture（单图片，字符串）,pictures（多图片，json字符串）,video（视频，字符串）,file（文件，json字符串）,json（JSON）,array（数组）",
       "fieldJson": "JSON标签(string)",
@@ -1243,6 +1243,14 @@ func (t *AutomationModuleAnalyzer) validateExecutionPlan(plan *ExecutionPlan) er
 				if field.FieldName == "" {
 					return fmt.Errorf("模块 %d 字段 %d 的 fieldName 不能为空", moduleIndex+1, i+1)
 				}
+				
+				// 确保字段名首字母大写
+				if len(field.FieldName) > 0 {
+					firstChar := string(field.FieldName[0])
+					if firstChar >= "a" && firstChar <= "z" {
+						moduleInfo.Fields[i].FieldName = strings.ToUpper(firstChar) + field.FieldName[1:]
+					}
+				}
 				if field.FieldDesc == "" {
 					return fmt.Errorf("模块 %d 字段 %d 的 fieldDesc 不能为空", moduleIndex+1, i+1)
 				}
diff --git a/server/utils/verify.go b/server/utils/verify.go
index e81c1f194..cc2cb78e7 100644
--- a/server/utils/verify.go
+++ b/server/utils/verify.go
@@ -5,7 +5,7 @@ var (
 	ApiVerify              = Rules{"Path": {NotEmpty()}, "Description": {NotEmpty()}, "ApiGroup": {NotEmpty()}, "Method": {NotEmpty()}}
 	MenuVerify             = Rules{"Path": {NotEmpty()}, "Name": {NotEmpty()}, "Component": {NotEmpty()}, "Sort": {Ge("0")}}
 	MenuMetaVerify         = Rules{"Title": {NotEmpty()}}
-	LoginVerify            = Rules{"CaptchaId": {NotEmpty()}, "Captcha": {NotEmpty()}, "Username": {NotEmpty()}, "Password": {NotEmpty()}}
+	LoginVerify            = Rules{"Username": {NotEmpty()}, "Password": {NotEmpty()}}
 	RegisterVerify         = Rules{"Username": {NotEmpty()}, "NickName": {NotEmpty()}, "Password": {NotEmpty()}, "AuthorityId": {NotEmpty()}}
 	PageInfoVerify         = Rules{"Page": {NotEmpty()}, "PageSize": {NotEmpty()}}
 	CustomerVerify         = Rules{"CustomerName": {NotEmpty()}, "CustomerPhoneData": {NotEmpty()}}

From 52be26eb4388762df305fef9dd2d0c03201fd957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Wed, 6 Aug 2025 15:55:38 +0800
Subject: [PATCH 32/56] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=9C=AA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=BB=98=E8=AE=A4=E8=B7=AF=E7=94=B1=E6=97=B6?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/pinia/modules/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js
index a36896bd1..5b1f55c73 100644
--- a/web/src/pinia/modules/user.js
+++ b/web/src/pinia/modules/user.js
@@ -93,7 +93,7 @@ export const useUserStore = defineStore('user', () => {
       }
 
       if (!router.hasRoute(userInfo.value.authority.defaultRouter)) {
-        ElMessage.error('请联系管理员进行授权')
+        ElMessage.error('不存在可以登陆的首页，请联系管理员进行配置')
       } else {
         await router.replace({ name: userInfo.value.authority.defaultRouter })
       }

From 8b8ae7b692d5ce2dcfde586e4f5605bc0ccbdc82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 7 Aug 2025 16:18:04 +0800
Subject: [PATCH 33/56] =?UTF-8?q?refactor(auth):=20=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8C=87=E4=BB=A4=E4=B8=AD=E7=9A=84=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/directive/auth.js | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/web/src/directive/auth.js b/web/src/directive/auth.js
index d2b9b6a8f..2517299cc 100644
--- a/web/src/directive/auth.js
+++ b/web/src/directive/auth.js
@@ -7,22 +7,7 @@ export default {
       // 当被绑定的元素插入到 DOM 中时……
       mounted: function (el, binding) {
         const userInfo = userStore.userInfo
-        let type = ''
-        switch (Object.prototype.toString.call(binding.value)) {
-          case '[object Array]':
-            type = 'Array'
-            break
-          case '[object String]':
-            type = 'String'
-            break
-          case '[object Number]':
-            type = 'Number'
-            break
-          default:
-            type = ''
-            break
-        }
-        if (type === '') {
+        if (!binding.value){
           el.parentNode.removeChild(el)
           return
         }

From 339db778c31a092e7841f5f02b4893e9c4d55cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Fri, 8 Aug 2025 11:46:08 +0800
Subject: [PATCH 34/56] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5svg=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/package.json b/web/package.json
index 3e2bb3e24..5cc38ccbd 100644
--- a/web/package.json
+++ b/web/package.json
@@ -42,7 +42,7 @@
     "tailwindcss": "^3.4.10",
     "universal-cookie": "^7",
     "vform3-builds": "^3.0.10",
-    "vite-auto-import-svg": "^1.6.0",
+    "vite-auto-import-svg": "^1.7.0",
     "vue": "^3.5.7",
     "vue-cropper": "^1.1.4",
     "vue-echarts": "^7.0.3",

From 1e3c968277dcb89420671b2dd90a8bf97c93db38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Mon, 11 Aug 2025 10:52:15 +0800
Subject: [PATCH 35/56] =?UTF-8?q?refactor(mcp):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E6=8F=8F=E8=BF=B0=E5=B9=B6=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/mcp/current_time.go      | 81 ---------------------------------
 server/mcp/get_nickname.go      | 79 --------------------------------
 server/mcp/gva_auto_generate.go |  2 +-
 3 files changed, 1 insertion(+), 161 deletions(-)
 delete mode 100644 server/mcp/current_time.go
 delete mode 100644 server/mcp/get_nickname.go

diff --git a/server/mcp/current_time.go b/server/mcp/current_time.go
deleted file mode 100644
index 41eaea308..000000000
--- a/server/mcp/current_time.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package mcpTool
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"github.com/mark3labs/mcp-go/mcp"
-	"time"
-)
-
-func init() {
-	RegisterTool(&CurrentTime{})
-}
-
-type CurrentTime struct {
-}
-
-// 获取当前系统时间
-func (t *CurrentTime) Handle(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	// 获取当前系统时间
-
-	timezone, ok := request.GetArguments()["timezone"].(string)
-
-	if !ok {
-		return nil, errors.New("参数错误：timezone 必须是字符串类型")
-	}
-	// 根据timezone参数加载对应时区
-	loc, err := loadTimeZone(timezone)
-	if err != nil {
-		return nil, err
-	}
-
-	// 获取当前时间并转换为指定时区
-	currentTime := time.Now().In(loc).Format("2006-01-02 15:04:05")
-	//返回
-	return &mcp.CallToolResult{
-		Content: []mcp.Content{
-			mcp.TextContent{
-				Type: "text",
-				Text: fmt.Sprintf("%s 时区的当前时间是：%s", timezone, currentTime),
-			},
-		},
-	}, nil
-}
-
-func (t *CurrentTime) New() mcp.Tool {
-	return mcp.NewTool("currentTime",
-		mcp.WithDescription("获取当前系统时间"),
-		mcp.WithString("timezone",
-			mcp.Required(),
-			mcp.Description("时区"),
-			mcp.Enum("UTC", "CST", "PST", "EST", "GMT", "CET", "JST", "MST", "IST", "AST", "HST"),
-		))
-}
-
-// 将简写时区转换为IANA标准时区
-func loadTimeZone(timezone string) (*time.Location, error) {
-	// 时区映射表
-	timezoneMap := map[string]string{
-		"UTC": "UTC",
-		"CST": "Asia/Shanghai", // 中国标准时间
-		"PST": "America/Los_Angeles",
-		"EST": "America/New_York",
-		"GMT": "GMT",
-		"CET": "Europe/Paris",
-		"JST": "Asia/Tokyo",
-		"MST": "America/Denver",
-		"IST": "Asia/Kolkata",
-		"AST": "Asia/Riyadh", // 阿拉伯标准时间
-		"HST": "Pacific/Honolulu",
-	}
-
-	// 获取标准时区名称
-	tzName, exists := timezoneMap[timezone]
-	if !exists {
-		return nil, errors.New("不支持的时区: " + timezone)
-	}
-
-	// 加载时区
-	return time.LoadLocation(tzName)
-}
diff --git a/server/mcp/get_nickname.go b/server/mcp/get_nickname.go
deleted file mode 100644
index 6ad55f6ab..000000000
--- a/server/mcp/get_nickname.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package mcpTool
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
-	"github.com/mark3labs/mcp-go/mcp"
-	"gorm.io/gorm"
-)
-
-func init() {
-	RegisterTool(&GetNickname{})
-}
-
-type GetNickname struct{}
-
-// 根据用户username获取nickname
-func (t *GetNickname) New() mcp.Tool {
-	return mcp.NewTool("getNickname",
-		mcp.WithDescription("根据用户username获取nickname"),
-		mcp.WithString("username",
-			mcp.Required(),
-			mcp.Description("用户的username"),
-		))
-}
-
-// Handle 处理获取昵称的请求
-func (t *GetNickname) Handle(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
-	// 1. 参数验证
-	username, ok := request.GetArguments()["username"].(string)
-	if !ok {
-		return nil, errors.New("参数错误：username 必须是字符串类型")
-	}
-
-	if username == "" {
-		return nil, errors.New("参数错误：username 不能为空")
-	}
-
-	// 2. 记录操作日志
-	global.GVA_LOG.Info("getNickname 工具被调用")
-
-	// 3. 优化查询，只选择需要的字段
-	var user struct {
-		NickName string
-	}
-
-	err := global.GVA_DB.Model(&system.SysUser{}).
-		Select("nick_name").
-		Where("username = ?", username).
-		First(&user).Error
-
-	// 4. 优化错误处理
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return &mcp.CallToolResult{
-				Content: []mcp.Content{
-					mcp.TextContent{
-						Type: "text",
-						Text: fmt.Sprintf("用户 %s 不存在", username),
-					},
-				},
-			}, nil
-		}
-		global.GVA_LOG.Error("数据库查询错误")
-		return nil, errors.New("系统错误，请稍后再试")
-	}
-
-	// 构造回复信息
-	return &mcp.CallToolResult{
-		Content: []mcp.Content{
-			mcp.TextContent{
-				Type: "text",
-				Text: fmt.Sprintf("用户 %s 的昵称是 %s", username, user.NickName),
-			},
-		},
-	}, nil
-}
diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
index 6c48a14ed..cb9ae0c35 100644
--- a/server/mcp/gva_auto_generate.go
+++ b/server/mcp/gva_auto_generate.go
@@ -188,7 +188,7 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
       "desc": "详情显示(bool)",
       "excel": "导入导出(bool)",
       "require": "是否必填(bool)",
-      "defaultValue": "默认值(string)",
+      "defaultValue": "默认值(string)，JSON类型（array,json,file,pictures）请保持为空他们不可以设置默认值",
       "errorText": "错误提示(string)",
       "clearable": "是否可清空(bool)",
       "sort": "是否排序(bool)",

From eb2925829f63b96d885f514cff771b5c05d604db Mon Sep 17 00:00:00 2001
From: dzwvip <dzwvip@qq.com>
Date: Tue, 12 Aug 2025 15:05:38 +0800
Subject: [PATCH 36/56] =?UTF-8?q?=E4=BF=AE=E6=94=B9gorm-oracle=E7=9A=84?=
 =?UTF-8?q?=E9=A9=B1=E5=8A=A8=E5=8C=85=E4=B8=BAgo-ora,=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96cgo=E5=92=8Coracle=20client?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/config/gorm_oracle.go                  | 10 +++++++++-
 server/initialize/gorm_oracle.go              | 14 ++------------
 server/service/system/sys_auto_code_oracle.go |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/server/config/gorm_oracle.go b/server/config/gorm_oracle.go
index 1bbeb46ab..52cf21c00 100644
--- a/server/config/gorm_oracle.go
+++ b/server/config/gorm_oracle.go
@@ -1,10 +1,18 @@
 package config
 
+import (
+	"fmt"
+	"net"
+	"net/url"
+)
+
 type Oracle struct {
 	GeneralDB `yaml:",inline" mapstructure:",squash"`
 }
 
 func (m *Oracle) Dsn() string {
-	return "oracle://" + m.Username + ":" + m.Password + "@" + m.Path + ":" + m.Port + "/" + m.Dbname + "?" + m.Config
+	dsn := fmt.Sprintf("oracle://%s:%s@%s/%s?%s", url.PathEscape(m.Username), url.PathEscape(m.Password),
+		net.JoinHostPort(m.Path, m.Port), url.PathEscape(m.Dbname), m.Config)
+	return dsn
 
 }
diff --git a/server/initialize/gorm_oracle.go b/server/initialize/gorm_oracle.go
index 513359f0f..80fa8fa8a 100644
--- a/server/initialize/gorm_oracle.go
+++ b/server/initialize/gorm_oracle.go
@@ -1,18 +1,14 @@
 package initialize
 
 import (
-	//"github.com/dzwvip/oracle"
+	oracle "github.com/dzwvip/gorm-oracle"
 	"github.com/flipped-aurora/gin-vue-admin/server/config"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/initialize/internal"
-
-	//_ "github.com/godror/godror"
-	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 )
 
 // GormOracle 初始化oracle数据库
-// 如果需要Oracle库 放开import里的注释 把下方 mysql.Config 改为 oracle.Config ;  mysql.New 改为 oracle.New
 func GormOracle() *gorm.DB {
 	m := global.GVA_CONFIG.Oracle
 	return initOracleDatabase(m)
@@ -28,13 +24,7 @@ func initOracleDatabase(m config.Oracle) *gorm.DB {
 	if m.Dbname == "" {
 		return nil
 	}
-
-	oracleConfig := mysql.Config{
-		DSN:               m.Dsn(), // DSN data source name
-		DefaultStringSize: 191,     // string 类型字段的默认长度
-	}
-
-	if db, err := gorm.Open(mysql.New(oracleConfig), internal.Gorm.Config(m.Prefix, m.Singular)); err != nil {
+	if db, err := gorm.Open(oracle.Open(m.Dsn()), internal.Gorm.Config(m.Prefix, m.Singular)); err != nil {
 		panic(err)
 	} else {
 		sqlDB, _ := db.DB()
diff --git a/server/service/system/sys_auto_code_oracle.go b/server/service/system/sys_auto_code_oracle.go
index 3cdb362e9..fc3c43fb3 100644
--- a/server/service/system/sys_auto_code_oracle.go
+++ b/server/service/system/sys_auto_code_oracle.go
@@ -64,7 +64,7 @@ WHERE
     lower(a.table_name) = ?
     AND lower(a.OWNER) = ?
 ORDER BY
-    a.COLUMN_ID;
+    a.COLUMN_ID
 `
 
 	err = global.GVA_DBList[businessDB].Raw(sql, tableName, dbName).Scan(&entities).Error

From 1d700ad5b6b513ff4dc4e53376fb251f21950338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:26:17 +0800
Subject: [PATCH 37/56] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d5ca7e243..6eea7bbd9 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,8 @@
 
 <table>
   <tr>
-    <td width="200">
+    <td width="250">
+	  <p>⭐️ <a href="https://www.bilibili.com/video/BV1B3htzqEf1/?spm_id_from=333.1387.homepage.video_card.click" target="__blank"> 高度适配AI编辑器的MCP </a></p>
       <p>📄 创建基础模板</p>
       <p>🤖 AI生成结构</p>
       <p>⏰ 生成代码</p>

From dd34d6e3beefbe3a63cac645f49480b2fc47786d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Tue, 26 Aug 2025 18:43:55 +0800
Subject: [PATCH 38/56] =?UTF-8?q?fix:=20mcp=E5=AD=97=E6=AE=B5=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=A0=B7=E5=BC=8F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/go.mod                   |  4 +++
 server/mcp/gva_auto_generate.go | 58 ++++++++++++++++++++++++++-------
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/server/go.mod b/server/go.mod
index 8a313c485..a83d2196c 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -74,6 +74,8 @@ require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/dzwvip/gorm-oracle v0.1.2 // indirect
+	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/gammazero/toposort v0.1.1 // indirect
 	github.com/gin-contrib/sse v1.0.0 // indirect
@@ -137,6 +139,7 @@ require (
 	github.com/sagikazarmark/locafero v0.7.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/sijms/go-ora/v2 v2.7.17 // indirect
 	github.com/sorairolake/lzip-go v0.3.5 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.12.0 // indirect
@@ -144,6 +147,7 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
+	github.com/thoas/go-funk v0.7.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.14 // indirect
 	github.com/tklauser/numcpus v0.9.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
diff --git a/server/mcp/gva_auto_generate.go b/server/mcp/gva_auto_generate.go
index cb9ae0c35..8fe4ef85d 100644
--- a/server/mcp/gva_auto_generate.go
+++ b/server/mcp/gva_auto_generate.go
@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 	"time"
+	"unicode"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
@@ -176,7 +177,7 @@ func (t *AutomationModuleAnalyzer) New() mcp.Tool {
       "fieldName": "字段名(string)必须大写开头",
       "fieldDesc": "字段描述(string)",
       "fieldType": "字段类型支持：string（字符串）,richtext（富文本）,int（整型）,bool（布尔值）,float64（浮点型）,time.Time（时间）,enum（枚举）,picture（单图片，字符串）,pictures（多图片，json字符串）,video（视频，字符串）,file（文件，json字符串）,json（JSON）,array（数组）",
-      "fieldJson": "JSON标签(string)",
+      "fieldJson": "JSON标签(string 必须是小驼峰命名，例:userName)",
       "dataTypeLong": "数据长度(string)",
       "comment": "注释(string)",
       "columnName": "数据库列名(string)",
@@ -808,7 +809,7 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
       "fieldName": "字段名（必须大写开头）",
       "fieldDesc": "字段描述",
       "fieldType": "字段类型支持：string（字符串）,richtext（富文本）,int（整型）,bool（布尔值）,float64（浮点型）,time.Time（时间）,enum（枚举）,picture（单图片，字符串）,pictures（多图片，json字符串）,video（视频，字符串）,file（文件，json字符串）,json（JSON）,array（数组）",
-      "fieldJson": "json标签",
+      "fieldJson": "json标签(string 必须是小驼峰命名，例:userName)",
       "dataTypeLong": "长度",
       "comment": "注释",
       "columnName": "数据库列名",
@@ -1243,14 +1244,7 @@ func (t *AutomationModuleAnalyzer) validateExecutionPlan(plan *ExecutionPlan) er
 				if field.FieldName == "" {
 					return fmt.Errorf("模块 %d 字段 %d 的 fieldName 不能为空", moduleIndex+1, i+1)
 				}
-				
-				// 确保字段名首字母大写
-				if len(field.FieldName) > 0 {
-					firstChar := string(field.FieldName[0])
-					if firstChar >= "a" && firstChar <= "z" {
-						moduleInfo.Fields[i].FieldName = strings.ToUpper(firstChar) + field.FieldName[1:]
-					}
-				}
+
 				if field.FieldDesc == "" {
 					return fmt.Errorf("模块 %d 字段 %d 的 fieldDesc 不能为空", moduleIndex+1, i+1)
 				}
@@ -1264,6 +1258,48 @@ func (t *AutomationModuleAnalyzer) validateExecutionPlan(plan *ExecutionPlan) er
 					return fmt.Errorf("模块 %d 字段 %d 的 columnName 不能为空", moduleIndex+1, i+1)
 				}
 
+				// 确保字段名首字母大写
+				if len(field.FieldName) > 0 {
+					firstChar := string(field.FieldName[0])
+					if firstChar >= "a" && firstChar <= "z" {
+						moduleInfo.Fields[i].FieldName = strings.ToUpper(firstChar) + field.FieldName[1:]
+					}
+				}
+
+				// 确保FieldJson使用小驼峰命名
+				if len(field.FieldJson) > 0 {
+					// 处理下划线命名转小驼峰
+					if strings.Contains(field.FieldJson, "_") {
+						parts := strings.Split(field.FieldJson, "_")
+						camelCase := strings.ToLower(parts[0])
+						for j := 1; j < len(parts); j++ {
+							if len(parts[j]) > 0 {
+								camelCase += strings.ToUpper(string(parts[j][0])) + strings.ToLower(parts[j][1:])
+							}
+						}
+						moduleInfo.Fields[i].FieldJson = camelCase
+					} else {
+						// 处理首字母大写转小写
+						firstChar := string(field.FieldJson[0])
+						if firstChar >= "A" && firstChar <= "Z" {
+							moduleInfo.Fields[i].FieldJson = strings.ToLower(firstChar) + field.FieldJson[1:]
+						}
+					}
+				}
+
+				// 确保ColumnName使用下划线命名
+				if len(field.ColumnName) > 0 {
+					// 将驼峰命名转换为下划线命名
+					var result strings.Builder
+					for i, r := range field.ColumnName {
+						if i > 0 && r >= 'A' && r <= 'Z' {
+							result.WriteRune('_')
+						}
+						result.WriteRune(unicode.ToLower(r))
+					}
+					moduleInfo.Fields[i].ColumnName = result.String()
+				}
+
 				// 验证字段类型
 				validFieldTypes := []string{"string", "int", "int64", "float64", "bool", "time.Time", "enum", "picture", "video", "file", "pictures", "array", "richtext", "json"}
 				validType := false
@@ -1377,7 +1413,7 @@ func (t *AutomationModuleAnalyzer) executeCreation(ctx context.Context, plan *Ex
 		}
 
 		result.Message += fmt.Sprintf("批量创建完成，共处理 %d 个模块; ", len(plan.ModulesInfo))
-		
+
 		// 添加重要提醒：不要使用其他MCP工具
 		result.Message += "\n\n⚠️ 重要提醒：\n"
 		result.Message += "模块创建已完成，API和菜单已自动生成。请不要再调用以下MCP工具：\n"

From cb97d3832d5321e008a32d65845e56e34a2af123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Thu, 28 Aug 2025 11:45:01 +0800
Subject: [PATCH 39/56] Merge pull request #2080 from flipped-aurora/v2.8.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

发布v2.8.5 beta 版本
---
 .claude/rules/project_rules.md                | 738 ++++++++++++++++++
 .cursor/rules/project_rules.md                | 738 ++++++++++++++++++
 .trae/rules/project_rules.md                  | 738 ++++++++++++++++++
 server/api/v1/system/sys_user.go              |   2 +-
 server/core/server.go                         |   3 +-
 server/docs/docs.go                           |   2 +-
 server/initialize/gorm_mssql.go               |   8 +-
 server/initialize/gorm_mysql.go               |   5 +-
 server/initialize/gorm_oracle.go              |   4 +-
 server/initialize/gorm_pgsql.go               |   4 +-
 server/initialize/gorm_sqlite.go              |   4 +-
 server/initialize/internal/gorm.go            |  25 +-
 server/main.go                                |   2 +-
 server/mcp/api_lister.go                      | 165 ++++
 server/mcp/menu_lister.go                     | 112 +++
 server/model/system/sys_version.go            |   2 +-
 .../resource/package/web/view/table.vue.tpl   |   4 +-
 server/resource/plugin/web/view/view.vue.tpl  |   4 +-
 server/utils/autocode/template_funcs.go       |  24 +-
 web/limit.js                                  |   4 +-
 web/openDocument.js                           |   2 +-
 web/package.json                              |  10 +-
 web/postcss.config.js                         |   6 -
 web/src/components/errorPreview/index.vue     |  14 +-
 web/src/core/config.js                        |   2 +-
 web/src/core/gin-vue-admin.js                 |   3 +-
 web/src/main.js                               |   1 +
 web/src/style/element_visiable.scss           |   3 -
 web/src/style/main.scss                       |  10 +-
 web/src/view/error/index.vue                  |  14 +-
 web/src/view/init/index.vue                   |  22 +-
 web/src/view/layout/aside/combinationMode.vue |   4 +-
 web/src/view/layout/aside/headMode.vue        |   2 +-
 web/src/view/layout/aside/normalMode.vue      |   2 +-
 web/src/view/layout/aside/sidebarMode.vue     |   6 +-
 web/src/view/layout/header/tools.vue          |  12 +-
 web/src/view/layout/index.vue                 |   2 +-
 web/src/view/layout/setting/index.vue         |   8 +-
 web/src/view/layout/tabs/index.vue            |   2 +-
 .../superAdmin/authority/components/menus.vue |   2 +-
 web/tailwind.config.js                        |  23 -
 web/uno.config.js                             |  26 +
 web/vite.config.js                            |   5 +-
 43 files changed, 2659 insertions(+), 110 deletions(-)
 create mode 100644 .claude/rules/project_rules.md
 create mode 100644 .cursor/rules/project_rules.md
 create mode 100644 .trae/rules/project_rules.md
 create mode 100644 server/mcp/api_lister.go
 create mode 100644 server/mcp/menu_lister.go
 delete mode 100644 web/postcss.config.js
 delete mode 100644 web/tailwind.config.js
 create mode 100644 web/uno.config.js

diff --git a/.claude/rules/project_rules.md b/.claude/rules/project_rules.md
new file mode 100644
index 000000000..3998e9989
--- /dev/null
+++ b/.claude/rules/project_rules.md
@@ -0,0 +1,738 @@
+### 功能描述以及必要性描述
+
+---
+name: gin-vue-admin
+description: |
+  gin-vue-admin 是一个基于现代化技术栈的全栈管理系统框架。
+  
+  前端技术栈：
+  - Vue 3.5.7 + Composition API
+  - Vite 6.2.3 构建工具
+  - Pinia 2.2.2 状态管理
+  - Element Plus 2.10.2 UI组件库
+  - UnoCSS 66.4.2 原子化CSS框架
+  - Vue Router 4.4.3 路由管理
+  - Axios 1.8.2 HTTP客户端
+  - ECharts 5.5.1 数据可视化
+  - @vueuse/core Vue组合式API工具集
+  
+  后端技术栈：
+  - Go 1.23 + Gin 1.10.0 Web框架
+  - GORM 1.25.12 ORM框架
+  - Casbin 2.103.0 权限管理
+  - Viper 1.19.0 配置管理
+  - Zap 1.27.0 日志系统
+  - Redis 9.7.0 缓存
+  - JWT 5.2.2 认证授权
+  - 支持MySQL、PostgreSQL、SQLite、SQL Server、MongoDB多种数据库
+  - 集成阿里云OSS、AWS S3、MinIO、七牛云、腾讯云COS等云存储服务
+  
+  核心特性：
+  - 完整的RBAC权限控制系统
+  - 代码自动生成功能
+  - 丰富的中间件支持
+  - 插件化架构设计
+  - Swagger API文档
+---
+
+#### **角色与目标**
+
+你是一名资深的 Go 后端开发专家，**专精于 `gin-vue-admin` (GVA) 框架的架构与开发范式**。
+
+你的核心任务是，根据需求开发**完整、生产级别的全栈功能包或插件**。你必须严格遵循 GVA 的分层架构、代码规范和核心设计模式，确保你生成的每一部分代码都能无缝集成到现有项目中。
+
+---
+
+### **🚀 重要提示：GVA Helper MCP 支持**
+
+**在开始任何GVA开发工作之前，请务必注意以下重要工作流程：**
+
+1. **MCP支持**: GVA框架本身支持MCP（Model Context Protocol），提供了强大的开发辅助能力
+
+2. **GVA Helper**: 通常会有一个名为 "**GVA Helper**" 的MCP助手，专门为GVA框架开发提供支持
+
+3. **开发流程**: 
+   - **第一步**: 在开发任何新功能之前，**必须先通过GVA Helper获得支持和指导**
+   - **第二步**: 在获得GVA Helper的专业建议和代码示例后，再进行具体的开发操作
+   - **第三步**: 遵循GVA Helper提供的最佳实践和代码规范
+
+4. **优势**: 通过GVA Helper可以获得：
+   - 最新的GVA框架特性和最佳实践
+   - 符合项目规范的代码模板
+   - 避免常见的开发陷阱和错误
+   - 确保代码质量和一致性
+
+**请始终记住：GVA Helper → 获得支持 → 开始开发**
+
+---
+
+### **核心开发指令：绝不可违背的原则**
+
+
+## **项目结构说明**
+
+### **整体架构**
+
+gin-vue-admin 采用前后端分离架构：
+- **后端 (server/)**：基于 Go + Gin 的 RESTful API 服务
+- **前端 (web/)**：基于 Vue 3 + Vite 的单页面应用
+- **部署 (deploy/)**：Docker、Kubernetes 等部署配置
+
+### **后端目录结构 (server/)**
+
+```
+server/
+├── api/                    # API控制器层
+│   └── v1/                # API版本控制
+│       ├── enter.go       # API组入口文件
+│       ├── system/        # 系统模块API
+│       └──example/       # 示例模块API
+├── config/                # 配置结构体定义
+├── core/                  # 核心启动文件
+├── docs/                  # Swagger文档
+├── global/                # 全局变量和模型
+├── initialize/            # 初始化模块
+├── middleware/            # 中间件
+├── model/                 # 数据模型层
+│   ├── system/           # 系统模块模型
+│   ├── example/          # 示例模块模型
+│   └── common/           # 通用模型
+├── plugin/               # 插件目录
+│   ├── announcement/     # 公告插件
+│   └── email/           # 邮件插件
+├── router/               # 路由层
+│   ├── enter.go         # 路由组入口
+│   ├── system/          # 系统路由
+│   └──example/         # 示例路由
+├── service/              # 服务层
+│   ├── enter.go         # 服务组入口
+│   ├── system/          # 系统服务
+│   └──  example/         # 示例服务
+├── source/               # 数据初始化
+├── utils/                # 工具包
+├── config.yaml          # 配置文件
+└── main.go              # 程序入口
+```
+
+### **前端目录结构 (web/)**
+
+```
+web/
+├── public/               # 静态资源
+├── src/
+│   ├── api/             # API接口定义
+│   │   ├── user.js      # 用户相关API
+│   │   ├── menu.js      # 菜单相关API
+│   │   └── cattery/     # 业务模块API
+│   ├── assets/          # 资源文件
+│   │   ├── icons/       # 图标
+│   │   └── images/      # 图片
+│   ├── core/            # 核心配置
+│   ├── directive/       # 自定义指令
+│   ├── hooks/           # 组合式API钩子
+│   ├── pinia/           # 状态管理
+│   │   ├── index.js     # Pinia入口
+│   │   └── modules/     # 状态模块
+│   ├── plugin/          # 前端插件
+│   │   ├── announcement/ # 公告插件
+│   │   └── email/       # 邮件插件
+│   ├── router/          # 路由配置
+│   ├── style/           # 样式文件
+│   ├── utils/           # 工具函数
+│   ├── view/            # 页面组件
+│   │   ├── dashboard/   # 仪表盘
+│   │   ├── layout/      # 布局组件
+│   │   ├── login/       # 登录页
+│   │   ├── superAdmin/  # 超级管理员
+│   │   ├── systemTools/ # 系统工具
+│   │   └── cattery/     # 业务页面
+│   ├── App.vue          # 根组件
+│   └── main.js          # 程序入口
+├── package.json         # 依赖配置
+├── vite.config.js       # Vite配置
+└── uno.config.js        # UnoCSS配置
+```
+
+---
+
+#### 后端规则
+
+在编写任何代码之前，你必须将以下 GVA 的核心设计原则作为最高行为准则：
+
+1. **严格的分层架构**:
+    
+    - **职责单一**: 每个层（Model, Service, API, Router）都有其唯一职责，**严禁跨层调用**。例如，API层绝不能直接操作数据库，必须通过Service层。Service层绝不能直接处理`gin.Context`。
+        
+    - **依赖关系**: 依赖链条必须是单向的：`Router -> API -> Service -> Model`。
+        
+2. **`enter.go` 组管理模式**:
+    
+    - 所有 `api`, `service`, `router` 层都**必须**使用 `enter.go` 文件来创建和暴露各自的 `ApiGroup`, `ServiceGroup`, `RouterGroup`。
+        
+    - 全局实例变量（如 `service.ServiceGroupApp`）是模块间通信的唯一入口，以此来避免循环引用。
+        
+3. **详尽的 Swagger 注释 (API层强制要求)**:
+    
+    - **每一个**对外暴露的 API 函数都**必须**拥有完整且准确的 Swagger 注释块。这不仅是API文档的来源，也是前后端协作、自动化测试和前端AI分析的基础。注释必须清晰地描述接口的功能、参数和返回值。
+        
+4. **统一的响应与错误处理**:
+    
+    - Service 层函数遇到业务错误时，应返回 `error` 对象。
+        
+    - API 层负责捕获 Service 层的 `error`，并使用项目统一的 `response` 包（如 `response.OkWithDetailed` 或 `response.FailWithMessage`）将其转换为格式化的 JSON 响应和正确的 HTTP 状态码。
+        
+
+---
+
+### **各层级代码实现规范**
+
+#### **1. 模型层 (`model/`)**
+
+- **数据模型 (`model/xxx.go`)**:
+    
+    - 用于定义与数据库表映射的 GORM 结构体。
+        
+    - 结构体应继承 `global.GVA_MODEL` 以包含 `ID`, `CreatedAt`, `UpdatedAt` 等基础字段。
+        
+    - 必须为字段添加清晰的 `json` 和 `gorm` 标签。
+        
+- **请求模型 (`model/request/xxx.go`)**:
+    
+    - 用于定义接收前端请求参数的结构体（DTOs）。
+        
+    - **必须**为字段添加 `json` 和 `form` 标签，以便 Gin 进行参数绑定。
+        
+    - 对于列表查询请求，应创建一个 `XxxSearch` 结构体，并内嵌通用的 `request.PageInfo` 分页结构体。
+        
+
+#### **2. 服务层 (`service/`)**
+
+- **职责**: 封装所有核心业务逻辑，进行数据库的CRUD操作。**此层不应出现任何与HTTP协议相关的代码（如 `gin.Context`）**。
+    
+- **结构**: 在 `service/` 下为每个模块创建 `xxx_service.go` 文件，并在 `service/enter.go` 中注册。
+    
+- **函数签名**: 函数应接收具体的业务参数（如 `model.Xxx` 或 `request.XxxSearch`），并返回处理结果和 `error`。
+    
+
+#### **3. API层 (`api/`)**
+
+- **职责**: 作为HTTP请求的入口，负责参数校验、调用Service层方法、并返回格式化的JSON响应。
+    
+- **结构**: 在 `api/` 下为每个模块创建 `xxx_api.go` 文件，并在 `api/enter.go` 中注册。
+    
+- **交互**: **必须**通过全局变量 `service.ServiceGroupApp` 来调用服务层的方法。
+    
+- **Swagger 示例 (必须遵循)**:
+    
+    Go
+    
+    ```
+    // CreateXxx 创建XXX
+    // @Tags     XxxModule
+    // @Summary  创建一个新的XXX
+    // @Security ApiKeyAuth
+    // @accept   application/json
+    // @Produce  application/json
+    // @Param    data body request.CreateXxxRequest true "XXX的名称和描述"
+    // @Success  200  {object} response.Response{msg=string} "创建成功"
+    // @Router   /xxx/createXxx [post]
+    func (a *XxxApi) CreateXxx(c *gin.Context) {
+        // ...
+    }
+    ```
+    
+
+#### **4. 路由层 (`router/`)**
+
+- **职责**: 定义API路由规则，并将HTTP请求路径映射到具体的API处理函数上，同时配置中间件。
+    
+- **结构**: 在 `router/` 下为每个模块创建 `xxx_router.go` 文件，并在 `router/enter.go` 中注册。
+    
+- **交互**: **必须**通过全局变量 `api.ApiGroupApp` 来引用API层的处理函数。
+    
+- **路由分组**: 应根据业务需求和权限，合理使用路由组 (`Router.Group()`)，并挂载不同的中间件（如鉴权、操作记录等）。
+
+#### **5. 初始化层 (`initialize/`)**
+
+- **职责**: 提供插件资源（数据库、路由、菜单等）的初始化入口，供主程序调用。
+    
+- **`gorm.go`**: 实现 `InitializeDB` 函数，**必须**调用 `db.AutoMigrate` 自动迁移本插件所有 `model` 的表结构。
+    
+- **`router.go`**: 实现 `InitializeRouter` 函数，**必须**调用 `router.RouterGroupApp` 中本插件路由的初始化方法，注册所有API路由。
+    
+- **`menu.go`**: 实现 `InitializeMenu` 函数，负责在数据库中创建或更新本插件的侧边栏菜单、按钮和对应的API权限。
+- viper.go: 加载插件配置文件
+-  api.go: 注册API到系统
+    
+
+#### **6. 插件入口 (`plugin.go`) 
+
+- **职责**: 作为插件的唯一入口，实现 GVA 的插件接口，让框架能够识别和加载本插件。
+    
+- **接口实现**: **必须**定义一个结构体并实现 `system.Plugin` 接口。
+    
+- **`Register`方法**: 实现 `Register` 方法，该方法接收一个 `*gin.RouterGroup` 参数，其内部**必须**调用本插件 `initialize` 包中的 `InitializeRouter` 函数来挂载路由。
+    
+- **`RouterPath`方法**: 实现 `RouterPath` 方法，返回该插件所有API的根路径，例如 `"/myPlugin"`。
+
+### 模块间引用关系：
+- API层引用Service层：在API文件中定义变量如 `var xxxService = service.ServiceGroupApp.XxxService`
+- Router层引用API层：在路由函数中使用 `api.ApiGroupApp.XxxApi.XxxMethod`
+- Initialize/Router引用Router层：通过 `router.RouterGroupApp.XxxRouter.InitXxxRouter`
+- 各模块通过enter.go文件组织和暴露功能，避免循环引用
+
+### 代码组织示例：
+
+1. Service入口 (service/enter.go):
+```go
+package service
+
+type ServiceGroup struct {
+    XxxService
+    YyyService
+    // 其他服务...
+}
+
+var ServiceGroupApp = new(ServiceGroup)
+```
+
+2. API入口 (api/enter.go):
+```go
+package api
+
+type ApiGroup struct {
+    XxxApi
+    YyyApi
+    // 其他API...
+}
+
+var ApiGroupApp = new(ApiGroup)
+```
+
+3. Router入口 (router/enter.go):
+```go
+package router
+
+type RouterGroup struct {
+    XxxRouter
+    YyyRouter
+    // 其他路由...
+}
+
+var RouterGroupApp = new(RouterGroup)
+```
+
+### Swagger注释规范：
+- @Tags: 接口所属的分组
+- @Summary: 接口功能简述
+- @Security: 安全认证方式（如需认证则添加）
+- @accept/@Produce: 请求/响应格式
+- @Param: 请求参数，包括名称、来源、类型、是否必须、描述
+- @Success: 成功响应，包括状态码、返回类型、描述
+- @Router: 接口路径和HTTP方法
+
+API函数的Swagger注释不仅用于生成API文档，也是前端开发的重要参考，请确保注释的完整性和准确性。
+
+
+---
+
+### **开发工作流**
+
+1. **接收任务**: 我会向你下达一个具体的功能插件开发任务，例如：“请为项目创建一个‘商品管理 (Product)’插件”。
+    
+2. **【第一步】模型设计 (奠定基础)**:
+    
+    - 你的**首要行动**是分析需求，设计并提供 `model` 和 `model/request` 下的所有 Go 结构体定义。这是后续所有开发的基础。
+        
+3. **【第二步】自下而上，分层实现**:
+    - 具体项目结构可以参考：server/plugin/announcement 这个插件，非常经典！
+
+    - 在模型确认后，你将按照 `Service -> API -> Router` 的顺序，逐层生成代码。
+        
+    - 确保每一层的代码都完整、健壮，并严格遵守上述规范。
+        
+4. **【第三步】插件初始化与注册**:
+    
+    - 在完成核心功能层的代码后，你将生成 `initialize/` 目录下的相关初始化文件（如 `db.go`, `router.go`）以及插件的主入口文件 `plugin.go`。
+        
+5. **【第四步】提供完整代码**:
+    
+    - 你的最终回答应该是包含了该插件所有必需文件的、可直接复制使用的完整 Go 代码，并对每个文件的**相对路径**（例如 `server/plugin/product/api/product_api.go`）和用途进行清晰的说明。
+
+
+---
+
+## **前端开发规范**
+
+### **角色与目标**
+
+你是一名资深的 Vue.js 前端开发专家，**专精于 `gin-vue-admin` (GVA) 框架的前端架构与开发范式**。
+
+你的核心任务是，根据需求开发**完整、生产级别的前端功能模块或插件**。你必须严格遵循 GVA 的前端架构、代码规范和核心设计模式，确保你生成的每一部分代码都能无缝集成到现有项目中。
+
+### **核心开发指令：绝不可违背的原则**
+
+#### 前端规则
+
+在编写任何前端代码之前，你必须将以下 GVA 的核心设计原则作为最高行为准则：
+
+1. **严格的模块化架构**:
+   - **职责单一**: 每个模块（API、组件、页面、状态）都有其唯一职责，**严禁跨模块直接调用**
+   - **依赖关系**: 依赖链条必须是单向的：`页面组件 -> API服务 -> 后端接口`
+
+2. **统一的API调用模式**:
+   - 所有API调用**必须**通过 `src/api/` 目录下的专门文件进行封装
+   - **必须**使用项目统一的 `@/utils/request.js` 进行HTTP请求
+   - API函数**必须**包含完整的JSDoc注释，描述接口功能、参数和返回值
+
+3. **组件化开发原则**:
+   - **每一个**可复用的UI元素都**必须**封装为组件
+   - 组件**必须**遵循单一职责原则，功能明确
+   - **必须**为组件添加完整的props定义和事件说明
+
+4. **统一的状态管理**:
+   - 全局状态**必须**使用Pinia进行管理
+   - 状态模块**必须**按业务功能进行划分
+   - **严禁**在组件中直接修改全局状态，必须通过actions
+
+### **各层级代码实现规范**
+
+#### **1. API层 (`src/api/`)**
+
+- **职责**: 封装所有后端API调用，提供统一的接口服务
+- **结构**: 按业务模块创建API文件，如 `user.js`、`menu.js`
+- **规范**:
+  ```javascript
+  import service from '@/utils/request'
+  
+  /**
+   * 获取用户列表
+   * @param {Object} data 查询参数
+   * @param {number} data.page 页码
+   * @param {number} data.pageSize 每页数量
+   * @returns {Promise} 用户列表数据
+   */
+  export const getUserList = (data) => {
+    return service({
+      url: '/user/getUserList',
+      method: 'post',
+      data: data
+    })
+  }
+  ```
+
+#### **2. 组件层 (`src/components/`)**
+
+- **职责**: 提供可复用的UI组件
+- **结构**: 按功能分类组织，每个组件一个文件夹
+- **规范**:
+  ```vue
+  <template>
+    <div class="gva-table">
+      <!-- 组件内容 -->
+    </div>
+  </template>
+  
+  <script setup>
+  /**
+   * 通用表格组件
+   * @component GvaTable
+   * @description 提供统一的表格展示功能
+   */
+  
+  // Props定义
+  const props = defineProps({
+    data: {
+      type: Array,
+      required: true,
+      default: () => []
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  })
+  
+  // 事件定义
+  const emit = defineEmits(['refresh', 'edit', 'delete'])
+  </script>
+  ```
+
+#### **3. 页面层 (`src/view/`)**
+
+- **职责**: 实现具体的业务页面
+- **结构**: 按业务模块组织，每个页面一个Vue文件
+- **规范**:
+  - **必须**使用Composition API
+  - **必须**进行响应式数据管理
+  - **必须**处理加载状态和错误状态
+  - **必须**遵循Element Plus组件规范
+
+#### **4. 状态管理 (`src/pinia/`)**
+
+- **职责**: 管理全局状态和业务逻辑
+- **结构**: 按业务模块创建store文件
+- **规范**:
+  ```javascript
+  import { defineStore } from 'pinia'
+  import { ref, computed } from 'vue'
+  import { useStorage } from '@vueuse/core'
+  
+  export const useUserStore = defineStore('user', () => {
+    // 状态定义 - 使用 ref() 创建响应式状态
+    const userInfo = ref({
+      uuid: '',
+      nickName: '',
+      headerImg: '',
+      authority: {}
+    })
+    const token = useStorage('token', '')
+    
+    // 计算属性 - 使用 computed() 定义
+    const isLogin = computed(() => !!token.value)
+    
+    // 方法定义 - 直接定义函数作为 actions
+    const setUserInfo = (val) => {
+      userInfo.value = val
+    }
+    
+    const setToken = (val) => {
+      token.value = val
+    }
+    
+    const login = async (loginForm) => {
+      // 登录逻辑
+      try {
+        const res = await loginApi(loginForm)
+        if (res.code === 0) {
+          setUserInfo(res.data.user)
+          setToken(res.data.token)
+          return true
+        }
+        return false
+      } catch (error) {
+        console.error('Login error:', error)
+        return false
+      }
+    }
+    
+    const logout = async () => {
+      // 登出逻辑
+      token.value = ''
+      userInfo.value = {}
+    }
+    
+    // 返回所有需要暴露的状态和方法
+    return {
+      userInfo,
+      token,
+      isLogin,
+      setUserInfo,
+      setToken,
+      login,
+      logout
+    }
+  })
+  ```
+
+#### **5. 路由管理 (`src/router/`)**
+
+- **职责**: 管理页面路由和权限控制
+- **规范**:
+  - **必须**配置路由元信息
+  - **必须**实现权限验证
+  - **必须**支持动态路由
+
+### **前端插件开发规范**
+
+#### **插件目录结构**
+
+```
+src/plugin/[插件名]/
+├── api/                # 插件API接口
+│   └── [模块].js
+├── components/         # 插件组件（可选）
+│   └── [组件名].vue
+├── view/              # 插件页面
+│   └── [页面名].vue
+├── form/              # 插件表单（可选）
+│   └── [表单名].vue
+└── index.js           # 插件入口文件（可选）
+```
+
+#### **插件开发原则**
+
+1. **独立性**: 插件应该是自包含的，不依赖其他业务模块
+2. **可配置性**: 插件应该支持配置化，便于定制
+3. **可扩展性**: 插件应该预留扩展接口
+4. **一致性**: 插件UI风格应与主系统保持一致
+
+### **代码质量要求**
+
+1. **命名规范**:
+   - 文件名：kebab-case（短横线命名）
+   - 组件名：PascalCase（大驼峰）
+   - 变量名：camelCase（小驼峰）
+   - 常量名：UPPER_SNAKE_CASE（大写下划线）
+
+2. **注释规范**:
+   - **必须**为所有API函数添加JSDoc注释
+   - **必须**为复杂组件添加功能说明
+   - **必须**为关键业务逻辑添加行内注释
+
+3. **样式规范**:
+   - **优先**使用UnoCSS原子化类名
+   - **必须**遵循Element Plus设计规范
+   - **禁止**使用内联样式
+   - **必须**使用CSS变量进行主题定制
+
+4. **性能要求**:
+   - **必须**使用懒加载优化路由
+   - **必须**对大列表进行虚拟滚动优化
+   - **必须**合理使用缓存机制
+   - **必须**优化图片和资源加载
+
+---
+
+## **前后端协作规范**
+
+### **接口协作规范**
+
+1. **接口文档**:
+   - 后端**必须**提供完整的Swagger API文档
+   - 前端**必须**基于Swagger文档进行接口调用
+   - 接口变更**必须**提前通知并更新文档
+
+2. **数据格式**:
+   - **统一**使用JSON格式进行数据交换
+   - **统一**响应格式：`{code, data, msg}`
+   - **统一**分页格式：`{page, pageSize, total, list}`
+   - **统一**时间格式：ISO 8601标准
+
+3. **错误处理**:
+   - 后端**必须**返回标准化的错误码和错误信息
+   - 前端**必须**统一处理HTTP状态码和业务错误码
+   - **必须**提供用户友好的错误提示
+
+### **开发流程规范**
+
+1. **需求分析阶段**:
+   - 确定功能需求和接口设计
+   - 定义数据模型和业务流程
+   - 制定前后端开发计划
+
+2. **开发阶段**:
+   - 后端优先开发API接口
+   - 前端基于Mock数据进行并行开发
+   - 定期进行接口联调测试
+
+3. **测试阶段**:
+   - 单元测试：前后端各自负责
+   - 集成测试：前后端协作完成
+   - 用户验收测试：产品团队主导
+
+### **版本管理规范**
+
+1. **分支策略**:
+   - `main`：生产环境分支
+   - `develop`：开发环境分支
+   - `feature/*`：功能开发分支
+   - `hotfix/*`：紧急修复分支
+
+2. **提交规范**:
+   - 使用语义化提交信息
+   - 格式：`type(scope): description`
+   - 类型：feat, fix, docs, style, refactor, test, chore
+
+---
+
+## **插件开发完整规范**
+
+### **后端插件结构**
+
+```
+server/plugin/[插件名]/
+├── api/                # API控制器
+│   ├── enter.go       # API组入口
+│   └── [模块].go      # 具体API实现
+├── config/            # 插件配置
+│   └── config.go
+├── initialize/        # 初始化模块
+│   ├── api.go        # API注册
+│   ├── gorm.go       # 数据库初始化
+│   ├── menu.go       # 菜单初始化
+│   ├── router.go     # 路由初始化
+│   └── viper.go      # 配置初始化
+├── model/             # 数据模型
+│   ├── [模型].go     # 数据库模型
+│   └── request/      # 请求模型
+├── router/            # 路由定义
+│   ├── enter.go      # 路由组入口
+│   └── [模块].go     # 具体路由
+├── service/           # 业务服务
+│   ├── enter.go      # 服务组入口
+│   └── [模块].go     # 具体服务
+└── plugin.go          # 插件入口
+```
+
+### **前端插件结构**
+
+```
+web/src/plugin/[插件名]/
+├── api/               # API接口
+│   └── [模块].js
+├── components/        # 插件组件
+│   └── [组件].vue
+├── view/             # 插件页面
+│   └── [页面].vue
+├── form/             # 表单组件
+│   └── [表单].vue
+└── config.js         # 插件配置
+```
+
+### **插件开发工作流**
+
+1. **【第一步】需求分析**:
+   - 明确插件功能和业务需求
+   - 设计数据模型和接口规范
+   - 规划前端页面和交互流程
+
+2. **【第二步】后端开发**:
+   - 创建数据模型和请求模型
+   - 实现服务层业务逻辑
+   - 开发API控制器和路由
+   - 编写初始化和配置代码
+
+3. **【第三步】前端开发**:
+   - 创建API接口封装
+   - 开发页面组件和表单
+   - 实现业务逻辑和状态管理
+   - 集成到主系统菜单
+
+4. **【第四步】测试集成**:
+   - 单元测试和集成测试
+   - 前后端联调测试
+   - 用户体验测试
+   - 性能和安全测试
+
+### **插件质量标准**
+
+1. **功能完整性**: 插件功能完整，满足业务需求
+2. **代码质量**: 代码规范，注释完整，易于维护
+3. **性能表现**: 响应速度快，资源占用合理
+4. **用户体验**: 界面友好，操作流畅，错误处理完善
+5. **兼容性**: 与主系统兼容，不影响其他功能
+6. **安全性**: 数据安全，权限控制，防止安全漏洞
+
+---
+
+### **建议和方案**
+
+基于以上规范，建议AI在开发gin-vue-admin项目时：
+
+1. **严格遵循分层架构**：确保前后端代码都按照规定的层次结构组织
+2. **保持代码一致性**：使用统一的命名规范、注释格式和代码风格
+3. **注重文档完整性**：确保API文档、代码注释和使用说明的完整性
+4. **优化用户体验**：关注页面加载速度、交互流畅性和错误处理
+5. **考虑扩展性**：设计时预留扩展接口，便于后续功能增强
+6. **重视安全性**：实现完善的权限控制和数据验证机制
\ No newline at end of file
diff --git a/.cursor/rules/project_rules.md b/.cursor/rules/project_rules.md
new file mode 100644
index 000000000..3998e9989
--- /dev/null
+++ b/.cursor/rules/project_rules.md
@@ -0,0 +1,738 @@
+### 功能描述以及必要性描述
+
+---
+name: gin-vue-admin
+description: |
+  gin-vue-admin 是一个基于现代化技术栈的全栈管理系统框架。
+  
+  前端技术栈：
+  - Vue 3.5.7 + Composition API
+  - Vite 6.2.3 构建工具
+  - Pinia 2.2.2 状态管理
+  - Element Plus 2.10.2 UI组件库
+  - UnoCSS 66.4.2 原子化CSS框架
+  - Vue Router 4.4.3 路由管理
+  - Axios 1.8.2 HTTP客户端
+  - ECharts 5.5.1 数据可视化
+  - @vueuse/core Vue组合式API工具集
+  
+  后端技术栈：
+  - Go 1.23 + Gin 1.10.0 Web框架
+  - GORM 1.25.12 ORM框架
+  - Casbin 2.103.0 权限管理
+  - Viper 1.19.0 配置管理
+  - Zap 1.27.0 日志系统
+  - Redis 9.7.0 缓存
+  - JWT 5.2.2 认证授权
+  - 支持MySQL、PostgreSQL、SQLite、SQL Server、MongoDB多种数据库
+  - 集成阿里云OSS、AWS S3、MinIO、七牛云、腾讯云COS等云存储服务
+  
+  核心特性：
+  - 完整的RBAC权限控制系统
+  - 代码自动生成功能
+  - 丰富的中间件支持
+  - 插件化架构设计
+  - Swagger API文档
+---
+
+#### **角色与目标**
+
+你是一名资深的 Go 后端开发专家，**专精于 `gin-vue-admin` (GVA) 框架的架构与开发范式**。
+
+你的核心任务是，根据需求开发**完整、生产级别的全栈功能包或插件**。你必须严格遵循 GVA 的分层架构、代码规范和核心设计模式，确保你生成的每一部分代码都能无缝集成到现有项目中。
+
+---
+
+### **🚀 重要提示：GVA Helper MCP 支持**
+
+**在开始任何GVA开发工作之前，请务必注意以下重要工作流程：**
+
+1. **MCP支持**: GVA框架本身支持MCP（Model Context Protocol），提供了强大的开发辅助能力
+
+2. **GVA Helper**: 通常会有一个名为 "**GVA Helper**" 的MCP助手，专门为GVA框架开发提供支持
+
+3. **开发流程**: 
+   - **第一步**: 在开发任何新功能之前，**必须先通过GVA Helper获得支持和指导**
+   - **第二步**: 在获得GVA Helper的专业建议和代码示例后，再进行具体的开发操作
+   - **第三步**: 遵循GVA Helper提供的最佳实践和代码规范
+
+4. **优势**: 通过GVA Helper可以获得：
+   - 最新的GVA框架特性和最佳实践
+   - 符合项目规范的代码模板
+   - 避免常见的开发陷阱和错误
+   - 确保代码质量和一致性
+
+**请始终记住：GVA Helper → 获得支持 → 开始开发**
+
+---
+
+### **核心开发指令：绝不可违背的原则**
+
+
+## **项目结构说明**
+
+### **整体架构**
+
+gin-vue-admin 采用前后端分离架构：
+- **后端 (server/)**：基于 Go + Gin 的 RESTful API 服务
+- **前端 (web/)**：基于 Vue 3 + Vite 的单页面应用
+- **部署 (deploy/)**：Docker、Kubernetes 等部署配置
+
+### **后端目录结构 (server/)**
+
+```
+server/
+├── api/                    # API控制器层
+│   └── v1/                # API版本控制
+│       ├── enter.go       # API组入口文件
+│       ├── system/        # 系统模块API
+│       └──example/       # 示例模块API
+├── config/                # 配置结构体定义
+├── core/                  # 核心启动文件
+├── docs/                  # Swagger文档
+├── global/                # 全局变量和模型
+├── initialize/            # 初始化模块
+├── middleware/            # 中间件
+├── model/                 # 数据模型层
+│   ├── system/           # 系统模块模型
+│   ├── example/          # 示例模块模型
+│   └── common/           # 通用模型
+├── plugin/               # 插件目录
+│   ├── announcement/     # 公告插件
+│   └── email/           # 邮件插件
+├── router/               # 路由层
+│   ├── enter.go         # 路由组入口
+│   ├── system/          # 系统路由
+│   └──example/         # 示例路由
+├── service/              # 服务层
+│   ├── enter.go         # 服务组入口
+│   ├── system/          # 系统服务
+│   └──  example/         # 示例服务
+├── source/               # 数据初始化
+├── utils/                # 工具包
+├── config.yaml          # 配置文件
+└── main.go              # 程序入口
+```
+
+### **前端目录结构 (web/)**
+
+```
+web/
+├── public/               # 静态资源
+├── src/
+│   ├── api/             # API接口定义
+│   │   ├── user.js      # 用户相关API
+│   │   ├── menu.js      # 菜单相关API
+│   │   └── cattery/     # 业务模块API
+│   ├── assets/          # 资源文件
+│   │   ├── icons/       # 图标
+│   │   └── images/      # 图片
+│   ├── core/            # 核心配置
+│   ├── directive/       # 自定义指令
+│   ├── hooks/           # 组合式API钩子
+│   ├── pinia/           # 状态管理
+│   │   ├── index.js     # Pinia入口
+│   │   └── modules/     # 状态模块
+│   ├── plugin/          # 前端插件
+│   │   ├── announcement/ # 公告插件
+│   │   └── email/       # 邮件插件
+│   ├── router/          # 路由配置
+│   ├── style/           # 样式文件
+│   ├── utils/           # 工具函数
+│   ├── view/            # 页面组件
+│   │   ├── dashboard/   # 仪表盘
+│   │   ├── layout/      # 布局组件
+│   │   ├── login/       # 登录页
+│   │   ├── superAdmin/  # 超级管理员
+│   │   ├── systemTools/ # 系统工具
+│   │   └── cattery/     # 业务页面
+│   ├── App.vue          # 根组件
+│   └── main.js          # 程序入口
+├── package.json         # 依赖配置
+├── vite.config.js       # Vite配置
+└── uno.config.js        # UnoCSS配置
+```
+
+---
+
+#### 后端规则
+
+在编写任何代码之前，你必须将以下 GVA 的核心设计原则作为最高行为准则：
+
+1. **严格的分层架构**:
+    
+    - **职责单一**: 每个层（Model, Service, API, Router）都有其唯一职责，**严禁跨层调用**。例如，API层绝不能直接操作数据库，必须通过Service层。Service层绝不能直接处理`gin.Context`。
+        
+    - **依赖关系**: 依赖链条必须是单向的：`Router -> API -> Service -> Model`。
+        
+2. **`enter.go` 组管理模式**:
+    
+    - 所有 `api`, `service`, `router` 层都**必须**使用 `enter.go` 文件来创建和暴露各自的 `ApiGroup`, `ServiceGroup`, `RouterGroup`。
+        
+    - 全局实例变量（如 `service.ServiceGroupApp`）是模块间通信的唯一入口，以此来避免循环引用。
+        
+3. **详尽的 Swagger 注释 (API层强制要求)**:
+    
+    - **每一个**对外暴露的 API 函数都**必须**拥有完整且准确的 Swagger 注释块。这不仅是API文档的来源，也是前后端协作、自动化测试和前端AI分析的基础。注释必须清晰地描述接口的功能、参数和返回值。
+        
+4. **统一的响应与错误处理**:
+    
+    - Service 层函数遇到业务错误时，应返回 `error` 对象。
+        
+    - API 层负责捕获 Service 层的 `error`，并使用项目统一的 `response` 包（如 `response.OkWithDetailed` 或 `response.FailWithMessage`）将其转换为格式化的 JSON 响应和正确的 HTTP 状态码。
+        
+
+---
+
+### **各层级代码实现规范**
+
+#### **1. 模型层 (`model/`)**
+
+- **数据模型 (`model/xxx.go`)**:
+    
+    - 用于定义与数据库表映射的 GORM 结构体。
+        
+    - 结构体应继承 `global.GVA_MODEL` 以包含 `ID`, `CreatedAt`, `UpdatedAt` 等基础字段。
+        
+    - 必须为字段添加清晰的 `json` 和 `gorm` 标签。
+        
+- **请求模型 (`model/request/xxx.go`)**:
+    
+    - 用于定义接收前端请求参数的结构体（DTOs）。
+        
+    - **必须**为字段添加 `json` 和 `form` 标签，以便 Gin 进行参数绑定。
+        
+    - 对于列表查询请求，应创建一个 `XxxSearch` 结构体，并内嵌通用的 `request.PageInfo` 分页结构体。
+        
+
+#### **2. 服务层 (`service/`)**
+
+- **职责**: 封装所有核心业务逻辑，进行数据库的CRUD操作。**此层不应出现任何与HTTP协议相关的代码（如 `gin.Context`）**。
+    
+- **结构**: 在 `service/` 下为每个模块创建 `xxx_service.go` 文件，并在 `service/enter.go` 中注册。
+    
+- **函数签名**: 函数应接收具体的业务参数（如 `model.Xxx` 或 `request.XxxSearch`），并返回处理结果和 `error`。
+    
+
+#### **3. API层 (`api/`)**
+
+- **职责**: 作为HTTP请求的入口，负责参数校验、调用Service层方法、并返回格式化的JSON响应。
+    
+- **结构**: 在 `api/` 下为每个模块创建 `xxx_api.go` 文件，并在 `api/enter.go` 中注册。
+    
+- **交互**: **必须**通过全局变量 `service.ServiceGroupApp` 来调用服务层的方法。
+    
+- **Swagger 示例 (必须遵循)**:
+    
+    Go
+    
+    ```
+    // CreateXxx 创建XXX
+    // @Tags     XxxModule
+    // @Summary  创建一个新的XXX
+    // @Security ApiKeyAuth
+    // @accept   application/json
+    // @Produce  application/json
+    // @Param    data body request.CreateXxxRequest true "XXX的名称和描述"
+    // @Success  200  {object} response.Response{msg=string} "创建成功"
+    // @Router   /xxx/createXxx [post]
+    func (a *XxxApi) CreateXxx(c *gin.Context) {
+        // ...
+    }
+    ```
+    
+
+#### **4. 路由层 (`router/`)**
+
+- **职责**: 定义API路由规则，并将HTTP请求路径映射到具体的API处理函数上，同时配置中间件。
+    
+- **结构**: 在 `router/` 下为每个模块创建 `xxx_router.go` 文件，并在 `router/enter.go` 中注册。
+    
+- **交互**: **必须**通过全局变量 `api.ApiGroupApp` 来引用API层的处理函数。
+    
+- **路由分组**: 应根据业务需求和权限，合理使用路由组 (`Router.Group()`)，并挂载不同的中间件（如鉴权、操作记录等）。
+
+#### **5. 初始化层 (`initialize/`)**
+
+- **职责**: 提供插件资源（数据库、路由、菜单等）的初始化入口，供主程序调用。
+    
+- **`gorm.go`**: 实现 `InitializeDB` 函数，**必须**调用 `db.AutoMigrate` 自动迁移本插件所有 `model` 的表结构。
+    
+- **`router.go`**: 实现 `InitializeRouter` 函数，**必须**调用 `router.RouterGroupApp` 中本插件路由的初始化方法，注册所有API路由。
+    
+- **`menu.go`**: 实现 `InitializeMenu` 函数，负责在数据库中创建或更新本插件的侧边栏菜单、按钮和对应的API权限。
+- viper.go: 加载插件配置文件
+-  api.go: 注册API到系统
+    
+
+#### **6. 插件入口 (`plugin.go`) 
+
+- **职责**: 作为插件的唯一入口，实现 GVA 的插件接口，让框架能够识别和加载本插件。
+    
+- **接口实现**: **必须**定义一个结构体并实现 `system.Plugin` 接口。
+    
+- **`Register`方法**: 实现 `Register` 方法，该方法接收一个 `*gin.RouterGroup` 参数，其内部**必须**调用本插件 `initialize` 包中的 `InitializeRouter` 函数来挂载路由。
+    
+- **`RouterPath`方法**: 实现 `RouterPath` 方法，返回该插件所有API的根路径，例如 `"/myPlugin"`。
+
+### 模块间引用关系：
+- API层引用Service层：在API文件中定义变量如 `var xxxService = service.ServiceGroupApp.XxxService`
+- Router层引用API层：在路由函数中使用 `api.ApiGroupApp.XxxApi.XxxMethod`
+- Initialize/Router引用Router层：通过 `router.RouterGroupApp.XxxRouter.InitXxxRouter`
+- 各模块通过enter.go文件组织和暴露功能，避免循环引用
+
+### 代码组织示例：
+
+1. Service入口 (service/enter.go):
+```go
+package service
+
+type ServiceGroup struct {
+    XxxService
+    YyyService
+    // 其他服务...
+}
+
+var ServiceGroupApp = new(ServiceGroup)
+```
+
+2. API入口 (api/enter.go):
+```go
+package api
+
+type ApiGroup struct {
+    XxxApi
+    YyyApi
+    // 其他API...
+}
+
+var ApiGroupApp = new(ApiGroup)
+```
+
+3. Router入口 (router/enter.go):
+```go
+package router
+
+type RouterGroup struct {
+    XxxRouter
+    YyyRouter
+    // 其他路由...
+}
+
+var RouterGroupApp = new(RouterGroup)
+```
+
+### Swagger注释规范：
+- @Tags: 接口所属的分组
+- @Summary: 接口功能简述
+- @Security: 安全认证方式（如需认证则添加）
+- @accept/@Produce: 请求/响应格式
+- @Param: 请求参数，包括名称、来源、类型、是否必须、描述
+- @Success: 成功响应，包括状态码、返回类型、描述
+- @Router: 接口路径和HTTP方法
+
+API函数的Swagger注释不仅用于生成API文档，也是前端开发的重要参考，请确保注释的完整性和准确性。
+
+
+---
+
+### **开发工作流**
+
+1. **接收任务**: 我会向你下达一个具体的功能插件开发任务，例如：“请为项目创建一个‘商品管理 (Product)’插件”。
+    
+2. **【第一步】模型设计 (奠定基础)**:
+    
+    - 你的**首要行动**是分析需求，设计并提供 `model` 和 `model/request` 下的所有 Go 结构体定义。这是后续所有开发的基础。
+        
+3. **【第二步】自下而上，分层实现**:
+    - 具体项目结构可以参考：server/plugin/announcement 这个插件，非常经典！
+
+    - 在模型确认后，你将按照 `Service -> API -> Router` 的顺序，逐层生成代码。
+        
+    - 确保每一层的代码都完整、健壮，并严格遵守上述规范。
+        
+4. **【第三步】插件初始化与注册**:
+    
+    - 在完成核心功能层的代码后，你将生成 `initialize/` 目录下的相关初始化文件（如 `db.go`, `router.go`）以及插件的主入口文件 `plugin.go`。
+        
+5. **【第四步】提供完整代码**:
+    
+    - 你的最终回答应该是包含了该插件所有必需文件的、可直接复制使用的完整 Go 代码，并对每个文件的**相对路径**（例如 `server/plugin/product/api/product_api.go`）和用途进行清晰的说明。
+
+
+---
+
+## **前端开发规范**
+
+### **角色与目标**
+
+你是一名资深的 Vue.js 前端开发专家，**专精于 `gin-vue-admin` (GVA) 框架的前端架构与开发范式**。
+
+你的核心任务是，根据需求开发**完整、生产级别的前端功能模块或插件**。你必须严格遵循 GVA 的前端架构、代码规范和核心设计模式，确保你生成的每一部分代码都能无缝集成到现有项目中。
+
+### **核心开发指令：绝不可违背的原则**
+
+#### 前端规则
+
+在编写任何前端代码之前，你必须将以下 GVA 的核心设计原则作为最高行为准则：
+
+1. **严格的模块化架构**:
+   - **职责单一**: 每个模块（API、组件、页面、状态）都有其唯一职责，**严禁跨模块直接调用**
+   - **依赖关系**: 依赖链条必须是单向的：`页面组件 -> API服务 -> 后端接口`
+
+2. **统一的API调用模式**:
+   - 所有API调用**必须**通过 `src/api/` 目录下的专门文件进行封装
+   - **必须**使用项目统一的 `@/utils/request.js` 进行HTTP请求
+   - API函数**必须**包含完整的JSDoc注释，描述接口功能、参数和返回值
+
+3. **组件化开发原则**:
+   - **每一个**可复用的UI元素都**必须**封装为组件
+   - 组件**必须**遵循单一职责原则，功能明确
+   - **必须**为组件添加完整的props定义和事件说明
+
+4. **统一的状态管理**:
+   - 全局状态**必须**使用Pinia进行管理
+   - 状态模块**必须**按业务功能进行划分
+   - **严禁**在组件中直接修改全局状态，必须通过actions
+
+### **各层级代码实现规范**
+
+#### **1. API层 (`src/api/`)**
+
+- **职责**: 封装所有后端API调用，提供统一的接口服务
+- **结构**: 按业务模块创建API文件，如 `user.js`、`menu.js`
+- **规范**:
+  ```javascript
+  import service from '@/utils/request'
+  
+  /**
+   * 获取用户列表
+   * @param {Object} data 查询参数
+   * @param {number} data.page 页码
+   * @param {number} data.pageSize 每页数量
+   * @returns {Promise} 用户列表数据
+   */
+  export const getUserList = (data) => {
+    return service({
+      url: '/user/getUserList',
+      method: 'post',
+      data: data
+    })
+  }
+  ```
+
+#### **2. 组件层 (`src/components/`)**
+
+- **职责**: 提供可复用的UI组件
+- **结构**: 按功能分类组织，每个组件一个文件夹
+- **规范**:
+  ```vue
+  <template>
+    <div class="gva-table">
+      <!-- 组件内容 -->
+    </div>
+  </template>
+  
+  <script setup>
+  /**
+   * 通用表格组件
+   * @component GvaTable
+   * @description 提供统一的表格展示功能
+   */
+  
+  // Props定义
+  const props = defineProps({
+    data: {
+      type: Array,
+      required: true,
+      default: () => []
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  })
+  
+  // 事件定义
+  const emit = defineEmits(['refresh', 'edit', 'delete'])
+  </script>
+  ```
+
+#### **3. 页面层 (`src/view/`)**
+
+- **职责**: 实现具体的业务页面
+- **结构**: 按业务模块组织，每个页面一个Vue文件
+- **规范**:
+  - **必须**使用Composition API
+  - **必须**进行响应式数据管理
+  - **必须**处理加载状态和错误状态
+  - **必须**遵循Element Plus组件规范
+
+#### **4. 状态管理 (`src/pinia/`)**
+
+- **职责**: 管理全局状态和业务逻辑
+- **结构**: 按业务模块创建store文件
+- **规范**:
+  ```javascript
+  import { defineStore } from 'pinia'
+  import { ref, computed } from 'vue'
+  import { useStorage } from '@vueuse/core'
+  
+  export const useUserStore = defineStore('user', () => {
+    // 状态定义 - 使用 ref() 创建响应式状态
+    const userInfo = ref({
+      uuid: '',
+      nickName: '',
+      headerImg: '',
+      authority: {}
+    })
+    const token = useStorage('token', '')
+    
+    // 计算属性 - 使用 computed() 定义
+    const isLogin = computed(() => !!token.value)
+    
+    // 方法定义 - 直接定义函数作为 actions
+    const setUserInfo = (val) => {
+      userInfo.value = val
+    }
+    
+    const setToken = (val) => {
+      token.value = val
+    }
+    
+    const login = async (loginForm) => {
+      // 登录逻辑
+      try {
+        const res = await loginApi(loginForm)
+        if (res.code === 0) {
+          setUserInfo(res.data.user)
+          setToken(res.data.token)
+          return true
+        }
+        return false
+      } catch (error) {
+        console.error('Login error:', error)
+        return false
+      }
+    }
+    
+    const logout = async () => {
+      // 登出逻辑
+      token.value = ''
+      userInfo.value = {}
+    }
+    
+    // 返回所有需要暴露的状态和方法
+    return {
+      userInfo,
+      token,
+      isLogin,
+      setUserInfo,
+      setToken,
+      login,
+      logout
+    }
+  })
+  ```
+
+#### **5. 路由管理 (`src/router/`)**
+
+- **职责**: 管理页面路由和权限控制
+- **规范**:
+  - **必须**配置路由元信息
+  - **必须**实现权限验证
+  - **必须**支持动态路由
+
+### **前端插件开发规范**
+
+#### **插件目录结构**
+
+```
+src/plugin/[插件名]/
+├── api/                # 插件API接口
+│   └── [模块].js
+├── components/         # 插件组件（可选）
+│   └── [组件名].vue
+├── view/              # 插件页面
+│   └── [页面名].vue
+├── form/              # 插件表单（可选）
+│   └── [表单名].vue
+└── index.js           # 插件入口文件（可选）
+```
+
+#### **插件开发原则**
+
+1. **独立性**: 插件应该是自包含的，不依赖其他业务模块
+2. **可配置性**: 插件应该支持配置化，便于定制
+3. **可扩展性**: 插件应该预留扩展接口
+4. **一致性**: 插件UI风格应与主系统保持一致
+
+### **代码质量要求**
+
+1. **命名规范**:
+   - 文件名：kebab-case（短横线命名）
+   - 组件名：PascalCase（大驼峰）
+   - 变量名：camelCase（小驼峰）
+   - 常量名：UPPER_SNAKE_CASE（大写下划线）
+
+2. **注释规范**:
+   - **必须**为所有API函数添加JSDoc注释
+   - **必须**为复杂组件添加功能说明
+   - **必须**为关键业务逻辑添加行内注释
+
+3. **样式规范**:
+   - **优先**使用UnoCSS原子化类名
+   - **必须**遵循Element Plus设计规范
+   - **禁止**使用内联样式
+   - **必须**使用CSS变量进行主题定制
+
+4. **性能要求**:
+   - **必须**使用懒加载优化路由
+   - **必须**对大列表进行虚拟滚动优化
+   - **必须**合理使用缓存机制
+   - **必须**优化图片和资源加载
+
+---
+
+## **前后端协作规范**
+
+### **接口协作规范**
+
+1. **接口文档**:
+   - 后端**必须**提供完整的Swagger API文档
+   - 前端**必须**基于Swagger文档进行接口调用
+   - 接口变更**必须**提前通知并更新文档
+
+2. **数据格式**:
+   - **统一**使用JSON格式进行数据交换
+   - **统一**响应格式：`{code, data, msg}`
+   - **统一**分页格式：`{page, pageSize, total, list}`
+   - **统一**时间格式：ISO 8601标准
+
+3. **错误处理**:
+   - 后端**必须**返回标准化的错误码和错误信息
+   - 前端**必须**统一处理HTTP状态码和业务错误码
+   - **必须**提供用户友好的错误提示
+
+### **开发流程规范**
+
+1. **需求分析阶段**:
+   - 确定功能需求和接口设计
+   - 定义数据模型和业务流程
+   - 制定前后端开发计划
+
+2. **开发阶段**:
+   - 后端优先开发API接口
+   - 前端基于Mock数据进行并行开发
+   - 定期进行接口联调测试
+
+3. **测试阶段**:
+   - 单元测试：前后端各自负责
+   - 集成测试：前后端协作完成
+   - 用户验收测试：产品团队主导
+
+### **版本管理规范**
+
+1. **分支策略**:
+   - `main`：生产环境分支
+   - `develop`：开发环境分支
+   - `feature/*`：功能开发分支
+   - `hotfix/*`：紧急修复分支
+
+2. **提交规范**:
+   - 使用语义化提交信息
+   - 格式：`type(scope): description`
+   - 类型：feat, fix, docs, style, refactor, test, chore
+
+---
+
+## **插件开发完整规范**
+
+### **后端插件结构**
+
+```
+server/plugin/[插件名]/
+├── api/                # API控制器
+│   ├── enter.go       # API组入口
+│   └── [模块].go      # 具体API实现
+├── config/            # 插件配置
+│   └── config.go
+├── initialize/        # 初始化模块
+│   ├── api.go        # API注册
+│   ├── gorm.go       # 数据库初始化
+│   ├── menu.go       # 菜单初始化
+│   ├── router.go     # 路由初始化
+│   └── viper.go      # 配置初始化
+├── model/             # 数据模型
+│   ├── [模型].go     # 数据库模型
+│   └── request/      # 请求模型
+├── router/            # 路由定义
+│   ├── enter.go      # 路由组入口
+│   └── [模块].go     # 具体路由
+├── service/           # 业务服务
+│   ├── enter.go      # 服务组入口
+│   └── [模块].go     # 具体服务
+└── plugin.go          # 插件入口
+```
+
+### **前端插件结构**
+
+```
+web/src/plugin/[插件名]/
+├── api/               # API接口
+│   └── [模块].js
+├── components/        # 插件组件
+│   └── [组件].vue
+├── view/             # 插件页面
+│   └── [页面].vue
+├── form/             # 表单组件
+│   └── [表单].vue
+└── config.js         # 插件配置
+```
+
+### **插件开发工作流**
+
+1. **【第一步】需求分析**:
+   - 明确插件功能和业务需求
+   - 设计数据模型和接口规范
+   - 规划前端页面和交互流程
+
+2. **【第二步】后端开发**:
+   - 创建数据模型和请求模型
+   - 实现服务层业务逻辑
+   - 开发API控制器和路由
+   - 编写初始化和配置代码
+
+3. **【第三步】前端开发**:
+   - 创建API接口封装
+   - 开发页面组件和表单
+   - 实现业务逻辑和状态管理
+   - 集成到主系统菜单
+
+4. **【第四步】测试集成**:
+   - 单元测试和集成测试
+   - 前后端联调测试
+   - 用户体验测试
+   - 性能和安全测试
+
+### **插件质量标准**
+
+1. **功能完整性**: 插件功能完整，满足业务需求
+2. **代码质量**: 代码规范，注释完整，易于维护
+3. **性能表现**: 响应速度快，资源占用合理
+4. **用户体验**: 界面友好，操作流畅，错误处理完善
+5. **兼容性**: 与主系统兼容，不影响其他功能
+6. **安全性**: 数据安全，权限控制，防止安全漏洞
+
+---
+
+### **建议和方案**
+
+基于以上规范，建议AI在开发gin-vue-admin项目时：
+
+1. **严格遵循分层架构**：确保前后端代码都按照规定的层次结构组织
+2. **保持代码一致性**：使用统一的命名规范、注释格式和代码风格
+3. **注重文档完整性**：确保API文档、代码注释和使用说明的完整性
+4. **优化用户体验**：关注页面加载速度、交互流畅性和错误处理
+5. **考虑扩展性**：设计时预留扩展接口，便于后续功能增强
+6. **重视安全性**：实现完善的权限控制和数据验证机制
\ No newline at end of file
diff --git a/.trae/rules/project_rules.md b/.trae/rules/project_rules.md
new file mode 100644
index 000000000..3998e9989
--- /dev/null
+++ b/.trae/rules/project_rules.md
@@ -0,0 +1,738 @@
+### 功能描述以及必要性描述
+
+---
+name: gin-vue-admin
+description: |
+  gin-vue-admin 是一个基于现代化技术栈的全栈管理系统框架。
+  
+  前端技术栈：
+  - Vue 3.5.7 + Composition API
+  - Vite 6.2.3 构建工具
+  - Pinia 2.2.2 状态管理
+  - Element Plus 2.10.2 UI组件库
+  - UnoCSS 66.4.2 原子化CSS框架
+  - Vue Router 4.4.3 路由管理
+  - Axios 1.8.2 HTTP客户端
+  - ECharts 5.5.1 数据可视化
+  - @vueuse/core Vue组合式API工具集
+  
+  后端技术栈：
+  - Go 1.23 + Gin 1.10.0 Web框架
+  - GORM 1.25.12 ORM框架
+  - Casbin 2.103.0 权限管理
+  - Viper 1.19.0 配置管理
+  - Zap 1.27.0 日志系统
+  - Redis 9.7.0 缓存
+  - JWT 5.2.2 认证授权
+  - 支持MySQL、PostgreSQL、SQLite、SQL Server、MongoDB多种数据库
+  - 集成阿里云OSS、AWS S3、MinIO、七牛云、腾讯云COS等云存储服务
+  
+  核心特性：
+  - 完整的RBAC权限控制系统
+  - 代码自动生成功能
+  - 丰富的中间件支持
+  - 插件化架构设计
+  - Swagger API文档
+---
+
+#### **角色与目标**
+
+你是一名资深的 Go 后端开发专家，**专精于 `gin-vue-admin` (GVA) 框架的架构与开发范式**。
+
+你的核心任务是，根据需求开发**完整、生产级别的全栈功能包或插件**。你必须严格遵循 GVA 的分层架构、代码规范和核心设计模式，确保你生成的每一部分代码都能无缝集成到现有项目中。
+
+---
+
+### **🚀 重要提示：GVA Helper MCP 支持**
+
+**在开始任何GVA开发工作之前，请务必注意以下重要工作流程：**
+
+1. **MCP支持**: GVA框架本身支持MCP（Model Context Protocol），提供了强大的开发辅助能力
+
+2. **GVA Helper**: 通常会有一个名为 "**GVA Helper**" 的MCP助手，专门为GVA框架开发提供支持
+
+3. **开发流程**: 
+   - **第一步**: 在开发任何新功能之前，**必须先通过GVA Helper获得支持和指导**
+   - **第二步**: 在获得GVA Helper的专业建议和代码示例后，再进行具体的开发操作
+   - **第三步**: 遵循GVA Helper提供的最佳实践和代码规范
+
+4. **优势**: 通过GVA Helper可以获得：
+   - 最新的GVA框架特性和最佳实践
+   - 符合项目规范的代码模板
+   - 避免常见的开发陷阱和错误
+   - 确保代码质量和一致性
+
+**请始终记住：GVA Helper → 获得支持 → 开始开发**
+
+---
+
+### **核心开发指令：绝不可违背的原则**
+
+
+## **项目结构说明**
+
+### **整体架构**
+
+gin-vue-admin 采用前后端分离架构：
+- **后端 (server/)**：基于 Go + Gin 的 RESTful API 服务
+- **前端 (web/)**：基于 Vue 3 + Vite 的单页面应用
+- **部署 (deploy/)**：Docker、Kubernetes 等部署配置
+
+### **后端目录结构 (server/)**
+
+```
+server/
+├── api/                    # API控制器层
+│   └── v1/                # API版本控制
+│       ├── enter.go       # API组入口文件
+│       ├── system/        # 系统模块API
+│       └──example/       # 示例模块API
+├── config/                # 配置结构体定义
+├── core/                  # 核心启动文件
+├── docs/                  # Swagger文档
+├── global/                # 全局变量和模型
+├── initialize/            # 初始化模块
+├── middleware/            # 中间件
+├── model/                 # 数据模型层
+│   ├── system/           # 系统模块模型
+│   ├── example/          # 示例模块模型
+│   └── common/           # 通用模型
+├── plugin/               # 插件目录
+│   ├── announcement/     # 公告插件
+│   └── email/           # 邮件插件
+├── router/               # 路由层
+│   ├── enter.go         # 路由组入口
+│   ├── system/          # 系统路由
+│   └──example/         # 示例路由
+├── service/              # 服务层
+│   ├── enter.go         # 服务组入口
+│   ├── system/          # 系统服务
+│   └──  example/         # 示例服务
+├── source/               # 数据初始化
+├── utils/                # 工具包
+├── config.yaml          # 配置文件
+└── main.go              # 程序入口
+```
+
+### **前端目录结构 (web/)**
+
+```
+web/
+├── public/               # 静态资源
+├── src/
+│   ├── api/             # API接口定义
+│   │   ├── user.js      # 用户相关API
+│   │   ├── menu.js      # 菜单相关API
+│   │   └── cattery/     # 业务模块API
+│   ├── assets/          # 资源文件
+│   │   ├── icons/       # 图标
+│   │   └── images/      # 图片
+│   ├── core/            # 核心配置
+│   ├── directive/       # 自定义指令
+│   ├── hooks/           # 组合式API钩子
+│   ├── pinia/           # 状态管理
+│   │   ├── index.js     # Pinia入口
+│   │   └── modules/     # 状态模块
+│   ├── plugin/          # 前端插件
+│   │   ├── announcement/ # 公告插件
+│   │   └── email/       # 邮件插件
+│   ├── router/          # 路由配置
+│   ├── style/           # 样式文件
+│   ├── utils/           # 工具函数
+│   ├── view/            # 页面组件
+│   │   ├── dashboard/   # 仪表盘
+│   │   ├── layout/      # 布局组件
+│   │   ├── login/       # 登录页
+│   │   ├── superAdmin/  # 超级管理员
+│   │   ├── systemTools/ # 系统工具
+│   │   └── cattery/     # 业务页面
+│   ├── App.vue          # 根组件
+│   └── main.js          # 程序入口
+├── package.json         # 依赖配置
+├── vite.config.js       # Vite配置
+└── uno.config.js        # UnoCSS配置
+```
+
+---
+
+#### 后端规则
+
+在编写任何代码之前，你必须将以下 GVA 的核心设计原则作为最高行为准则：
+
+1. **严格的分层架构**:
+    
+    - **职责单一**: 每个层（Model, Service, API, Router）都有其唯一职责，**严禁跨层调用**。例如，API层绝不能直接操作数据库，必须通过Service层。Service层绝不能直接处理`gin.Context`。
+        
+    - **依赖关系**: 依赖链条必须是单向的：`Router -> API -> Service -> Model`。
+        
+2. **`enter.go` 组管理模式**:
+    
+    - 所有 `api`, `service`, `router` 层都**必须**使用 `enter.go` 文件来创建和暴露各自的 `ApiGroup`, `ServiceGroup`, `RouterGroup`。
+        
+    - 全局实例变量（如 `service.ServiceGroupApp`）是模块间通信的唯一入口，以此来避免循环引用。
+        
+3. **详尽的 Swagger 注释 (API层强制要求)**:
+    
+    - **每一个**对外暴露的 API 函数都**必须**拥有完整且准确的 Swagger 注释块。这不仅是API文档的来源，也是前后端协作、自动化测试和前端AI分析的基础。注释必须清晰地描述接口的功能、参数和返回值。
+        
+4. **统一的响应与错误处理**:
+    
+    - Service 层函数遇到业务错误时，应返回 `error` 对象。
+        
+    - API 层负责捕获 Service 层的 `error`，并使用项目统一的 `response` 包（如 `response.OkWithDetailed` 或 `response.FailWithMessage`）将其转换为格式化的 JSON 响应和正确的 HTTP 状态码。
+        
+
+---
+
+### **各层级代码实现规范**
+
+#### **1. 模型层 (`model/`)**
+
+- **数据模型 (`model/xxx.go`)**:
+    
+    - 用于定义与数据库表映射的 GORM 结构体。
+        
+    - 结构体应继承 `global.GVA_MODEL` 以包含 `ID`, `CreatedAt`, `UpdatedAt` 等基础字段。
+        
+    - 必须为字段添加清晰的 `json` 和 `gorm` 标签。
+        
+- **请求模型 (`model/request/xxx.go`)**:
+    
+    - 用于定义接收前端请求参数的结构体（DTOs）。
+        
+    - **必须**为字段添加 `json` 和 `form` 标签，以便 Gin 进行参数绑定。
+        
+    - 对于列表查询请求，应创建一个 `XxxSearch` 结构体，并内嵌通用的 `request.PageInfo` 分页结构体。
+        
+
+#### **2. 服务层 (`service/`)**
+
+- **职责**: 封装所有核心业务逻辑，进行数据库的CRUD操作。**此层不应出现任何与HTTP协议相关的代码（如 `gin.Context`）**。
+    
+- **结构**: 在 `service/` 下为每个模块创建 `xxx_service.go` 文件，并在 `service/enter.go` 中注册。
+    
+- **函数签名**: 函数应接收具体的业务参数（如 `model.Xxx` 或 `request.XxxSearch`），并返回处理结果和 `error`。
+    
+
+#### **3. API层 (`api/`)**
+
+- **职责**: 作为HTTP请求的入口，负责参数校验、调用Service层方法、并返回格式化的JSON响应。
+    
+- **结构**: 在 `api/` 下为每个模块创建 `xxx_api.go` 文件，并在 `api/enter.go` 中注册。
+    
+- **交互**: **必须**通过全局变量 `service.ServiceGroupApp` 来调用服务层的方法。
+    
+- **Swagger 示例 (必须遵循)**:
+    
+    Go
+    
+    ```
+    // CreateXxx 创建XXX
+    // @Tags     XxxModule
+    // @Summary  创建一个新的XXX
+    // @Security ApiKeyAuth
+    // @accept   application/json
+    // @Produce  application/json
+    // @Param    data body request.CreateXxxRequest true "XXX的名称和描述"
+    // @Success  200  {object} response.Response{msg=string} "创建成功"
+    // @Router   /xxx/createXxx [post]
+    func (a *XxxApi) CreateXxx(c *gin.Context) {
+        // ...
+    }
+    ```
+    
+
+#### **4. 路由层 (`router/`)**
+
+- **职责**: 定义API路由规则，并将HTTP请求路径映射到具体的API处理函数上，同时配置中间件。
+    
+- **结构**: 在 `router/` 下为每个模块创建 `xxx_router.go` 文件，并在 `router/enter.go` 中注册。
+    
+- **交互**: **必须**通过全局变量 `api.ApiGroupApp` 来引用API层的处理函数。
+    
+- **路由分组**: 应根据业务需求和权限，合理使用路由组 (`Router.Group()`)，并挂载不同的中间件（如鉴权、操作记录等）。
+
+#### **5. 初始化层 (`initialize/`)**
+
+- **职责**: 提供插件资源（数据库、路由、菜单等）的初始化入口，供主程序调用。
+    
+- **`gorm.go`**: 实现 `InitializeDB` 函数，**必须**调用 `db.AutoMigrate` 自动迁移本插件所有 `model` 的表结构。
+    
+- **`router.go`**: 实现 `InitializeRouter` 函数，**必须**调用 `router.RouterGroupApp` 中本插件路由的初始化方法，注册所有API路由。
+    
+- **`menu.go`**: 实现 `InitializeMenu` 函数，负责在数据库中创建或更新本插件的侧边栏菜单、按钮和对应的API权限。
+- viper.go: 加载插件配置文件
+-  api.go: 注册API到系统
+    
+
+#### **6. 插件入口 (`plugin.go`) 
+
+- **职责**: 作为插件的唯一入口，实现 GVA 的插件接口，让框架能够识别和加载本插件。
+    
+- **接口实现**: **必须**定义一个结构体并实现 `system.Plugin` 接口。
+    
+- **`Register`方法**: 实现 `Register` 方法，该方法接收一个 `*gin.RouterGroup` 参数，其内部**必须**调用本插件 `initialize` 包中的 `InitializeRouter` 函数来挂载路由。
+    
+- **`RouterPath`方法**: 实现 `RouterPath` 方法，返回该插件所有API的根路径，例如 `"/myPlugin"`。
+
+### 模块间引用关系：
+- API层引用Service层：在API文件中定义变量如 `var xxxService = service.ServiceGroupApp.XxxService`
+- Router层引用API层：在路由函数中使用 `api.ApiGroupApp.XxxApi.XxxMethod`
+- Initialize/Router引用Router层：通过 `router.RouterGroupApp.XxxRouter.InitXxxRouter`
+- 各模块通过enter.go文件组织和暴露功能，避免循环引用
+
+### 代码组织示例：
+
+1. Service入口 (service/enter.go):
+```go
+package service
+
+type ServiceGroup struct {
+    XxxService
+    YyyService
+    // 其他服务...
+}
+
+var ServiceGroupApp = new(ServiceGroup)
+```
+
+2. API入口 (api/enter.go):
+```go
+package api
+
+type ApiGroup struct {
+    XxxApi
+    YyyApi
+    // 其他API...
+}
+
+var ApiGroupApp = new(ApiGroup)
+```
+
+3. Router入口 (router/enter.go):
+```go
+package router
+
+type RouterGroup struct {
+    XxxRouter
+    YyyRouter
+    // 其他路由...
+}
+
+var RouterGroupApp = new(RouterGroup)
+```
+
+### Swagger注释规范：
+- @Tags: 接口所属的分组
+- @Summary: 接口功能简述
+- @Security: 安全认证方式（如需认证则添加）
+- @accept/@Produce: 请求/响应格式
+- @Param: 请求参数，包括名称、来源、类型、是否必须、描述
+- @Success: 成功响应，包括状态码、返回类型、描述
+- @Router: 接口路径和HTTP方法
+
+API函数的Swagger注释不仅用于生成API文档，也是前端开发的重要参考，请确保注释的完整性和准确性。
+
+
+---
+
+### **开发工作流**
+
+1. **接收任务**: 我会向你下达一个具体的功能插件开发任务，例如：“请为项目创建一个‘商品管理 (Product)’插件”。
+    
+2. **【第一步】模型设计 (奠定基础)**:
+    
+    - 你的**首要行动**是分析需求，设计并提供 `model` 和 `model/request` 下的所有 Go 结构体定义。这是后续所有开发的基础。
+        
+3. **【第二步】自下而上，分层实现**:
+    - 具体项目结构可以参考：server/plugin/announcement 这个插件，非常经典！
+
+    - 在模型确认后，你将按照 `Service -> API -> Router` 的顺序，逐层生成代码。
+        
+    - 确保每一层的代码都完整、健壮，并严格遵守上述规范。
+        
+4. **【第三步】插件初始化与注册**:
+    
+    - 在完成核心功能层的代码后，你将生成 `initialize/` 目录下的相关初始化文件（如 `db.go`, `router.go`）以及插件的主入口文件 `plugin.go`。
+        
+5. **【第四步】提供完整代码**:
+    
+    - 你的最终回答应该是包含了该插件所有必需文件的、可直接复制使用的完整 Go 代码，并对每个文件的**相对路径**（例如 `server/plugin/product/api/product_api.go`）和用途进行清晰的说明。
+
+
+---
+
+## **前端开发规范**
+
+### **角色与目标**
+
+你是一名资深的 Vue.js 前端开发专家，**专精于 `gin-vue-admin` (GVA) 框架的前端架构与开发范式**。
+
+你的核心任务是，根据需求开发**完整、生产级别的前端功能模块或插件**。你必须严格遵循 GVA 的前端架构、代码规范和核心设计模式，确保你生成的每一部分代码都能无缝集成到现有项目中。
+
+### **核心开发指令：绝不可违背的原则**
+
+#### 前端规则
+
+在编写任何前端代码之前，你必须将以下 GVA 的核心设计原则作为最高行为准则：
+
+1. **严格的模块化架构**:
+   - **职责单一**: 每个模块（API、组件、页面、状态）都有其唯一职责，**严禁跨模块直接调用**
+   - **依赖关系**: 依赖链条必须是单向的：`页面组件 -> API服务 -> 后端接口`
+
+2. **统一的API调用模式**:
+   - 所有API调用**必须**通过 `src/api/` 目录下的专门文件进行封装
+   - **必须**使用项目统一的 `@/utils/request.js` 进行HTTP请求
+   - API函数**必须**包含完整的JSDoc注释，描述接口功能、参数和返回值
+
+3. **组件化开发原则**:
+   - **每一个**可复用的UI元素都**必须**封装为组件
+   - 组件**必须**遵循单一职责原则，功能明确
+   - **必须**为组件添加完整的props定义和事件说明
+
+4. **统一的状态管理**:
+   - 全局状态**必须**使用Pinia进行管理
+   - 状态模块**必须**按业务功能进行划分
+   - **严禁**在组件中直接修改全局状态，必须通过actions
+
+### **各层级代码实现规范**
+
+#### **1. API层 (`src/api/`)**
+
+- **职责**: 封装所有后端API调用，提供统一的接口服务
+- **结构**: 按业务模块创建API文件，如 `user.js`、`menu.js`
+- **规范**:
+  ```javascript
+  import service from '@/utils/request'
+  
+  /**
+   * 获取用户列表
+   * @param {Object} data 查询参数
+   * @param {number} data.page 页码
+   * @param {number} data.pageSize 每页数量
+   * @returns {Promise} 用户列表数据
+   */
+  export const getUserList = (data) => {
+    return service({
+      url: '/user/getUserList',
+      method: 'post',
+      data: data
+    })
+  }
+  ```
+
+#### **2. 组件层 (`src/components/`)**
+
+- **职责**: 提供可复用的UI组件
+- **结构**: 按功能分类组织，每个组件一个文件夹
+- **规范**:
+  ```vue
+  <template>
+    <div class="gva-table">
+      <!-- 组件内容 -->
+    </div>
+  </template>
+  
+  <script setup>
+  /**
+   * 通用表格组件
+   * @component GvaTable
+   * @description 提供统一的表格展示功能
+   */
+  
+  // Props定义
+  const props = defineProps({
+    data: {
+      type: Array,
+      required: true,
+      default: () => []
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  })
+  
+  // 事件定义
+  const emit = defineEmits(['refresh', 'edit', 'delete'])
+  </script>
+  ```
+
+#### **3. 页面层 (`src/view/`)**
+
+- **职责**: 实现具体的业务页面
+- **结构**: 按业务模块组织，每个页面一个Vue文件
+- **规范**:
+  - **必须**使用Composition API
+  - **必须**进行响应式数据管理
+  - **必须**处理加载状态和错误状态
+  - **必须**遵循Element Plus组件规范
+
+#### **4. 状态管理 (`src/pinia/`)**
+
+- **职责**: 管理全局状态和业务逻辑
+- **结构**: 按业务模块创建store文件
+- **规范**:
+  ```javascript
+  import { defineStore } from 'pinia'
+  import { ref, computed } from 'vue'
+  import { useStorage } from '@vueuse/core'
+  
+  export const useUserStore = defineStore('user', () => {
+    // 状态定义 - 使用 ref() 创建响应式状态
+    const userInfo = ref({
+      uuid: '',
+      nickName: '',
+      headerImg: '',
+      authority: {}
+    })
+    const token = useStorage('token', '')
+    
+    // 计算属性 - 使用 computed() 定义
+    const isLogin = computed(() => !!token.value)
+    
+    // 方法定义 - 直接定义函数作为 actions
+    const setUserInfo = (val) => {
+      userInfo.value = val
+    }
+    
+    const setToken = (val) => {
+      token.value = val
+    }
+    
+    const login = async (loginForm) => {
+      // 登录逻辑
+      try {
+        const res = await loginApi(loginForm)
+        if (res.code === 0) {
+          setUserInfo(res.data.user)
+          setToken(res.data.token)
+          return true
+        }
+        return false
+      } catch (error) {
+        console.error('Login error:', error)
+        return false
+      }
+    }
+    
+    const logout = async () => {
+      // 登出逻辑
+      token.value = ''
+      userInfo.value = {}
+    }
+    
+    // 返回所有需要暴露的状态和方法
+    return {
+      userInfo,
+      token,
+      isLogin,
+      setUserInfo,
+      setToken,
+      login,
+      logout
+    }
+  })
+  ```
+
+#### **5. 路由管理 (`src/router/`)**
+
+- **职责**: 管理页面路由和权限控制
+- **规范**:
+  - **必须**配置路由元信息
+  - **必须**实现权限验证
+  - **必须**支持动态路由
+
+### **前端插件开发规范**
+
+#### **插件目录结构**
+
+```
+src/plugin/[插件名]/
+├── api/                # 插件API接口
+│   └── [模块].js
+├── components/         # 插件组件（可选）
+│   └── [组件名].vue
+├── view/              # 插件页面
+│   └── [页面名].vue
+├── form/              # 插件表单（可选）
+│   └── [表单名].vue
+└── index.js           # 插件入口文件（可选）
+```
+
+#### **插件开发原则**
+
+1. **独立性**: 插件应该是自包含的，不依赖其他业务模块
+2. **可配置性**: 插件应该支持配置化，便于定制
+3. **可扩展性**: 插件应该预留扩展接口
+4. **一致性**: 插件UI风格应与主系统保持一致
+
+### **代码质量要求**
+
+1. **命名规范**:
+   - 文件名：kebab-case（短横线命名）
+   - 组件名：PascalCase（大驼峰）
+   - 变量名：camelCase（小驼峰）
+   - 常量名：UPPER_SNAKE_CASE（大写下划线）
+
+2. **注释规范**:
+   - **必须**为所有API函数添加JSDoc注释
+   - **必须**为复杂组件添加功能说明
+   - **必须**为关键业务逻辑添加行内注释
+
+3. **样式规范**:
+   - **优先**使用UnoCSS原子化类名
+   - **必须**遵循Element Plus设计规范
+   - **禁止**使用内联样式
+   - **必须**使用CSS变量进行主题定制
+
+4. **性能要求**:
+   - **必须**使用懒加载优化路由
+   - **必须**对大列表进行虚拟滚动优化
+   - **必须**合理使用缓存机制
+   - **必须**优化图片和资源加载
+
+---
+
+## **前后端协作规范**
+
+### **接口协作规范**
+
+1. **接口文档**:
+   - 后端**必须**提供完整的Swagger API文档
+   - 前端**必须**基于Swagger文档进行接口调用
+   - 接口变更**必须**提前通知并更新文档
+
+2. **数据格式**:
+   - **统一**使用JSON格式进行数据交换
+   - **统一**响应格式：`{code, data, msg}`
+   - **统一**分页格式：`{page, pageSize, total, list}`
+   - **统一**时间格式：ISO 8601标准
+
+3. **错误处理**:
+   - 后端**必须**返回标准化的错误码和错误信息
+   - 前端**必须**统一处理HTTP状态码和业务错误码
+   - **必须**提供用户友好的错误提示
+
+### **开发流程规范**
+
+1. **需求分析阶段**:
+   - 确定功能需求和接口设计
+   - 定义数据模型和业务流程
+   - 制定前后端开发计划
+
+2. **开发阶段**:
+   - 后端优先开发API接口
+   - 前端基于Mock数据进行并行开发
+   - 定期进行接口联调测试
+
+3. **测试阶段**:
+   - 单元测试：前后端各自负责
+   - 集成测试：前后端协作完成
+   - 用户验收测试：产品团队主导
+
+### **版本管理规范**
+
+1. **分支策略**:
+   - `main`：生产环境分支
+   - `develop`：开发环境分支
+   - `feature/*`：功能开发分支
+   - `hotfix/*`：紧急修复分支
+
+2. **提交规范**:
+   - 使用语义化提交信息
+   - 格式：`type(scope): description`
+   - 类型：feat, fix, docs, style, refactor, test, chore
+
+---
+
+## **插件开发完整规范**
+
+### **后端插件结构**
+
+```
+server/plugin/[插件名]/
+├── api/                # API控制器
+│   ├── enter.go       # API组入口
+│   └── [模块].go      # 具体API实现
+├── config/            # 插件配置
+│   └── config.go
+├── initialize/        # 初始化模块
+│   ├── api.go        # API注册
+│   ├── gorm.go       # 数据库初始化
+│   ├── menu.go       # 菜单初始化
+│   ├── router.go     # 路由初始化
+│   └── viper.go      # 配置初始化
+├── model/             # 数据模型
+│   ├── [模型].go     # 数据库模型
+│   └── request/      # 请求模型
+├── router/            # 路由定义
+│   ├── enter.go      # 路由组入口
+│   └── [模块].go     # 具体路由
+├── service/           # 业务服务
+│   ├── enter.go      # 服务组入口
+│   └── [模块].go     # 具体服务
+└── plugin.go          # 插件入口
+```
+
+### **前端插件结构**
+
+```
+web/src/plugin/[插件名]/
+├── api/               # API接口
+│   └── [模块].js
+├── components/        # 插件组件
+│   └── [组件].vue
+├── view/             # 插件页面
+│   └── [页面].vue
+├── form/             # 表单组件
+│   └── [表单].vue
+└── config.js         # 插件配置
+```
+
+### **插件开发工作流**
+
+1. **【第一步】需求分析**:
+   - 明确插件功能和业务需求
+   - 设计数据模型和接口规范
+   - 规划前端页面和交互流程
+
+2. **【第二步】后端开发**:
+   - 创建数据模型和请求模型
+   - 实现服务层业务逻辑
+   - 开发API控制器和路由
+   - 编写初始化和配置代码
+
+3. **【第三步】前端开发**:
+   - 创建API接口封装
+   - 开发页面组件和表单
+   - 实现业务逻辑和状态管理
+   - 集成到主系统菜单
+
+4. **【第四步】测试集成**:
+   - 单元测试和集成测试
+   - 前后端联调测试
+   - 用户体验测试
+   - 性能和安全测试
+
+### **插件质量标准**
+
+1. **功能完整性**: 插件功能完整，满足业务需求
+2. **代码质量**: 代码规范，注释完整，易于维护
+3. **性能表现**: 响应速度快，资源占用合理
+4. **用户体验**: 界面友好，操作流畅，错误处理完善
+5. **兼容性**: 与主系统兼容，不影响其他功能
+6. **安全性**: 数据安全，权限控制，防止安全漏洞
+
+---
+
+### **建议和方案**
+
+基于以上规范，建议AI在开发gin-vue-admin项目时：
+
+1. **严格遵循分层架构**：确保前后端代码都按照规定的层次结构组织
+2. **保持代码一致性**：使用统一的命名规范、注释格式和代码风格
+3. **注重文档完整性**：确保API文档、代码注释和使用说明的完整性
+4. **优化用户体验**：关注页面加载速度、交互流畅性和错误处理
+5. **考虑扩展性**：设计时预留扩展接口，便于后续功能增强
+6. **重视安全性**：实现完善的权限控制和数据验证机制
\ No newline at end of file
diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
index 40f09341b..9169f06ce 100644
--- a/server/api/v1/system/sys_user.go
+++ b/server/api/v1/system/sys_user.go
@@ -47,7 +47,7 @@ func (b *BaseApi) Login(c *gin.Context) {
 	}
 
 	var oc bool = openCaptcha == 0 || openCaptcha < interfaceToInt(v)
-	if oc && !store.Verify(l.CaptchaId, l.Captcha, true) {
+	if oc && (l.Captcha == "" || l.CaptchaId == "" || !store.Verify(l.CaptchaId, l.Captcha, true)) {
 		// 验证码次数+1
 		global.BlackCache.Increment(key, 1)
 		response.FailWithMessage("验证码错误", c)
diff --git a/server/core/server.go b/server/core/server.go
index 6e386e071..550150cd2 100644
--- a/server/core/server.go
+++ b/server/core/server.go
@@ -35,7 +35,7 @@ func RunServer() {
 
 	fmt.Printf(`
 	欢迎使用 gin-vue-admin
-	当前版本:v2.8.4
+	当前版本:v2.8.5
 	加群方式:微信号：shouzi_1994 QQ群：470239250
 	项目地址：https://github.com/flipped-aurora/gin-vue-admin
 	插件市场:https://plugin.gin-vue-admin.com
@@ -48,6 +48,7 @@ func RunServer() {
 	** 版权所有方：flipped-aurora开源团队 **
 	** 版权持有公司：北京翻转极光科技有限责任公司 **
 	** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **
+	** 感谢您对Gin-Vue-Admin的支持与关注 合法授权使用更有利于项目的长久发展**
 `, address, address, global.GVA_CONFIG.MCP.SSEPath, address, global.GVA_CONFIG.MCP.MessagePath)
 	initServer(address, Router, 10*time.Minute, 10*time.Minute)
 }
diff --git a/server/docs/docs.go b/server/docs/docs.go
index 669b94b6a..853db3480 100644
--- a/server/docs/docs.go
+++ b/server/docs/docs.go
@@ -9296,7 +9296,7 @@ const docTemplate = `{
 
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = &swag.Spec{
-	Version:          "v2.8.4",
+	Version:          "v2.8.5",
 	Host:             "",
 	BasePath:         "",
 	Schemes:          []string{},
diff --git a/server/initialize/gorm_mssql.go b/server/initialize/gorm_mssql.go
index e1478ea41..530275ab1 100644
--- a/server/initialize/gorm_mssql.go
+++ b/server/initialize/gorm_mssql.go
@@ -28,7 +28,9 @@ func GormMssql() *gorm.DB {
 		DSN:               m.Dsn(), // DSN data source name
 		DefaultStringSize: 191,     // string 类型字段的默认长度
 	}
-	if db, err := gorm.Open(sqlserver.New(mssqlConfig), internal.Gorm.Config(m.Prefix, m.Singular)); err != nil {
+	// 数据库配置
+	general := m.GeneralDB
+	if db, err := gorm.Open(sqlserver.New(mssqlConfig), internal.Gorm.Config(general)); err != nil {
 		return nil
 	} else {
 		db.InstanceSet("gorm:table_options", "ENGINE="+m.Engine)
@@ -48,7 +50,9 @@ func GormMssqlByConfig(m config.Mssql) *gorm.DB {
 		DSN:               m.Dsn(), // DSN data source name
 		DefaultStringSize: 191,     // string 类型字段的默认长度
 	}
-	if db, err := gorm.Open(sqlserver.New(mssqlConfig), internal.Gorm.Config(m.Prefix, m.Singular)); err != nil {
+	// 数据库配置
+	general := m.GeneralDB
+	if db, err := gorm.Open(sqlserver.New(mssqlConfig), internal.Gorm.Config(general)); err != nil {
 		panic(err)
 	} else {
 		db.InstanceSet("gorm:table_options", "ENGINE=InnoDB")
diff --git a/server/initialize/gorm_mysql.go b/server/initialize/gorm_mysql.go
index 61e50ba29..cf949aa18 100644
--- a/server/initialize/gorm_mysql.go
+++ b/server/initialize/gorm_mysql.go
@@ -34,8 +34,9 @@ func initMysqlDatabase(m config.Mysql) *gorm.DB {
 		DefaultStringSize:         191,     // string 类型字段的默认长度
 		SkipInitializeWithVersion: false,   // 根据版本自动配置
 	}
-
-	if db, err := gorm.Open(mysql.New(mysqlConfig), internal.Gorm.Config(m.Prefix, m.Singular)); err != nil {
+	// 数据库配置
+	general := m.GeneralDB
+	if db, err := gorm.Open(mysql.New(mysqlConfig), internal.Gorm.Config(general)); err != nil {
 		panic(err)
 	} else {
 		db.InstanceSet("gorm:table_options", "ENGINE="+m.Engine)
diff --git a/server/initialize/gorm_oracle.go b/server/initialize/gorm_oracle.go
index 80fa8fa8a..9d3d66359 100644
--- a/server/initialize/gorm_oracle.go
+++ b/server/initialize/gorm_oracle.go
@@ -24,7 +24,9 @@ func initOracleDatabase(m config.Oracle) *gorm.DB {
 	if m.Dbname == "" {
 		return nil
 	}
-	if db, err := gorm.Open(oracle.Open(m.Dsn()), internal.Gorm.Config(m.Prefix, m.Singular)); err != nil {
+	// 数据库配置
+	general := m.GeneralDB
+	if db, err := gorm.Open(oracle.Open(m.Dsn()), internal.Gorm.Config(general)); err != nil {
 		panic(err)
 	} else {
 		sqlDB, _ := db.DB()
diff --git a/server/initialize/gorm_pgsql.go b/server/initialize/gorm_pgsql.go
index 6abde5892..b5022db2f 100644
--- a/server/initialize/gorm_pgsql.go
+++ b/server/initialize/gorm_pgsql.go
@@ -30,7 +30,9 @@ func initPgSqlDatabase(p config.Pgsql) *gorm.DB {
 		DSN:                  p.Dsn(), // DSN data source name
 		PreferSimpleProtocol: false,
 	}
-	if db, err := gorm.Open(postgres.New(pgsqlConfig), internal.Gorm.Config(p.Prefix, p.Singular)); err != nil {
+	// 数据库配置
+	general := p.GeneralDB
+	if db, err := gorm.Open(postgres.New(pgsqlConfig), internal.Gorm.Config(general)); err != nil {
 		panic(err)
 	} else {
 		sqlDB, _ := db.DB()
diff --git a/server/initialize/gorm_sqlite.go b/server/initialize/gorm_sqlite.go
index 9d158bf16..33510eea5 100644
--- a/server/initialize/gorm_sqlite.go
+++ b/server/initialize/gorm_sqlite.go
@@ -25,7 +25,9 @@ func initSqliteDatabase(s config.Sqlite) *gorm.DB {
 		return nil
 	}
 
-	if db, err := gorm.Open(sqlite.Open(s.Dsn()), internal.Gorm.Config(s.Prefix, s.Singular)); err != nil {
+	// 数据库配置
+	general := s.GeneralDB
+	if db, err := gorm.Open(sqlite.Open(s.Dsn()), internal.Gorm.Config(general)); err != nil {
 		panic(err)
 	} else {
 		sqlDB, _ := db.DB()
diff --git a/server/initialize/internal/gorm.go b/server/initialize/internal/gorm.go
index ebf5526c3..28f40979a 100644
--- a/server/initialize/internal/gorm.go
+++ b/server/initialize/internal/gorm.go
@@ -1,12 +1,12 @@
 package internal
 
 import (
+	"time"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/config"
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
-	"time"
 )
 
 var Gorm = new(_gorm)
@@ -15,22 +15,7 @@ type _gorm struct{}
 
 // Config gorm 自定义配置
 // Author [SliverHorn](https://github.com/SliverHorn)
-func (g *_gorm) Config(prefix string, singular bool) *gorm.Config {
-	var general config.GeneralDB
-	switch global.GVA_CONFIG.System.DbType {
-	case "mysql":
-		general = global.GVA_CONFIG.Mysql.GeneralDB
-	case "pgsql":
-		general = global.GVA_CONFIG.Pgsql.GeneralDB
-	case "oracle":
-		general = global.GVA_CONFIG.Oracle.GeneralDB
-	case "sqlite":
-		general = global.GVA_CONFIG.Sqlite.GeneralDB
-	case "mssql":
-		general = global.GVA_CONFIG.Mssql.GeneralDB
-	default:
-		general = global.GVA_CONFIG.Mysql.GeneralDB
-	}
+func (g *_gorm) Config(general config.GeneralDB) *gorm.Config {
 	return &gorm.Config{
 		Logger: logger.New(NewWriter(general), logger.Config{
 			SlowThreshold: 200 * time.Millisecond,
@@ -38,8 +23,8 @@ func (g *_gorm) Config(prefix string, singular bool) *gorm.Config {
 			Colorful:      true,
 		}),
 		NamingStrategy: schema.NamingStrategy{
-			TablePrefix:   prefix,
-			SingularTable: singular,
+			TablePrefix:   general.Prefix,
+			SingularTable: general.Singular,
 		},
 		DisableForeignKeyConstraintWhenMigrating: true,
 	}
diff --git a/server/main.go b/server/main.go
index f5badf750..1f4c37d5c 100644
--- a/server/main.go
+++ b/server/main.go
@@ -21,7 +21,7 @@ import (
 // @Tag.Description 用户
 
 // @title                       Gin-Vue-Admin Swagger API接口文档
-// @version                     v2.8.4
+// @version                     v2.8.5
 // @description                 使用gin+vue进行极速开发的全栈开发基础平台
 // @securityDefinitions.apikey  ApiKeyAuth
 // @in                          header
diff --git a/server/mcp/api_lister.go b/server/mcp/api_lister.go
new file mode 100644
index 000000000..d8a87d1f1
--- /dev/null
+++ b/server/mcp/api_lister.go
@@ -0,0 +1,165 @@
+package mcpTool
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/mark3labs/mcp-go/mcp"
+	"go.uber.org/zap"
+)
+
+// 注册工具
+func init() {
+	// 注册工具将在enter.go中统一处理
+	RegisterTool(&ApiLister{})
+}
+
+// ApiInfo API信息结构
+type ApiInfo struct {
+	ID          uint   `json:"id,omitempty"`          // 数据库ID（仅数据库API有）
+	Path        string `json:"path"`                  // API路径
+	Description string `json:"description,omitempty"` // API描述
+	ApiGroup    string `json:"apiGroup,omitempty"`    // API组
+	Method      string `json:"method"`                // HTTP方法
+	Source      string `json:"source"`                // 来源：database 或 gin
+}
+
+// ApiListResponse API列表响应结构
+type ApiListResponse struct {
+	Success      bool      `json:"success"`
+	Message      string    `json:"message"`
+	DatabaseApis []ApiInfo `json:"databaseApis"` // 数据库中的API
+	GinApis      []ApiInfo `json:"ginApis"`      // gin框架中的API
+	TotalCount   int       `json:"totalCount"`   // 总数量
+}
+
+// ApiLister API列表工具
+type ApiLister struct{}
+
+// New 创建API列表工具
+func (a *ApiLister) New() mcp.Tool {
+	return mcp.NewTool("list_all_apis",
+		mcp.WithDescription(`获取系统中所有的API接口，分为两组：
+
+**功能说明：**
+- 返回数据库中已注册的API列表
+- 返回gin框架中实际注册的路由API列表
+- 帮助前端判断是使用现有API还是需要创建新的API,如果api在前端未使用且需要前端调用的时候，请到api文件夹下对应模块的js中添加方法并暴露给当前业务调用
+
+**返回数据结构：**
+- databaseApis: 数据库中的API记录（包含ID、描述、分组等完整信息）
+- ginApis: gin路由中的API（仅包含路径和方法），需要AI根据路径自行揣摩路径的业务含义，例如：/api/user/:id 表示根据用户ID获取用户信息`),
+	)
+}
+
+// Handle 处理API列表请求
+func (a *ApiLister) Handle(_ context.Context, _ mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+
+	// 获取数据库中的API
+	databaseApis, err := a.getDatabaseApis()
+	if err != nil {
+		global.GVA_LOG.Error("获取数据库API失败", zap.Error(err))
+		errorResponse := ApiListResponse{
+			Success: false,
+			Message: "获取数据库API失败: " + err.Error(),
+		}
+		resultJSON, _ := json.Marshal(errorResponse)
+		return &mcp.CallToolResult{
+			Content: []mcp.Content{
+				mcp.TextContent{
+					Type: "text",
+					Text: string(resultJSON),
+				},
+			},
+		}, nil
+	}
+
+	// 获取gin路由中的API
+	ginApis, err := a.getGinApis()
+	if err != nil {
+		global.GVA_LOG.Error("获取gin路由API失败", zap.Error(err))
+		errorResponse := ApiListResponse{
+			Success: false,
+			Message: "获取gin路由API失败: " + err.Error(),
+		}
+		resultJSON, _ := json.Marshal(errorResponse)
+		return &mcp.CallToolResult{
+			Content: []mcp.Content{
+				mcp.TextContent{
+					Type: "text",
+					Text: string(resultJSON),
+				},
+			},
+		}, nil
+	}
+
+	// 构建响应
+	response := ApiListResponse{
+		Success:      true,
+		Message:      "获取API列表成功",
+		DatabaseApis: databaseApis,
+		GinApis:      ginApis,
+		TotalCount:   len(databaseApis) + len(ginApis),
+	}
+
+	global.GVA_LOG.Info("API列表获取成功",
+		zap.Int("数据库API数量", len(databaseApis)),
+		zap.Int("gin路由API数量", len(ginApis)),
+		zap.Int("总数量", response.TotalCount))
+
+	resultJSON, err := json.Marshal(response)
+	if err != nil {
+		return nil, fmt.Errorf("序列化结果失败: %v", err)
+	}
+
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.TextContent{
+				Type: "text",
+				Text: string(resultJSON),
+			},
+		},
+	}, nil
+}
+
+// getDatabaseApis 获取数据库中的所有API
+func (a *ApiLister) getDatabaseApis() ([]ApiInfo, error) {
+	var apis []system.SysApi
+	err := global.GVA_DB.Model(&system.SysApi{}).Order("api_group ASC, path ASC").Find(&apis).Error
+	if err != nil {
+		return nil, err
+	}
+
+	// 转换为ApiInfo格式
+	var result []ApiInfo
+	for _, api := range apis {
+		result = append(result, ApiInfo{
+			ID:          api.ID,
+			Path:        api.Path,
+			Description: api.Description,
+			ApiGroup:    api.ApiGroup,
+			Method:      api.Method,
+			Source:      "database",
+		})
+	}
+
+	return result, nil
+}
+
+// getGinApis 获取gin路由中的所有API（包含被忽略的API）
+func (a *ApiLister) getGinApis() ([]ApiInfo, error) {
+	// 从gin路由信息中获取所有API
+	var result []ApiInfo
+	for _, route := range global.GVA_ROUTERS {
+		result = append(result, ApiInfo{
+			Path:   route.Path,
+			Method: route.Method,
+			Source: "gin",
+		})
+	}
+
+	return result, nil
+}
diff --git a/server/mcp/menu_lister.go b/server/mcp/menu_lister.go
new file mode 100644
index 000000000..c04c83e92
--- /dev/null
+++ b/server/mcp/menu_lister.go
@@ -0,0 +1,112 @@
+package mcpTool
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/mark3labs/mcp-go/mcp"
+	"go.uber.org/zap"
+)
+
+// 注册工具
+func init() {
+	// 注册工具将在enter.go中统一处理
+	RegisterTool(&MenuLister{})
+}
+
+// MenuListResponse 菜单列表响应结构
+type MenuListResponse struct {
+	Success     bool                  `json:"success"`
+	Message     string                `json:"message"`
+	Menus       []system.SysBaseMenu  `json:"menus"`
+	TotalCount  int                   `json:"totalCount"`
+	Description string                `json:"description"`
+}
+
+// MenuLister 菜单列表工具
+type MenuLister struct{}
+
+// New 创建菜单列表工具
+func (m *MenuLister) New() mcp.Tool {
+	return mcp.NewTool("list_all_menus",
+		mcp.WithDescription(`获取系统中所有菜单信息，包括菜单树结构、路由信息、组件路径等，用于前端编写vue-router时正确跳转
+
+**功能说明：**
+- 返回完整的菜单树形结构
+- 包含路由配置信息（path、name、component）
+- 包含菜单元数据（title、icon、keepAlive等）
+- 包含菜单参数和按钮配置
+- 支持父子菜单关系展示
+
+**使用场景：**
+- 前端路由配置：获取所有菜单信息用于配置vue-router
+- 菜单权限管理：了解系统中所有可用的菜单项
+- 导航组件开发：构建动态导航菜单
+- 系统架构分析：了解系统的菜单结构和页面组织`),
+	)
+}
+
+// Handle 处理菜单列表请求
+func (m *MenuLister) Handle(_ context.Context, _ mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	// 获取所有基础菜单
+	allMenus, err := m.getAllMenus()
+	if err != nil {
+		global.GVA_LOG.Error("获取菜单列表失败", zap.Error(err))
+		return &mcp.CallToolResult{
+			Content: []mcp.Content{
+				mcp.TextContent{
+					Type: "text",
+					Text: fmt.Sprintf("获取菜单列表失败: %v", err),
+				},
+			},
+			IsError: true,
+		}, nil
+	}
+
+	// 构建返回结果
+	response := MenuListResponse{
+		Success:     true,
+		Message:     "获取菜单列表成功",
+		Menus:       allMenus,
+		TotalCount:  len(allMenus),
+		Description: "系统中所有菜单信息的标准列表，包含路由配置和组件信息",
+	}
+
+	// 序列化响应
+	responseJSON, err := json.MarshalIndent(response, "", "  ")
+	if err != nil {
+		global.GVA_LOG.Error("序列化菜单响应失败", zap.Error(err))
+		return &mcp.CallToolResult{
+			Content: []mcp.Content{
+				mcp.TextContent{
+					Type: "text",
+					Text: fmt.Sprintf("序列化响应失败: %v", err),
+				},
+			},
+			IsError: true,
+		}, nil
+	}
+
+	return &mcp.CallToolResult{
+		Content: []mcp.Content{
+			mcp.TextContent{
+				Type: "text",
+				Text: string(responseJSON),
+			},
+		},
+	}, nil
+}
+
+// getAllMenus 获取所有基础菜单
+func (m *MenuLister) getAllMenus() ([]system.SysBaseMenu, error) {
+	var menus []system.SysBaseMenu
+	err := global.GVA_DB.Order("sort").Preload("Parameters").Preload("MenuBtn").Find(&menus).Error
+	if err != nil {
+		return nil, err
+	}
+	return menus, nil
+}
+
diff --git a/server/model/system/sys_version.go b/server/model/system/sys_version.go
index e20cbdf24..a4d7ceb3a 100644
--- a/server/model/system/sys_version.go
+++ b/server/model/system/sys_version.go
@@ -11,7 +11,7 @@ type SysVersion struct {
 	VersionName *string `json:"versionName" form:"versionName" gorm:"comment:版本名称;column:version_name;size:255;" binding:"required"` //版本名称
 	VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"`   //版本号
 	Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"`                     //版本描述
-	VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:text;"`               //版本数据
+	VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:longtext;"`               //版本数据
 }
 
 // TableName 版本管理 SysVersion自定义表名 sys_versions
diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index 895ad2d4e..beadadef3 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -393,8 +393,8 @@ const searchInfo = ref({})
 // 排序
 const sortChange = ({ prop, order }) => {
   const sortMap = {
-    CreatedAt:"CreatedAt",
-    ID:"ID",
+    CreatedAt:"created_at",
+    ID:"id",
     {{- range .Fields}}
      {{- if .Table}}
       {{- if and .Sort}}
diff --git a/server/resource/plugin/web/view/view.vue.tpl b/server/resource/plugin/web/view/view.vue.tpl
index 8363bdbdb..f5b8547a1 100644
--- a/server/resource/plugin/web/view/view.vue.tpl
+++ b/server/resource/plugin/web/view/view.vue.tpl
@@ -388,8 +388,8 @@ const searchInfo = ref({})
 // 排序
 const sortChange = ({ prop, order }) => {
   const sortMap = {
-    CreatedAt:"CreatedAt",
-    ID:"ID",
+    CreatedAt:"created_at",
+    ID:"id",
     {{- range .Fields}}
      {{- if .Table}}
       {{- if and .Sort}}
diff --git a/server/utils/autocode/template_funcs.go b/server/utils/autocode/template_funcs.go
index 70b297886..157c992ac 100644
--- a/server/utils/autocode/template_funcs.go
+++ b/server/utils/autocode/template_funcs.go
@@ -46,7 +46,8 @@ func GenerateField(field systemReq.AutoCodeField) string {
 
 	gormTag += "column:" + field.ColumnName + ";"
 
-	if field.DataTypeLong != "" && field.FieldType != "enum" {
+	// 对于int类型，根据DataTypeLong决定具体的Go类型，不使用size标签
+	if field.DataTypeLong != "" && field.FieldType != "enum" && field.FieldType != "int" {
 		gormTag += fmt.Sprintf("size:%s;", field.DataTypeLong)
 	}
 
@@ -85,8 +86,27 @@ func GenerateField(field systemReq.AutoCodeField) string {
 		tagContent := fmt.Sprintf(`json:"%s" form:"%s" gorm:"%s"`,
 			field.FieldJson, field.FieldJson, gormTag)
 
+		// 对于int类型，根据DataTypeLong决定具体的Go类型
+		var fieldType string
+		if field.FieldType == "int" {
+			switch field.DataTypeLong {
+			case "1", "2", "3":
+				fieldType = "int8"
+			case "4", "5":
+				fieldType = "int16"
+			case "6", "7", "8", "9", "10":
+				fieldType = "int32"
+			case "11", "12", "13", "14", "15", "16", "17", "18", "19", "20":
+				fieldType = "int64"
+			default:
+				fieldType = "int64"
+			}
+		} else {
+			fieldType = field.FieldType
+		}
+
 		result = fmt.Sprintf(`%s  *%s `+"`"+`%s`+"`"+``,
-			field.FieldName, field.FieldType, tagContent)
+			field.FieldName, fieldType, tagContent)
 	}
 
 	if field.Require {
diff --git a/web/limit.js b/web/limit.js
index 6ba9d4623..f23fa5121 100644
--- a/web/limit.js
+++ b/web/limit.js
@@ -1,6 +1,6 @@
 // 运行项目前通过node执行此脚本 （此脚本与 node_modules 目录同级）
-const fs = require('fs')
-const path = require('path')
+import fs from 'fs'
+import path from 'path'
 const wfPath = path.resolve(__dirname, './node_modules/.bin')
 
 fs.readdir(wfPath, (err, files) => {
diff --git a/web/openDocument.js b/web/openDocument.js
index 1693eeebd..03a886b46 100644
--- a/web/openDocument.js
+++ b/web/openDocument.js
@@ -3,7 +3,7 @@
      未经授权的商用使用可能会被我们的资产搜索引擎爬取，并可能导致后续索赔。索赔金额将不低于高级授权费的十倍。请您遵守版权法律法规，尊重知识产权。
 */
 
-var child_process = require('child_process')
+import child_process from 'child_process'
 
 var url = 'https://www.gin-vue-admin.com'
 var cmd = ''
diff --git a/web/package.json b/web/package.json
index 5cc38ccbd..da978d87b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gin-vue-admin",
-  "version": "2.8.4",
+  "version": "2.8.5",
   "private": true,
   "scripts": {
     "serve": "node openDocument.js && vite --host --mode development",
@@ -9,10 +9,12 @@
     "preview": "vite preview",
     "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
   },
+  "type": "module",
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
     "@form-create/designer": "^3.2.6",
     "@form-create/element-ui": "^3.2.10",
+    "@unocss/transformer-directives": "^66.4.2",
     "@vue-office/docx": "^1.6.2",
     "@vue-office/excel": "^1.7.11",
     "@vue-office/pdf": "^2.0.2",
@@ -39,10 +41,9 @@
     "screenfull": "^6.0.2",
     "sortablejs": "^1.15.3",
     "spark-md5": "^3.0.2",
-    "tailwindcss": "^3.4.10",
     "universal-cookie": "^7",
     "vform3-builds": "^3.0.10",
-    "vite-auto-import-svg": "^1.7.0",
+    "vite-auto-import-svg": "^1.9.0",
     "vue": "^3.5.7",
     "vue-cropper": "^1.1.4",
     "vue-echarts": "^7.0.3",
@@ -55,6 +56,8 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.25.1",
     "@eslint/js": "^8.56.0",
+    "@unocss/extractor-svelte": "^66.4.2",
+    "@unocss/preset-wind3": "^66.4.2",
     "@vitejs/plugin-legacy": "^6.0.0",
     "@vitejs/plugin-vue": "^5.0.3",
     "@vue/cli-plugin-babel": "~5.0.8",
@@ -71,6 +74,7 @@
     "eslint-plugin-vue": "^9.19.2",
     "sass": "^1.78.0",
     "terser": "^5.31.6",
+    "unocss": "^66.4.2",
     "vite": "^6.2.3",
     "vite-plugin-banner": "^0.8.0",
     "vite-plugin-importer": "^0.2.5",
diff --git a/web/postcss.config.js b/web/postcss.config.js
deleted file mode 100644
index 85f717cc0..000000000
--- a/web/postcss.config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {}
-  }
-}
diff --git a/web/src/components/errorPreview/index.vue b/web/src/components/errorPreview/index.vue
index dd08402af..d3d99b0f8 100644
--- a/web/src/components/errorPreview/index.vue
+++ b/web/src/components/errorPreview/index.vue
@@ -7,13 +7,13 @@
       <!-- 弹窗头部 -->
       <div class="p-5 border-b border-gray-100 flex justify-between items-center">
         <h3 class="text-lg font-semibold text-gray-800">{{ displayData.title }}</h3>
-        <button class="text-gray-400 hover:text-gray-600 transition-colors" @click="closeModal">
-          <close />
-        </button>
+        <div class="text-gray-400 hover:text-gray-600 transition-colors cursor-pointer" @click="closeModal">
+          <close class="h-6 w-6" />
+        </div>
       </div>
       
       <!-- 弹窗内容 -->
-      <div class="p-6">
+      <div class="p-6 pt-0">
         <!-- 错误类型 -->
         <div class="mb-4">
           <div class="text-xs font-medium text-gray-500 uppercase mb-2">错误类型</div>
@@ -45,16 +45,16 @@
       
       <!-- 弹窗底部 -->
       <div class="py-2 px-4 border-t border-gray-100 flex justify-end">
-        <button class="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors font-medium text-sm shadow-sm" @click="handleConfirm">
+        <div class="px-4 py-2 bg-blue-600 text-white rounded-lg hover:bg-blue-700 transition-colors font-medium text-sm shadow-sm cursor-pointer" @click="handleConfirm">
           确定
-        </button>
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script setup>
-import { defineProps, defineEmits, ref, computed, onMounted } from 'vue';
+import { defineProps, defineEmits, computed } from 'vue';
 
 const props = defineProps({
   errorData: {
diff --git a/web/src/core/config.js b/web/src/core/config.js
index 24ca844ed..3d684ac22 100644
--- a/web/src/core/config.js
+++ b/web/src/core/config.js
@@ -17,7 +17,7 @@ export const viteLogo = (env) => {
         `> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin`
       )
     )
-    console.log(greenText(`> 当前版本:v2.8.4`))
+    console.log(greenText(`> 当前版本:v2.8.5`))
     console.log(greenText(`> 加群方式:微信：shouzi_1994 QQ群：470239250`))
     console.log(
       greenText(`> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`)
diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js
index 3062fc905..8e37207ed 100644
--- a/web/src/core/gin-vue-admin.js
+++ b/web/src/core/gin-vue-admin.js
@@ -10,7 +10,7 @@ export default {
     register(app)
     console.log(`
        欢迎使用 Gin-Vue-Admin
-       当前版本:v2.8.4
+       当前版本:v2.8.5
        加群方式:微信：shouzi_1994 QQ群：622360840
        项目地址：https://github.com/flipped-aurora/gin-vue-admin
        插件市场:https://plugin.gin-vue-admin.com
@@ -22,6 +22,7 @@ export default {
        ** 版权所有方：flipped-aurora开源团队 **
        ** 版权持有公司：北京翻转极光科技有限责任公司 **
        ** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **
+       ** 感谢您对Gin-Vue-Admin的支持与关注 合法授权使用更有利于项目的长久发展**
     `)
   }
 }
diff --git a/web/src/main.js b/web/src/main.js
index 372b491f1..18ba0723e 100644
--- a/web/src/main.js
+++ b/web/src/main.js
@@ -1,5 +1,6 @@
 import './style/element_visiable.scss'
 import 'element-plus/theme-chalk/dark/css-vars.css'
+import 'uno.css';
 import { createApp } from 'vue'
 import ElementPlus from 'element-plus'
 
diff --git a/web/src/style/element_visiable.scss b/web/src/style/element_visiable.scss
index 112c0bf4f..59f4583b4 100644
--- a/web/src/style/element_visiable.scss
+++ b/web/src/style/element_visiable.scss
@@ -1,9 +1,6 @@
 @use '@/style/main.scss';
 @use '@/style/reset';
 
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
 
 .el-button {
   font-weight: 400;
diff --git a/web/src/style/main.scss b/web/src/style/main.scss
index a213d4813..21a3d121e 100644
--- a/web/src/style/main.scss
+++ b/web/src/style/main.scss
@@ -17,7 +17,15 @@
 }
 
 .gva-btn-list {
-  @apply mb-3 flex items-center;
+  @apply mb-3 flex items-center flex-wrap gap-2;
+  .el-button+.el-button{
+    @apply ml-0 !important;
+  }
+  .el-upload{
+    .el-button{
+      @apply ml-0 !important;
+    }
+  }
 }
 
 #nprogress .bar {
diff --git a/web/src/view/error/index.vue b/web/src/view/error/index.vue
index 1f0079fa4..ec91562c3 100644
--- a/web/src/view/error/index.vue
+++ b/web/src/view/error/index.vue
@@ -24,6 +24,7 @@
 <script setup>
   import { useUserStore } from '@/pinia/modules/user'
   import { useRouter } from 'vue-router'
+  import { emitter } from '@/utils/bus'
 
   defineOptions({
     name: 'Error'
@@ -32,6 +33,17 @@
   const userStore = useUserStore()
   const router = useRouter()
   const toDashboard = () => {
-    router.push({ name: userStore.userInfo.authority.defaultRouter })
+    try {
+      router.push({ name: userStore.userInfo.authority.defaultRouter })
+    } catch (error) {
+        emitter.emit('show-error', {
+        code: '401',
+        message: "检测到其他用户修改了路由权限，请重新登录",
+        fn: () => {
+          userStore.ClearStorage()
+          router.push({ name: 'Login', replace: true })
+        }
+      })
+    }
   }
 </script>
diff --git a/web/src/view/init/index.vue b/web/src/view/init/index.vue
index 211ec4a88..5d7697648 100644
--- a/web/src/view/init/index.vue
+++ b/web/src/view/init/index.vue
@@ -136,7 +136,7 @@
   // @ts-ignore
   import { initDB } from '@/api/initdb'
   import { reactive, ref } from 'vue'
-  import { ElLoading, ElMessage } from 'element-plus'
+  import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
   import { useRouter } from 'vue-router'
 
   defineOptions({
@@ -274,7 +274,25 @@
           type: 'success',
           message: res.msg
         })
-        router.push({ name: 'Login' })
+        
+        // 显示AI助手配置提示弹窗
+        ElMessageBox.confirm(
+          '已经完成基础数据库初始化！建议先进行编辑器AI助手配置，以获得更好的开发体验。',
+          '配置完成',
+          {
+            confirmButtonText: '查看AI配置文档',
+            cancelButtonText: '稍后配置',
+            type: 'success',
+            center: true
+          }
+        ).then(() => {
+          // 点击确认按钮，打开AI配置文档
+          window.open('https://www.gin-vue-admin.com/guide/server/mcp.html', '_blank')
+          router.push({ name: 'Login' })
+        }).catch(() => {
+          // 点击取消按钮或关闭弹窗，直接跳转到登录页
+          router.push({ name: 'Login' })
+        })
       }
       loading.close()
     } catch (_) {
diff --git a/web/src/view/layout/aside/combinationMode.vue b/web/src/view/layout/aside/combinationMode.vue
index 3e588ce60..5584e8913 100644
--- a/web/src/view/layout/aside/combinationMode.vue
+++ b/web/src/view/layout/aside/combinationMode.vue
@@ -7,7 +7,7 @@
       <el-menu
         :default-active="routerStore.topActive"
         mode="horizontal"
-        class="border-r-0 border-b-0 w-full flex gap-1 items-center box-border h-[calc(100%-1px)]"
+        class="!border-r-0 border-b-0 w-full flex gap-1 items-center box-border h-[calc(100%-1px)]"
         unique-opened
         @select="(index, _, ele) => selectMenuItem(index, _, ele, true)"
       >
@@ -34,7 +34,7 @@
           :collapse="isCollapse"
           :collapse-transition="false"
           :default-active="active"
-          class="border-r-0 w-full"
+          class="!border-r-0 w-full"
           unique-opened
           @select="(index, _, ele) => selectMenuItem(index, _, ele, false)"
         >
diff --git a/web/src/view/layout/aside/headMode.vue b/web/src/view/layout/aside/headMode.vue
index 78318ba4e..db48fc9d5 100644
--- a/web/src/view/layout/aside/headMode.vue
+++ b/web/src/view/layout/aside/headMode.vue
@@ -6,7 +6,7 @@
     <el-menu
       :default-active="active"
       mode="horizontal"
-      class="border-r-0 w-full flex gap-1 items-center box-border h-[calc(100%-1px)]"
+      class="!border-r-0 w-full flex gap-1 items-center box-border h-[calc(100%-1px)]"
       unique-opened
       :ellipsis="shouldEllipsis"
       @select="selectMenuItem"
diff --git a/web/src/view/layout/aside/normalMode.vue b/web/src/view/layout/aside/normalMode.vue
index 8c0fae108..89d73d910 100644
--- a/web/src/view/layout/aside/normalMode.vue
+++ b/web/src/view/layout/aside/normalMode.vue
@@ -11,7 +11,7 @@
         :collapse="isCollapse"
         :collapse-transition="false"
         :default-active="active"
-        class="border-r-0 w-full"
+        class="!border-r-0 w-full"
         unique-opened
         @select="selectMenuItem"
       >
diff --git a/web/src/view/layout/aside/sidebarMode.vue b/web/src/view/layout/aside/sidebarMode.vue
index 032a2537f..128c655ca 100644
--- a/web/src/view/layout/aside/sidebarMode.vue
+++ b/web/src/view/layout/aside/sidebarMode.vue
@@ -2,7 +2,7 @@
   <div class="flex h-full">
     <!-- 一级菜单常驻侧边栏 -->
     <div
-      class="relative h-full bg-white text-slate-700 dark:text-slate-300 dark:bg-slate-900 border-r shadow dark:shadow-gray-700"
+      class="relative !h-full bg-white text-slate-700 dark:text-slate-300 dark:bg-slate-900 border-r shadow dark:shadow-gray-700"
       :style="{
         width: config.layout_side_collapsed_width + 'px'
       }"
@@ -12,7 +12,7 @@
           :collapse="true"
           :collapse-transition="false"
           :default-active="topActive"
-          class="border-r-0 w-full"
+          class="!border-r-0 w-full"
           unique-opened
           @select="selectTopMenuItem"
         >
@@ -74,7 +74,7 @@
           :collapse="isCollapse"
           :collapse-transition="false"
           :default-active="active"
-          class="border-r-0 w-full"
+          class="!border-r-0 w-full"
           unique-opened
           @select="selectMenuItem"
         >
diff --git a/web/src/view/layout/header/tools.vue b/web/src/view/layout/header/tools.vue
index deba8d8c7..1176debda 100644
--- a/web/src/view/layout/header/tools.vue
+++ b/web/src/view/layout/header/tools.vue
@@ -8,7 +8,7 @@
     <el-tooltip class="" effect="dark" content="视频教程" placement="bottom">
       <el-dropdown @command="toDoc">
         <el-icon
-          class="w-8 h-8 shadow rounded-full border border-gray-200 dark:border-gray-600 cursor-pointer border-solid"
+          class="w-8 h-8 p-2 shadow rounded-full border border-gray-200 dark:border-gray-600 cursor-pointer border-solid"
         >
           <Film />
         </el-icon>
@@ -29,7 +29,7 @@
     <el-tooltip class="" effect="dark" content="搜索" placement="bottom">
       <el-icon
         @click="handleCommand"
-        class="w-8 h-8 shadow rounded-full border border-gray-200 dark:border-gray-600 cursor-pointer border-solid"
+        class="w-8 h-8 p-2 shadow rounded-full border border-gray-200 dark:border-gray-600 cursor-pointer border-solid"
       >
         <Search />
       </el-icon>
@@ -37,7 +37,7 @@
 
     <el-tooltip class="" effect="dark" content="系统设置" placement="bottom">
       <el-icon
-        class="w-8 h-8 shadow rounded-full border border-gray-200 dark:border-gray-600 cursor-pointer border-solid"
+        class="w-8 h-8 p-2 shadow rounded-full border border-gray-200 dark:border-gray-600 cursor-pointer border-solid"
         @click="toggleSetting"
       >
         <Setting />
@@ -46,7 +46,7 @@
 
     <el-tooltip class="" effect="dark" content="刷新" placement="bottom">
       <el-icon
-        class="w-8 h-8 shadow rounded-full border border-gray-200 dark:border-gray-600 cursor-pointer border-solid"
+        class="w-8 h-8 p-2 shadow rounded-full border border-gray-200 dark:border-gray-600 cursor-pointer border-solid"
         :class="showRefreshAnmite ? 'animate-spin' : ''"
         @click="toggleRefresh"
       >
@@ -61,14 +61,14 @@
     >
       <el-icon
         v-if="appStore.isDark"
-        class="w-8 h-8 shadow rounded-full border border-gray-600 cursor-pointer border-solid"
+        class="w-8 h-8 p-2 shadow rounded-full border border-gray-600 cursor-pointer border-solid"
         @click="appStore.toggleTheme(false)"
       >
         <Sunny />
       </el-icon>
       <el-icon
         v-else
-        class="w-8 h-8 shadow rounded-full border border-gray-200 cursor-pointer border-solid"
+        class="w-8 h-8 p-2 shadow rounded-full border border-gray-200 cursor-pointer border-solid"
         @click="appStore.toggleTheme(true)"
       >
         <Moon />
diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue
index 43342024c..77f115fa7 100644
--- a/web/src/view/layout/index.vue
+++ b/web/src/view/layout/index.vue
@@ -11,7 +11,7 @@
       :content="userStore.userInfo.nickName"
     />
     <gva-header />
-    <div class="flex flex-row w-full gva-container pt-16 box-border h-full">
+    <div class="flex flex-row w-full pt-16 box-border h-full">
       <gva-aside
         v-if="
           config.side_mode === 'normal' || config.side_mode === 'sidebar' ||
diff --git a/web/src/view/layout/setting/index.vue b/web/src/view/layout/setting/index.vue
index ac24d4735..6e2f3f6be 100644
--- a/web/src/view/layout/setting/index.vue
+++ b/web/src/view/layout/setting/index.vue
@@ -22,14 +22,14 @@
       </div>
     </template>
 
-    <div class="h-full bg-white dark:bg-gray-900">
+    <div class="bg-white dark:bg-gray-900">
       <div class="px-8 pt-4 pb-6 border-b border-gray-200 dark:border-gray-700">
         <div class="flex justify-center">
           <div class="inline-flex bg-gray-100 dark:bg-gray-800 rounded-xl p-1.5 border border-gray-200 dark:border-gray-700 shadow-sm">
-            <button
+            <div
               v-for="tab in tabs"
               :key="tab.key"
-              class="px-6 py-3 text-base font-medium rounded-lg transition-all duration-150 ease-in-out min-w-[80px]"
+              class="px-6 py-3 text-base text-center cursor-pointer font-medium rounded-lg transition-all duration-150 ease-in-out min-w-[80px]"
               :class="[
                 activeTab === tab.key
                   ? 'text-white shadow-md transform -translate-y-0.5'
@@ -39,7 +39,7 @@
               @click="activeTab = tab.key"
             >
               {{ tab.label }}
-            </button>
+            </div>
           </div>
         </div>
       </div>
diff --git a/web/src/view/layout/tabs/index.vue b/web/src/view/layout/tabs/index.vue
index 4ad54f371..6a6ad8ad6 100644
--- a/web/src/view/layout/tabs/index.vue
+++ b/web/src/view/layout/tabs/index.vue
@@ -8,7 +8,7 @@
       v-model="activeValue"
       :closable="!(historys.length === 1 && $route.name === defaultRouter)"
       type="card"
-      class="bg-white text-slate-700 dark:text-slate-500 dark:bg-slate-900"
+      class="bg-white text-slate-700 dark:text-slate-500 dark:bg-slate-900 pt-1"
       @contextmenu.prevent="openContextMenu($event)"
       @tab-click="changeTab"
       @tab-remove="removeTab"
diff --git a/web/src/view/superAdmin/authority/components/menus.vue b/web/src/view/superAdmin/authority/components/menus.vue
index 2dd571dc5..fd00f8d28 100644
--- a/web/src/view/superAdmin/authority/components/menus.vue
+++ b/web/src/view/superAdmin/authority/components/menus.vue
@@ -23,7 +23,7 @@
           <template #default="{ node, data }">
             <span class="custom-tree-node">
               <span>{{ node.label }}</span>
-              <span v-if="node.checked">
+              <span v-if="node.checked && !data.name?.startsWith('http://') && !data.name?.startsWith('https://')">
                 <el-button
                   type="primary"
                   link
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
deleted file mode 100644
index 35531e00e..000000000
--- a/web/tailwind.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/** @type {import('tailwindcss').Config} */
-module.exports = {
-  content: ['./index.html', './src/**/*.{vue,js,ts,jsx,tsx}'],
-  important: true,
-  theme: {
-    extend: {
-      backgroundColor: {
-        main: '#F5F5F5'
-      },
-      textColor: {
-        active: 'var(--el-color-primary)'
-      },
-      boxShadowColor: {
-        active: 'var(--el-color-primary)'
-      },
-      borderColor: {
-        'table-border': 'var(--el-border-color-lighter)'
-      }
-    }
-  },
-  darkMode: 'class',
-  plugins: []
-}
diff --git a/web/uno.config.js b/web/uno.config.js
new file mode 100644
index 000000000..779a77e4f
--- /dev/null
+++ b/web/uno.config.js
@@ -0,0 +1,26 @@
+import { defineConfig } from '@unocss/vite';
+import presetWind3 from '@unocss/preset-wind3';
+import transformerDirectives from '@unocss/transformer-directives'
+
+export default defineConfig({
+  theme: {
+    backgroundColor: {
+      main: '#F5F5F5'
+    },
+    textColor: {
+      active: 'var(--el-color-primary)'
+    },
+    boxShadowColor: {
+      active: 'var(--el-color-primary)'
+    },
+    borderColor: {
+      'table-border': 'var(--el-border-color-lighter)'
+    }
+  },
+  presets: [
+    presetWind3({ dark: 'class' })
+  ],
+  transformers: [
+    transformerDirectives(),
+  ],
+})
diff --git a/web/vite.config.js b/web/vite.config.js
index e50e4241a..4922e4082 100644
--- a/web/vite.config.js
+++ b/web/vite.config.js
@@ -9,6 +9,8 @@ import vueDevTools from 'vite-plugin-vue-devtools'
 import VueFilePathPlugin from './vitePlugin/componentName/index.js'
 import { svgBuilder } from 'vite-auto-import-svg'
 import { AddSecret } from './vitePlugin/secret'
+import UnoCSS from 'unocss/vite'
+
 // @see https://cn.vitejs.dev/config/
 export default ({ mode }) => {
   AddSecret('')
@@ -111,7 +113,8 @@ export default ({ mode }) => {
       vuePlugin(),
       svgBuilder(['./src/plugin/','./src/assets/icons/'],base, outDir,'assets', NODE_ENV),
       [Banner(`\n Build based on gin-vue-admin \n Time : ${timestamp}`)],
-      VueFilePathPlugin('./src/pathInfo.json')
+      VueFilePathPlugin('./src/pathInfo.json'),
+      UnoCSS()
     ]
   }
   return config

From 2f7f3e5ac66c2c7baf65ef35be7951cd449d8f92 Mon Sep 17 00:00:00 2001
From: Qing Liang <106448173+xue-ding-e@users.noreply.github.com>
Date: Thu, 28 Aug 2025 13:37:04 +0800
Subject: [PATCH 40/56] =?UTF-8?q?other:=E6=B3=A8=E9=87=8A=20=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81=20(#2081)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/router/system/sys_user.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/router/system/sys_user.go b/server/router/system/sys_user.go
index 6c14b8200..0e076f772 100644
--- a/server/router/system/sys_user.go
+++ b/server/router/system/sys_user.go
@@ -18,7 +18,7 @@ func (s *UserRouter) InitUserRouter(Router *gin.RouterGroup) {
 		userRouter.PUT("setUserInfo", baseApi.SetUserInfo)                // 设置用户信息
 		userRouter.PUT("setSelfInfo", baseApi.SetSelfInfo)                // 设置自身信息
 		userRouter.POST("setUserAuthorities", baseApi.SetUserAuthorities) // 设置用户权限组
-		userRouter.POST("resetPassword", baseApi.ResetPassword)           // 设置用户权限组
+		userRouter.POST("resetPassword", baseApi.ResetPassword)           // 重置用户密码
 		userRouter.PUT("setSelfSetting", baseApi.SetSelfSetting)          // 用户界面配置
 	}
 	{

From 9d5c93b4c3c855cdd566edfa63c2098dc2efdc4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 28 Aug 2025 13:40:34 +0800
Subject: [PATCH 41/56] =?UTF-8?q?refactor(version):=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E7=AE=A1=E7=90=86=E5=B9=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=87=B3v2.8.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将版本号从硬编码改为统一管理，使用package.json和全局变量维护版本信息
---
 server/core/server.go         |  4 ++--
 server/docs/docs.go           |  7 +++++--
 server/global/version.go      | 12 ++++++++++++
 web/src/core/config.js        |  4 +++-
 web/src/core/gin-vue-admin.js |  3 ++-
 5 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 server/global/version.go

diff --git a/server/core/server.go b/server/core/server.go
index 550150cd2..f7f9a7f94 100644
--- a/server/core/server.go
+++ b/server/core/server.go
@@ -35,7 +35,7 @@ func RunServer() {
 
 	fmt.Printf(`
 	欢迎使用 gin-vue-admin
-	当前版本:v2.8.5
+	当前版本:%s
 	加群方式:微信号：shouzi_1994 QQ群：470239250
 	项目地址：https://github.com/flipped-aurora/gin-vue-admin
 	插件市场:https://plugin.gin-vue-admin.com
@@ -49,6 +49,6 @@ func RunServer() {
 	** 版权持有公司：北京翻转极光科技有限责任公司 **
 	** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **
 	** 感谢您对Gin-Vue-Admin的支持与关注 合法授权使用更有利于项目的长久发展**
-`, address, address, global.GVA_CONFIG.MCP.SSEPath, address, global.GVA_CONFIG.MCP.MessagePath)
+`, global.Version, address, address, global.GVA_CONFIG.MCP.SSEPath, address, global.GVA_CONFIG.MCP.MessagePath)
 	initServer(address, Router, 10*time.Minute, 10*time.Minute)
 }
diff --git a/server/docs/docs.go b/server/docs/docs.go
index 853db3480..e5fc176f3 100644
--- a/server/docs/docs.go
+++ b/server/docs/docs.go
@@ -2,7 +2,10 @@
 
 package docs
 
-import "github.com/swaggo/swag"
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/swaggo/swag"
+)
 
 const docTemplate = `{
     "schemes": {{ marshal .Schemes }},
@@ -9296,7 +9299,7 @@ const docTemplate = `{
 
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = &swag.Spec{
-	Version:          "v2.8.5",
+	Version:          global.Version,
 	Host:             "",
 	BasePath:         "",
 	Schemes:          []string{},
diff --git a/server/global/version.go b/server/global/version.go
new file mode 100644
index 000000000..68314d1e6
--- /dev/null
+++ b/server/global/version.go
@@ -0,0 +1,12 @@
+package global
+
+// Version 版本信息
+// 目前只有Version正式使用 其余为预留
+const (
+	// Version 当前版本号
+	Version = "v2.8.5"
+	// AppName 应用名称
+	AppName = "Gin-Vue-Admin"
+	// Description 应用描述
+	Description = "使用gin+vue进行极速开发的全栈开发基础平台"
+)
\ No newline at end of file
diff --git a/web/src/core/config.js b/web/src/core/config.js
index 3d684ac22..63a89edc6 100644
--- a/web/src/core/config.js
+++ b/web/src/core/config.js
@@ -1,6 +1,8 @@
 /**
  * 网站配置文件
  */
+import packageInfo from '../../package.json'
+
 const greenText = (text) => `\x1b[32m${text}\x1b[0m`
 
 const config = {
@@ -17,7 +19,7 @@ export const viteLogo = (env) => {
         `> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin`
       )
     )
-    console.log(greenText(`> 当前版本:v2.8.5`))
+    console.log(greenText(`> 当前版本:v${packageInfo.version}`))
     console.log(greenText(`> 加群方式:微信：shouzi_1994 QQ群：470239250`))
     console.log(
       greenText(`> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`)
diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js
index 8e37207ed..075bc4124 100644
--- a/web/src/core/gin-vue-admin.js
+++ b/web/src/core/gin-vue-admin.js
@@ -4,13 +4,14 @@
  * */
 // 加载网站配置文件夹
 import { register } from './global'
+import packageInfo from '../../package.json'
 
 export default {
   install: (app) => {
     register(app)
     console.log(`
        欢迎使用 Gin-Vue-Admin
-       当前版本:v2.8.5
+       当前版本:v${packageInfo.version}
        加群方式:微信：shouzi_1994 QQ群：622360840
        项目地址：https://github.com/flipped-aurora/gin-vue-admin
        插件市场:https://plugin.gin-vue-admin.com

From d8e6f2f5f48184326092c025a9e8bb37ecba0d7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 28 Aug 2025 13:58:29 +0800
Subject: [PATCH 42/56] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5=20go.mod?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/go.mod |  2 +-
 server/go.sum | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/server/go.mod b/server/go.mod
index a83d2196c..b3b8dfe44 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -9,6 +9,7 @@ require (
 	github.com/aws/aws-sdk-go v1.55.6
 	github.com/casbin/casbin/v2 v2.103.0
 	github.com/casbin/gorm-adapter/v3 v3.32.0
+	github.com/dzwvip/gorm-oracle v0.1.2
 	github.com/fsnotify/fsnotify v1.8.0
 	github.com/gin-gonic/gin v1.10.0
 	github.com/glebarez/sqlite v1.11.0
@@ -74,7 +75,6 @@ require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/dzwvip/gorm-oracle v0.1.2 // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
 	github.com/gammazero/toposort v0.1.1 // indirect
diff --git a/server/go.sum b/server/go.sum
index 8dfab999f..4b7359460 100644
--- a/server/go.sum
+++ b/server/go.sum
@@ -107,6 +107,10 @@ github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj6
 github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/dzwvip/gorm-oracle v0.1.2 h1:811aFDY7oDfKWHc0Z0lHdXzzr89EmKBSwc/jLJ8GU5g=
+github.com/dzwvip/gorm-oracle v0.1.2/go.mod h1:TbF7idnO9UgGpJ0qJpDZby1/wGquzP5GYof88ScBITE=
+github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
+github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -260,6 +264,7 @@ github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJk
 github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
@@ -408,6 +413,8 @@ github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFt
 github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
 github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
 github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
+github.com/sijms/go-ora/v2 v2.7.17 h1:M/pYIqjaMUeBxyzOWp2oj4ntF6fHSBloJWGNH9vbmsU=
+github.com/sijms/go-ora/v2 v2.7.17/go.mod h1:EHxlY6x7y9HAsdfumurRfTd+v8NrEOTR3Xl4FWlH6xk=
 github.com/songzhibin97/gkit v1.2.13 h1:paY0XJkdRuy9/8k9nTnbdrzo8pC22jIIFldUkOQv5nU=
 github.com/songzhibin97/gkit v1.2.13/go.mod h1:38CreNR27eTGaG1UMGihrXqI4xc3nGfYxLVKKVx6Ngg=
 github.com/sorairolake/lzip-go v0.3.5 h1:ms5Xri9o1JBIWvOFAorYtUNik6HI3HgBTkISiqu0Cwg=
@@ -451,6 +458,8 @@ github.com/tencentyun/cos-go-sdk-v5 v0.7.60 h1:/e/tmvRmfKexr/QQIBzWhOkZWsmY3EK72
 github.com/tencentyun/cos-go-sdk-v5 v0.7.60/go.mod h1:8+hG+mQMuRP/OIS9d83syAvXvrMj9HhkND6Q1fLghw0=
 github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
 github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
+github.com/thoas/go-funk v0.7.0 h1:GmirKrs6j6zJbhJIficOsz2aAI7700KsU/5YrdHRM1Y=
+github.com/thoas/go-funk v0.7.0/go.mod h1:+IWnUfUmFO1+WVYQWQtIJHeRRdaIyyYglZN7xzUPe4Q=
 github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
 github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
 github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPDo=
@@ -781,6 +790,7 @@ gorm.io/driver/sqlserver v1.5.4 h1:xA+Y1KDNspv79q43bPyjDMUgHoYHLhXYmdFcYPobg8g=
 gorm.io/driver/sqlserver v1.5.4/go.mod h1:+frZ/qYmuna11zHPlh5oc2O6ZA/lS88Keb0XSH1Zh/g=
 gorm.io/gen v0.3.26 h1:sFf1j7vNStimPRRAtH4zz5NiHM+1dr6eA9aaRdplyhY=
 gorm.io/gen v0.3.26/go.mod h1:a5lq5y3w4g5LMxBcw0wnO6tYUCdNutWODq5LrIt75LE=
+gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
 gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 gorm.io/gorm v1.25.0/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=

From 11aa8c5cc2efa3fb64892f630810dd25d3b484d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 28 Aug 2025 15:11:52 +0800
Subject: [PATCH 43/56] =?UTF-8?q?feat(version):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E6=94=AF=E6=8C=81=E5=88=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/api/v1/system/sys_version.go          |  53 ++++-
 server/model/system/request/sys_version.go   |   8 +-
 server/model/system/response/sys_version.go  |   9 +-
 server/service/system/sys_version.go         |  34 ++++
 server/source/system/dictionary_detail.go    |   6 +-
 web/src/view/systemTools/version/version.vue | 204 +++++++++++++------
 6 files changed, 243 insertions(+), 71 deletions(-)

diff --git a/server/api/v1/system/sys_version.go b/server/api/v1/system/sys_version.go
index 7f441c7ce..1e228089b 100644
--- a/server/api/v1/system/sys_version.go
+++ b/server/api/v1/system/sys_version.go
@@ -267,6 +267,17 @@ func (sysVersionApi *SysVersionApi) ExportVersion(c *gin.Context) {
 		}
 	}
 
+	// 获取选中的字典数据
+	var dictData []system.SysDictionary
+	if len(req.DictIds) > 0 {
+		dictData, err = sysVersionService.GetDictionariesByIds(ctx, req.DictIds)
+		if err != nil {
+			global.GVA_LOG.Error("获取字典数据失败!", zap.Error(err))
+			response.FailWithMessage("获取字典数据失败:"+err.Error(), c)
+			return
+		}
+	}
+
 	// 处理菜单数据，构建递归的children结构
 	processedMenus := buildMenuTree(menuData)
 
@@ -282,6 +293,34 @@ func (sysVersionApi *SysVersionApi) ExportVersion(c *gin.Context) {
 		processedApis = append(processedApis, cleanApi)
 	}
 
+	// 处理字典数据，清除ID和时间戳字段，包含字典详情
+	processedDicts := make([]system.SysDictionary, 0, len(dictData))
+	for _, dict := range dictData {
+		cleanDict := system.SysDictionary{
+			Name:   dict.Name,
+			Type:   dict.Type,
+			Status: dict.Status,
+			Desc:   dict.Desc,
+		}
+		
+		// 处理字典详情数据，清除ID和时间戳字段
+		cleanDetails := make([]system.SysDictionaryDetail, 0, len(dict.SysDictionaryDetails))
+		for _, detail := range dict.SysDictionaryDetails {
+			cleanDetail := system.SysDictionaryDetail{
+				Label:  detail.Label,
+				Value:  detail.Value,
+				Extend: detail.Extend,
+				Status: detail.Status,
+				Sort:   detail.Sort,
+				// 不复制 ID, CreatedAt, UpdatedAt, SysDictionaryID
+			}
+			cleanDetails = append(cleanDetails, cleanDetail)
+		}
+		cleanDict.SysDictionaryDetails = cleanDetails
+		
+		processedDicts = append(processedDicts, cleanDict)
+	}
+
 	// 构建导出数据
 	exportData := systemRes.ExportVersionResponse{
 		Version: systemReq.VersionInfo{
@@ -290,8 +329,9 @@ func (sysVersionApi *SysVersionApi) ExportVersion(c *gin.Context) {
 			Description: req.Description,
 			ExportTime:  time.Now().Format("2006-01-02 15:04:05"),
 		},
-		Menus: processedMenus,
-		Apis:  processedApis,
+		Menus:        processedMenus,
+		Apis:         processedApis,
+		Dictionaries: processedDicts,
 	}
 
 	// 转换为JSON
@@ -418,6 +458,15 @@ func (sysVersionApi *SysVersionApi) ImportVersion(c *gin.Context) {
 		}
 	}
 
+	// 导入字典数据
+	if len(importData.ExportDictionary) > 0 {
+		if err := sysVersionService.ImportDictionaries(importData.ExportDictionary); err != nil {
+			global.GVA_LOG.Error("导入字典失败!", zap.Error(err))
+			response.FailWithMessage("导入字典失败: "+err.Error(), c)
+			return
+		}
+	}
+
 	// 创建导入记录
 	jsonData, _ := json.Marshal(importData)
 	version := system.SysVersion{
diff --git a/server/model/system/request/sys_version.go b/server/model/system/request/sys_version.go
index 23dd665b1..3d6d7ff27 100644
--- a/server/model/system/request/sys_version.go
+++ b/server/model/system/request/sys_version.go
@@ -20,13 +20,15 @@ type ExportVersionRequest struct {
 	Description string `json:"description"`                    // 版本描述
 	MenuIds     []uint `json:"menuIds"`                        // 选中的菜单ID列表
 	ApiIds      []uint `json:"apiIds"`                         // 选中的API ID列表
+	DictIds     []uint `json:"dictIds"`                        // 选中的字典ID列表
 }
 
 // ImportVersionRequest 导入版本请求结构体
 type ImportVersionRequest struct {
-	VersionInfo VersionInfo           `json:"version" binding:"required"` // 版本信息
-	ExportMenu  []system.SysBaseMenu  `json:"menus"`                      // 菜单数据，直接复用SysBaseMenu
-	ExportApi   []system.SysApi       `json:"apis"`                       // API数据，直接复用SysApi
+	VersionInfo      VersionInfo            `json:"version" binding:"required"` // 版本信息
+	ExportMenu       []system.SysBaseMenu   `json:"menus"`                      // 菜单数据，直接复用SysBaseMenu
+	ExportApi        []system.SysApi        `json:"apis"`                       // API数据，直接复用SysApi
+	ExportDictionary []system.SysDictionary `json:"dictionaries"`               // 字典数据，直接复用SysDictionary
 }
 
 // VersionInfo 版本信息结构体
diff --git a/server/model/system/response/sys_version.go b/server/model/system/response/sys_version.go
index b1509b89e..b207ddc88 100644
--- a/server/model/system/response/sys_version.go
+++ b/server/model/system/response/sys_version.go
@@ -7,7 +7,8 @@ import (
 
 // ExportVersionResponse 导出版本响应结构体
 type ExportVersionResponse struct {
-	Version request.VersionInfo     `json:"version"` // 版本信息
-	Menus   []system.SysBaseMenu    `json:"menus"`   // 菜单数据，直接复用SysBaseMenu
-	Apis    []system.SysApi         `json:"apis"`    // API数据，直接复用SysApi
-}
\ No newline at end of file
+	Version      request.VersionInfo    `json:"version"`      // 版本信息
+	Menus        []system.SysBaseMenu   `json:"menus"`        // 菜单数据，直接复用SysBaseMenu
+	Apis         []system.SysApi        `json:"apis"`         // API数据，直接复用SysApi
+	Dictionaries []system.SysDictionary `json:"dictionaries"` // 字典数据，直接复用SysDictionary
+}
diff --git a/server/service/system/sys_version.go b/server/service/system/sys_version.go
index 568941021..68d5ae2dd 100644
--- a/server/service/system/sys_version.go
+++ b/server/service/system/sys_version.go
@@ -86,6 +86,12 @@ func (sysVersionService *SysVersionService) GetApisByIds(ctx context.Context, id
 	return
 }
 
+// GetDictionariesByIds 根据ID列表获取字典数据
+func (sysVersionService *SysVersionService) GetDictionariesByIds(ctx context.Context, ids []uint) (dictionaries []system.SysDictionary, err error) {
+	err = global.GVA_DB.Where("id in ?", ids).Preload("SysDictionaryDetails").Find(&dictionaries).Error
+	return
+}
+
 // ImportMenus 导入菜单数据
 func (sysVersionService *SysVersionService) ImportMenus(ctx context.Context, menus []system.SysBaseMenu) error {
 	return global.GVA_DB.Transaction(func(tx *gorm.DB) error {
@@ -194,3 +200,31 @@ func (sysVersionService *SysVersionService) ImportApis(apis []system.SysApi) err
 		return nil
 	})
 }
+
+// ImportDictionaries 导入字典数据
+func (sysVersionService *SysVersionService) ImportDictionaries(dictionaries []system.SysDictionary) error {
+	return global.GVA_DB.Transaction(func(tx *gorm.DB) error {
+		for _, dict := range dictionaries {
+			// 检查字典是否已存在
+			var existingDict system.SysDictionary
+			if err := tx.Where("type = ?", dict.Type).First(&existingDict).Error; err == nil {
+				// 字典已存在，跳过
+				continue
+			}
+
+			// 创建新字典
+			newDict := system.SysDictionary{
+				Name:                 dict.Name,
+				Type:                 dict.Type,
+				Status:               dict.Status,
+				Desc:                 dict.Desc,
+				SysDictionaryDetails: dict.SysDictionaryDetails,
+			}
+
+			if err := tx.Create(&newDict).Error; err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}
diff --git a/server/source/system/dictionary_detail.go b/server/source/system/dictionary_detail.go
index 938cbc23e..8a2bd2b6f 100644
--- a/server/source/system/dictionary_detail.go
+++ b/server/source/system/dictionary_detail.go
@@ -66,7 +66,7 @@ func (i *initDictDetail) InitializeData(ctx context.Context) (context.Context, e
 	}
 
 	dicts[2].SysDictionaryDetails = []sysModel.SysDictionaryDetail{
-		{Label: "date", Status: &True},
+		{Label: "date", Value: "0", Status: &True, Extend: "mysql", Sort: 0},
 		{Label: "time", Value: "1", Status: &True, Extend: "mysql", Sort: 1},
 		{Label: "year", Value: "2", Status: &True, Extend: "mysql", Sort: 2},
 		{Label: "datetime", Value: "3", Status: &True, Extend: "mysql", Sort: 3},
@@ -74,7 +74,7 @@ func (i *initDictDetail) InitializeData(ctx context.Context) (context.Context, e
 		{Label: "timestamptz", Value: "6", Status: &True, Extend: "pgsql", Sort: 5},
 	}
 	dicts[3].SysDictionaryDetails = []sysModel.SysDictionaryDetail{
-		{Label: "float", Status: &True},
+		{Label: "float", Value: "0", Status: &True, Extend: "mysql", Sort: 0},
 		{Label: "double", Value: "1", Status: &True, Extend: "mysql", Sort: 1},
 		{Label: "decimal", Value: "2", Status: &True, Extend: "mysql", Sort: 2},
 		{Label: "numeric", Value: "3", Status: &True, Extend: "pgsql", Sort: 3},
@@ -82,7 +82,7 @@ func (i *initDictDetail) InitializeData(ctx context.Context) (context.Context, e
 	}
 
 	dicts[4].SysDictionaryDetails = []sysModel.SysDictionaryDetail{
-		{Label: "char", Status: &True},
+		{Label: "char", Value: "0", Status: &True, Extend: "mysql", Sort: 0},
 		{Label: "varchar", Value: "1", Status: &True, Extend: "mysql", Sort: 1},
 		{Label: "tinyblob", Value: "2", Status: &True, Extend: "mysql", Sort: 2},
 		{Label: "tinytext", Value: "3", Status: &True, Extend: "mysql", Sort: 3},
diff --git a/web/src/view/systemTools/version/version.vue b/web/src/view/systemTools/version/version.vue
index b0ff92471..6f4838265 100644
--- a/web/src/view/systemTools/version/version.vue
+++ b/web/src/view/systemTools/version/version.vue
@@ -117,9 +117,9 @@
           <el-input v-model="exportForm.description" type="textarea" placeholder="请输入版本描述" />
         </el-form-item>
         <el-form-item label="发版信息">
-          <div class="flex gap-5 w-full">
+          <div class="flex gap-3 w-full">
             <!-- 菜单选择 -->
-            <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full flex-1 w-1/2">
+            <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full flex-1 w-1/3">
               <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
                 <span class="m-0 text-gray-800 text-base font-medium">选择菜单</span>
               </div>
@@ -140,7 +140,7 @@
             </div>
 
             <!-- API选择 -->
-            <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full flex-1 w-1/2">
+            <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full flex-1 w-1/3">
               <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
                 <span class="m-0 text-gray-800 text-base font-medium">选择API</span>
               </div>
@@ -153,7 +153,7 @@
                 <el-tree ref="apiTreeRef" :data="apiTreeData" :default-checked-keys="selectedApiIds"
                   :props="apiTreeProps" default-expand-all highlight-current node-key="onlyId" show-checkbox
                   :filter-node-method="filterApiNode" @check="onApiCheck" class="api-tree">
-                  <template #default="{ _, data }">
+                  <template #default="{ data }">
                     <div class="flex items-center justify-between w-full pr-1">
                       <span>{{ data.description }}</span>
                       <el-tooltip :content="data.path">
@@ -166,6 +166,32 @@
                 </el-tree>
               </div>
             </div>
+
+            <!-- 字典选择 -->
+            <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full flex-1 w-1/3">
+              <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
+                <span class="m-0 text-gray-800 text-base font-medium">选择字典</span>
+              </div>
+              <div class="px-4 py-3 border-b border-gray-300 bg-gray-50">
+                <el-input v-model="dictFilterText" placeholder="输入关键字进行过滤" clearable size="small" />
+              </div>
+              <div class="flex-1 p-2 min-h-[300px] max-h-[400px] overflow-y-auto">
+                <el-tree ref="dictTreeRef" :data="dictTreeData" :default-checked-keys="selectedDictIds"
+                  :props="dictTreeProps" default-expand-all highlight-current node-key="ID" show-checkbox
+                  :filter-node-method="filterDictNode" @check="onDictCheck" class="dict-tree">
+                  <template #default="{ data }">
+                    <div class="flex items-center justify-between w-full pr-1">
+                      <span>{{ data.name || data.label }}</span>
+                      <el-tooltip :content="data.desc || (data.value ? `值: ${data.value}` : '')">
+                        <span class="text-gray-500 text-xs ml-2">
+                          {{ data.type || (data.value ? `值: ${data.value}` : '') }}
+                        </span>
+                      </el-tooltip>
+                    </div>
+                  </template>
+                </el-tree>
+              </div>
+            </div>
           </div>
         </el-form-item>
       </el-form>
@@ -212,8 +238,8 @@
         </el-form-item>
         <el-form-item label="预览内容" v-if="importPreviewData">
           <div class="flex flex-col flex-1 gap-4 border border-gray-300 rounded p-4 bg-gray-50">
-            <div class="flex gap-5 w-full">
-              <div class="border border-gray-300 rounded overflow-hidden flex-1 w-1/2">
+            <div class="flex gap-3 w-full">
+              <div class="border border-gray-300 rounded overflow-hidden flex-1 w-1/3">
                 <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full">
                   <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
                     <h3 class="m-0 text-gray-800 text-base font-medium">菜单 ({{ getTotalMenuCount() }}项)</h3>
@@ -238,7 +264,7 @@
                   </div>
                 </div>
               </div>
-              <div class="border border-gray-300 rounded overflow-hidden flex-1 w-1/2">
+              <div class="border border-gray-300 rounded overflow-hidden flex-1 w-1/3">
                 <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full">
                   <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
                     <h3 class="m-0 text-gray-800 text-base font-medium">API ({{ importPreviewData.apis?.length || 0 }}项)</h3>
@@ -263,6 +289,33 @@
                   </div>
                 </div>
               </div>
+              <div class="border border-gray-300 rounded overflow-hidden flex-1 w-1/3">
+                <div class="flex flex-col border border-gray-300 rounded overflow-hidden h-full">
+                  <div class="flex justify-between items-center px-4 py-3 bg-gray-50 border-b border-gray-300">
+                    <h3 class="m-0 text-gray-800 text-base font-medium">字典 ({{ importPreviewData.dictionaries?.length || 0 }}项)</h3>
+                  </div>
+                  <div class="flex-1 p-2 min-h-[300px] max-h-[400px] overflow-y-auto">
+                    <el-tree
+                      :data="previewDictTreeData"
+                      :props="dictTreeProps"
+                      node-key="ID"
+                      :expand-on-click-node="false"
+                      :check-on-click-node="false"
+                      :show-checkbox="false"
+                      default-expand-all
+                    >
+                      <template #default="{ data }">
+                        <div class="flex-1 flex items-center justify-between text-sm pr-2">
+                          <span>{{ data.name || data.label }}</span>
+                          <span class="text-gray-500 text-xs ml-2">
+                            {{ data.type || (data.value ? `值: ${data.value}` : '') }}
+                          </span>
+                        </div>
+                      </template>
+                    </el-tree>
+                  </div>
+                </div>
+              </div>
             </div>
           </div>
         </el-form-item>
@@ -286,14 +339,13 @@ import {
 // 导入菜单和API相关接口
 import { getMenuList } from '@/api/menu'
 import { getApiList } from '@/api/api'
+import { getSysDictionaryList } from '@/api/sysDictionary'
 
 // 全量引入格式化工具 请按需保留
-import { getDictFunc, formatDate, filterDict } from '@/utils/format'
+import { formatDate } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { UploadFilled } from '@element-plus/icons-vue'
-import { ref, reactive, watch } from 'vue'
-// 引入按钮权限标识
-import { useBtnAuth } from '@/utils/btnAuth'
+import { ref, watch } from 'vue'
 import { useAppStore } from "@/pinia"
 
 defineOptions({
@@ -313,21 +365,26 @@ const exportForm = ref({
   versionCode: '',
   description: '',
   menuIds: [],
-  apiIds: []
+  apiIds: [],
+  dictIds: []
 })
 
 // 树形结构相关数据
 const menuTreeData = ref([])
 const apiTreeData = ref([])
+const dictTreeData = ref([])
 const selectedMenuIds = ref([])
 const selectedApiIds = ref([])
+const selectedDictIds = ref([])
 const menuFilterText = ref('')
 const apiFilterTextName = ref('')
 const apiFilterTextPath = ref('')
+const dictFilterText = ref('')
 
 // 树形组件引用
 const menuTreeRef = ref(null)
 const apiTreeRef = ref(null)
+const dictTreeRef = ref(null)
 
 // 树形属性配置
 const menuTreeProps = ref({
@@ -342,6 +399,21 @@ const apiTreeProps = ref({
   label: 'description'
 })
 
+const dictTreeProps = ref({
+  children: 'sysDictionaryDetails',
+  label: function (data) {
+    // 如果是字典主项，显示字典名称
+    if (data.name) {
+      return data.name
+    }
+    // 如果是字典详情项，显示标签
+    if (data.label) {
+      return data.label
+    }
+    return '未知项'
+  }
+})
+
 // 导入相关数据
 const importDialogVisible = ref(false)
 const importLoading = ref(false)
@@ -350,36 +422,10 @@ const importPreviewData = ref(null)
 const uploadRef = ref(null)
 const previewMenuTreeData = ref([])
 const previewApiTreeData = ref([])
+const previewDictTreeData = ref([])
 
 
 
-// 验证规则
-const rule = reactive({
-  versionName: [{
-    required: true,
-    message: '请输入版本名称',
-    trigger: ['input', 'blur'],
-  },
-  {
-    whitespace: true,
-    message: '不能只输入空格',
-    trigger: ['input', 'blur'],
-  }
-  ],
-  versionCode: [{
-    required: true,
-    message: '请输入版本号',
-    trigger: ['input', 'blur'],
-  },
-  {
-    whitespace: true,
-    message: '不能只输入空格',
-    trigger: ['input', 'blur'],
-  }
-  ]
-})
-
-const elFormRef = ref()
 const elSearchFormRef = ref()
 
 // =========== 表格控制部分 ===========
@@ -549,6 +595,19 @@ const getMenuAndApiList = async () => {
   }
 }
 
+// 获取字典列表
+const getDictList = async () => {
+  try {
+    const dictRes = await getSysDictionaryList({ page: 1, pageSize: 9999 })
+    if (dictRes.code === 0) {
+      dictTreeData.value = dictRes.data || []
+    }
+  } catch (error) {
+    console.error('获取字典数据失败:', error)
+    ElMessage.error('获取字典数据失败')
+  }
+}
+
 // 构建API树形结构
 const buildApiTree = (apis) => {
   const apiObj = {}
@@ -595,6 +654,20 @@ const filterApiNode = (value, data) => {
   return matchesName && matchesPath
 }
 
+const filterDictNode = (value, data) => {
+  if (!value) return true
+  const name = data.name || ''
+  const type = data.type || ''
+  const desc = data.desc || ''
+  const label = data.label || ''
+  const dataValue = data.value || ''
+  return name.indexOf(value) !== -1 || 
+         type.indexOf(value) !== -1 || 
+         desc.indexOf(value) !== -1 || 
+         label.indexOf(value) !== -1 || 
+         dataValue.indexOf(value) !== -1
+}
+
 const onMenuCheck = (data, checked) => {
   if (checked.checkedKeys) {
     selectedMenuIds.value = checked.checkedKeys
@@ -607,6 +680,12 @@ const onApiCheck = (data, checked) => {
   }
 }
 
+const onDictCheck = (data, checked) => {
+  if (checked.checkedKeys) {
+    selectedDictIds.value = checked.checkedKeys
+  }
+}
+
 // 监听过滤文本变化
 watch(menuFilterText, (val) => {
   if (menuTreeRef.value) {
@@ -620,10 +699,17 @@ watch([apiFilterTextName, apiFilterTextPath], () => {
   }
 })
 
+watch(dictFilterText, (val) => {
+  if (dictTreeRef.value) {
+    dictTreeRef.value.filter(val)
+  }
+})
+
 // 导出相关方法
 const openExportDialog = async () => {
   exportDialogVisible.value = true
   await getMenuAndApiList()
+  await getDictList()
 }
 
 const closeExportDialog = () => {
@@ -633,13 +719,16 @@ const closeExportDialog = () => {
     versionCode: '',
     description: '',
     menuIds: [],
-    apiIds: []
+    apiIds: [],
+    dictIds: []
   }
   selectedMenuIds.value = []
   selectedApiIds.value = []
+  selectedDictIds.value = []
   menuFilterText.value = ''
   apiFilterTextName.value = ''
   apiFilterTextPath.value = ''
+  dictFilterText.value = ''
 }
 
 const handleExport = async () => {
@@ -650,15 +739,18 @@ const handleExport = async () => {
 
   exportLoading.value = true
   try {
-    // 获取选中的菜单和API
+    // 获取选中的菜单、API和字典
     const checkedMenus = menuTreeRef.value ? menuTreeRef.value.getCheckedNodes(false, true) : []
     const checkedApis = apiTreeRef.value ? apiTreeRef.value.getCheckedNodes(true) : []
+    const checkedDicts = dictTreeRef.value ? dictTreeRef.value.getCheckedNodes(true) : []
 
     const menuIds = checkedMenus.map(menu => menu.ID)
     const apiIds = checkedApis.map(api => api.ID)
+    const dictIds = checkedDicts.map(dict => dict.ID)
 
     exportForm.value.menuIds = menuIds
     exportForm.value.apiIds = apiIds
+    exportForm.value.dictIds = dictIds
 
     const res = await exportVersion(exportForm.value)
     if (res.code !== 0) {
@@ -748,29 +840,14 @@ const getTotalMenuCount = () => {
   return countMenus(importPreviewData.value.menus)
 }
 
-// 构建树形结构的辅助函数
-const buildTreeData = (data, parentId = 0) => {
-  const tree = []
-  // 处理parentId可能为字符串"0"或数字0的情况
-  const targetParentId = parentId === 0 ? [0, "0"] : [parentId]
-  const items = data.filter(item => targetParentId.includes(item.parentId))
-  
-  items.forEach(item => {
-    const children = buildTreeData(data, item.ID)
-    if (children.length > 0) {
-      item.children = children
-    }
-    tree.push(item)
-  })
-  
-  return tree
-}
+
 
 const handleJsonContentChange = () => {
   if (!importJsonContent.value.trim()) {
     importPreviewData.value = null
     previewMenuTreeData.value = []
     previewApiTreeData.value = []
+    previewDictTreeData.value = []
     return
   }
 
@@ -780,7 +857,8 @@ const handleJsonContentChange = () => {
     // 构建预览数据
     importPreviewData.value = {
       menus: data.menus || [],
-      apis: data.apis || []
+      apis: data.apis || [],
+      dictionaries: data.dictionaries || []
     }
 
     // 直接使用菜单数据，因为它已经是树形结构（包含children字段）
@@ -810,11 +888,19 @@ const handleJsonContentChange = () => {
     } else {
       previewApiTreeData.value = []
     }
+
+    // 处理字典数据
+    if (data.dictionaries && data.dictionaries.length > 0) {
+      previewDictTreeData.value = data.dictionaries
+    } else {
+      previewDictTreeData.value = []
+    }
   } catch (error) {
     console.error('JSON解析失败:', error)
     importPreviewData.value = null
     previewMenuTreeData.value = []
     previewApiTreeData.value = []
+    previewDictTreeData.value = []
   }
 }
 

From 1ce3e11d52cb21961b850807a4aaa9c543874720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 28 Aug 2025 15:34:35 +0800
Subject: [PATCH 44/56] =?UTF-8?q?fix(selectFile):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6fileList=E4=B8=BAu?=
 =?UTF-8?q?ndefined=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/selectFile/selectFile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/components/selectFile/selectFile.vue b/web/src/components/selectFile/selectFile.vue
index 61bad6f28..8bf0d6dc6 100644
--- a/web/src/components/selectFile/selectFile.vue
+++ b/web/src/components/selectFile/selectFile.vue
@@ -47,7 +47,7 @@
 
   const model = defineModel({ type: Array })
 
-  const fileList = ref(model.value)
+  const fileList = ref(model.value || [])
 
   const emits = defineEmits(['on-success', 'on-error'])
 

From 8b0a00b98a4d5f5662091153b818aaa2dba0f511 Mon Sep 17 00:00:00 2001
From: Qing Liang <106448173+xue-ding-e@users.noreply.github.com>
Date: Fri, 29 Aug 2025 11:44:59 +0800
Subject: [PATCH 45/56] Update project_rules.md (#2083)

---
 .claude/rules/project_rules.md | 47 +++++++++++++++++++++++++---------
 .cursor/rules/project_rules.md | 43 +++++++++++++++++++++++--------
 .trae/rules/project_rules.md   | 43 +++++++++++++++++++++++--------
 3 files changed, 101 insertions(+), 32 deletions(-)

diff --git a/.claude/rules/project_rules.md b/.claude/rules/project_rules.md
index 3998e9989..161f2ae69 100644
--- a/.claude/rules/project_rules.md
+++ b/.claude/rules/project_rules.md
@@ -189,13 +189,24 @@ web/
 #### **1. 模型层 (`model/`)**
 
 - **数据模型 (`model/xxx.go`)**:
-    
-    - 用于定义与数据库表映射的 GORM 结构体。
-        
-    - 结构体应继承 `global.GVA_MODEL` 以包含 `ID`, `CreatedAt`, `UpdatedAt` 等基础字段。
-        
-    - 必须为字段添加清晰的 `json` 和 `gorm` 标签。
-        
+
+   - 用于定义与数据库表映射的 GORM 结构体。
+
+   - 结构体应继承 `global.GVA_MODEL` 以包含 `ID`, `CreatedAt`, `UpdatedAt` 等基础字段。
+
+   - 必须为字段添加清晰的 `json` 和 `gorm` 标签。
+
+   - **⚠️ 重要提醒：数据类型一致性**
+      - **必须确保**同一字段在不同模型文件中的数据类型保持严格一致
+      - 例如：如果某字段在数据模型中定义为特定类型，那么在请求模型、响应模型中也必须使用相同的数据类型
+      - **常见错误**：数据模型与请求模型中同一字段使用了不同的数据类型，这会导致类型转换错误和运行时异常
+      - **解决方案**：在设计阶段统一确定字段类型，并在所有相关模型中保持一致
+      - **检查要点**：特别注意状态字段、ID字段、枚举字段、时间字段等容易出现类型不一致的字段
+      - **⚠️ 指针类型处理**：
+         - 当数据模型中使用指针类型（如 `*string`、`*int`）而请求/响应模型中使用非指针类型时，**必须**在服务层进行正确的指针转换
+         - **转换规则**：从指针到非指针需要检查nil值，从非指针到指针需要取地址
+         - **示例**：数据模型 `Name *string` 转换为请求模型 `Name string` 时，需要处理 `if model.Name != nil { request.Name = *model.Name }`
+
 - **请求模型 (`model/request/xxx.go`)**:
     
     - 用于定义接收前端请求参数的结构体（DTOs）。
@@ -212,7 +223,12 @@ web/
 - **结构**: 在 `service/` 下为每个模块创建 `xxx_service.go` 文件，并在 `service/enter.go` 中注册。
     
 - **函数签名**: 函数应接收具体的业务参数（如 `model.Xxx` 或 `request.XxxSearch`），并返回处理结果和 `error`。
-    
+
+- **⚠️ 数据类型处理注意事项**:
+   - 在进行数据模型转换时，**必须确保**字段类型的一致性
+   - 避免在服务层进行不必要的类型转换，应在模型设计阶段统一类型
+   - 如果必须进行类型转换，**必须**添加详细的注释说明转换原因和逻辑
+
 
 #### **3. API层 (`api/`)**
 
@@ -608,6 +624,12 @@ src/plugin/[插件名]/
    - **统一**响应格式：`{code, data, msg}`
    - **统一**分页格式：`{page, pageSize, total, list}`
    - **统一**时间格式：ISO 8601标准
+   - **⚠️ 数据类型一致性**：
+      - 前后端对于同一字段**必须**使用相同的数据类型
+      - 后端Go结构体中的字段类型必须与前端JavaScript/TypeScript中的类型定义保持一致
+      - 特别注意：状态字段、ID字段、枚举值、时间字段等容易出现类型不匹配的字段
+      - 示例：后端数值类型字段对应前端 `number` 类型，字符串类型对应 `string` 类型，布尔类型对应 `boolean` 类型
+      - **指针类型处理**：后端Go中的指针类型在JSON序列化时会自动处理nil值，前端接收到的是对应的基础类型或null值
 
 3. **错误处理**:
    - 后端**必须**返回标准化的错误码和错误信息
@@ -719,10 +741,11 @@ web/src/plugin/[插件名]/
 
 1. **功能完整性**: 插件功能完整，满足业务需求
 2. **代码质量**: 代码规范，注释完整，易于维护
-3. **性能表现**: 响应速度快，资源占用合理
-4. **用户体验**: 界面友好，操作流畅，错误处理完善
-5. **兼容性**: 与主系统兼容，不影响其他功能
-6. **安全性**: 数据安全，权限控制，防止安全漏洞
+3. **数据类型一致性**: 前后端数据模型字段类型保持严格一致，避免类型转换错误
+4. **性能表现**: 响应速度快，资源占用合理
+5. **用户体验**: 界面友好，操作流畅，错误处理完善
+6. **兼容性**: 与主系统兼容，不影响其他功能
+7. **安全性**: 数据安全，权限控制，防止安全漏洞
 
 ---
 
diff --git a/.cursor/rules/project_rules.md b/.cursor/rules/project_rules.md
index 3998e9989..687be168a 100644
--- a/.cursor/rules/project_rules.md
+++ b/.cursor/rules/project_rules.md
@@ -195,7 +195,18 @@ web/
     - 结构体应继承 `global.GVA_MODEL` 以包含 `ID`, `CreatedAt`, `UpdatedAt` 等基础字段。
         
     - 必须为字段添加清晰的 `json` 和 `gorm` 标签。
-        
+
+    - **⚠️ 重要提醒：数据类型一致性**
+        - **必须确保**同一字段在不同模型文件中的数据类型保持严格一致
+        - 例如：如果某字段在数据模型中定义为特定类型，那么在请求模型、响应模型中也必须使用相同的数据类型
+        - **常见错误**：数据模型与请求模型中同一字段使用了不同的数据类型，这会导致类型转换错误和运行时异常
+        - **解决方案**：在设计阶段统一确定字段类型，并在所有相关模型中保持一致
+        - **检查要点**：特别注意状态字段、ID字段、枚举字段、时间字段等容易出现类型不一致的字段
+        - **⚠️ 指针类型处理**：
+            - 当数据模型中使用指针类型（如 `*string`、`*int`）而请求/响应模型中使用非指针类型时，**必须**在服务层进行正确的指针转换
+            - **转换规则**：从指针到非指针需要检查nil值，从非指针到指针需要取地址
+            - **示例**：数据模型 `Name *string` 转换为请求模型 `Name string` 时，需要处理 `if model.Name != nil { request.Name = *model.Name }`
+
 - **请求模型 (`model/request/xxx.go`)**:
     
     - 用于定义接收前端请求参数的结构体（DTOs）。
@@ -212,7 +223,12 @@ web/
 - **结构**: 在 `service/` 下为每个模块创建 `xxx_service.go` 文件，并在 `service/enter.go` 中注册。
     
 - **函数签名**: 函数应接收具体的业务参数（如 `model.Xxx` 或 `request.XxxSearch`），并返回处理结果和 `error`。
-    
+
+- **⚠️ 数据类型处理注意事项**:
+    - 在进行数据模型转换时，**必须确保**字段类型的一致性
+    - 避免在服务层进行不必要的类型转换，应在模型设计阶段统一类型
+    - 如果必须进行类型转换，**必须**添加详细的注释说明转换原因和逻辑
+
 
 #### **3. API层 (`api/`)**
 
@@ -604,10 +620,16 @@ src/plugin/[插件名]/
    - 接口变更**必须**提前通知并更新文档
 
 2. **数据格式**:
-   - **统一**使用JSON格式进行数据交换
-   - **统一**响应格式：`{code, data, msg}`
-   - **统一**分页格式：`{page, pageSize, total, list}`
-   - **统一**时间格式：ISO 8601标准
+    - **统一**使用JSON格式进行数据交换
+    - **统一**响应格式：`{code, data, msg}`
+    - **统一**分页格式：`{page, pageSize, total, list}`
+    - **统一**时间格式：ISO 8601标准
+    - **⚠️ 数据类型一致性**：
+        - 前后端对于同一字段**必须**使用相同的数据类型
+        - 后端Go结构体中的字段类型必须与前端JavaScript/TypeScript中的类型定义保持一致
+        - 特别注意：状态字段、ID字段、枚举值、时间字段等容易出现类型不匹配的字段
+        - 示例：后端数值类型字段对应前端 `number` 类型，字符串类型对应 `string` 类型，布尔类型对应 `boolean` 类型
+        - **指针类型处理**：后端Go中的指针类型在JSON序列化时会自动处理nil值，前端接收到的是对应的基础类型或null值
 
 3. **错误处理**:
    - 后端**必须**返回标准化的错误码和错误信息
@@ -719,10 +741,11 @@ web/src/plugin/[插件名]/
 
 1. **功能完整性**: 插件功能完整，满足业务需求
 2. **代码质量**: 代码规范，注释完整，易于维护
-3. **性能表现**: 响应速度快，资源占用合理
-4. **用户体验**: 界面友好，操作流畅，错误处理完善
-5. **兼容性**: 与主系统兼容，不影响其他功能
-6. **安全性**: 数据安全，权限控制，防止安全漏洞
+3. **数据类型一致性**: 前后端数据模型字段类型保持严格一致，避免类型转换错误
+4. **性能表现**: 响应速度快，资源占用合理
+5. **用户体验**: 界面友好，操作流畅，错误处理完善
+6. **兼容性**: 与主系统兼容，不影响其他功能
+7. **安全性**: 数据安全，权限控制，防止安全漏洞
 
 ---
 
diff --git a/.trae/rules/project_rules.md b/.trae/rules/project_rules.md
index 3998e9989..687be168a 100644
--- a/.trae/rules/project_rules.md
+++ b/.trae/rules/project_rules.md
@@ -195,7 +195,18 @@ web/
     - 结构体应继承 `global.GVA_MODEL` 以包含 `ID`, `CreatedAt`, `UpdatedAt` 等基础字段。
         
     - 必须为字段添加清晰的 `json` 和 `gorm` 标签。
-        
+
+    - **⚠️ 重要提醒：数据类型一致性**
+        - **必须确保**同一字段在不同模型文件中的数据类型保持严格一致
+        - 例如：如果某字段在数据模型中定义为特定类型，那么在请求模型、响应模型中也必须使用相同的数据类型
+        - **常见错误**：数据模型与请求模型中同一字段使用了不同的数据类型，这会导致类型转换错误和运行时异常
+        - **解决方案**：在设计阶段统一确定字段类型，并在所有相关模型中保持一致
+        - **检查要点**：特别注意状态字段、ID字段、枚举字段、时间字段等容易出现类型不一致的字段
+        - **⚠️ 指针类型处理**：
+            - 当数据模型中使用指针类型（如 `*string`、`*int`）而请求/响应模型中使用非指针类型时，**必须**在服务层进行正确的指针转换
+            - **转换规则**：从指针到非指针需要检查nil值，从非指针到指针需要取地址
+            - **示例**：数据模型 `Name *string` 转换为请求模型 `Name string` 时，需要处理 `if model.Name != nil { request.Name = *model.Name }`
+
 - **请求模型 (`model/request/xxx.go`)**:
     
     - 用于定义接收前端请求参数的结构体（DTOs）。
@@ -212,7 +223,12 @@ web/
 - **结构**: 在 `service/` 下为每个模块创建 `xxx_service.go` 文件，并在 `service/enter.go` 中注册。
     
 - **函数签名**: 函数应接收具体的业务参数（如 `model.Xxx` 或 `request.XxxSearch`），并返回处理结果和 `error`。
-    
+
+- **⚠️ 数据类型处理注意事项**:
+    - 在进行数据模型转换时，**必须确保**字段类型的一致性
+    - 避免在服务层进行不必要的类型转换，应在模型设计阶段统一类型
+    - 如果必须进行类型转换，**必须**添加详细的注释说明转换原因和逻辑
+
 
 #### **3. API层 (`api/`)**
 
@@ -604,10 +620,16 @@ src/plugin/[插件名]/
    - 接口变更**必须**提前通知并更新文档
 
 2. **数据格式**:
-   - **统一**使用JSON格式进行数据交换
-   - **统一**响应格式：`{code, data, msg}`
-   - **统一**分页格式：`{page, pageSize, total, list}`
-   - **统一**时间格式：ISO 8601标准
+    - **统一**使用JSON格式进行数据交换
+    - **统一**响应格式：`{code, data, msg}`
+    - **统一**分页格式：`{page, pageSize, total, list}`
+    - **统一**时间格式：ISO 8601标准
+    - **⚠️ 数据类型一致性**：
+        - 前后端对于同一字段**必须**使用相同的数据类型
+        - 后端Go结构体中的字段类型必须与前端JavaScript/TypeScript中的类型定义保持一致
+        - 特别注意：状态字段、ID字段、枚举值、时间字段等容易出现类型不匹配的字段
+        - 示例：后端数值类型字段对应前端 `number` 类型，字符串类型对应 `string` 类型，布尔类型对应 `boolean` 类型
+        - **指针类型处理**：后端Go中的指针类型在JSON序列化时会自动处理nil值，前端接收到的是对应的基础类型或null值
 
 3. **错误处理**:
    - 后端**必须**返回标准化的错误码和错误信息
@@ -719,10 +741,11 @@ web/src/plugin/[插件名]/
 
 1. **功能完整性**: 插件功能完整，满足业务需求
 2. **代码质量**: 代码规范，注释完整，易于维护
-3. **性能表现**: 响应速度快，资源占用合理
-4. **用户体验**: 界面友好，操作流畅，错误处理完善
-5. **兼容性**: 与主系统兼容，不影响其他功能
-6. **安全性**: 数据安全，权限控制，防止安全漏洞
+3. **数据类型一致性**: 前后端数据模型字段类型保持严格一致，避免类型转换错误
+4. **性能表现**: 响应速度快，资源占用合理
+5. **用户体验**: 界面友好，操作流畅，错误处理完善
+6. **兼容性**: 与主系统兼容，不影响其他功能
+7. **安全性**: 数据安全，权限控制，防止安全漏洞
 
 ---
 

From 2e8f5870d80d21019331701ca81a1df425dfb110 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Sun, 31 Aug 2025 00:16:32 +0800
Subject: [PATCH 46/56] =?UTF-8?q?refactor(model):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=95=B0=E6=8D=AE=E5=AD=97=E6=AE=B5=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B1=BB=E5=9E=8B=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为VersionData字段添加postgres和sqlite数据库特定的类型注释，提高跨数据库兼容性
---
 server/model/system/sys_version.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/model/system/sys_version.go b/server/model/system/sys_version.go
index a4d7ceb3a..19fff30a6 100644
--- a/server/model/system/sys_version.go
+++ b/server/model/system/sys_version.go
@@ -8,10 +8,10 @@ import (
 // 版本管理 结构体  SysVersion
 type SysVersion struct {
 	global.GVA_MODEL
-	VersionName *string `json:"versionName" form:"versionName" gorm:"comment:版本名称;column:version_name;size:255;" binding:"required"` //版本名称
-	VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"`   //版本号
-	Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"`                     //版本描述
-	VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:longtext;"`               //版本数据
+	VersionName *string `json:"versionName" form:"versionName" gorm:"comment:版本名称;column:version_name;size:255;" binding:"required"`                           //版本名称
+	VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"`                            //版本号
+	Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"`                                               //版本描述
+	VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:longtext;postgres:type:text;sqlite:type:text;"` //版本数据
 }
 
 // TableName 版本管理 SysVersion自定义表名 sys_versions

From 9e688c65d336a256a7380a6a774039442e992ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Mon, 1 Sep 2025 15:17:58 +0800
Subject: [PATCH 47/56] =?UTF-8?q?fix(richtext):=20=E4=B8=BA=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=B7=BB=E5=8A=A0token=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加用户token到图片上传请求头中，确保有权限的用户才能上传文件
---
 web/src/components/richtext/rich-edit.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/src/components/richtext/rich-edit.vue b/web/src/components/richtext/rich-edit.vue
index 6cb277146..cf248fb9e 100644
--- a/web/src/components/richtext/rich-edit.vue
+++ b/web/src/components/richtext/rich-edit.vue
@@ -27,6 +27,7 @@
 
   import { ElMessage } from 'element-plus'
   import { getUrl } from '@/utils/image'
+  import { useUserStore } from '@/pinia/modules/user'
 
   const emits = defineEmits(['change', 'update:modelValue'])
 
@@ -35,6 +36,7 @@
     emits('update:modelValue', valueHtml.value)
   }
 
+  const userStore = useUserStore()
   const props = defineProps({
     modelValue: {
       type: String,
@@ -53,6 +55,9 @@
   editorConfig.MENU_CONF['uploadImage'] = {
     fieldName: 'file',
     server: basePath + '/fileUploadAndDownload/upload?noSave=1',
+    headers: {
+      'x-token': userStore.token,
+    },
     customInsert(res, insertFn) {
       if (res.code === 0) {
         const urlPath = getUrl(res.data.file.url)

From 3e429f40913388ce45486e4657702e9ab90573c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9D=92=E8=8F=9C=E7=99=BD=E7=8E=89=E6=B1=A4?=
 <79054161+Azir-11@users.noreply.github.com>
Date: Tue, 2 Sep 2025 15:03:48 +0800
Subject: [PATCH 48/56] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=EF=BC=8C=E6=8F=90=E9=AB=98=20unocss=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=85=BC=E5=AE=B9=E6=80=A7=20(#2088)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 补充部分运行时依赖

* optimize: 优化class mark.
---
 web/package.json              | 2 ++
 web/src/view/layout/index.vue | 2 +-
 web/vite.config.js            | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/package.json b/web/package.json
index da978d87b..ca6ceeb18 100644
--- a/web/package.json
+++ b/web/package.json
@@ -58,6 +58,7 @@
     "@eslint/js": "^8.56.0",
     "@unocss/extractor-svelte": "^66.4.2",
     "@unocss/preset-wind3": "^66.4.2",
+    "@unocss/vite": "^66.5.0",
     "@vitejs/plugin-legacy": "^6.0.0",
     "@vitejs/plugin-vue": "^5.0.3",
     "@vue/cli-plugin-babel": "~5.0.8",
@@ -72,6 +73,7 @@
     "dotenv": "^16.4.5",
     "eslint": "^8.57.0",
     "eslint-plugin-vue": "^9.19.2",
+    "globals": "^16.3.0",
     "sass": "^1.78.0",
     "terser": "^5.31.6",
     "unocss": "^66.4.2",
diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue
index 77f115fa7..879b44ef9 100644
--- a/web/src/view/layout/index.vue
+++ b/web/src/view/layout/index.vue
@@ -11,7 +11,7 @@
       :content="userStore.userInfo.nickName"
     />
     <gva-header />
-    <div class="flex flex-row w-full pt-16 box-border h-full">
+    <div class="flex flex-row w-full gva-container pt-16 box-border !h-full">
       <gva-aside
         v-if="
           config.side_mode === 'normal' || config.side_mode === 'sidebar' ||
diff --git a/web/vite.config.js b/web/vite.config.js
index 4922e4082..c653ce253 100644
--- a/web/vite.config.js
+++ b/web/vite.config.js
@@ -9,7 +9,7 @@ import vueDevTools from 'vite-plugin-vue-devtools'
 import VueFilePathPlugin from './vitePlugin/componentName/index.js'
 import { svgBuilder } from 'vite-auto-import-svg'
 import { AddSecret } from './vitePlugin/secret'
-import UnoCSS from 'unocss/vite'
+import UnoCSS from '@unocss/vite'
 
 // @see https://cn.vitejs.dev/config/
 export default ({ mode }) => {

From 6bf848d53f6132a1b6367796650af137b56fb3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Wed, 3 Sep 2025 16:29:52 +0800
Subject: [PATCH 49/56] =?UTF-8?q?style:=20=E7=BB=9F=E4=B8=80=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8!=E5=89=8D=E7=BC=80=E6=9B=BF=E4=BB=A3=E6=96=B9?=
 =?UTF-8?q?=E6=8B=AC=E5=8F=B7=E7=9A=84=E5=AE=BD=E5=BA=A6=E7=B1=BB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改模板文件中的宽度类名，从w-[380px]和w-40统一改为!w-380px和!w-40
修复模板中条件判断的语法格式问题
---
 server/resource/package/web/view/table.vue.tpl | 4 ++--
 server/resource/plugin/web/view/view.vue.tpl   | 4 ++--
 server/utils/autocode/template_funcs.go        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index beadadef3..b2662da83 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -110,7 +110,7 @@ getDataSourceFunc()
 
       <el-date-picker
             v-model="searchInfo.createdAtRange"
-            class="w-[380px]"
+            class="!w-380px"
             type="datetimerange"
             range-separator="至"
             start-placeholder="开始时间"
@@ -161,7 +161,7 @@ getDataSourceFunc()
         >
         <el-table-column type="selection" width="55" />
         {{ if .GvaModel }}
-        <el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end -}}width="180">
+        <el-table-column sortable align="left" label="日期" prop="CreatedAt" {{ if .IsTree -}} min-{{- end -}}width="180">
             <template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
         </el-table-column>
         {{ end }}
diff --git a/server/resource/plugin/web/view/view.vue.tpl b/server/resource/plugin/web/view/view.vue.tpl
index f5b8547a1..98b557a55 100644
--- a/server/resource/plugin/web/view/view.vue.tpl
+++ b/server/resource/plugin/web/view/view.vue.tpl
@@ -108,7 +108,7 @@ getDataSourceFunc()
       </template>
          <el-date-picker
                   v-model="searchInfo.createdAtRange"
-                  class="w-[380px]"
+                  class="!w-380px"
                   type="datetimerange"
                   range-separator="至"
                   start-placeholder="开始时间"
@@ -158,7 +158,7 @@ getDataSourceFunc()
         >
         <el-table-column type="selection" width="55" />
         {{ if .GvaModel }}
-        <el-table-column sortable align="left" label="日期" prop="CreatedAt" {{- if .IsTree }} min-{{- end -}}width="180">
+        <el-table-column sortable align="left" label="日期" prop="CreatedAt" {{ if .IsTree -}} min-{{- end -}}width="180">
             <template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
         </el-table-column>
         {{ end }}
diff --git a/server/utils/autocode/template_funcs.go b/server/utils/autocode/template_funcs.go
index 157c992ac..40e561345 100644
--- a/server/utils/autocode/template_funcs.go
+++ b/server/utils/autocode/template_funcs.go
@@ -242,11 +242,11 @@ func GenerateSearchFormItem(field systemReq.AutoCodeField) string {
 `
 	} else if field.FieldType == "float64" || field.FieldType == "int" {
 		if field.FieldSearchType == "BETWEEN" || field.FieldSearchType == "NOT BETWEEN" {
-			result += fmt.Sprintf(`  <el-input class="w-40" v-model.number="searchInfo.start%s" placeholder="最小值" />
+			result += fmt.Sprintf(`  <el-input class="!w-40" v-model.number="searchInfo.start%s" placeholder="最小值" />
 `, field.FieldName)
 			result += `  —
 `
-			result += fmt.Sprintf(`  <el-input class="w-40" v-model.number="searchInfo.end%s" placeholder="最大值" />
+			result += fmt.Sprintf(`  <el-input class="!w-40" v-model.number="searchInfo.end%s" placeholder="最大值" />
 `, field.FieldName)
 		} else {
 			result += fmt.Sprintf(`  <el-input v-model.number="searchInfo.%s" placeholder="搜索条件" />
@@ -270,7 +270,7 @@ func GenerateSearchFormItem(field systemReq.AutoCodeField) string {
 `
 			result += `  </template>
 `
-			result += fmt.Sprintf(`<el-date-picker class="w-[380px]" v-model="searchInfo.%sRange" type="datetimerange" range-separator="至"  start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>`, field.FieldJson)
+			result += fmt.Sprintf(`<el-date-picker class="!w-380px" v-model="searchInfo.%sRange" type="datetimerange" range-separator="至"  start-placeholder="开始时间" end-placeholder="结束时间"></el-date-picker>`, field.FieldJson)
 		} else {
 			result += fmt.Sprintf(`<el-date-picker v-model="searchInfo.%s" type="datetime" placeholder="搜索条件"></el-date-picker>`, field.FieldJson)
 		}

From fb199aeedc157bc86c92d241e0aa564008fd331e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Thu, 4 Sep 2025 15:16:31 +0800
Subject: [PATCH 50/56] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A?=
 =?UTF-8?q?=E5=87=BA=E6=9D=A5=E7=9A=84=E4=B8=80=E4=B8=AA/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/source/system/user.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/source/system/user.go b/server/source/system/user.go
index 8f6745942..d5c20d59b 100644
--- a/server/source/system/user.go
+++ b/server/source/system/user.go
@@ -70,7 +70,7 @@ func (i *initUser) InitializeData(ctx context.Context) (next context.Context, er
 			Username:    "a303176530",
 			Password:    password,
 			NickName:    "用户1",
-			HeaderImg:   "https:///qmplusimg.henrongyi.top/1572075907logo.png",
+			HeaderImg:   "https://qmplusimg.henrongyi.top/1572075907logo.png",
 			AuthorityId: 9528,
 			Phone:       "17611111111",
 			Email:       "333333333@qq.com"},

From 58b123d31655697d3870cb8007beb734a0e16a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Fri, 5 Sep 2025 17:38:46 +0800
Subject: [PATCH 51/56] =?UTF-8?q?fix:=20VersionData=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8text=20=E8=80=83=E8=99=91=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/model/system/sys_version.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/model/system/sys_version.go b/server/model/system/sys_version.go
index 19fff30a6..9c0971065 100644
--- a/server/model/system/sys_version.go
+++ b/server/model/system/sys_version.go
@@ -8,10 +8,10 @@ import (
 // 版本管理 结构体  SysVersion
 type SysVersion struct {
 	global.GVA_MODEL
-	VersionName *string `json:"versionName" form:"versionName" gorm:"comment:版本名称;column:version_name;size:255;" binding:"required"`                           //版本名称
-	VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"`                            //版本号
-	Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"`                                               //版本描述
-	VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:longtext;postgres:type:text;sqlite:type:text;"` //版本数据
+	VersionName *string `json:"versionName" form:"versionName" gorm:"comment:版本名称;column:version_name;size:255;" binding:"required"` //版本名称
+	VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"`  //版本号
+	Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"`                     //版本描述
+	VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:text;"`               //版本数据
 }
 
 // TableName 版本管理 SysVersion自定义表名 sys_versions

From 78cdc287c5e9e67c001859c06d2fd2ab48f41c0b Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Sun, 7 Sep 2025 12:46:38 +0800
Subject: [PATCH 52/56] =?UTF-8?q?docs:=20=E6=9B=B4=E6=96=B0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E8=A7=84=E5=88=99=E6=96=87=E6=A1=A3=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8F=8F=E8=BF=B0=E4=B8=BA=E5=85=A8=E6=A0=88?=
 =?UTF-8?q?=E4=B8=93=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .claude/rules/project_rules.md | 2 +-
 .cursor/rules/project_rules.md | 2 +-
 .trae/rules/project_rules.md   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.claude/rules/project_rules.md b/.claude/rules/project_rules.md
index 161f2ae69..3a683aa11 100644
--- a/.claude/rules/project_rules.md
+++ b/.claude/rules/project_rules.md
@@ -37,7 +37,7 @@ description: |
 
 #### **角色与目标**
 
-你是一名资深的 Go 后端开发专家，**专精于 `gin-vue-admin` (GVA) 框架的架构与开发范式**。
+你是一名资深的全栈开发专家，**专精于 `gin-vue-admin` (GVA) 框架的架构与开发范式**，熟练使用Golang、Vue3、Gin、GORM等技术栈。
 
 你的核心任务是，根据需求开发**完整、生产级别的全栈功能包或插件**。你必须严格遵循 GVA 的分层架构、代码规范和核心设计模式，确保你生成的每一部分代码都能无缝集成到现有项目中。
 
diff --git a/.cursor/rules/project_rules.md b/.cursor/rules/project_rules.md
index 687be168a..f8fb9471b 100644
--- a/.cursor/rules/project_rules.md
+++ b/.cursor/rules/project_rules.md
@@ -37,7 +37,7 @@ description: |
 
 #### **角色与目标**
 
-你是一名资深的 Go 后端开发专家，**专精于 `gin-vue-admin` (GVA) 框架的架构与开发范式**。
+你是一名资深的全栈开发专家，**专精于 `gin-vue-admin` (GVA) 框架的架构与开发范式**，熟练使用Golang、Vue3、Gin、GORM等技术栈。
 
 你的核心任务是，根据需求开发**完整、生产级别的全栈功能包或插件**。你必须严格遵循 GVA 的分层架构、代码规范和核心设计模式，确保你生成的每一部分代码都能无缝集成到现有项目中。
 
diff --git a/.trae/rules/project_rules.md b/.trae/rules/project_rules.md
index 687be168a..f8fb9471b 100644
--- a/.trae/rules/project_rules.md
+++ b/.trae/rules/project_rules.md
@@ -37,7 +37,7 @@ description: |
 
 #### **角色与目标**
 
-你是一名资深的 Go 后端开发专家，**专精于 `gin-vue-admin` (GVA) 框架的架构与开发范式**。
+你是一名资深的全栈开发专家，**专精于 `gin-vue-admin` (GVA) 框架的架构与开发范式**，熟练使用Golang、Vue3、Gin、GORM等技术栈。
 
 你的核心任务是，根据需求开发**完整、生产级别的全栈功能包或插件**。你必须严格遵循 GVA 的分层架构、代码规范和核心设计模式，确保你生成的每一部分代码都能无缝集成到现有项目中。
 

From 4e9e3570ed27d335e770c839f8ef7884e0139f6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?=
 <165128580+pixelmaxQm@users.noreply.github.com>
Date: Sun, 7 Sep 2025 23:58:05 +0800
Subject: [PATCH 53/56] =?UTF-8?q?fix:=20VersionData=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BAtext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/model/system/sys_version.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/model/system/sys_version.go b/server/model/system/sys_version.go
index 19fff30a6..e7c0a82cc 100644
--- a/server/model/system/sys_version.go
+++ b/server/model/system/sys_version.go
@@ -11,7 +11,7 @@ type SysVersion struct {
 	VersionName *string `json:"versionName" form:"versionName" gorm:"comment:版本名称;column:version_name;size:255;" binding:"required"`                           //版本名称
 	VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"`                            //版本号
 	Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"`                                               //版本描述
-	VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:longtext;postgres:type:text;sqlite:type:text;"` //版本数据
+	VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:text;"` //版本数据
 }
 
 // TableName 版本管理 SysVersion自定义表名 sys_versions

From ea5709e5b6594ad622c39c68185e6cd804805a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Mon, 8 Sep 2025 10:51:13 +0800
Subject: [PATCH 54/56] =?UTF-8?q?style(=E8=8F=9C=E5=8D=95=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6):=20=E8=B0=83=E6=95=B4=E7=BA=A7=E8=81=94=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E5=AE=BD=E5=BA=A6=E6=A0=B7=E5=BC=8F=E4=B8=BA?=
 =?UTF-8?q?=E5=85=A8=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/superAdmin/menu/components/components-cascader.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/view/superAdmin/menu/components/components-cascader.vue b/web/src/view/superAdmin/menu/components/components-cascader.vue
index e7de0003c..2370c0024 100644
--- a/web/src/view/superAdmin/menu/components/components-cascader.vue
+++ b/web/src/view/superAdmin/menu/components/components-cascader.vue
@@ -6,7 +6,7 @@
       :options="pathOptions"
       v-model="activeComponent"
       filterable
-      class="w-full"
+      class="!w-full"
       clearable
       @change="emitChange"
     />

From 424c5b23b43778a4d4924ae1ca8dc4a7c9d9faee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?=
 <qimiaojiangjizhao@gmail.com>
Date: Tue, 9 Sep 2025 11:18:11 +0800
Subject: [PATCH 55/56] =?UTF-8?q?style(layout):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E5=AE=9A=E4=BD=8D=E7=B1=BB=E5=90=8D=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E9=87=8D=E8=A6=81=E4=BF=AE=E9=A5=B0=E7=AC=A6=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/layout/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue
index 879b44ef9..5210a4c80 100644
--- a/web/src/view/layout/index.vue
+++ b/web/src/view/layout/index.vue
@@ -7,7 +7,7 @@
       :font="font"
       :z-index="9999"
       :gap="[180, 150]"
-      class="absolute inset-0 pointer-events-none"
+      class="!absolute !inset-0 !pointer-events-none"
       :content="userStore.userInfo.nickName"
     />
     <gva-header />

From 182af9a1b6df17d25c5d3bbe6760a13eff33921f Mon Sep 17 00:00:00 2001
From: Qing Liang <106448173+xue-ding-e@users.noreply.github.com>
Date: Thu, 11 Sep 2025 11:20:52 +0800
Subject: [PATCH 56/56] Update response.go
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除多余注释
---
 server/model/common/response/response.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/model/common/response/response.go b/server/model/common/response/response.go
index a429b12e1..f0e0e5312 100644
--- a/server/model/common/response/response.go
+++ b/server/model/common/response/response.go
@@ -18,7 +18,6 @@ const (
 )
 
 func Result(code int, data interface{}, msg string, c *gin.Context) {
-	// 开始时间
 	c.JSON(http.StatusOK, Response{
 		code,
 		data,