From eb8e3ce2d4c1a0a70b00d7391228cdd4e21e5a91 Mon Sep 17 00:00:00 2001
From: sliboy <34034053+sliboy@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:35:08 +0800
Subject: [PATCH 01/20] chore(user.vue): Update user.vue, alter userInfo
 username to userName.

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

diff --git a/web/src/view/superAdmin/user/user.vue b/web/src/view/superAdmin/user/user.vue
index 23c260d115..2f8cbbc475 100644
--- a/web/src/view/superAdmin/user/user.vue
+++ b/web/src/view/superAdmin/user/user.vue
@@ -368,7 +368,7 @@ const deleteUserFunc = async(row) => {
 
 // 弹窗相关
 const userInfo = ref({
-  username: '',
+  userName: '',
   password: '',
   nickName: '',
   headerImg: '',

From 56ca3ae8fb3dfd81e55f205783b77ffa0b8ab845 Mon Sep 17 00:00:00 2001
From: ba0ch3ng <ba0ch3ng@foxmail.com>
Date: Wed, 28 Aug 2024 16:38:21 +0800
Subject: [PATCH 02/20] feat: redis-list support

---
 server/config.yaml         | 11 +++++++++++
 server/config/config.go    | 15 ++++++++-------
 server/config/redis.go     |  1 +
 server/core/server.go      |  3 +++
 server/global/global.go    | 25 ++++++++++++++++++-------
 server/initialize/redis.go | 34 ++++++++++++++++++++++++++++------
 6 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/server/config.yaml b/server/config.yaml
index c08dca46df..b532a8cbb8 100644
--- a/server/config.yaml
+++ b/server/config.yaml
@@ -31,6 +31,17 @@ redis:
     - "172.21.0.4:7001"
     - "172.21.0.2:7002"
 
+# redis-list configuration
+redis-list:
+  - name: cache           # 数据库的名称,注意: name 需要在 redis-list 中唯一
+    useCluster: false     # 是否使用redis集群模式    
+    addr: 127.0.0.1:6379  # 使用集群模式addr和db默认无效
+    password: ""
+    db: 0
+    clusterAddrs:
+      - "172.21.0.3:7000"
+      - "172.21.0.4:7001"
+      - "172.21.0.2:7002"
 
 # mongo configuration
 mongo:
diff --git a/server/config/config.go b/server/config/config.go
index 46de2cb462..6519333cb3 100644
--- a/server/config/config.go
+++ b/server/config/config.go
@@ -1,13 +1,14 @@
 package config
 
 type Server struct {
-	JWT     JWT     `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
-	Zap     Zap     `mapstructure:"zap" json:"zap" yaml:"zap"`
-	Redis   Redis   `mapstructure:"redis" json:"redis" yaml:"redis"`
-	Mongo   Mongo   `mapstructure:"mongo" json:"mongo" yaml:"mongo"`
-	Email   Email   `mapstructure:"email" json:"email" yaml:"email"`
-	System  System  `mapstructure:"system" json:"system" yaml:"system"`
-	Captcha Captcha `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
+	JWT       JWT     `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
+	Zap       Zap     `mapstructure:"zap" json:"zap" yaml:"zap"`
+	Redis     Redis   `mapstructure:"redis" json:"redis" yaml:"redis"`
+	RedisList []Redis `mapstructure:"redis-list" json:"redis-list" yaml:"redis-list"`
+	Mongo     Mongo   `mapstructure:"mongo" json:"mongo" yaml:"mongo"`
+	Email     Email   `mapstructure:"email" json:"email" yaml:"email"`
+	System    System  `mapstructure:"system" json:"system" yaml:"system"`
+	Captcha   Captcha `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
 	// auto
 	AutoCode Autocode `mapstructure:"autocode" json:"autocode" yaml:"autocode"`
 	// gorm
diff --git a/server/config/redis.go b/server/config/redis.go
index 33c0ccbbb8..94b5bf6b59 100644
--- a/server/config/redis.go
+++ b/server/config/redis.go
@@ -1,6 +1,7 @@
 package config
 
 type Redis struct {
+	Name         string   `mapstructure:"name" json:"name" yaml:"name"`                         // 代表当前实例的名字
 	Addr         string   `mapstructure:"addr" json:"addr" yaml:"addr"`                         // 服务器地址:端口
 	Password     string   `mapstructure:"password" json:"password" yaml:"password"`             // 密码
 	DB           int      `mapstructure:"db" json:"db" yaml:"db"`                               // 单实例模式下redis的哪个数据库
diff --git a/server/core/server.go b/server/core/server.go
index a698c8dacb..4654dbc55a 100644
--- a/server/core/server.go
+++ b/server/core/server.go
@@ -17,6 +17,9 @@ func RunWindowsServer() {
 		// 初始化redis服务
 		initialize.Redis()
 	}
+	
+	initialize.RedisList()
+
 	if global.GVA_CONFIG.System.UseMongo {
 		err := initialize.Mongo.Initialization()
 		if err != nil {
diff --git a/server/global/global.go b/server/global/global.go
index 017b02f807..7291d2a307 100644
--- a/server/global/global.go
+++ b/server/global/global.go
@@ -1,9 +1,11 @@
 package global
 
 import (
+	"fmt"
+	"sync"
+
 	"github.com/gin-gonic/gin"
 	"github.com/qiniu/qmgo"
-	"sync"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/utils/timer"
 	"github.com/songzhibin97/gkit/cache/local_cache"
@@ -20,12 +22,13 @@ import (
 )
 
 var (
-	GVA_DB     *gorm.DB
-	GVA_DBList map[string]*gorm.DB
-	GVA_REDIS  redis.UniversalClient
-	GVA_MONGO  *qmgo.QmgoClient
-	GVA_CONFIG config.Server
-	GVA_VP     *viper.Viper
+	GVA_DB        *gorm.DB
+	GVA_DBList    map[string]*gorm.DB
+	GVA_REDIS     redis.UniversalClient
+	GVA_REDISList map[string]redis.UniversalClient
+	GVA_MONGO     *qmgo.QmgoClient
+	GVA_CONFIG    config.Server
+	GVA_VP        *viper.Viper
 	// GVA_LOG    *oplogging.Logger
 	GVA_LOG                 *zap.Logger
 	GVA_Timer               timer.Timer = timer.NewTimerTask()
@@ -53,3 +56,11 @@ func MustGetGlobalDBByDBName(dbname string) *gorm.DB {
 	}
 	return db
 }
+
+func GetRedis(name string) redis.UniversalClient {
+	redis, ok := GVA_REDISList[name]
+	if !ok || redis == nil {
+		panic(fmt.Sprintf("redis `%s` no init", name))
+	}
+	return redis
+}
diff --git a/server/initialize/redis.go b/server/initialize/redis.go
index 41dfd76e01..2d9c8f4eb8 100644
--- a/server/initialize/redis.go
+++ b/server/initialize/redis.go
@@ -3,14 +3,14 @@ package initialize
 import (
 	"context"
 
+	"github.com/flipped-aurora/gin-vue-admin/server/config"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 
 	"github.com/redis/go-redis/v9"
 	"go.uber.org/zap"
 )
 
-func Redis() {
-	redisCfg := global.GVA_CONFIG.Redis
+func initRedisClient(redisCfg config.Redis) (redis.UniversalClient, error) {
 	var client redis.UniversalClient
 	// 使用集群模式
 	if redisCfg.UseCluster {
@@ -28,10 +28,32 @@ func Redis() {
 	}
 	pong, err := client.Ping(context.Background()).Result()
 	if err != nil {
-		global.GVA_LOG.Error("redis connect ping failed, err:", zap.Error(err))
+		global.GVA_LOG.Error("redis connect ping failed, err:", zap.String("name", redisCfg.Name), zap.Error(err))
+		return nil, err
+	}
+
+	global.GVA_LOG.Info("redis connect ping response:", zap.String("name", redisCfg.Name), zap.String("pong", pong))
+	return client, nil
+}
+
+func Redis() {
+	redisClient, err := initRedisClient(global.GVA_CONFIG.Redis)
+	if err != nil {
 		panic(err)
-	} else {
-		global.GVA_LOG.Info("redis connect ping response:", zap.String("pong", pong))
-		global.GVA_REDIS = client
 	}
+	global.GVA_REDIS = redisClient
+}
+
+func RedisList() {
+	redisMap := make(map[string]redis.UniversalClient)
+
+	for _, redisCfg := range global.GVA_CONFIG.RedisList {
+		client, err := initRedisClient(redisCfg)
+		if err != nil {
+			panic(err)
+		}
+		redisMap[redisCfg.Name] = client
+	}
+
+	global.GVA_REDISList = redisMap
 }

From da565883282eef093129052324e9a81865de6525 Mon Sep 17 00:00:00 2001
From: task <121913992@qq.com>
Date: Thu, 29 Aug 2024 14:22:16 +0800
Subject: [PATCH 03/20] =?UTF-8?q?=E5=AA=92=E4=BD=93=E5=BA=93=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=B9=E9=87=8F=E5=AF=BC=E5=85=A5URL=EF=BC=9B=20?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=EF=BC=9A=E6=96=87=E4=BB=B6=E5=90=8D|?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=88=96=E8=80=85=E4=BB=85=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

示例：
我的图片|https://my-oss.com/my.png
https://my-oss.com/my_1.png
---
 .../v1/example/exa_file_upload_download.go    | 23 +++++++
 .../example/exa_file_upload_and_download.go   |  1 +
 .../example/exa_file_upload_download.go       | 10 +++
 server/source/system/api.go                   |  1 +
 server/source/system/casbin.go                |  3 +
 web/src/api/fileUploadAndDownload.js          | 13 ++++
 web/src/components/upload/common.vue          |  1 +
 web/src/utils/format.js                       | 14 +++-
 web/src/view/example/upload/upload.vue        | 67 +++++++++++++++++--
 web/src/view/systemTools/system/system.vue    | 19 ++----
 10 files changed, 133 insertions(+), 19 deletions(-)

diff --git a/server/api/v1/example/exa_file_upload_download.go b/server/api/v1/example/exa_file_upload_download.go
index 18d1251240..330c8a7982 100644
--- a/server/api/v1/example/exa_file_upload_download.go
+++ b/server/api/v1/example/exa_file_upload_download.go
@@ -108,3 +108,26 @@ func (b *FileUploadAndDownloadApi) GetFileList(c *gin.Context) {
 		PageSize: pageInfo.PageSize,
 	}, "获取成功", c)
 }
+
+// ImportURL
+// @Tags      ExaFileUploadAndDownload
+// @Summary   导入URL
+// @Security  ApiKeyAuth
+// @Produce   application/json
+// @Param     data  body      example.ExaFileUploadAndDownload  true  "对象"
+// @Success   200   {object}  response.Response{msg=string}     "导入URL"
+// @Router    /fileUploadAndDownload/importURL [post]
+func (b *FileUploadAndDownloadApi) ImportURL(c *gin.Context) {
+	var file []example.ExaFileUploadAndDownload
+	err := c.ShouldBindJSON(&file)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := fileUploadAndDownloadService.ImportURL(&file); err != nil {
+		global.GVA_LOG.Error("导入URL失败!", zap.Error(err))
+		response.FailWithMessage("导入URL失败", c)
+		return
+	}
+	response.OkWithMessage("导入URL成功", c)
+}
diff --git a/server/router/example/exa_file_upload_and_download.go b/server/router/example/exa_file_upload_and_download.go
index 19d983c317..84f6ecdb08 100644
--- a/server/router/example/exa_file_upload_and_download.go
+++ b/server/router/example/exa_file_upload_and_download.go
@@ -17,5 +17,6 @@ func (e *FileUploadAndDownloadRouter) InitFileUploadAndDownloadRouter(Router *gi
 		fileUploadAndDownloadRouter.GET("findFile", exaFileUploadAndDownloadApi.FindFile)                                  // 查询当前文件成功的切片
 		fileUploadAndDownloadRouter.POST("breakpointContinueFinish", exaFileUploadAndDownloadApi.BreakpointContinueFinish) // 切片传输完成
 		fileUploadAndDownloadRouter.POST("removeChunk", exaFileUploadAndDownloadApi.RemoveChunk)                           // 删除切片
+		fileUploadAndDownloadRouter.POST("importURL", exaFileUploadAndDownloadApi.ImportURL)                               // 导入URL
 	}
 }
diff --git a/server/service/example/exa_file_upload_download.go b/server/service/example/exa_file_upload_download.go
index 15e2d70cb4..abd4accad1 100644
--- a/server/service/example/exa_file_upload_download.go
+++ b/server/service/example/exa_file_upload_download.go
@@ -106,3 +106,13 @@ func (e *FileUploadAndDownloadService) UploadFile(header *multipart.FileHeader,
 	}
 	return f, nil
 }
+
+//@author: [piexlmax](https://github.com/piexlmax)
+//@function: ImportURL
+//@description: 导入URL
+//@param: file model.SysAttachment
+//@return: error
+
+func (e *FileUploadAndDownloadService) ImportURL(file *[]example.ExaFileUploadAndDownload) error {
+	return global.GVA_DB.Create(&file).Error
+}
diff --git a/server/source/system/api.go b/server/source/system/api.go
index 30e59e38b7..757f98cf26 100644
--- a/server/source/system/api.go
+++ b/server/source/system/api.go
@@ -97,6 +97,7 @@ func (i *initApi) InitializeData(ctx context.Context) (context.Context, error) {
 		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/deleteFile", Description: "删除文件"},
 		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/editFileName", Description: "文件名或者备注编辑"},
 		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/getFileList", Description: "获取上传文件列表"},
+		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/importURL", Description: "c"},
 
 		{ApiGroup: "系统服务", Method: "POST", Path: "/system/getServerInfo", Description: "获取服务器信息"},
 		{ApiGroup: "系统服务", Method: "POST", Path: "/system/getSystemConfig", Description: "获取配置文件内容"},
diff --git a/server/source/system/casbin.go b/server/source/system/casbin.go
index 92b83c1f0d..a9db0047a3 100644
--- a/server/source/system/casbin.go
+++ b/server/source/system/casbin.go
@@ -95,6 +95,7 @@ func (i *initCasbin) InitializeData(ctx context.Context) (context.Context, error
 		{Ptype: "p", V0: "888", V1: "/fileUploadAndDownload/deleteFile", V2: "POST"},
 		{Ptype: "p", V0: "888", V1: "/fileUploadAndDownload/editFileName", V2: "POST"},
 		{Ptype: "p", V0: "888", V1: "/fileUploadAndDownload/getFileList", V2: "POST"},
+		{Ptype: "p", V0: "888", V1: "/fileUploadAndDownload/importURL", V2: "POST"},
 
 		{Ptype: "p", V0: "888", V1: "/casbin/updateCasbin", V2: "POST"},
 		{Ptype: "p", V0: "888", V1: "/casbin/getPolicyPathByAuthorityId", V2: "POST"},
@@ -203,6 +204,7 @@ func (i *initCasbin) InitializeData(ctx context.Context) (context.Context, error
 		{Ptype: "p", V0: "8881", V1: "/fileUploadAndDownload/getFileList", V2: "POST"},
 		{Ptype: "p", V0: "8881", V1: "/fileUploadAndDownload/deleteFile", V2: "POST"},
 		{Ptype: "p", V0: "8881", V1: "/fileUploadAndDownload/editFileName", V2: "POST"},
+		{Ptype: "p", V0: "8881", V1: "/fileUploadAndDownload/importURL", V2: "POST"},
 		{Ptype: "p", V0: "8881", V1: "/casbin/updateCasbin", V2: "POST"},
 		{Ptype: "p", V0: "8881", V1: "/casbin/getPolicyPathByAuthorityId", V2: "POST"},
 		{Ptype: "p", V0: "8881", V1: "/jwt/jsonInBlacklist", V2: "POST"},
@@ -244,6 +246,7 @@ func (i *initCasbin) InitializeData(ctx context.Context) (context.Context, error
 		{Ptype: "p", V0: "9528", V1: "/fileUploadAndDownload/getFileList", V2: "POST"},
 		{Ptype: "p", V0: "9528", V1: "/fileUploadAndDownload/deleteFile", V2: "POST"},
 		{Ptype: "p", V0: "9528", V1: "/fileUploadAndDownload/editFileName", V2: "POST"},
+		{Ptype: "p", V0: "9528", V1: "/fileUploadAndDownload/importURL", V2: "POST"},
 		{Ptype: "p", V0: "9528", V1: "/casbin/updateCasbin", V2: "POST"},
 		{Ptype: "p", V0: "9528", V1: "/casbin/getPolicyPathByAuthorityId", V2: "POST"},
 		{Ptype: "p", V0: "9528", V1: "/jwt/jsonInBlacklist", V2: "POST"},
diff --git a/web/src/api/fileUploadAndDownload.js b/web/src/api/fileUploadAndDownload.js
index 0a5d0211db..2bff5bb47e 100644
--- a/web/src/api/fileUploadAndDownload.js
+++ b/web/src/api/fileUploadAndDownload.js
@@ -42,3 +42,16 @@ export const editFileName = (data) => {
     data
   })
 }
+
+/**
+ * 导入URL
+ * @param data
+ * @returns {*}
+ */
+export const importURL = (data) => {
+  return service({
+    url: '/fileUploadAndDownload/importURL',
+    method: 'post',
+    data
+  })
+}
diff --git a/web/src/components/upload/common.vue b/web/src/components/upload/common.vue
index a010e2cd9f..94d30d00a9 100644
--- a/web/src/components/upload/common.vue
+++ b/web/src/components/upload/common.vue
@@ -6,6 +6,7 @@
       :on-error="uploadError"
       :on-success="uploadSuccess"
       :show-file-list="false"
+      multiple
       class="upload-btn"
     >
       <el-button type="primary">普通上传</el-button>
diff --git a/web/src/utils/format.js b/web/src/utils/format.js
index cf3f1a05a8..4fd9ad80df 100644
--- a/web/src/utils/format.js
+++ b/web/src/utils/format.js
@@ -124,4 +124,16 @@ const baseUrl = ref(import.meta.env.VITE_BASE_API)
 
 export const getBaseUrl = () => {
     return  baseUrl.value === "/" ? "" : baseUrl.value
-}
\ No newline at end of file
+}
+
+export const CreateUUID = () => {
+  let d = new Date().getTime()
+  if (window.performance && typeof window.performance.now === 'function') {
+    d += performance.now()
+  }
+  return '00000000-0000-0000-0000-000000000000'.replace(/0/g, (c) => {
+    const r = (d + Math.random() * 16) % 16 | 0    // d是随机种子
+    d = Math.floor(d / 16)
+    return (c === '0' ? r : (r & 0x3 | 0x8)).toString(16)
+  })
+}
diff --git a/web/src/view/example/upload/upload.vue b/web/src/view/example/upload/upload.vue
index 727cc5645c..1b08a837d7 100644
--- a/web/src/view/example/upload/upload.vue
+++ b/web/src/view/example/upload/upload.vue
@@ -15,9 +15,16 @@
           :max-w-h="1080"
           @on-success="getTableData"
         />
+        <el-button
+            type="primary"
+            icon="upload"
+            @click="importUrlFunc"
+        >
+          导入URL
+        </el-button>
         <el-input
           v-model="search.keyword"
-          class="keyword"
+          class="w-72"
           placeholder="请输入文件名或备注"
         />
         <el-button
@@ -122,12 +129,12 @@
 </template>
 
 <script setup>
-import { getFileList, deleteFile, editFileName } from '@/api/fileUploadAndDownload'
+import {getFileList, deleteFile, editFileName, importURL} from '@/api/fileUploadAndDownload'
 import { downloadImage } from '@/utils/downloadImg'
 import CustomPic from '@/components/customPic/index.vue'
 import UploadImage from '@/components/upload/image.vue'
 import UploadCommon from '@/components/upload/common.vue'
-import { formatDate } from '@/utils/format'
+import {CreateUUID, formatDate} from '@/utils/format'
 import WarningBar from '@/components/warningBar/warningBar.vue'
 
 import { ref } from 'vue'
@@ -228,7 +235,7 @@ const editFileNameFunc = async(row) => {
         type: 'success',
         message: '编辑成功!',
       })
-      getTableData()
+      await getTableData()
     }
   }).catch(() => {
     ElMessage({
@@ -237,11 +244,61 @@ const editFileNameFunc = async(row) => {
     })
   })
 }
+
+/**
+ * 导入URL
+ */
+const importUrlFunc = () => {
+  ElMessageBox.prompt('格式：文件名|链接或者仅链接。', '导入', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    inputType: 'textarea',
+    inputPlaceholder: '我的图片|https://my-oss.com/my.png\nhttps://my-oss.com/my_1.png',
+    inputPattern: /\S/,
+    inputErrorMessage: '不能为空',
+  }).then(async({ value }) => {
+    let data = value.split('\n')
+    let importData = []
+    data.forEach(item => {
+      let oneData = item.trim().split('|')
+      let url, name
+      if (oneData.length > 1) {
+        name = oneData[0].trim()
+        url = oneData[1]
+      } else {
+        url = oneData[0].trim()
+        let str = url.substring(url.lastIndexOf('/') + 1)
+        name = str.substring(0, str.lastIndexOf('.'))
+      }
+      if (url) {
+        importData.push({
+          name: name,
+          url: url,
+          tag: url.substring(url.lastIndexOf(".") + 1),
+          key: CreateUUID()
+        })
+      }
+    })
+
+    const res = await importURL(importData)
+    if (res.code === 0) {
+      ElMessage({
+        type: 'success',
+        message: '导入成功!',
+      })
+      await getTableData()
+    }
+  }).catch(() => {
+    ElMessage({
+      type: 'info',
+      message: '取消导入',
+    })
+  })
+}
 </script>
 
 <style scoped>
 .name {
   cursor: pointer;
 }
-
 </style>
diff --git a/web/src/view/systemTools/system/system.vue b/web/src/view/systemTools/system/system.vue
index 634df9e35d..83b370feb9 100644
--- a/web/src/view/systemTools/system/system.vue
+++ b/web/src/view/systemTools/system/system.vue
@@ -13,7 +13,7 @@
             class="mt-3.5"
         >
           <el-form-item label="端口值">
-            <el-input v-model.number="config.system.addr" placeholder="请输入端口值"/>
+            <el-input-number v-model="config.system.addr" placeholder="请输入端口值"/>
           </el-form-item>
           <el-form-item label="数据库类型">
             <el-select
@@ -50,7 +50,7 @@
             <el-switch v-model="config.system['use-mongo']"/>
           </el-form-item>
           <el-form-item label="严格角色模式">
-            <el-checkbox v-model="config.system['use-strict-auth']">开启</el-checkbox>
+            <el-switch v-model="config.system['use-strict-auth']"/>
           </el-form-item>
           <el-form-item label="限流次数">
             <el-input-number v-model.number="config.system['iplimit-count']"/>
@@ -75,7 +75,7 @@
           <el-form-item label="jwt签名">
             <el-input v-model.trim="config.jwt['signing-key']" placeholder="请输入jwt签名">
               <template #append>
-                <el-button @click="CreateUUID">生成</el-button>
+                <el-button @click="getUUID">生成</el-button>
               </template>
             </el-input>
           </el-form-item>
@@ -682,6 +682,7 @@ import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Minus, Plus } from '@element-plus/icons-vue'
 import { emailTest } from '@/api/email'
+import {CreateUUID} from "@/utils/format";
 
 defineOptions({
   name: 'Config',
@@ -795,16 +796,8 @@ const email = async() => {
   }
 }
 
-const CreateUUID = () => {
-  let d = new Date().getTime()
-  if (window.performance && typeof window.performance.now === 'function') {
-    d += performance.now()
-  }
-  config.value.jwt['signing-key'] = '00000000-0000-0000-0000-000000000000'.replace(/0/g, (c) => {
-    const r = (d + Math.random() * 16) % 16 | 0    // d是随机种子
-    d = Math.floor(d / 16)
-    return (c === '0' ? r : (r & 0x3 | 0x8)).toString(16)
-  })
+const getUUID = () => {
+  config.value.jwt['signing-key'] = CreateUUID()
 }
 
 const addNode = () => {

From c1d5e9535025860e258f7ea69aba8333e146ab58 Mon Sep 17 00:00:00 2001
From: task <121913992@qq.com>
Date: Thu, 29 Aug 2024 15:09:43 +0800
Subject: [PATCH 04/20] =?UTF-8?q?fix=20=E6=8F=8F=E8=BF=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/service/example/exa_file_upload_download.go | 2 +-
 server/source/system/api.go                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/service/example/exa_file_upload_download.go b/server/service/example/exa_file_upload_download.go
index abd4accad1..85b7d3387e 100644
--- a/server/service/example/exa_file_upload_download.go
+++ b/server/service/example/exa_file_upload_download.go
@@ -110,7 +110,7 @@ func (e *FileUploadAndDownloadService) UploadFile(header *multipart.FileHeader,
 //@author: [piexlmax](https://github.com/piexlmax)
 //@function: ImportURL
 //@description: 导入URL
-//@param: file model.SysAttachment
+//@param: file model.ExaFileUploadAndDownload
 //@return: error
 
 func (e *FileUploadAndDownloadService) ImportURL(file *[]example.ExaFileUploadAndDownload) error {
diff --git a/server/source/system/api.go b/server/source/system/api.go
index 757f98cf26..a5f198fb29 100644
--- a/server/source/system/api.go
+++ b/server/source/system/api.go
@@ -97,7 +97,7 @@ func (i *initApi) InitializeData(ctx context.Context) (context.Context, error) {
 		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/deleteFile", Description: "删除文件"},
 		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/editFileName", Description: "文件名或者备注编辑"},
 		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/getFileList", Description: "获取上传文件列表"},
-		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/importURL", Description: "c"},
+		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/importURL", Description: "导入URL"},
 
 		{ApiGroup: "系统服务", Method: "POST", Path: "/system/getServerInfo", Description: "获取服务器信息"},
 		{ApiGroup: "系统服务", Method: "POST", Path: "/system/getSystemConfig", Description: "获取配置文件内容"},

From d1b7c2df2dad54453a3dee264cc7b819eb192897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?pixelMax=28=E5=A5=87=E6=B7=BC?= <flipped_aurora@163.com>
Date: Tue, 3 Sep 2024 11:48:43 +0800
Subject: [PATCH 05/20] =?UTF-8?q?feature:=20=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=96=B9=E6=B3=95=E6=94=AF=E6=8C=81=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B9=E6=B3=95=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/model/system/request/sys_auto_code.go     | 1 +
 server/resource/function/api.go.tpl              | 8 ++++----
 server/resource/function/api.js.tpl              | 8 ++++----
 server/resource/function/server.go.tpl           | 4 ++--
 web/src/view/systemTools/autoCodeAdmin/index.vue | 5 +++++
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/server/model/system/request/sys_auto_code.go b/server/model/system/request/sys_auto_code.go
index 7737bbd582..2957a1fc59 100644
--- a/server/model/system/request/sys_auto_code.go
+++ b/server/model/system/request/sys_auto_code.go
@@ -236,6 +236,7 @@ type AutoFunc struct {
 	Package         string `json:"package"`
 	FuncName        string `json:"funcName"`        // 方法名称
 	Router          string `json:"router"`          // 路由名称
+	FuncDesc        string `json:"funcDesc"`        // 方法介绍
 	BusinessDB      string `json:"businessDB"`      // 业务库
 	StructName      string `json:"structName"`      // Struct名称
 	PackageName     string `json:"packageName"`     // 文件名称
diff --git a/server/resource/function/api.go.tpl b/server/resource/function/api.go.tpl
index c788a9fa18..dae9cee751 100644
--- a/server/resource/function/api.go.tpl
+++ b/server/resource/function/api.go.tpl
@@ -1,7 +1,7 @@
 {{if .IsPlugin}}
-// {{.FuncName}} 等待开发的的{{.Description}}接口
+// {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
-// @Summary 等待开发的的{{.Description}}接口
+// @Summary {{.FuncDesc}}
 // @accept application/json
 // @Produce application/json
 // @Param data query request.{{.StructName}}Search true "分页获取{{.Description}}列表"
@@ -20,9 +20,9 @@ func (a *{{.Abbreviation}}) {{.FuncName}}(c *gin.Context) {
 
 {{- else -}}
 
-// {{.FuncName}} 等待开发的的{{.Description}}接口
+// {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
-// @Summary 等待开发的的{{.Description}}接口
+// @Summary {{.FuncDesc}}
 // @accept application/json
 // @Produce application/json
 // @Param data query {{.Package}}Req.{{.StructName}}Search true "成功"
diff --git a/server/resource/function/api.js.tpl b/server/resource/function/api.js.tpl
index 524e8320f8..003438cc11 100644
--- a/server/resource/function/api.js.tpl
+++ b/server/resource/function/api.js.tpl
@@ -1,7 +1,7 @@
 {{if .IsPlugin}}
-// {{.FuncName}} 等待开发的的{{.Description}}接口
+// {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
-// @Summary 等待开发的的{{.Description}}接口
+// @Summary {{.FuncDesc}}
 // @accept application/json
 // @Produce application/json
 // @Param data query request.{{.StructName}}Search true "分页获取{{.Description}}列表"
@@ -16,9 +16,9 @@ export const {{.Router}} = () => {
 
 {{- else -}}
 
-// {{.FuncName}} 等待开发的的{{.Description}}接口
+// {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
-// @Summary 等待开发的的{{.Description}}接口
+// @Summary {{.FuncDesc}}
 // @accept application/json
 // @Produce application/json
 // @Param data query {{.Package}}Req.{{.StructName}}Search true "成功"
diff --git a/server/resource/function/server.go.tpl b/server/resource/function/server.go.tpl
index da3f4fe224..1c5191c4b4 100644
--- a/server/resource/function/server.go.tpl
+++ b/server/resource/function/server.go.tpl
@@ -6,7 +6,7 @@
 {{- end}}
 {{if .IsPlugin}}
 
-// {{.FuncName}} 请实现方法
+// {{.FuncName}} {{.FuncDesc}}
 // Author [yourname](https://github.com/yourname)
 func (s *{{.Abbreviation}}) {{.FuncName}}() (err error) {
 	db := {{$db}}.Model(&model.{{.StructName}}{})
@@ -15,7 +15,7 @@ func (s *{{.Abbreviation}}) {{.FuncName}}() (err error) {
 
 {{- else -}}
 
-// {{.FuncName}} 请实现方法
+// {{.FuncName}} {{.FuncDesc}}
 // Author [yourname](https://github.com/yourname)
 func ({{.Abbreviation}}Service *{{.StructName}}Service){{.FuncName}}() (err error) {
 	// 请在这里实现自己的业务逻辑
diff --git a/web/src/view/systemTools/autoCodeAdmin/index.vue b/web/src/view/systemTools/autoCodeAdmin/index.vue
index 410d09e985..4ff10b5332 100644
--- a/web/src/view/systemTools/autoCodeAdmin/index.vue
+++ b/web/src/view/systemTools/autoCodeAdmin/index.vue
@@ -177,6 +177,9 @@
           <el-form-item label="缩写：">
             <el-input v-model="autoFunc.abbreviation" placeholder="请输入缩写" disabled />
           </el-form-item>
+          <el-form-item label="方法名：">
+            <el-input v-model="autoFunc.funcDesc" placeholder="请输入方法介绍" />
+          </el-form-item>
           <el-form-item label="方法名：">
             <el-input v-model="autoFunc.funcName" placeholder="请输入方法名" />
           </el-form-item>
@@ -238,6 +241,7 @@ const autoFunc = ref({
   humpPackageName:"",
   businessDB:"",
   method:"",
+  funcDesc: ""
 })
 
 const addFuncBtn =  (row) => {
@@ -252,6 +256,7 @@ const addFuncBtn =  (row) => {
   autoFunc.value.method = ""
   autoFunc.value.funcName = ""
   autoFunc.value.router = ""
+  autoFunc.value.funcDesc = "方法介绍"
   funcFlag.value = true;
 };
 

From 75500cfdee0a6367c12c8eb29473f27346ddcde2 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Wed, 4 Sep 2024 23:35:19 +0800
Subject: [PATCH 06/20] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=EF=BC=8C=E5=8D=87=E7=BA=A7=E4=B8=BA=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/package.json | 68 ++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/web/package.json b/web/package.json
index 5cf146f1ae..b3baa445dc 100644
--- a/web/package.json
+++ b/web/package.json
@@ -10,58 +10,58 @@
         "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit"
     },
     "dependencies": {
-        "@element-plus/icons-vue": "^2.1.0",
-        "@vue-office/docx": "^1.3.0",
-        "@vue-office/excel": "^1.4.5",
-        "@vue-office/pdf": "^1.5.3",
-        "@vueuse/core": "^10.7.2",
+        "@element-plus/icons-vue": "^2.3.1",
+        "@vue-office/docx": "^1.6.2",
+        "@vue-office/excel": "^1.7.11",
+        "@vue-office/pdf": "^2.0.2",
+        "@vueuse/core": "^11.0.3",
         "@wangeditor/editor": "^5.1.23",
         "@wangeditor/editor-for-vue": "^5.1.12",
-        "axios": "^1.4.0",
-        "core-js": "^3.31.1",
+        "axios": "^1.7.7",
+        "core-js": "^3.38.1",
         "default-passive-events": "^2.0.0",
-        "echarts": "5.4.3",
-        "element-plus": "^2.7.4",
-        "highlight.js": "^11.8.0",
+        "echarts": "5.5.1",
+        "element-plus": "^2.8.1",
+        "highlight.js": "^11.10.0",
         "js-cookie": "^3.0.5",
-        "marked": "4.3.0",
+        "marked": "14.1.1",
         "mitt": "^3.0.1",
         "nprogress": "^0.2.0",
         "path": "^0.12.7",
-        "pinia": "^2.1.4",
-        "qs": "^6.11.2",
+        "pinia": "^2.2.2",
+        "qs": "^6.13.0",
         "screenfull": "^6.0.2",
-        "sortablejs": "^1.15.2",
+        "sortablejs": "^1.15.3",
         "spark-md5": "^3.0.2",
-        "tailwindcss": "^3.3.3",
+        "tailwindcss": "^3.4.10",
         "vite-auto-import-svg": "^1.0.0",
-        "vue": "^3.4.21",
-        "vue-echarts": "^6.7.2",
-        "vue-router": "^4.3.2",
+        "vue": "^3.5.1",
+        "vue-echarts": "^7.0.3",
+        "vue-router": "^4.4.3",
         "vuedraggable": "^4.1.0"
     },
     "devDependencies": {
-        "@babel/eslint-parser": "^7.22.9",
-        "@vitejs/plugin-legacy": "^4.1.0",
-        "@vitejs/plugin-vue": "^4.2.3",
+        "@babel/eslint-parser": "^7.25.1",
+        "@vitejs/plugin-legacy": "^5.4.2",
+        "@vitejs/plugin-vue": "^5.1.3",
         "@vue/cli-plugin-babel": "~5.0.8",
         "@vue/cli-plugin-eslint": "~5.0.8",
         "@vue/cli-plugin-router": "~5.0.8",
         "@vue/cli-plugin-vuex": "~5.0.8",
         "@vue/cli-service": "~5.0.8",
-        "@vue/compiler-sfc": "^3.3.4",
-        "babel-plugin-import": "^1.13.6",
-        "chalk": "^4.1.2",
-        "dotenv": "^16.3.1",
-        "eslint": "^8.49.0",
-        "eslint-plugin-vue": "^9.15.1",
-        "sass": "^1.54.0",
-        "terser": "^5.19.1",
-        "unplugin-auto-import": "^0.16.6",
-        "unplugin-vue-components": "^0.25.1",
-        "vite": "^4.4.6",
-        "vite-plugin-banner": "^0.7.0",
+        "@vue/compiler-sfc": "^3.5.1",
+        "babel-plugin-import": "^1.13.8",
+        "chalk": "^5.3.0",
+        "dotenv": "^16.4.5",
+        "eslint": "^9.9.1",
+        "eslint-plugin-vue": "^9.28.0",
+        "sass": "^1.78.0",
+        "terser": "^5.31.6",
+        "unplugin-auto-import": "^0.18.2",
+        "unplugin-vue-components": "^0.27.4",
+        "vite": "^5.4.3",
+        "vite-plugin-banner": "^0.8.0",
         "vite-plugin-importer": "^0.2.5",
-        "vite-plugin-vue-devtools": "^7.3.7"
+        "vite-plugin-vue-devtools": "^7.4.4"
     }
 }

From 8818c25deaf37bd12540af0d48e56417d6fac641 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Wed, 4 Sep 2024 23:55:49 +0800
Subject: [PATCH 07/20] =?UTF-8?q?feature:=20=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=A2=84=E8=A7=88=E9=83=A8=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=BB=91=E5=A4=9C=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/service/system/auto_code_template.go   |  4 +-
 web/package.json                              |  1 +
 web/src/core/config.js                        | 81 ++++---------------
 .../autoCode/component/previewCodeDialg.vue   | 48 ++++++-----
 4 files changed, 47 insertions(+), 87 deletions(-)

diff --git a/server/service/system/auto_code_template.go b/server/service/system/auto_code_template.go
index 782880a884..7c55d5f856 100644
--- a/server/service/system/auto_code_template.go
+++ b/server/service/system/auto_code_template.go
@@ -200,8 +200,10 @@ func (s *autoCodeTemplate) Preview(ctx context.Context, info request.AutoCode) (
 		if len(key) > len(global.GVA_CONFIG.AutoCode.Root) {
 			key, _ = filepath.Rel(global.GVA_CONFIG.AutoCode.Root, key)
 		}
+		// 获取key的后缀 取消.
+		suffix := filepath.Ext(key)[1:]
 		var builder strings.Builder
-		builder.WriteString("```\n\n")
+		builder.WriteString("```" + suffix + "\n\n")
 		builder.WriteString(writer.String())
 		builder.WriteString("\n\n```")
 		preview[key] = builder.String()
diff --git a/web/package.json b/web/package.json
index b3baa445dc..3360335e24 100644
--- a/web/package.json
+++ b/web/package.json
@@ -25,6 +25,7 @@
         "highlight.js": "^11.10.0",
         "js-cookie": "^3.0.5",
         "marked": "14.1.1",
+        "marked-highlight": "^2.1.4",
         "mitt": "^3.0.1",
         "nprogress": "^0.2.0",
         "path": "^0.12.7",
diff --git a/web/src/core/config.js b/web/src/core/config.js
index 836cde3199..eb3eb08a69 100644
--- a/web/src/core/config.js
+++ b/web/src/core/config.js
@@ -1,7 +1,7 @@
 /**
  * 网站配置文件
  */
-import chalk from "chalk";
+const greenText = (text) => `\x1b[32m${text}\x1b[0m`;
 
 const config = {
   appName: 'Gin-Vue-Admin',
@@ -12,72 +12,19 @@ const config = {
 
 export const viteLogo = (env) => {
   if (config.showViteLogo) {
-    const chalk = require('chalk')
-    console.log(
-      chalk.green(
-        `> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin`
-      )
-    )
-    console.log(
-      chalk.green(
-        `> 当前版本:v2.7.3`
-      )
-    )
-    console.log(
-      chalk.green(
-        `> 加群方式:微信：shouzi_1994 QQ群：470239250`
-      )
-    )
-    console.log(
-      chalk.green(
-        `> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`
-      )
-    )
-    console.log(
-      chalk.green(
-        `> 插件市场:https://plugin.gin-vue-admin.com`
-      )
-    )
-    console.log(
-        chalk.green(
-            `> GVA讨论社区:https://support.qq.com/products/371961`
-        )
-    )
-    console.log(
-      chalk.green(
-        `> 默认自动化文档地址:http://127.0.0.1:${env.VITE_SERVER_PORT}/swagger/index.html`
-      )
-    )
-    console.log(
-      chalk.green(
-        `> 默认前端文件运行地址:http://127.0.0.1:${env.VITE_CLI_PORT}`
-      )
-    )
-
-    console.log(
-        chalk.green(
-            `--------------------------------------版权声明--------------------------------------`
-        )
-    )
-
-    console.log(
-        chalk.green(
-            `** 版权所有方：flipped-aurora开源团队 **`
-        )
-    )
-
-    console.log(
-        chalk.green(
-            `** 版权持有公司：北京翻转极光科技有限责任公司 **`
-        )
-    )
-
-    console.log(
-      chalk.green(
-        `** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **`
-      )
-    )
-    console.log('\n')
+    console.log(greenText(`> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin`));
+    console.log(greenText(`> 当前版本:v2.7.3`));
+    console.log(greenText(`> 加群方式:微信：shouzi_1994 QQ群：470239250`));
+    console.log(greenText(`> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`));
+    console.log(greenText(`> 插件市场:https://plugin.gin-vue-admin.com`));
+    console.log(greenText(`> GVA讨论社区:https://support.qq.com/products/371961`));
+    console.log(greenText(`> 默认自动化文档地址:http://127.0.0.1:${env.VITE_SERVER_PORT}/swagger/index.html`));
+    console.log(greenText(`> 默认前端文件运行地址:http://127.0.0.1:${env.VITE_CLI_PORT}`));
+    console.log(greenText(`--------------------------------------版权声明--------------------------------------`));
+    console.log(greenText(`** 版权所有方：flipped-aurora开源团队 **`));
+    console.log(greenText(`** 版权持有公司：北京翻转极光科技有限责任公司 **`));
+    console.log(greenText(`** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **`));
+    console.log('\n');
   }
 }
 
diff --git a/web/src/view/systemTools/autoCode/component/previewCodeDialg.vue b/web/src/view/systemTools/autoCode/component/previewCodeDialg.vue
index aa36444970..6d78672bcc 100644
--- a/web/src/view/systemTools/autoCode/component/previewCodeDialg.vue
+++ b/web/src/view/systemTools/autoCode/component/previewCodeDialg.vue
@@ -8,18 +8,30 @@
     >
       <div
         :id="key"
-        class="h-[calc(100vh-110px)] bg-white px-5 overflow-y-scroll"
+        class="h-[calc(100vh-110px)] px-5 overflow-y-scroll"
       />
     </el-tab-pane>
   </el-tabs>
 </template>
 
 <script setup>
-import { marked } from 'marked'
+import { Marked } from "marked";
+import { markedHighlight } from "marked-highlight";
 import hljs from 'highlight.js'
-import 'highlight.js/styles/atom-one-dark.css'
 import { ElMessage } from 'element-plus'
 import { onMounted, ref } from 'vue'
+import {useAppStore} from "@/pinia";
+
+const appStore = useAppStore()
+
+onMounted(() => {
+  const isDarkMode = appStore.config.darkMode === 'dark';
+  if (isDarkMode) {
+    import('highlight.js/styles/atom-one-dark.css');
+  } else {
+    import('highlight.js/styles/atom-one-light.css');
+  }
+});
 
 const props = defineProps({
   previewCode: {
@@ -32,26 +44,24 @@ const props = defineProps({
 
 const activeName = ref('')
 onMounted(() => {
-  marked.setOptions({
-    renderer: new marked.Renderer(),
-    highlight: function(code) {
-      return hljs.highlightAuto(code).value
-    },
-    pedantic: false,
-    gfm: true,
-    tables: true,
-    breaks: false,
-    sanitize: false,
-    smartLists: true,
-    smartypants: false,
-    xhtml: false,
-    langPrefix: 'hljs language-'
-  })
+  const marked = new Marked(
+      markedHighlight({
+        langPrefix: 'hljs language-',
+        highlight(code, lang, info) {
+          console.log(code,lang,info)
+          const language = hljs.getLanguage(lang) ? lang : 'plaintext';
+          if (lang === 'vue') {
+            return hljs.highlight(code, { language: 'html' }).value;
+          }
+          return hljs.highlight(code, { language }).value;
+        }
+      })
+  );
   for (const key in props.previewCode) {
     if (activeName.value === '') {
       activeName.value = key
     }
-    document.getElementById(key).innerHTML = marked(props.previewCode[key])
+    document.getElementById(key).innerHTML = marked.parse(props.previewCode[key])
   }
 })
 

From 9b90f27800e3c07f04720db9900363df7de43cf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?pixelMax=28=E5=A5=87=E6=B7=BC?= <flipped_aurora@163.com>
Date: Thu, 5 Sep 2024 10:23:38 +0800
Subject: [PATCH 08/20] =?UTF-8?q?fixed:=20=E4=BF=AE=E5=A4=8Dkeepalive?=
 =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=90=8E=E5=A4=B1=E6=95=88=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/openDocument.js                         | 1 -
 web/src/api/authority.js                    | 2 +-
 web/src/permission.js                       | 1 -
 web/src/pinia/modules/router.js             | 4 +---
 web/src/utils/asyncRouter.js                | 1 +
 web/src/view/superAdmin/api/api.vue         | 1 -
 web/src/view/systemTools/autoCode/index.vue | 1 -
 7 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/web/openDocument.js b/web/openDocument.js
index a9e65554c9..1693eeebd3 100644
--- a/web/openDocument.js
+++ b/web/openDocument.js
@@ -7,7 +7,6 @@ var child_process = require('child_process')
 
 var url = 'https://www.gin-vue-admin.com'
 var cmd = ''
-console.log(process.platform)
 switch (process.platform) {
   case 'win32':
     cmd = 'start'
diff --git a/web/src/api/authority.js b/web/src/api/authority.js
index 0401273206..61b22067aa 100644
--- a/web/src/api/authority.js
+++ b/web/src/api/authority.js
@@ -19,7 +19,7 @@ export const deleteAuthority = (data) => {
   return service({
     url: '/authority/deleteAuthority',
     method: 'post',
-    data
+    data,
   })
 }
 
diff --git a/web/src/permission.js b/web/src/permission.js
index 4938d401f9..b0c39af513 100644
--- a/web/src/permission.js
+++ b/web/src/permission.js
@@ -85,7 +85,6 @@ router.beforeEach(async(to, from) => {
   } else {
     // 不在白名单中并且已经登录的时候
     if (token) {
-      console.log(sessionStorage.getItem("needCloseAll"))
       if(sessionStorage.getItem("needToHome") === 'true') {
         sessionStorage.removeItem("needToHome")
         return { path: '/'}
diff --git a/web/src/pinia/modules/router.js b/web/src/pinia/modules/router.js
index 6859edbc93..a4bb9a45f6 100644
--- a/web/src/pinia/modules/router.js
+++ b/web/src/pinia/modules/router.js
@@ -31,9 +31,7 @@ const KeepAliveFilter = (routes) => {
   routes && routes.forEach(item => {
     // 子菜单中有 keep-alive 的，父菜单也必须 keep-alive，否则无效。这里将子菜单中有 keep-alive 的父菜单也加入。
     if ((item.children && item.children.some(ch => ch.meta.keepAlive) || item.meta.keepAlive)) {
-      const regex = /\(\) => import\("([^?]+)\??.*"\)/;
-      const match = String(item.component).match(regex);
-      const path = match ? match[1] : "";
+      const path = item.meta.path
       keepAliveRoutersArr.push(pathInfo[path])
       nameMap[item.name] = pathInfo[path]
     }
diff --git a/web/src/utils/asyncRouter.js b/web/src/utils/asyncRouter.js
index dfa62bbd1c..26c3df0a07 100644
--- a/web/src/utils/asyncRouter.js
+++ b/web/src/utils/asyncRouter.js
@@ -4,6 +4,7 @@ const pluginModules = import.meta.glob('../plugin/**/*.vue')
 export const asyncRouterHandle = (asyncRouter) => {
   asyncRouter.forEach(item => {
     if (item.component && typeof item.component === 'string') {
+      item.meta.path = "/src/"+item.component
       if (item.component.split('/')[0] === 'view') {
         item.component = dynamicImport(viewModules, item.component)
       } else if (item.component.split('/')[0] === 'plugin') {
diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
index fd81062548..9373f0e22d 100644
--- a/web/src/view/superAdmin/api/api.vue
+++ b/web/src/view/superAdmin/api/api.vue
@@ -690,7 +690,6 @@ const onSync = async() => {
   if (res.code === 0) {
     res.data.newApis.forEach(item => {
       item.apiGroup = apiGroupMap.value[item.path.split('/')[1]]
-      console.log(apiGroupMap.value)
     })
 
     syncApiData.value = res.data
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index 0c70d84120..e138aa09d2 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -1390,7 +1390,6 @@ const exportJson = () => {
 const importJson = (file) =>{
   const reader = new FileReader()
   reader.onload = (e) => {
-    console.log(e)
     try {
       form.value = JSON.parse(e.target.result)
       ElMessage.success('JSON 文件导入成功')

From 8ed441d1cbb1ef3b168a1ec2fd3bc8e290755daf Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Thu, 5 Sep 2024 22:51:56 +0800
Subject: [PATCH 09/20] =?UTF-8?q?feature:=20=E5=A2=9E=E5=8A=A0=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9F=BA=E7=A1=80=E6=A8=A1=E6=9D=BF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/model/system/request/sys_auto_code.go  |  1 +
 server/resource/package/server/api/api.go.tpl | 10 +++++++++
 .../package/server/model/model.go.tpl         |  4 ++++
 .../server/model/request/request.go.tpl       |  4 ++++
 .../package/server/router/router.go.tpl       | 13 +++++++++++-
 .../package/server/service/service.go.tpl     | 10 ++++++++-
 server/resource/package/web/api/api.js.tpl    | 17 +++++++++++++++
 server/resource/package/web/view/form.vue.tpl | 10 +++++++++
 .../resource/package/web/view/table.vue.tpl   | 13 ++++++++++++
 .../plugin/server/api/api.go.template         | 10 +++++++--
 .../plugin/server/model/model.go.template     |  4 ++++
 .../server/model/request/request.go.template  |  7 +++++--
 .../plugin/server/router/router.go.template   | 21 +++++++++++++++----
 .../plugin/server/service/service.go.template |  9 +++++++-
 .../resource/plugin/web/api/api.js.template   | 16 +++++++++++++-
 .../plugin/web/form/form.vue.template         | 10 +++++++++
 .../plugin/web/view/view.vue.template         | 13 ++++++++++++
 server/utils/verify.go                        |  2 +-
 18 files changed, 161 insertions(+), 13 deletions(-)

diff --git a/server/model/system/request/sys_auto_code.go b/server/model/system/request/sys_auto_code.go
index 2957a1fc59..ae04aa7835 100644
--- a/server/model/system/request/sys_auto_code.go
+++ b/server/model/system/request/sys_auto_code.go
@@ -25,6 +25,7 @@ type AutoCode struct {
 	AutoCreateApiToSql  bool                   `json:"autoCreateApiToSql" example:"false"`  // 是否自动创建api
 	AutoCreateMenuToSql bool                   `json:"autoCreateMenuToSql" example:"false"` // 是否自动创建menu
 	AutoCreateBtnAuth   bool                   `json:"autoCreateBtnAuth" example:"false"`   // 是否自动创建按钮权限
+	OnlyTemplate        bool                   `json:"onlyTemplate" example:"false"`        // 是否只生成模板
 	Fields              []*AutoCodeField       `json:"fields"`
 	DictTypes           []string               `json:"-"`
 	PrimaryField        *AutoCodeField         `json:"primaryField"`
diff --git a/server/resource/package/server/api/api.go.tpl b/server/resource/package/server/api/api.go.tpl
index 138a479487..43e727aa14 100644
--- a/server/resource/package/server/api/api.go.tpl
+++ b/server/resource/package/server/api/api.go.tpl
@@ -1,6 +1,7 @@
 package {{.Package}}
 
 import (
+	{{if not .OnlyTemplate}}
 	"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/{{.Package}}"
@@ -10,10 +11,16 @@ import (
     {{- if .AutoCreateResource}}
     "github.com/flipped-aurora/gin-vue-admin/server/utils"
     {{- end }}
+    {{- else}}
+    "github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+    "github.com/gin-gonic/gin"
+    {{- end}}
 )
 
 type {{.StructName}}Api struct {}
 
+{{if not .OnlyTemplate}}
+
 // Create{{.StructName}} 创建{{.Description}}
 // @Tags {{.StructName}}
 // @Summary 创建{{.Description}}
@@ -185,6 +192,8 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}DataSource(c *
 }
 {{- end }}
 
+{{- end }}
+
 // Get{{.StructName}}Public 不需要鉴权的{{.Description}}接口
 // @Tags {{.StructName}}
 // @Summary 不需要鉴权的{{.Description}}接口
@@ -196,6 +205,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}DataSource(c *
 func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}Public(c *gin.Context) {
     // 此接口不需要鉴权
     // 示例为返回了一个固定的消息接口，一般本接口用于C端服务，需要自己实现业务逻辑
+    {{.Abbreviation}}Service.Get{{.StructName}}Public()
     response.OkWithDetailed(gin.H{
        "info": "不需要鉴权的{{.Description}}接口信息",
     }, "获取成功", c)
diff --git a/server/resource/package/server/model/model.go.tpl b/server/resource/package/server/model/model.go.tpl
index 07ca697254..36d9037547 100644
--- a/server/resource/package/server/model/model.go.tpl
+++ b/server/resource/package/server/model/model.go.tpl
@@ -1,6 +1,7 @@
 // 自动生成模板{{.StructName}}
 package {{.Package}}
 
+{{- if not .OnlyTemplate}}
 import (
 	{{- if .GvaModel }}
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
@@ -12,9 +13,11 @@ import (
 	"gorm.io/datatypes"
 	{{- end }}
 )
+{{- end }}
 
 // {{.Description}} 结构体  {{.StructName}}
 type {{.StructName}} struct {
+{{- if not .OnlyTemplate}}
 {{- if .GvaModel }}
     global.GVA_MODEL
 {{- end }}
@@ -46,6 +49,7 @@ type {{.StructName}} struct {
     UpdatedBy  uint   `gorm:"column:updated_by;comment:更新者"`
     DeletedBy  uint   `gorm:"column:deleted_by;comment:删除者"`
     {{- end }}
+{{- end }}
 }
 
 {{ if .TableName }}
diff --git a/server/resource/package/server/model/request/request.go.tpl b/server/resource/package/server/model/request/request.go.tpl
index c9cefa3b0b..e97a0fd7ab 100644
--- a/server/resource/package/server/model/request/request.go.tpl
+++ b/server/resource/package/server/model/request/request.go.tpl
@@ -1,11 +1,14 @@
 package request
 
 import (
+{{- if not .OnlyTemplate }}
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	{{ if or .HasSearchTimer .GvaModel}}"time"{{ end }}
+{{- end }}
 )
 
 type {{.StructName}}Search struct{
+{{- if not .OnlyTemplate}}
 {{- if .GvaModel }}
     StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
     EndCreatedAt   *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
@@ -31,4 +34,5 @@ type {{.StructName}}Search struct{
     Sort  string `json:"sort" form:"sort"`
     Order string `json:"order" form:"order"`
     {{- end}}
+{{- end}}
 }
diff --git a/server/resource/package/server/router/router.go.tpl b/server/resource/package/server/router/router.go.tpl
index aa5e9005fb..7ad3c9ff58 100644
--- a/server/resource/package/server/router/router.go.tpl
+++ b/server/resource/package/server/router/router.go.tpl
@@ -9,9 +9,15 @@ type {{.StructName}}Router struct {}
 
 // Init{{.StructName}}Router 初始化 {{.Description}} 路由信息
 func (s *{{.StructName}}Router) Init{{.StructName}}Router(Router *gin.RouterGroup,PublicRouter *gin.RouterGroup) {
+	{{- if not .OnlyTemplate}}
 	{{.Abbreviation}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
 	{{.Abbreviation}}RouterWithoutRecord := Router.Group("{{.Abbreviation}}")
+	{{- else }}
+	// {{.Abbreviation}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
+    // {{.Abbreviation}}RouterWithoutRecord := Router.Group("{{.Abbreviation}}")
+	{{- end}}
 	{{.Abbreviation}}RouterWithoutAuth := PublicRouter.Group("{{.Abbreviation}}")
+	{{- if not .OnlyTemplate}}
 	{
 		{{.Abbreviation}}Router.POST("create{{.StructName}}", {{.Abbreviation}}Api.Create{{.StructName}})   // 新建{{.Description}}
 		{{.Abbreviation}}Router.DELETE("delete{{.StructName}}", {{.Abbreviation}}Api.Delete{{.StructName}}) // 删除{{.Description}}
@@ -26,6 +32,11 @@ func (s *{{.StructName}}Router) Init{{.StructName}}Router(Router *gin.RouterGrou
 	{{- if .HasDataSource}}
 	    {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}DataSource", {{.Abbreviation}}Api.Get{{.StructName}}DataSource)  // 获取{{.Description}}数据源
 	{{- end}}
-	    {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}Public", {{.Abbreviation}}Api.Get{{.StructName}}Public)  // 获取{{.Description}}列表
+	    {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}Public", {{.Abbreviation}}Api.Get{{.StructName}}Public)  // {{.Description}}开放接口
+	}
+	{{- else}}
+	{
+	    {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}Public", {{.Abbreviation}}Api.Get{{.StructName}}Public)  // {{.Description}}开放接口
 	}
+    {{ end }}
 }
diff --git a/server/resource/package/server/service/service.go.tpl b/server/resource/package/server/service/service.go.tpl
index b2ca1bc9e2..872e1e978c 100644
--- a/server/resource/package/server/service/service.go.tpl
+++ b/server/resource/package/server/service/service.go.tpl
@@ -1,12 +1,14 @@
 package {{.Package}}
 
 import (
+{{- if not .OnlyTemplate }}
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/{{.Package}}"
     {{.Package}}Req "github.com/flipped-aurora/gin-vue-admin/server/model/{{.Package}}/request"
     {{- if .AutoCreateResource }}
     "gorm.io/gorm"
     {{- end}}
+{{- end }}
 )
 
 type {{.StructName}}Service struct {}
@@ -18,6 +20,7 @@ type {{.StructName}}Service struct {}
  {{- $db =  printf "global.MustGetGlobalDBByDBName(\"%s\")" .BusinessDB   }}
 {{- end}}
 
+{{- if not .OnlyTemplate }}
 // Create{{.StructName}} 创建{{.Description}}记录
 // Author [piexlmax](https://github.com/piexlmax)
 func ({{.Abbreviation}}Service *{{.StructName}}Service) Create{{.StructName}}({{.Abbreviation}} *{{.Package}}.{{.StructName}}) (err error) {
@@ -151,4 +154,9 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}DataSou
 	{{- end }}
 	return
 }
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}
+func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}DataSource() {
+    // 此方法为获取数据源定义的数据
+    // 请自行实现
+}
diff --git a/server/resource/package/web/api/api.js.tpl b/server/resource/package/web/api/api.js.tpl
index cf9d553050..05b7a9837f 100644
--- a/server/resource/package/web/api/api.js.tpl
+++ b/server/resource/package/web/api/api.js.tpl
@@ -1,5 +1,6 @@
 import service from '@/utils/request'
 
+{{- if .OnlyTemplate}}
 // @Tags {{.StructName}}
 // @Summary 创建{{.Description}}
 // @Security ApiKeyAuth
@@ -111,3 +112,19 @@ export const get{{.StructName}}DataSource = () => {
   })
 }
 {{- end}}
+
+{{- end}}
+
+// @Tags {{.StructName}}
+// @Summary 不需要鉴权的{{.Description}}接口
+// @accept application/json
+// @Produce application/json
+// @Param data query {{.Package}}Req.{{.StructName}}Search true "分页获取{{.Description}}列表"
+// @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
+// @Router /{{.Abbreviation}}/get{{.StructName}}Public [get]
+export const get{{.StructName}}Public = () => {
+  return service({
+    url: '/{{.Abbreviation}}/get{{.StructName}}Public',
+    method: 'get',
+  })
+}
\ No newline at end of file
diff --git a/server/resource/package/web/view/form.vue.tpl b/server/resource/package/web/view/form.vue.tpl
index de3ecaa6f1..6ad1a4369b 100644
--- a/server/resource/package/web/view/form.vue.tpl
+++ b/server/resource/package/web/view/form.vue.tpl
@@ -1,3 +1,4 @@
+{{- if not .OnlyTemplate }}
 <template>
   <div>
     <div class="gva-form-box">
@@ -238,3 +239,12 @@ const back = () => {
 
 <style>
 </style>
+{{- else }}
+<template>
+<div>form</div>
+</template>
+<script setup>
+</script>
+<style>
+</style>
+{{- end }}
diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl
index 5f35723bdf..556cb828f8 100644
--- a/server/resource/package/web/view/table.vue.tpl
+++ b/server/resource/package/web/view/table.vue.tpl
@@ -1,5 +1,6 @@
 {{- $global := . }}
 {{- $templateID := printf "%s_%s" .Package .StructName }}
+{{- if not .OnlyTemplate}}
 <template>
   <div>
     <div class="gva-search-box">
@@ -894,3 +895,15 @@ const closeDetailShow = () => {
 }
 {{end}}
 </style>
+{{- else}}
+<template>
+<div>form</div>
+</template>
+<script setup>
+defineOptions({
+  name: '{{.StructName}}'
+})
+</script>
+<style>
+</style>
+{{- end}}
\ No newline at end of file
diff --git a/server/resource/plugin/server/api/api.go.template b/server/resource/plugin/server/api/api.go.template
index fe618caf5a..03321c74f6 100644
--- a/server/resource/plugin/server/api/api.go.template
+++ b/server/resource/plugin/server/api/api.go.template
@@ -1,6 +1,7 @@
 package api
 
 import (
+{{if not .OnlyTemplate}}
 	"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/plugin/{{.Package}}/model"
@@ -10,12 +11,16 @@ import (
     {{- if .AutoCreateResource}}
     "github.com/flipped-aurora/gin-vue-admin/server/utils"
     {{- end }}
+{{- else }}
+    "github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+    "github.com/gin-gonic/gin"
+{{- end }}
 )
 
 var {{.StructName}} = new({{.Abbreviation}})
 
 type {{.Abbreviation}} struct {}
-
+{{if not .OnlyTemplate}}
 // Create{{.StructName}} 创建{{.Description}}
 // @Tags {{.StructName}}
 // @Summary 创建{{.Description}}
@@ -186,7 +191,7 @@ func (a *{{.Abbreviation}}) Get{{.StructName}}DataSource(c *gin.Context) {
     response.OkWithData(dataSource, c)
 }
 {{- end }}
-
+{{- end }}
 // Get{{.StructName}}Public 不需要鉴权的{{.Description}}接口
 // @Tags {{.StructName}}
 // @Summary 不需要鉴权的{{.Description}}接口
@@ -197,5 +202,6 @@ func (a *{{.Abbreviation}}) Get{{.StructName}}DataSource(c *gin.Context) {
 // @Router /{{.Abbreviation}}/get{{.StructName}}Public [get]
 func (a *{{.Abbreviation}}) Get{{.StructName}}Public(c *gin.Context) {
     // 此接口不需要鉴权 示例为返回了一个固定的消息接口，一般本接口用于C端服务，需要自己实现业务逻辑
+    service{{ .StructName }}.Get{{.StructName}}Public()
     response.OkWithDetailed(gin.H{"info": "不需要鉴权的{{.Description}}接口信息"}, "获取成功", c)
 }
diff --git a/server/resource/plugin/server/model/model.go.template b/server/resource/plugin/server/model/model.go.template
index d496049af7..153ab3ba13 100644
--- a/server/resource/plugin/server/model/model.go.template
+++ b/server/resource/plugin/server/model/model.go.template
@@ -1,5 +1,6 @@
 package model
 
+{{- if not .OnlyTemplate}}
 import (
 	{{- if .GvaModel }}
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
@@ -11,9 +12,11 @@ import (
 	"gorm.io/datatypes"
 	{{- end }}
 )
+{{- end }}
 
 // {{.StructName}} {{.Description}} 结构体
 type {{.StructName}} struct {
+{{- if not .OnlyTemplate}}
 {{- if .GvaModel }}
     global.GVA_MODEL
 {{- end }}
@@ -45,6 +48,7 @@ type {{.StructName}} struct {
     UpdatedBy  uint   `gorm:"column:updated_by;comment:更新者"`
     DeletedBy  uint   `gorm:"column:deleted_by;comment:删除者"`
     {{- end }}
+    {{- end }}
 }
 
 {{ if .TableName }}
diff --git a/server/resource/plugin/server/model/request/request.go.template b/server/resource/plugin/server/model/request/request.go.template
index 8460695c53..cf2a569444 100644
--- a/server/resource/plugin/server/model/request/request.go.template
+++ b/server/resource/plugin/server/model/request/request.go.template
@@ -1,11 +1,13 @@
 package request
-
+{{- if not .OnlyTemplate}}
 import (
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	{{ if or .HasSearchTimer .GvaModel}}"time"{{ end }}
 )
-
+{{- end}}
 type {{.StructName}}Search struct{
+{{- if not .OnlyTemplate}}
+
 {{- if .GvaModel }}
     StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
     EndCreatedAt   *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
@@ -31,4 +33,5 @@ type {{.StructName}}Search struct{
     Sort  string `json:"sort" form:"sort"`
     Order string `json:"order" form:"order"`
     {{- end}}
+{{- end}}
 }
diff --git a/server/resource/plugin/server/router/router.go.template b/server/resource/plugin/server/router/router.go.template
index 429f7bf122..cc5cd2677b 100644
--- a/server/resource/plugin/server/router/router.go.template
+++ b/server/resource/plugin/server/router/router.go.template
@@ -1,7 +1,7 @@
 package router
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
+	{{if .OnlyTemplate }} // {{end}}"github.com/flipped-aurora/gin-vue-admin/server/middleware"
 	"github.com/gin-gonic/gin"
 )
 
@@ -11,6 +11,7 @@ type {{.Abbreviation}} struct {}
 
 // Init 初始化 {{.Description}} 路由信息
 func (r *{{.Abbreviation}}) Init(public *gin.RouterGroup, private *gin.RouterGroup) {
+{{- if not .OnlyTemplate }}
 	{
 	    group := private.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
 		group.POST("create{{.StructName}}", api{{.StructName}}.Create{{.StructName}})   // 新建{{.Description}}
@@ -23,11 +24,23 @@ func (r *{{.Abbreviation}}) Init(public *gin.RouterGroup, private *gin.RouterGro
 		group.GET("find{{.StructName}}", api{{.StructName}}.Find{{.StructName}})        // 根据ID获取{{.Description}}
 		group.GET("get{{.StructName}}List", api{{.StructName}}.Get{{.StructName}}List)  // 获取{{.Description}}列表
 	}
-	{{- if .HasDataSource}}
 	{
 	    group := public.Group("{{.Abbreviation}}")
+    	{{- if .HasDataSource}}
 	    group.GET("get{{.StructName}}DataSource", api{{.StructName}}.Get{{.StructName}}DataSource)  // 获取{{.Description}}数据源
-	    group.GET("get{{.StructName}}Public", api{{.StructName}}.Get{{.StructName}}Public)  // 获取{{.Description}}列表
+	    {{- end}}
+	    group.GET("get{{.StructName}}Public", api{{.StructName}}.Get{{.StructName}}Public)  // {{.Description}}开放接口
 	}
-	{{- end}}
+{{- else}}
+     // {
+	 //   group := private.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
+	 // }
+	 // {
+     //   group := private.Group("{{.Abbreviation}}")
+     // }
+    {
+	    group := public.Group("{{.Abbreviation}}")
+	    group.GET("get{{.StructName}}Public", api{{.StructName}}.Get{{.StructName}}Public)  // {{.Description}}开放接口
+    }
+{{- end}}
 }
diff --git a/server/resource/plugin/server/service/service.go.template b/server/resource/plugin/server/service/service.go.template
index 94bc95d0d8..7a43d6b948 100644
--- a/server/resource/plugin/server/service/service.go.template
+++ b/server/resource/plugin/server/service/service.go.template
@@ -1,12 +1,14 @@
 package service
 
 import (
+{{- if not .OnlyTemplate }}
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model"
     "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model/request"
     {{- if .AutoCreateResource }}
     "gorm.io/gorm"
     {{- end}}
+{{- end }}
 )
 
 var {{.StructName}} = new({{.Abbreviation}})
@@ -19,7 +21,7 @@ type {{.Abbreviation}} struct {}
 {{- else}}
  {{- $db =  printf "global.MustGetGlobalDBByDBName(\"%s\")" .BusinessDB   }}
 {{- end}}
-
+{{- if not .OnlyTemplate }}
 // Create{{.StructName}} 创建{{.Description}}记录
 // Author [piexlmax](https://github.com/piexlmax)
 func (s *{{.Abbreviation}}) Create{{.StructName}}({{.Abbreviation}} *model.{{.StructName}}) (err error) {
@@ -153,3 +155,8 @@ func (s *{{.Abbreviation}})Get{{.StructName}}DataSource() (res map[string][]map[
 	return
 }
 {{- end }}
+{{- end }}
+
+func (s *{{.Abbreviation}})Get{{.StructName}}Public() {
+
+}
\ No newline at end of file
diff --git a/server/resource/plugin/web/api/api.js.template b/server/resource/plugin/web/api/api.js.template
index cf9d553050..208f386e40 100644
--- a/server/resource/plugin/web/api/api.js.template
+++ b/server/resource/plugin/web/api/api.js.template
@@ -1,5 +1,5 @@
 import service from '@/utils/request'
-
+{{- if not .OnlyTemplate}}
 // @Tags {{.StructName}}
 // @Summary 创建{{.Description}}
 // @Security ApiKeyAuth
@@ -111,3 +111,17 @@ export const get{{.StructName}}DataSource = () => {
   })
 }
 {{- end}}
+{{- end}}
+// @Tags {{.StructName}}
+// @Summary 不需要鉴权的{{.Description}}接口
+// @accept application/json
+// @Produce application/json
+// @Param data query request.{{.StructName}}Search true "分页获取{{.Description}}列表"
+// @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
+// @Router /{{.Abbreviation}}/get{{.StructName}}Public [get]
+export const get{{.StructName}}Public = () => {
+  return service({
+    url: '/{{.Abbreviation}}/get{{.StructName}}Public',
+    method: 'get',
+  })
+}
\ No newline at end of file
diff --git a/server/resource/plugin/web/form/form.vue.template b/server/resource/plugin/web/form/form.vue.template
index 8ba44de589..882501e787 100644
--- a/server/resource/plugin/web/form/form.vue.template
+++ b/server/resource/plugin/web/form/form.vue.template
@@ -1,3 +1,4 @@
+{{- if not .OnlyTemplate}}
 <template>
   <div>
     <div class="gva-form-box">
@@ -239,3 +240,12 @@ const back = () => {
 
 <style>
 </style>
+{{- else }}
+<template>
+<div>form</div>
+</template>
+<script setup>
+</script>
+<style>
+</style>
+{{- end }}
\ No newline at end of file
diff --git a/server/resource/plugin/web/view/view.vue.template b/server/resource/plugin/web/view/view.vue.template
index 1f865822b8..05a5fb924b 100644
--- a/server/resource/plugin/web/view/view.vue.template
+++ b/server/resource/plugin/web/view/view.vue.template
@@ -1,5 +1,6 @@
 {{- $global := . }}
 {{- $templateID := printf "%s_%s" .Package .StructName }}
+{{- if not .OnlyTemplate}}
 <template>
   <div>
     <div class="gva-search-box">
@@ -900,3 +901,15 @@ const closeDetailShow = () => {
 }
 {{end}}
 </style>
+{{- else}}
+<template>
+<div>form</div>
+</template>
+<script setup>
+defineOptions({
+  name: '{{.StructName}}'
+})
+</script>
+<style>
+</style>
+{{- end}}
\ No newline at end of file
diff --git a/server/utils/verify.go b/server/utils/verify.go
index 59609079ad..43a86725f9 100644
--- a/server/utils/verify.go
+++ b/server/utils/verify.go
@@ -9,7 +9,7 @@ var (
 	RegisterVerify         = Rules{"Username": {NotEmpty()}, "NickName": {NotEmpty()}, "Password": {NotEmpty()}, "AuthorityId": {NotEmpty()}}
 	PageInfoVerify         = Rules{"Page": {NotEmpty()}, "PageSize": {NotEmpty()}}
 	CustomerVerify         = Rules{"CustomerName": {NotEmpty()}, "CustomerPhoneData": {NotEmpty()}}
-	AutoCodeVerify         = Rules{"Abbreviation": {NotEmpty()}, "StructName": {NotEmpty()}, "PackageName": {NotEmpty()}, "Fields": {NotEmpty()}}
+	AutoCodeVerify         = Rules{"Abbreviation": {NotEmpty()}, "StructName": {NotEmpty()}, "PackageName": {NotEmpty()}}
 	AutoPackageVerify      = Rules{"PackageName": {NotEmpty()}}
 	AuthorityVerify        = Rules{"AuthorityId": {NotEmpty()}, "AuthorityName": {NotEmpty()}}
 	AuthorityIdVerify      = Rules{"AuthorityId": {NotEmpty()}}

From eb6267cc515fc3505582d8c60f786d7b3d9170a3 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Thu, 5 Sep 2024 23:17:21 +0800
Subject: [PATCH 10/20] =?UTF-8?q?feature:=20=E5=A2=9E=E5=8A=A0=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E5=9F=BA=E7=A1=80=E6=A8=A1=E6=9D=BF=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/server/router/router.go.tpl       |  2 +-
 .../package/server/service/service.go.tpl     |  2 +-
 server/service/system/auto_code_template.go   | 47 ++++++++++--------
 web/src/view/systemTools/autoCode/index.vue   | 48 +++++++++++++++++--
 4 files changed, 73 insertions(+), 26 deletions(-)

diff --git a/server/resource/package/server/router/router.go.tpl b/server/resource/package/server/router/router.go.tpl
index 7ad3c9ff58..9a4ba9de02 100644
--- a/server/resource/package/server/router/router.go.tpl
+++ b/server/resource/package/server/router/router.go.tpl
@@ -1,7 +1,7 @@
 package {{.Package}}
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
+	{{if .OnlyTemplate}}// {{ end}}"github.com/flipped-aurora/gin-vue-admin/server/middleware"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/server/resource/package/server/service/service.go.tpl b/server/resource/package/server/service/service.go.tpl
index 872e1e978c..eded3ad6d1 100644
--- a/server/resource/package/server/service/service.go.tpl
+++ b/server/resource/package/server/service/service.go.tpl
@@ -156,7 +156,7 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}DataSou
 }
 {{- end }}
 {{- end }}
-func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}DataSource() {
+func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}Public() {
     // 此方法为获取数据源定义的数据
     // 请自行实现
 }
diff --git a/server/service/system/auto_code_template.go b/server/service/system/auto_code_template.go
index 7c55d5f856..52822207eb 100644
--- a/server/service/system/auto_code_template.go
+++ b/server/service/system/auto_code_template.go
@@ -85,7 +85,7 @@ func (s *autoCodeTemplate) Create(ctx context.Context, info request.AutoCode) er
 	}
 
 	// 自动创建api
-	if info.AutoCreateApiToSql {
+	if info.AutoCreateApiToSql && !info.OnlyTemplate {
 		apis := info.Apis()
 		err := global.GVA_DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
 			for _, v := range apis {
@@ -118,7 +118,7 @@ func (s *autoCodeTemplate) Create(ctx context.Context, info request.AutoCode) er
 			id = entity.ID
 		} else {
 			entity = info.Menu(autoPkg.Template)
-			if info.AutoCreateBtnAuth {
+			if info.AutoCreateBtnAuth && !info.OnlyTemplate {
 				entity.MenuBtn = []model.SysBaseMenuBtn{
 					{SysBaseMenuID: entity.ID, Name: "add", Desc: "新增"},
 					{SysBaseMenuID: entity.ID, Name: "batchDelete", Desc: "批量删除"},
@@ -231,28 +231,37 @@ func (s *autoCodeTemplate) generate(ctx context.Context, info request.AutoCode,
 		code[create] = builder
 	} // 生成文件
 	injections := make(map[string]utilsAst.Ast, len(asts))
-	if info.AutoMigrate {
-		for key, value := range asts {
-			keys := strings.Split(key, "=>")
-			if len(keys) == 2 {
-				if keys[1] == utilsAst.TypePluginInitializeV2 {
+	for key, value := range asts {
+		keys := strings.Split(key, "=>")
+		if len(keys) == 2 {
+			if keys[1] == utilsAst.TypePluginInitializeV2 {
+				continue
+			}
+			if info.OnlyTemplate {
+				if keys[1] == utilsAst.TypePackageInitializeGorm || keys[1] == utilsAst.TypePluginInitializeGorm {
 					continue
 				}
-				var builder strings.Builder
-				parse, _ := value.Parse("", &builder)
-				if parse != nil {
-					_ = value.Injection(parse)
-					err = value.Format("", &builder, parse)
-					if err != nil {
-						return nil, nil, nil, err
-					}
-					code[keys[0]] = builder
-					injections[keys[1]] = value
-					fmt.Println(keys[0], "注入成功!")
+			}
+			if !info.AutoMigrate {
+				if keys[1] == utilsAst.TypePackageInitializeGorm || keys[1] == utilsAst.TypePluginInitializeGorm {
+					continue
 				}
 			}
+			var builder strings.Builder
+			parse, _ := value.Parse("", &builder)
+			if parse != nil {
+				_ = value.Injection(parse)
+				err = value.Format("", &builder, parse)
+				if err != nil {
+					return nil, nil, nil, err
+				}
+				code[keys[0]] = builder
+				injections[keys[1]] = value
+				fmt.Println(keys[0], "注入成功!")
+			}
 		}
-	} // 注入代码
+	}
+	// 注入代码
 	return code, templates, injections, nil
 }
 
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index 0c70d84120..cb4ec308f4 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -386,6 +386,20 @@
               <el-checkbox v-model="form.autoCreateResource" />
             </el-form-item>
           </el-col>
+          <el-col :span="3">
+            <el-form-item>
+              <template #label>
+                <el-tooltip
+                    content="注：使用基础模板将不会生成任何结构体和CURD,仅仅配置enter等属性方便自行开发非CURD逻辑"
+                    placement="bottom"
+                    effect="light"
+                >
+                  <div> 基础模板 <el-icon><QuestionFilled /></el-icon> </div>
+                </el-tooltip>
+              </template>
+              <el-checkbox v-model="form.onlyTemplate" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </div>
@@ -395,6 +409,7 @@
         <el-button
           type="primary"
           @click="editAndAddField()"
+          :disabled="form.onlyTemplate"
         >
           新增字段
         </el-button>
@@ -1013,6 +1028,7 @@ const form = ref({
   autoMigrate: true,
   gvaModel: true,
   autoCreateResource: false,
+  onlyTemplate: false,
   fields: []
 })
 const rules = ref({
@@ -1125,6 +1141,9 @@ const deleteField = (index) => {
 }
 const autoCodeForm = ref(null)
 const enterForm = async(isPreview) => {
+
+  if(!form.value.onlyTemplate){
+
   if (form.value.fields.length <= 0) {
     ElMessage({
       type: 'error',
@@ -1151,22 +1170,24 @@ const enterForm = async(isPreview) => {
     return false
   }
 
-  if (form.value.package === form.value.abbreviation) {
+
+  if (form.value.fields.some(item => !item.fieldType)) {
     ElMessage({
       type: 'error',
-      message: 'package和结构体简称不可同名'
+      message: '请填写所有字段类型后进行提交'
     })
     return false
   }
 
-
-  if (form.value.fields.some(item => !item.fieldType)) {
+  if (form.value.package === form.value.abbreviation) {
     ElMessage({
       type: 'error',
-      message: '请填写所有字段类型后进行提交'
+      message: 'package和结构体简称不可同名'
     })
     return false
   }
+  }
+
 
   autoCodeForm.value.validate(async valid => {
     if (valid) {
@@ -1366,6 +1387,7 @@ const clearCatch = async () => {
     autoMigrate: true,
     gvaModel: true,
     autoCreateResource: false,
+    onlyTemplate: false,
     fields: []
   }
   await nextTick()
@@ -1402,4 +1424,20 @@ const importJson = (file) =>{
   return false
 }
 
+watch(()=>form.value.onlyTemplate,(val)=>{
+  if(val){
+    ElMessageBox.confirm('使用基础模板将不会生成任何结构体和CURD,仅仅配置enter等属性方便自行开发非CURD逻辑', '注意', {
+      confirmButtonText: '继续',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+      .then(() => {
+        form.value.fields = []
+      })
+      .catch(() => {
+        form.value.onlyTemplate = false
+      })
+  }
+})
+
 </script>

From 6239b24b9723ab9babf75ccd8a1ad904df7999fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=88=B1=E4=B8=BD-=E9=BB=91=E5=AD=90?=
 <62006632+ailiheizi@users.noreply.github.com>
Date: Fri, 6 Sep 2024 10:16:57 +0800
Subject: [PATCH 11/20] Update api.vue

fix: onReset no refresh data
---
 web/src/view/superAdmin/api/api.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue
index fd81062548..952b599fa5 100644
--- a/web/src/view/superAdmin/api/api.vue
+++ b/web/src/view/superAdmin/api/api.vue
@@ -591,6 +591,7 @@ const enterSyncDialog = async() => {
 
 const onReset = () => {
   searchInfo.value = {}
+  getTableData()
 }
 // 搜索
 

From f6dbdd13dfc72682904740d7912a29d35a2f6f5f Mon Sep 17 00:00:00 2001
From: task <121913992@qq.com>
Date: Fri, 6 Sep 2024 18:29:50 +0800
Subject: [PATCH 12/20] =?UTF-8?q?=E5=B0=86=E7=94=A8=E6=88=B7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=9D=E5=AD=98=E5=88=B0=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=EF=BC=8C=E5=88=B7=E6=96=B0=E6=88=96=E8=80=85=E5=BC=82=E5=9C=B0?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=85=8D=E7=BD=AE=E4=B8=8D=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/api/v1/system/sys_user.go      | 27 +++++++++++++++++++
 server/model/system/sys_user.go       | 28 ++++++++++----------
 server/router/system/sys_user.go      |  1 +
 server/service/system/sys_user.go     | 11 ++++++++
 server/source/system/api.go           |  1 +
 server/source/system/casbin.go        |  1 +
 web/src/api/user.js                   | 16 ++++++++++++
 web/src/pinia/modules/app.js          | 37 +++++++++++++++++----------
 web/src/pinia/modules/user.js         |  8 ++++--
 web/src/view/layout/setting/index.vue | 25 +++++++++---------
 web/src/view/login/index.vue          |  6 ++---
 11 files changed, 118 insertions(+), 43 deletions(-)

diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
index 2dc83d3676..edc7caa5f2 100644
--- a/server/api/v1/system/sys_user.go
+++ b/server/api/v1/system/sys_user.go
@@ -1,6 +1,7 @@
 package system
 
 import (
+	"gorm.io/datatypes"
 	"strconv"
 	"time"
 
@@ -415,6 +416,32 @@ func (b *BaseApi) SetSelfInfo(c *gin.Context) {
 	response.OkWithMessage("设置成功", c)
 }
 
+// SetSelfSetting
+// @Tags      SysUser
+// @Summary   设置用户配置
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      datatypes.JSON
+// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "设置用户配置"
+// @Router    /user/SetSelfSetting [put]
+func (b *BaseApi) SetSelfSetting(c *gin.Context) {
+	var req datatypes.JSON
+	err := c.ShouldBindJSON(&req)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	err = userService.SetSelfSetting(&req, utils.GetUserID(c))
+	if err != nil {
+		global.GVA_LOG.Error("设置失败!", zap.Error(err))
+		response.FailWithMessage("设置失败", c)
+		return
+	}
+	response.OkWithMessage("设置成功", c)
+}
+
 // GetUserInfo
 // @Tags      SysUser
 // @Summary   获取用户信息
diff --git a/server/model/system/sys_user.go b/server/model/system/sys_user.go
index 9a6892abc4..1af7027e1e 100644
--- a/server/model/system/sys_user.go
+++ b/server/model/system/sys_user.go
@@ -3,6 +3,7 @@ package system
 import (
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/gofrs/uuid/v5"
+	"gorm.io/datatypes"
 )
 
 type Login interface {
@@ -18,19 +19,20 @@ var _ Login = new(SysUser)
 
 type SysUser struct {
 	global.GVA_MODEL
-	UUID        uuid.UUID      `json:"uuid" gorm:"index;comment:用户UUID"`                                                     // 用户UUID
-	Username    string         `json:"userName" gorm:"index;comment:用户登录名"`                                                  // 用户登录名
-	Password    string         `json:"-"  gorm:"comment:用户登录密码"`                                                             // 用户登录密码
-	NickName    string         `json:"nickName" gorm:"default:系统用户;comment:用户昵称"`                                            // 用户昵称
-	SideMode    string         `json:"sideMode" gorm:"default:dark;comment:用户侧边主题"`                                          // 用户侧边主题
-	HeaderImg   string         `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"` // 用户头像
-	BaseColor   string         `json:"baseColor" gorm:"default:#fff;comment:基础颜色"`                                           // 基础颜色
-	AuthorityId uint           `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                        // 用户角色ID
-	Authority   SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
-	Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`
-	Phone       string         `json:"phone"  gorm:"comment:用户手机号"`                     // 用户手机号
-	Email       string         `json:"email"  gorm:"comment:用户邮箱"`                      // 用户邮箱
-	Enable      int            `json:"enable" gorm:"default:1;comment:用户是否被冻结 1正常 2冻结"` //用户是否被冻结 1正常 2冻结
+	UUID          uuid.UUID      `json:"uuid" gorm:"index;comment:用户UUID"`                                                         // 用户UUID
+	Username      string         `json:"userName" gorm:"index;comment:用户登录名"`                                                      // 用户登录名
+	Password      string         `json:"-"  gorm:"comment:用户登录密码"`                                                                 // 用户登录密码
+	NickName      string         `json:"nickName" gorm:"default:系统用户;comment:用户昵称"`                                                // 用户昵称
+	SideMode      string         `json:"sideMode" gorm:"default:dark;comment:用户侧边主题"`                                              // 用户侧边主题
+	HeaderImg     string         `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"`     // 用户头像
+	BaseColor     string         `json:"baseColor" gorm:"default:#fff;comment:基础颜色"`                                               // 基础颜色
+	AuthorityId   uint           `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                            // 用户角色ID
+	Authority     SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`              // 用户角色
+	Authorities   []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`                                         // 多用户角色
+	Phone         string         `json:"phone"  gorm:"comment:用户手机号"`                                                              // 用户手机号
+	Email         string         `json:"email"  gorm:"comment:用户邮箱"`                                                               // 用户邮箱
+	Enable        int            `json:"enable" gorm:"default:1;comment:用户是否被冻结 1正常 2冻结"`                                          //用户是否被冻结 1正常 2冻结
+	OriginSetting datatypes.JSON `json:"originSetting" form:"originSetting" gorm:"default:null;column:origin_setting;comment:配置;"` //配置
 }
 
 func (SysUser) TableName() string {
diff --git a/server/router/system/sys_user.go b/server/router/system/sys_user.go
index 35fc741aaf..6c14b82001 100644
--- a/server/router/system/sys_user.go
+++ b/server/router/system/sys_user.go
@@ -19,6 +19,7 @@ func (s *UserRouter) InitUserRouter(Router *gin.RouterGroup) {
 		userRouter.PUT("setSelfInfo", baseApi.SetSelfInfo)                // 设置自身信息
 		userRouter.POST("setUserAuthorities", baseApi.SetUserAuthorities) // 设置用户权限组
 		userRouter.POST("resetPassword", baseApi.ResetPassword)           // 设置用户权限组
+		userRouter.PUT("setSelfSetting", baseApi.SetSelfSetting)          // 用户界面配置
 	}
 	{
 		userRouterWithoutRecord.POST("getUserList", baseApi.GetUserList) // 分页获取用户列表
diff --git a/server/service/system/sys_user.go b/server/service/system/sys_user.go
index 221209f92b..3484766d1f 100644
--- a/server/service/system/sys_user.go
+++ b/server/service/system/sys_user.go
@@ -3,6 +3,7 @@ package system
 import (
 	"errors"
 	"fmt"
+	"gorm.io/datatypes"
 	"time"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
@@ -238,6 +239,16 @@ func (userService *UserService) SetSelfInfo(req system.SysUser) error {
 		Updates(req).Error
 }
 
+//@author: [piexlmax](https://github.com/piexlmax)
+//@function: SetSelfSetting
+//@description: 设置用户配置
+//@param: req datatypes.JSON, uid uint
+//@return: err error
+
+func (userService *UserService) SetSelfSetting(req *datatypes.JSON, uid uint) error {
+	return global.GVA_DB.Model(&system.SysUser{}).Where("id = ?", uid).Update("origin_setting", req).Error
+}
+
 //@author: [piexlmax](https://github.com/piexlmax)
 //@author: [SliverHorn](https://github.com/SliverHorn)
 //@function: GetUserInfo
diff --git a/server/source/system/api.go b/server/source/system/api.go
index a5f198fb29..f3affb211a 100644
--- a/server/source/system/api.go
+++ b/server/source/system/api.go
@@ -55,6 +55,7 @@ func (i *initApi) InitializeData(ctx context.Context) (context.Context, error) {
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/changePassword", Description: "修改密码（建议选择)"},
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/setUserAuthority", Description: "修改用户角色(必选)"},
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/resetPassword", Description: "重置用户密码"},
+		{ApiGroup: "系统用户", Method: "PUT", Path: "/user/setSelfSetting", Description: "用户界面配置"},
 
 		{ApiGroup: "api", Method: "POST", Path: "/api/createApi", Description: "创建api"},
 		{ApiGroup: "api", Method: "POST", Path: "/api/deleteApi", Description: "删除Api"},
diff --git a/server/source/system/casbin.go b/server/source/system/casbin.go
index a9db0047a3..bafd9ec123 100644
--- a/server/source/system/casbin.go
+++ b/server/source/system/casbin.go
@@ -85,6 +85,7 @@ func (i *initCasbin) InitializeData(ctx context.Context) (context.Context, error
 		{Ptype: "p", V0: "888", V1: "/user/setUserAuthority", V2: "POST"},
 		{Ptype: "p", V0: "888", V1: "/user/setUserAuthorities", V2: "POST"},
 		{Ptype: "p", V0: "888", V1: "/user/resetPassword", V2: "POST"},
+		{Ptype: "p", V0: "888", V1: "/user/setSelfSetting", V2: "PUT"},
 
 		{Ptype: "p", V0: "888", V1: "/fileUploadAndDownload/findFile", V2: "GET"},
 		{Ptype: "p", V0: "888", V1: "/fileUploadAndDownload/breakpointContinueFinish", V2: "POST"},
diff --git a/web/src/api/user.js b/web/src/api/user.js
index f1f3638ab9..2b357d031e 100644
--- a/web/src/api/user.js
+++ b/web/src/api/user.js
@@ -126,6 +126,22 @@ export const setSelfInfo = (data) => {
   })
 }
 
+// @Tags SysUser
+// @Summary 设置自身界面配置
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body model.SysUser true "设置自身界面配置"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
+// @Router /user/setSelfSetting [put]
+export const setSelfSetting = (data) => {
+  return service({
+    url: '/user/setSelfSetting',
+    method: 'put',
+    data: data
+  })
+}
+
 // @Tags User
 // @Summary 设置用户权限
 // @Security ApiKeyAuth
diff --git a/web/src/pinia/modules/app.js b/web/src/pinia/modules/app.js
index ddeb7f7fad..10a4b2e4af 100644
--- a/web/src/pinia/modules/app.js
+++ b/web/src/pinia/modules/app.js
@@ -4,7 +4,14 @@ import { ref, watchEffect, reactive } from 'vue'
 import originSetting from  "@/config.json"
 import {  setBodyPrimaryColor } from '@/utils/format'
 export const useAppStore = defineStore('app', () => {
-  const theme = ref(localStorage.getItem('theme')  || originSetting.darkMode || 'auto')
+
+  let selfOriginSetting = originSetting
+  const localOriginSetting = localStorage.getItem('originSetting')
+  if (localOriginSetting) {
+    selfOriginSetting = JSON.parse(localOriginSetting)
+  }
+
+  const theme = ref(localStorage.getItem('theme')  || selfOriginSetting.darkMode || 'auto')
   const device = ref("")
   const config = reactive({
     weakness: false,
@@ -20,18 +27,6 @@ export const useAppStore = defineStore('app', () => {
     side_mode : 'normal'
   })
 
-  // 初始化配置
-  Object.keys(originSetting).forEach(key => {
-      config[key] = originSetting[key]
-    if(key === 'primaryColor'){
-      setBodyPrimaryColor(originSetting[key],config.darkMode)
-    }
-  })
-
-  if (localStorage.getItem('darkMode')) {
-    config.darkMode = localStorage.getItem('darkMode')
-  }
-
 
   watchEffect(() =>{
     if (theme.value === 'dark'){
@@ -124,6 +119,22 @@ export const useAppStore = defineStore('app', () => {
     config.side_mode = e
   }
 
+  // 初始化配置
+  Object.keys(selfOriginSetting).forEach(key => {
+    config[key] = selfOriginSetting[key]
+    if(key === 'primaryColor'){
+      setBodyPrimaryColor(selfOriginSetting[key],config.darkMode)
+    }
+    if(key === 'darkMode'){
+      toggleDarkMode(config.darkMode)
+    }
+  })
+
+  const darkMode = localStorage.getItem('darkMode')
+  if (darkMode) {
+    config.darkMode = darkMode
+  }
+
   if(config.darkMode === 'auto'){
     toggleDarkModeAuto()
   }
diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js
index 9f20fd7cb5..7370c44586 100644
--- a/web/src/pinia/modules/user.js
+++ b/web/src/pinia/modules/user.js
@@ -21,16 +21,19 @@ export const useUserStore = defineStore('user', () => {
   const token = ref(window.localStorage.getItem('token') || cookie.get('x-token') || '')
   const setUserInfo = (val) => {
     userInfo.value = val
+    if(val.originSetting){
+      localStorage.setItem('originSetting', JSON.stringify(val.originSetting))
+    }
   }
 
   const setToken = (val) => {
     token.value = val
   }
 
-  const NeedInit = () => {
+  const NeedInit = async () => {
     token.value = ''
     window.localStorage.removeItem('token')
-    router.push({ name: 'Init', replace: true })
+    await router.push({name: 'Init', replace: true})
   }
 
   const ResetUserInfo = (value = {}) => {
@@ -89,6 +92,7 @@ export const useUserStore = defineStore('user', () => {
       window.localStorage.setItem('osType', 'MAC')
     }
 
+
     // 全部操作均结束，关闭loading并返回
     loadingInstance.value.close()
     return true
diff --git a/web/src/view/layout/setting/index.vue b/web/src/view/layout/setting/index.vue
index 8ab84c1165..6269171e41 100644
--- a/web/src/view/layout/setting/index.vue
+++ b/web/src/view/layout/setting/index.vue
@@ -112,14 +112,12 @@
         </div>
       </div>
 
-      <el-alert type="warning" :closable="false">
+<!--      <el-alert type="warning" :closable="false">
         请注意，所有配置请保存到本地文件的
         <el-tag>config.json</el-tag> 文件中，否则刷新页面后会丢失配置
-      </el-alert>
+      </el-alert>-->
 
-      <el-button type="primary" class="mt-4" @click="copyConfig"
-        >复制配置json</el-button
-      >
+      <el-button type="primary" class="mt-4" @click="saveConfig">保存配置</el-button>
     </div>
   </el-drawer>
 </template>
@@ -129,6 +127,7 @@ import { useAppStore } from "@/pinia";
 import { storeToRefs } from "pinia";
 import { ref, computed } from "vue";
 import { ElMessage } from "element-plus";
+import {setSelfSetting} from "@/api/user";
 const appStore = useAppStore();
 const { config, device } = storeToRefs(appStore);
 defineOptions({
@@ -169,8 +168,8 @@ const sideModes = [
   }
 ];
 
-const copyConfig = () => {
-  const input = document.createElement("textarea");
+const saveConfig = async () => {
+  /*const input = document.createElement("textarea");
   input.value = JSON.stringify(config.value);
   // 添加回车
   input.value = input.value.replace(/,/g, ",\n");
@@ -178,14 +177,16 @@ const copyConfig = () => {
   input.select();
   document.execCommand("copy");
   document.body.removeChild(input);
-  ElMessage.success("复制成功, 请自行保存到本地文件中");
+  ElMessage.success("复制成功, 请自行保存到本地文件中");*/
+  const res = await setSelfSetting(config.value)
+  if(res.code === 0){
+    localStorage.setItem('originSetting', JSON.stringify(config.value))
+    ElMessage.success('保存成功')
+    drawer.value = false
+  }
 };
 
 const customColor = ref("");
-
-const handleSideModelChange = (e) => {
-  console.log(e);
-};
 </script>
 
 <style lang="scss" scoped>
diff --git a/web/src/view/login/index.vue b/web/src/view/login/index.vue
index e64de18d1a..0a464a4f2f 100644
--- a/web/src/view/login/index.vue
+++ b/web/src/view/login/index.vue
@@ -231,7 +231,7 @@ const submitForm = () => {
         message: '请正确填写登录信息',
         showClose: true,
       })
-      loginVerify()
+      await loginVerify()
       return false
     }
 
@@ -240,7 +240,7 @@ const submitForm = () => {
 
     // 登陆失败，刷新验证码
     if (!flag) {
-      loginVerify()
+      await loginVerify()
       return false
     }
 
@@ -255,7 +255,7 @@ const checkInit = async() => {
   if (res.code === 0) {
     if (res.data?.needInit) {
       userStore.NeedInit()
-      router.push({ name: 'Init' })
+      await router.push({name: 'Init'})
     } else {
       ElMessage({
         type: 'info',

From 8d00db154ac9162eb3158910d10ee4d74fcaa0c2 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Mon, 9 Sep 2024 21:59:01 +0800
Subject: [PATCH 13/20] =?UTF-8?q?update:=20=E6=B8=85=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84userinfo=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/api/v1/system/sys_user.go  |  2 --
 server/model/system/sys_user.go   |  2 --
 server/service/system/sys_user.go |  3 +--
 web/src/pinia/modules/app.js      | 10 ++++----
 web/src/pinia/modules/user.js     | 38 +------------------------------
 5 files changed, 7 insertions(+), 48 deletions(-)

diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go
index edc7caa5f2..683b5d12e9 100644
--- a/server/api/v1/system/sys_user.go
+++ b/server/api/v1/system/sys_user.go
@@ -369,7 +369,6 @@ func (b *BaseApi) SetUserInfo(c *gin.Context) {
 		HeaderImg: user.HeaderImg,
 		Phone:     user.Phone,
 		Email:     user.Email,
-		SideMode:  user.SideMode,
 		Enable:    user.Enable,
 	})
 	if err != nil {
@@ -405,7 +404,6 @@ func (b *BaseApi) SetSelfInfo(c *gin.Context) {
 		HeaderImg: user.HeaderImg,
 		Phone:     user.Phone,
 		Email:     user.Email,
-		SideMode:  user.SideMode,
 		Enable:    user.Enable,
 	})
 	if err != nil {
diff --git a/server/model/system/sys_user.go b/server/model/system/sys_user.go
index 1af7027e1e..c10fa516fa 100644
--- a/server/model/system/sys_user.go
+++ b/server/model/system/sys_user.go
@@ -23,9 +23,7 @@ type SysUser struct {
 	Username      string         `json:"userName" gorm:"index;comment:用户登录名"`                                                      // 用户登录名
 	Password      string         `json:"-"  gorm:"comment:用户登录密码"`                                                                 // 用户登录密码
 	NickName      string         `json:"nickName" gorm:"default:系统用户;comment:用户昵称"`                                                // 用户昵称
-	SideMode      string         `json:"sideMode" gorm:"default:dark;comment:用户侧边主题"`                                              // 用户侧边主题
 	HeaderImg     string         `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"`     // 用户头像
-	BaseColor     string         `json:"baseColor" gorm:"default:#fff;comment:基础颜色"`                                               // 基础颜色
 	AuthorityId   uint           `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                            // 用户角色ID
 	Authority     SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`              // 用户角色
 	Authorities   []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`                                         // 多用户角色
diff --git a/server/service/system/sys_user.go b/server/service/system/sys_user.go
index 3484766d1f..74c5d52eba 100644
--- a/server/service/system/sys_user.go
+++ b/server/service/system/sys_user.go
@@ -214,7 +214,7 @@ func (userService *UserService) DeleteUser(id int) (err error) {
 
 func (userService *UserService) SetUserInfo(req system.SysUser) error {
 	return global.GVA_DB.Model(&system.SysUser{}).
-		Select("updated_at", "nick_name", "header_img", "phone", "email", "sideMode", "enable").
+		Select("updated_at", "nick_name", "header_img", "phone", "email", "enable").
 		Where("id=?", req.ID).
 		Updates(map[string]interface{}{
 			"updated_at": time.Now(),
@@ -222,7 +222,6 @@ func (userService *UserService) SetUserInfo(req system.SysUser) error {
 			"header_img": req.HeaderImg,
 			"phone":      req.Phone,
 			"email":      req.Email,
-			"side_mode":  req.SideMode,
 			"enable":     req.Enable,
 		}).Error
 }
diff --git a/web/src/pinia/modules/app.js b/web/src/pinia/modules/app.js
index 10a4b2e4af..187eb3ae31 100644
--- a/web/src/pinia/modules/app.js
+++ b/web/src/pinia/modules/app.js
@@ -5,11 +5,11 @@ import originSetting from  "@/config.json"
 import {  setBodyPrimaryColor } from '@/utils/format'
 export const useAppStore = defineStore('app', () => {
 
-  let selfOriginSetting = originSetting
-  const localOriginSetting = localStorage.getItem('originSetting')
-  if (localOriginSetting) {
-    selfOriginSetting = JSON.parse(localOriginSetting)
-  }
+    let selfOriginSetting = originSetting
+    const localOriginSetting = localStorage.getItem('originSetting')
+    if (localOriginSetting) {
+      selfOriginSetting = JSON.parse(localOriginSetting)
+    }
 
   const theme = ref(localStorage.getItem('theme')  || selfOriginSetting.darkMode || 'auto')
   const device = ref("")
diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js
index 7370c44586..3c89c7e05d 100644
--- a/web/src/pinia/modules/user.js
+++ b/web/src/pinia/modules/user.js
@@ -15,8 +15,6 @@ export const useUserStore = defineStore('user', () => {
     nickName: '',
     headerImg: '',
     authority: {},
-    sideMode: 'dark',
-    baseColor: '#fff'
   })
   const token = ref(window.localStorage.getItem('token') || cookie.get('x-token') || '')
   const setUserInfo = (val) => {
@@ -118,38 +116,8 @@ export const useUserStore = defineStore('user', () => {
     sessionStorage.clear()
     window.localStorage.removeItem('token')
     cookie.remove('x-token')
+    localStorage.removeItem('originSetting')
   }
-  /* 设置侧边栏模式*/
-  const changeSideMode = async(data) => {
-    const res = await setSelfInfo({ sideMode: data })
-    if (res.code === 0) {
-      userInfo.value.sideMode = data
-      ElMessage({
-        type: 'success',
-        message: '设置成功'
-      })
-    }
-  }
-
-  const mode = computed(() => userInfo.value.sideMode)
-  const sideMode = computed(() => {
-    if (userInfo.value.sideMode === 'dark') {
-      return '#191a23'
-    } else if (userInfo.value.sideMode === 'light') {
-      return '#fff'
-    } else {
-      return userInfo.value.sideMode
-    }
-  })
-  const baseColor = computed(() => {
-    if (userInfo.value.sideMode === 'dark') {
-      return '#fff'
-    } else if (userInfo.value.sideMode === 'light') {
-      return '#191a23'
-    } else {
-      return userInfo.value.baseColor
-    }
-  })
 
   watch(() => token.value, () => {
     window.localStorage.setItem('token', token.value)
@@ -163,11 +131,7 @@ export const useUserStore = defineStore('user', () => {
     GetUserInfo,
     LoginIn,
     LoginOut,
-    changeSideMode,
-    mode,
-    sideMode,
     setToken,
-    baseColor,
     loadingInstance,
     ClearStorage
   }

From 95cd59fc6e2b04aa731615a0eb96726c252e4ec6 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Mon, 9 Sep 2024 22:15:41 +0800
Subject: [PATCH 14/20] =?UTF-8?q?fixed:=20=E6=B8=85=E7=90=86=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E9=98=B6=E6=AE=B5=E9=A1=B5=E9=9D=A2=E6=97=A0=E7=AB=AF?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5404=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/vitePlugin/componentName/index.js | 32 +--------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/web/vitePlugin/componentName/index.js b/web/vitePlugin/componentName/index.js
index 36c23ea784..72ddcacc17 100644
--- a/web/vitePlugin/componentName/index.js
+++ b/web/vitePlugin/componentName/index.js
@@ -55,49 +55,19 @@ const vueFilePathPlugin = (outputFilePath) => {
         });
     };
 
-    const injectBeforeUnloadScript = () => {
-        if (process.env.NODE_ENV === 'development') {
-            return {
-                name: 'inject-before-unload-script',
-                transformIndexHtml(html) {
-                    return html.replace(
-                        '</body>',
-                        `<script>
-                        const isWindowActive = () => !document.hidden;
-                        window.addEventListener('beforeunload', function () {
-                            if (!isWindowActive()) {
-                                return;
-                            }
-                            fetch('/generate-path-name-map');
-                        });
-                    </script></body>`
-                    );
-                }
-            };
-        }
-        return {}
-    };
+
 
     return {
         name: 'vue-file-path-plugin',
         configResolved(resolvedConfig) {
             root = resolvedConfig.root;
         },
-        configureServer(server) {
-            if (process.env.NODE_ENV === 'development') {
-                server.middlewares.use('/generate-path-name-map', (req, res) => {
-                    generatePathNameMap();
-                    res.end('Path name map generated');
-                });
-            }
-        },
         buildEnd() {
             generatePathNameMap();
             if (process.env.NODE_ENV === 'development') {
                 watchDirectoryChanges();
             }
         },
-        ...injectBeforeUnloadScript()
     };
 }
 

From d1cab0664a60b827f3682e4b8cf9975f5dac3c7b Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Mon, 9 Sep 2024 22:55:48 +0800
Subject: [PATCH 15/20] =?UTF-8?q?feature:=20=E5=89=8D=E7=AB=AF=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98=E9=85=8D=E7=BD=AE=E8=B7=9F=E9=9A=8F=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E5=8D=95=E7=8B=AC=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?json=E7=BC=96=E8=AF=91=E7=94=9F=E6=95=88=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/config.json           | 10 ----
 web/src/pinia/modules/app.js  | 95 ++++++++++++++++-------------------
 web/src/pinia/modules/user.js |  7 ++-
 3 files changed, 49 insertions(+), 63 deletions(-)
 delete mode 100644 web/src/config.json

diff --git a/web/src/config.json b/web/src/config.json
deleted file mode 100644
index 08d2aebee6..0000000000
--- a/web/src/config.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{"weakness":false,
-  "grey":false,
-  "primaryColor":"#3b82f6",
-  "showTabs":true,
-  "darkMode":"auto",
-  "layout_side_width":200,
-  "layout_side_collapsed_width":60,
-  "layout_side_item_height":44,
-  "show_watermark":true,
-  "side_mode":"normal"}
diff --git a/web/src/pinia/modules/app.js b/web/src/pinia/modules/app.js
index 187eb3ae31..fbbdf256d4 100644
--- a/web/src/pinia/modules/app.js
+++ b/web/src/pinia/modules/app.js
@@ -1,44 +1,24 @@
 
 import { defineStore } from 'pinia'
 import { ref, watchEffect, reactive } from 'vue'
-import originSetting from  "@/config.json"
 import {  setBodyPrimaryColor } from '@/utils/format'
 export const useAppStore = defineStore('app', () => {
 
-    let selfOriginSetting = originSetting
-    const localOriginSetting = localStorage.getItem('originSetting')
-    if (localOriginSetting) {
-      selfOriginSetting = JSON.parse(localOriginSetting)
-    }
-
-  const theme = ref(localStorage.getItem('theme')  || selfOriginSetting.darkMode || 'auto')
   const device = ref("")
   const config = reactive({
     weakness: false,
     grey: false,
-    primaryColor: '#79B6E7',
+    primaryColor: '#3b82f6',
     showTabs: true,
-    darkMode: 'light',
+    darkMode: 'auto',
     layout_side_width : 256,
     layout_side_collapsed_width : 80,
     layout_side_item_height : 48,
-    show_watermark: false,
-
+    show_watermark: true,
     side_mode : 'normal'
   })
 
-
-  watchEffect(() =>{
-    if (theme.value === 'dark'){
-      document.documentElement.classList.add('dark');
-      document.documentElement.classList.remove('light');
-      localStorage.setItem('theme', 'dark');
-    }else{
-        document.documentElement.classList.add('light');
-        document.documentElement.classList.remove('dark');
-        localStorage.setItem('theme', 'light');
-    }
-  })
+  const theme = ref(localStorage.getItem('theme')  || 'auto')
 
   const toggleTheme = (dark) => {
     if (dark) {
@@ -50,25 +30,14 @@ export const useAppStore = defineStore('app', () => {
 
   const toggleWeakness = (e) => {
     config.weakness = e;
-    if(e) {
-      document.documentElement.classList.add('html-weakenss');
-    }else{
-      document.documentElement.classList.remove('html-weakenss');
-    }
   }
 
   const toggleGrey = (e) => {
     config.grey = e;
-    if(e) {
-      document.documentElement.classList.add('html-grey');
-    }else{
-        document.documentElement.classList.remove('html-grey');
-    }
   }
 
   const togglePrimaryColor = (e) => {
     config.primaryColor = e;
-    setBodyPrimaryColor(e,config.darkMode)
   }
 
   const toggleTabs = (e) => {
@@ -81,12 +50,6 @@ export const useAppStore = defineStore('app', () => {
 
   const toggleDarkMode = (e) => {
     config.darkMode = e
-    localStorage.setItem('darkMode', e)
-    if(e === 'dark'){
-      toggleTheme(true)
-    }else{
-      toggleTheme(false)
-    }
   }
 
   const toggleDarkModeAuto = () =>{
@@ -119,17 +82,6 @@ export const useAppStore = defineStore('app', () => {
     config.side_mode = e
   }
 
-  // 初始化配置
-  Object.keys(selfOriginSetting).forEach(key => {
-    config[key] = selfOriginSetting[key]
-    if(key === 'primaryColor'){
-      setBodyPrimaryColor(selfOriginSetting[key],config.darkMode)
-    }
-    if(key === 'darkMode'){
-      toggleDarkMode(config.darkMode)
-    }
-  })
-
   const darkMode = localStorage.getItem('darkMode')
   if (darkMode) {
     config.darkMode = darkMode
@@ -141,6 +93,45 @@ export const useAppStore = defineStore('app', () => {
 
     toggleGrey(config.grey)
 
+  watchEffect(() => {
+    if (theme.value === 'dark') {
+      document.documentElement.classList.add('dark');
+      document.documentElement.classList.remove('light');
+      localStorage.setItem('theme', 'dark');
+    } else {
+      document.documentElement.classList.add('light');
+      document.documentElement.classList.remove('dark');
+      localStorage.setItem('theme', 'light');
+    }
+  })
+  watchEffect(() => {
+    // 色弱模式监听处理
+    if (config.weakness) {
+      document.documentElement.classList.add('html-weakenss');
+    } else {
+      document.documentElement.classList.remove('html-weakenss');
+    }
+  })
+  watchEffect(() => {
+    // 灰色模式监听处理
+    if (config.grey) {
+      document.documentElement.classList.add('html-grey');
+    } else {
+      document.documentElement.classList.remove('html-grey');
+    }
+  })
+
+  watchEffect(() => {
+
+    setBodyPrimaryColor(config.primaryColor,config.darkMode)
+    localStorage.setItem('darkMode', config.darkMode)
+    if(config.darkMode === 'dark'){
+      toggleTheme(true)
+    }else{
+      toggleTheme(false)
+    }
+  })
+
   return {
     theme,
     device,
diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js
index 3c89c7e05d..a803b857a4 100644
--- a/web/src/pinia/modules/user.js
+++ b/web/src/pinia/modules/user.js
@@ -7,7 +7,10 @@ import { ref, computed, watch } from 'vue'
 import { useRouterStore } from './router'
 import cookie from 'js-cookie'
 
+import {useAppStore} from "@/pinia";
+
 export const useUserStore = defineStore('user', () => {
+  const appStore = useAppStore()
   const loadingInstance = ref(null)
 
   const userInfo = ref({
@@ -20,7 +23,9 @@ export const useUserStore = defineStore('user', () => {
   const setUserInfo = (val) => {
     userInfo.value = val
     if(val.originSetting){
-      localStorage.setItem('originSetting', JSON.stringify(val.originSetting))
+      Object.keys(appStore.config).forEach(key => {
+        appStore.config[key] = val.originSetting[key]
+      })
     }
   }
 

From 011a1393a538a1d0943c16a0f178119d25edcec7 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Mon, 9 Sep 2024 23:08:47 +0800
Subject: [PATCH 16/20] =?UTF-8?q?feature:=20=E5=A2=9E=E5=8A=A0=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E9=85=8D=E7=BD=AE=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

---
 web/src/pinia/modules/app.js | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/web/src/pinia/modules/app.js b/web/src/pinia/modules/app.js
index fbbdf256d4..91e222e721 100644
--- a/web/src/pinia/modules/app.js
+++ b/web/src/pinia/modules/app.js
@@ -18,7 +18,7 @@ export const useAppStore = defineStore('app', () => {
     side_mode : 'normal'
   })
 
-  const theme = ref(localStorage.getItem('theme')  || 'auto')
+  const theme = ref( 'auto')
 
   const toggleTheme = (dark) => {
     if (dark) {
@@ -82,26 +82,13 @@ export const useAppStore = defineStore('app', () => {
     config.side_mode = e
   }
 
-  const darkMode = localStorage.getItem('darkMode')
-  if (darkMode) {
-    config.darkMode = darkMode
-  }
-
-  if(config.darkMode === 'auto'){
-    toggleDarkModeAuto()
-  }
-
-    toggleGrey(config.grey)
-
   watchEffect(() => {
     if (theme.value === 'dark') {
       document.documentElement.classList.add('dark');
       document.documentElement.classList.remove('light');
-      localStorage.setItem('theme', 'dark');
     } else {
       document.documentElement.classList.add('light');
       document.documentElement.classList.remove('dark');
-      localStorage.setItem('theme', 'light');
     }
   })
   watchEffect(() => {
@@ -121,10 +108,13 @@ export const useAppStore = defineStore('app', () => {
     }
   })
 
+
+
   watchEffect(() => {
+    if(config.darkMode === 'auto'){
+      toggleDarkModeAuto()
+    }
 
-    setBodyPrimaryColor(config.primaryColor,config.darkMode)
-    localStorage.setItem('darkMode', config.darkMode)
     if(config.darkMode === 'dark'){
       toggleTheme(true)
     }else{
@@ -132,6 +122,10 @@ export const useAppStore = defineStore('app', () => {
     }
   })
 
+  watchEffect(() => {
+    setBodyPrimaryColor(config.primaryColor, theme.value)
+  })
+
   return {
     theme,
     device,

From 8443a6f7a3f8bb60919b5bffca61328077786cbb Mon Sep 17 00:00:00 2001
From: sliboy <sliboy@hotmail.com>
Date: Wed, 11 Sep 2024 09:16:21 +0800
Subject: [PATCH 17/20] =?UTF-8?q?fix(package):=20=E5=8C=85=E5=90=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=B8=AD=E6=96=87=E4=BC=9A=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C=E7=A6=81=E6=AD=A2=E5=8C=85=E5=90=8D?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/systemTools/autoPkg/autoPkg.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/web/src/view/systemTools/autoPkg/autoPkg.vue b/web/src/view/systemTools/autoPkg/autoPkg.vue
index eeac1804e2..6a1f7efedd 100644
--- a/web/src/view/systemTools/autoPkg/autoPkg.vue
+++ b/web/src/view/systemTools/autoPkg/autoPkg.vue
@@ -170,8 +170,10 @@ const getTemplates = async ()=>{
 
 getTemplates()
 
-const validateNum = (rule, value, callback) => {
-  if ((/^\d+$/.test(value[0]))) {
+const validateData = (rule, value, callback) => {
+  if (/[\u4E00-\u9FA5]/g.test(value)) {
+    callback(new Error('不能为中文'))
+  } else if ((/^\d+$/.test(value[0]))) {
     callback(new Error('不能够以数字开头'))
   } else {
     callback()
@@ -181,11 +183,11 @@ const validateNum = (rule, value, callback) => {
 const rules = ref({
   packageName: [
     { required: true, message: '请输入包名', trigger: 'blur' },
-    { validator: validateNum, trigger: 'blur' }
+    { validator: validateData, trigger: 'blur' }
   ],
   template:[
     { required: true, message: '请选择模板', trigger: 'change' },
-    { validator: validateNum, trigger: 'blur' }
+    { validator: validateData, trigger: 'blur' }
   ]
 })
 

From 8d8c2d8ee9b829f9d068780c02b5167d3e8dbd9f Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Wed, 11 Sep 2024 20:38:05 +0800
Subject: [PATCH 18/20] =?UTF-8?q?feature:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/utils/format.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/utils/format.js b/web/src/utils/format.js
index 4fd9ad80df..0cf75dc633 100644
--- a/web/src/utils/format.js
+++ b/web/src/utils/format.js
@@ -101,7 +101,7 @@ function addOpacityToColor(u, opacity) {
 }
 
 
-export const setBodyPrimaryColor = (  primaryColor, darkMode ) =>{
+export const setBodyPrimaryColor = (primaryColor, darkMode) =>{
 
   let fmtColorFunc = generateAllColors
   if (darkMode === 'light') {

From 702e0e97fc339e048df41028b0360c8af8fb3412 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Thu, 12 Sep 2024 20:37:28 +0800
Subject: [PATCH 19/20] =?UTF-8?q?feature:=20=E5=AF=B9=E4=B8=A5=E6=A0=BC?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=96=B0=E5=BB=BA=E6=A0=B9=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/api/v1/system/sys_authority.go          |  4 ++++
 web/src/view/init/index.vue                    | 18 +++++++-----------
 .../view/superAdmin/authority/authority.vue    |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/server/api/v1/system/sys_authority.go b/server/api/v1/system/sys_authority.go
index cd87022647..b34fc3a0b4 100644
--- a/server/api/v1/system/sys_authority.go
+++ b/server/api/v1/system/sys_authority.go
@@ -36,6 +36,10 @@ func (a *AuthorityApi) CreateAuthority(c *gin.Context) {
 		return
 	}
 
+	if *authority.ParentId == 0 && global.GVA_CONFIG.System.UseStrictAuth {
+		authority.ParentId = utils.Pointer(utils.GetUserAuthorityId(c))
+	}
+
 	if authBack, err = authorityService.CreateAuthority(authority); err != nil {
 		global.GVA_LOG.Error("创建失败!", zap.Error(err))
 		response.FailWithMessage("创建失败"+err.Error(), c)
diff --git a/web/src/view/init/index.vue b/web/src/view/init/index.vue
index dab6484f36..c60473110d 100644
--- a/web/src/view/init/index.vue
+++ b/web/src/view/init/index.vue
@@ -191,6 +191,7 @@ const goDoc = () => {
 const out = ref(false)
 
 const form = reactive({
+  adminPassword: '123456',
   dbType: 'mysql',
   host: '127.0.0.1',
   port: '3306',
@@ -204,7 +205,7 @@ const changeDB = (val) => {
   switch (val) {
     case 'mysql':
       Object.assign(form, {
-        adminPassword:'',
+        adminPassword:'123456',
         reAdminPassword:'',
         dbType: 'mysql',
         host: '127.0.0.1',
@@ -217,8 +218,7 @@ const changeDB = (val) => {
       break
     case 'pgsql':
       Object.assign(form, {
-        adminPassword:'',
-        reAdminPassword:'',
+        adminPassword:'123456',
         dbType: 'pgsql',
         host: '127.0.0.1',
         port: '5432',
@@ -230,8 +230,7 @@ const changeDB = (val) => {
       break
     case 'oracle':
       Object.assign(form, {
-        adminPassword:'',
-        reAdminPassword:'',
+        adminPassword:'123456',
         dbType: 'oracle',
         host: '127.0.0.1',
         port: '1521',
@@ -243,8 +242,7 @@ const changeDB = (val) => {
       break
     case 'mssql':
       Object.assign(form, {
-        adminPassword:'',
-        reAdminPassword:'',
+        adminPassword:'123456',
         dbType: 'mssql',
         host: '127.0.0.1',
         port: '1433',
@@ -256,8 +254,7 @@ const changeDB = (val) => {
       break
     case 'sqlite':
       Object.assign(form, {
-        adminPassword:'',
-        reAdminPassword:'',
+        adminPassword:'123456',
         dbType: 'sqlite',
         host: '',
         port: '',
@@ -269,8 +266,7 @@ const changeDB = (val) => {
       break
     default:
       Object.assign(form, {
-        adminPassword:'',
-        reAdminPassword:'',
+        adminPassword:'123456',
         dbType: 'mysql',
         host: '127.0.0.1',
         port: '3306',
diff --git a/web/src/view/superAdmin/authority/authority.vue b/web/src/view/superAdmin/authority/authority.vue
index d69f0ea67e..f40969ff00 100644
--- a/web/src/view/superAdmin/authority/authority.vue
+++ b/web/src/view/superAdmin/authority/authority.vue
@@ -201,7 +201,7 @@ const mustUint = (rule, value, callback) => {
 const AuthorityOption = ref([
   {
     authorityId: 0,
-    authorityName: '根角色'
+    authorityName: '根角色/严格模式下为当前角色'
   }
 ])
 const drawer = ref(false)
@@ -384,7 +384,7 @@ const setOptions = () => {
   AuthorityOption.value = [
     {
       authorityId: 0,
-      authorityName: '根角色'
+      authorityName: '根角色(严格模式下为当前用户角色)'
     }
   ]
   setAuthorityOptions(tableData.value, AuthorityOption.value, false)

From 485acef93eaca3e315ed1680cb939a4c41fcb328 Mon Sep 17 00:00:00 2001
From: pixelmaxQM <flipped_aurora@163.com>
Date: Thu, 12 Sep 2024 20:45:14 +0800
Subject: [PATCH 20/20] =?UTF-8?q?feature:=20=E7=89=88=E6=9C=AC=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E4=B8=BA2.7.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/server.go    | 4 ++--
 server/docs/docs.go      | 2 +-
 server/docs/swagger.json | 2 +-
 server/docs/swagger.yaml | 2 +-
 server/main.go           | 2 +-
 web/package.json         | 2 +-
 web/src/core/config.js   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/core/server.go b/server/core/server.go
index 4654dbc55a..3eabba4283 100644
--- a/server/core/server.go
+++ b/server/core/server.go
@@ -17,7 +17,7 @@ func RunWindowsServer() {
 		// 初始化redis服务
 		initialize.Redis()
 	}
-	
+
 	initialize.RedisList()
 
 	if global.GVA_CONFIG.System.UseMongo {
@@ -41,7 +41,7 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	欢迎使用 gin-vue-admin
-	当前版本:v2.7.3
+	当前版本:v2.7.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 7c16f61395..87f3feca1f 100644
--- a/server/docs/docs.go
+++ b/server/docs/docs.go
@@ -8087,7 +8087,7 @@ const docTemplate = `{
 
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = &swag.Spec{
-	Version:          "v2.7.3",
+	Version:          "v2.7.4",
 	Host:             "",
 	BasePath:         "",
 	Schemes:          []string{},
diff --git a/server/docs/swagger.json b/server/docs/swagger.json
index ff089bee4c..5c27ada772 100644
--- a/server/docs/swagger.json
+++ b/server/docs/swagger.json
@@ -4,7 +4,7 @@
         "description": "使用gin+vue进行极速开发的全栈开发基础平台",
         "title": "Gin-Vue-Admin Swagger API接口文档",
         "contact": {},
-        "version": "v2.7.3"
+        "version": "v2.7.4"
     },
     "paths": {
         "/api/createApi": {
diff --git a/server/docs/swagger.yaml b/server/docs/swagger.yaml
index a048f2fb8d..789d4db8aa 100644
--- a/server/docs/swagger.yaml
+++ b/server/docs/swagger.yaml
@@ -1634,7 +1634,7 @@ info:
   contact: {}
   description: 使用gin+vue进行极速开发的全栈开发基础平台
   title: Gin-Vue-Admin Swagger API接口文档
-  version: v2.7.3
+  version: v2.7.4
 paths:
   /api/createApi:
     post:
diff --git a/server/main.go b/server/main.go
index 4cb2bacb4f..38ad106211 100644
--- a/server/main.go
+++ b/server/main.go
@@ -15,7 +15,7 @@ import (
 //go:generate go mod download
 
 // @title                       Gin-Vue-Admin Swagger API接口文档
-// @version                     v2.7.3
+// @version                     v2.7.4
 // @description                 使用gin+vue进行极速开发的全栈开发基础平台
 // @securityDefinitions.apikey  ApiKeyAuth
 // @in                          header
diff --git a/web/package.json b/web/package.json
index 3360335e24..8dc92c1e1b 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
     "name": "gin-vue-admin",
-    "version": "2.7.3",
+    "version": "2.7.4",
     "private": true,
     "scripts": {
         "serve": "node openDocument.js && vite --host --mode development",
diff --git a/web/src/core/config.js b/web/src/core/config.js
index eb3eb08a69..65c80f27d1 100644
--- a/web/src/core/config.js
+++ b/web/src/core/config.js
@@ -13,7 +13,7 @@ const config = {
 export const viteLogo = (env) => {
   if (config.showViteLogo) {
     console.log(greenText(`> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin`));
-    console.log(greenText(`> 当前版本:v2.7.3`));
+    console.log(greenText(`> 当前版本:v2.7.4`));
     console.log(greenText(`> 加群方式:微信：shouzi_1994 QQ群：470239250`));
     console.log(greenText(`> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`));
     console.log(greenText(`> 插件市场:https://plugin.gin-vue-admin.com`));