Merge remote-tracking branch 'origin/main'

server/core/server.go

@@ -42,7 +42,7 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	欢迎使用 gin-vue-admin
-	当前版本:v2.5.9
+	当前版本:v2.6.0
     加群方式:微信号：shouzi_1994 QQ群：622360840
 	插件市场:https://plugin.gin-vue-admin.com
 	GVA讨论社区:https://support.qq.com/products/371961

server/docs/docs.go

@@ -7001,7 +7001,7 @@ const docTemplate = `{
 
 // SwaggerInfo holds exported Swagger Info so clients can modify it
 var SwaggerInfo = &swag.Spec{
-	Version:          "v2.5.9",
+	Version:          "v2.6.0",
 	Host:             "",
 	BasePath:         "",
 	Schemes:          []string{},

server/docs/swagger.json

@@ -4,7 +4,7 @@
         "description": "使用gin+vue进行极速开发的全栈开发基础平台",
         "title": "Gin-Vue-Admin Swagger API接口文档",
         "contact": {},
-        "version": "v2.5.9"
+        "version": "v2.6.0"
     },
     "paths": {
         "/api/createApi": {
@@ -6989,4 +6989,4 @@
             "in": "header"
         }
     }
-}
+}

server/docs/swagger.yaml

@@ -1585,7 +1585,7 @@ info:
   contact: {}
   description: 使用gin+vue进行极速开发的全栈开发基础平台
   title: Gin-Vue-Admin Swagger API接口文档
-  version: v2.5.9
+  version: v2.6.0
 paths:
   /api/createApi:
     post:

server/initialize/router.go

@@ -1,17 +1,35 @@
 package initialize
 
 import (
-	swaggerFiles "github.com/swaggo/files"
-	"net/http"
-
 	"github.com/flipped-aurora/gin-vue-admin/server/docs"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
 	"github.com/flipped-aurora/gin-vue-admin/server/router"
 	"github.com/gin-gonic/gin"
+	swaggerFiles "github.com/swaggo/files"
 	ginSwagger "github.com/swaggo/gin-swagger"
+	"net/http"
+	"os"
 )
 
+type justFilesFilesystem struct {
+	fs http.FileSystem
+}
+
+func (fs justFilesFilesystem) Open(name string) (http.File, error) {
+	f, err := fs.fs.Open(name)
+	if err != nil {
+		return nil, err
+	}
+
+	stat, err := f.Stat()
+	if stat.IsDir() {
+		return nil, os.ErrPermission
+	}
+
+	return f, nil
+}
+
 // 初始化总路由
 
 func Routers() *gin.Engine {
@@ -35,11 +53,10 @@ func Routers() *gin.Engine {
 	// VUE_APP_BASE_PATH = http://localhost
 	// 然后执行打包命令 npm run build。在打开下面3行注释
 	//Router.Static("/favicon.ico", "./dist/favicon.ico")
-	//Router.Static("/static", "./dist/static")   // dist里面的静态资源
+	//Router.Static("/assets", "./dist/assets")   // dist里面的静态资源
 	//Router.StaticFile("/", "./dist/index.html") // 前端网页入口页面
 
-	Router.StaticFS(global.GVA_CONFIG.Local.StorePath, http.Dir(global.GVA_CONFIG.Local.StorePath)) // 为用户头像和文件提供静态地址
-	// Router.Use(middleware.LoadTls())  // 如果需要使用https 请打开此中间件 然后前往 core/server.go 将启动模式 更变为 Router.RunTLS("端口","你的cre/pem文件","你的key文件")
+	Router.StaticFS(global.GVA_CONFIG.Local.StorePath, justFilesFilesystem{http.Dir(global.GVA_CONFIG.Local.StorePath)}) // Router.Use(middleware.LoadTls())  // 如果需要使用https 请打开此中间件 然后前往 core/server.go 将启动模式 更变为 Router.RunTLS("端口","你的cre/pem文件","你的key文件")
 	// 跨域，如需跨域可以打开下面的注释
 	// Router.Use(middleware.Cors()) // 直接放行全部跨域请求
 	// Router.Use(middleware.CorsByRules()) // 按照配置的规则放行跨域请求

server/main.go

@@ -14,7 +14,7 @@ import (
 //go:generate go mod download
 
 // @title                       Gin-Vue-Admin Swagger API接口文档
-// @version                     v2.5.9
+// @version                     v2.6.0
 // @description                 使用gin+vue进行极速开发的全栈开发基础平台
 // @securityDefinitions.apikey  ApiKeyAuth
 // @in                          header

server/service/system/sys_api.go

@@ -144,8 +144,15 @@ func (apiService *ApiService) UpdateApi(api system.SysApi) (err error) {
 	var oldA system.SysApi
 	err = global.GVA_DB.Where("id = ?", api.ID).First(&oldA).Error
 	if oldA.Path != api.Path || oldA.Method != api.Method {
-		if !errors.Is(global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&system.SysApi{}).Error, gorm.ErrRecordNotFound) {
-			return errors.New("存在相同api路径")
+		var duplicateApi system.SysApi
+		if err := global.GVA_DB.Where("path = ? AND method = ?", api.Path, api.Method).First(&duplicateApi).Error; err != nil {
+			if !errors.Is(err, gorm.ErrRecordNotFound) {
+				return err
+			}
+		} else {
+			if duplicateApi.ID != api.ID {
+				return errors.New("存在相同api路径")
+			}
 		}
 	}
 	if err != nil {

server/service/system/sys_export_template.go

@@ -134,7 +134,7 @@ func (sysExportTemplateService *SysExportTemplateService) ExportExcel(templateID
 	}
 	for i, row := range rows {
 		for j, colCell := range row {
-			err := f.SetCellValue("Sheet1", fmt.Sprintf("%s%d", string('A'+j), i+1), colCell)
+			err := f.SetCellValue("Sheet1", fmt.Sprintf("%s%d", getColumnName(j), i+1), colCell)
 			if err != nil {
 				return nil, "", err
 			}
@@ -179,7 +179,7 @@ func (sysExportTemplateService *SysExportTemplateService) ExportTemplate(templat
 		tableTitle = append(tableTitle, templateInfoMap[key])
 	}
 	for i := range tableTitle {
-		fErr := f.SetCellValue("Sheet1", fmt.Sprintf("%s%d", string('A'+i), 1), tableTitle[i])
+		fErr := f.SetCellValue("Sheet1", fmt.Sprintf("%s%d", getColumnName(i), 1), tableTitle[i])
 		if fErr != nil {
 			return nil, "", fErr
 		}
@@ -245,3 +245,13 @@ func (sysExportTemplateService *SysExportTemplateService) ImportExcel(templateID
 		return nil
 	})
 }
+
+func getColumnName(n int) string {
+	columnName := ""
+	for n > 0 {
+		n--
+		columnName = string(rune('A'+n%26)) + columnName
+		n /= 26
+	}
+	return columnName
+}

server/service/system/sys_menu.go

@@ -64,7 +64,7 @@ func (menuService *MenuService) getMenuTreeMap(authorityId uint) (treeMap map[st
 		btnMap[v.SysMenuID][v.SysBaseMenuBtn.Name] = authorityId
 	}
 	for _, v := range allMenus {
-		v.Btns = btnMap[v.ID]
+		v.Btns = btnMap[v.SysBaseMenu.ID]
 		treeMap[v.ParentId] = append(treeMap[v.ParentId], v)
 	}
 	return treeMap, err