flipped-aurora · pixelmaxQm · Sep 12, 2024 · Aug 15, 2024 · Aug 28, 2024 · Aug 29, 2024
diff --git 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/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/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"
 
@@ -368,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 {
@@ -404,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 {
@@ -415,6 +414,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/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
@@ -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
@@ -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
@@ -17,6 +17,9 @@ func RunWindowsServer() {
 		// 初始化redis服务
 		initialize.Redis()
 	}
+
+	initialize.RedisList()
+
 	if global.GVA_CONFIG.System.UseMongo {
 		err := initialize.Mongo.Initialization()
 		if err != nil {
@@ -38,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
@@ -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
@@ -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
@@ -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/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
@@ -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
 }
diff --git 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/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"`
@@ -236,6 +237,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/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,18 @@ 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:用户昵称"`                                                // 用户昵称
+	HeaderImg     string         `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;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/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
@@ -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 "成功"