+ Update codebase from v2.7.8 to v2.7.9.

+ Update translations.

README.md

@@ -2,6 +2,7 @@
 <div align=center>
 <img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width="300" height="300" />
 </div>
+
 <div align=center>
 <img src="https://img.shields.io/badge/golang-1.20-blue"/>
 <img src="https://img.shields.io/badge/gin-1.9.1-lightBlue"/>
@@ -10,6 +11,10 @@
 <img src="https://img.shields.io/badge/gorm-1.25.2-red"/>
 </div>
 
+<div align=center>
+<a href="https://trendshift.io/repositories/3250" target="_blank"><img src="https://trendshift.io/api/badge/repositories/3250" alt="Calcium-Ion%2Fnew-api | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+</div>
+
 [English](./README-en.md) | 简体中文
 
 ## ✨一分钟生成前后端基础代码

server/api/v1/example/enter.go

@@ -5,9 +5,11 @@ import "github.com/flipped-aurora/gin-vue-admin/server/service"
 type ApiGroup struct {
 	CustomerApi
 	FileUploadAndDownloadApi
+	AttachmentCategoryApi
 }
 
 var (
 	customerService              = service.ServiceGroupApp.ExampleServiceGroup.CustomerService
 	fileUploadAndDownloadService = service.ServiceGroupApp.ExampleServiceGroup.FileUploadAndDownloadService
+	attachmentCategoryService    = service.ServiceGroupApp.ExampleServiceGroup.AttachmentCategoryService
 )

server/api/v1/example/exa_attachment_category.go

@@ -0,0 +1,82 @@
+package example
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type AttachmentCategoryApi struct{}
+
+// GetCategoryList
+// @Tags      GetCategoryList
+// @Summary   媒体库分类列表
+// @Security  AttachmentCategory
+// @Produce   application/json
+// @Success   200   {object}  response.Response{data=example.ExaAttachmentCategory,msg=string}  "媒体库分类列表"
+// @Router    /attachmentCategory/getCategoryList [get]
+func (a *AttachmentCategoryApi) GetCategoryList(c *gin.Context) {
+	res, err := attachmentCategoryService.GetCategoryList()
+	if err != nil {
+		global.GVA_LOG.Error("获取分类列表失败!", zap.Error(err))
+		response.FailWithMessage("获取分类列表失败", c)
+		return
+	}
+	response.OkWithData(res, c)
+}
+
+// AddCategory
+// @Tags      AddCategory
+// @Summary   添加媒体库分类
+// @Security  AttachmentCategory
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      example.ExaAttachmentCategory  true  "媒体库分类数据"// @Success   200   {object}  response.Response{msg=string}   "添加媒体库分类"
+// @Router    /attachmentCategory/addCategory [post]
+func (a *AttachmentCategoryApi) AddCategory(c *gin.Context) {
+	var req example.ExaAttachmentCategory
+	if err := c.ShouldBindJSON(&req); err != nil {
+		global.GVA_LOG.Error("参数错误!", zap.Error(err))
+		response.FailWithMessage("参数错误", c)
+		return
+	}
+
+	if err := attachmentCategoryService.AddCategory(&req); err != nil {
+		global.GVA_LOG.Error("创建/更新失败!", zap.Error(err))
+		response.FailWithMessage("创建/更新失败："+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("创建/更新成功", c)
+}
+
+// DeleteCategory
+// @Tags      DeleteCategory
+// @Summary   删除分类
+// @Security  AttachmentCategory
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      common.GetById                true  "分类id"
+// @Success   200   {object}  response.Response{msg=string}  "删除分类"
+// @Router    /attachmentCategory/deleteCategory [post]
+func (a *AttachmentCategoryApi) DeleteCategory(c *gin.Context) {
+	var req common.GetById
+	if err := c.ShouldBindJSON(&req); err != nil {
+		response.FailWithMessage("参数错误", c)
+		return
+	}
+
+	if req.ID == 0 {
+		response.FailWithMessage("参数错误", c)
+		return
+	}
+
+	if err := attachmentCategoryService.DeleteCategory(&req.ID); err != nil {
+		response.FailWithMessage("删除失败", c)
+		return
+	}
+
+	response.OkWithMessage("删除成功", c)
+}

server/api/v1/example/exa_file_upload_download.go

@@ -2,12 +2,13 @@ package example
 
 import (
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/example/request"
 	exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
+	"strconv"
 )
 
 type FileUploadAndDownloadApi struct{}
@@ -25,12 +26,13 @@ func (b *FileUploadAndDownloadApi) UploadFile(c *gin.Context) {
 	var file example.ExaFileUploadAndDownload
 	noSave := c.DefaultQuery("noSave", "0")
 	_, header, err := c.Request.FormFile("file")
+	classId, _ := strconv.Atoi(c.DefaultPostForm("classId", "0"))
 	if err != nil {
 		global.GVA_LOG.Error(global.Translate("api.example.exa_breakpoint_continue.fileFail"), zap.Error(err))
 		response.FailWithMessage(global.Translate("api.example.exa_breakpoint_continue.fileFail"), c)
 		return
 	}
-	file, err = fileUploadAndDownloadService.UploadFile(header, noSave) // 文件上传后拿到文件路径
+	file, err = fileUploadAndDownloadService.UploadFile(header, noSave, classId) // 文件上传后拿到文件路径
 	if err != nil {
 		global.GVA_LOG.Error(global.Translate("api.example.exa_breakpoint_continue.modifyDatabaseConnectionFail"), zap.Error(err))
 		response.FailWithMessage(global.Translate("api.example.exa_breakpoint_continue.modifyDatabaseConnectionFail"), c)
@@ -85,11 +87,11 @@ func (b *FileUploadAndDownloadApi) DeleteFile(c *gin.Context) {
 // @Security  ApiKeyAuth
 // @accept    application/json
 // @Produce   application/json
-// @Param     data  body      request.PageInfo                                        true  "页码, 每页大小"
+// @Param     data  body      request.ExaAttachmentCategorySearch                                        true  "页码, 每页大小, 分类id"
 // @Success   200   {object}  response.Response{data=response.PageResult,msg=string}  "分页文件列表,返回包括列表,总数,页码,每页数量"
 // @Router    /fileUploadAndDownload/getFileList [post]
 func (b *FileUploadAndDownloadApi) GetFileList(c *gin.Context) {
-	var pageInfo request.PageInfo
+	var pageInfo request.ExaAttachmentCategorySearch
 	err := c.ShouldBindJSON(&pageInfo)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)

server/api/v1/system/sys_user.go

@@ -4,16 +4,14 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/flipped-aurora/gin-vue-admin/server/model/common"
-
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
 	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
-
 	"github.com/gin-gonic/gin"
 	"github.com/redis/go-redis/v9"
 	"go.uber.org/zap"
@@ -258,17 +256,17 @@ func (b *BaseApi) SetUserAuthority(c *gin.Context) {
 		return
 	}
 	claims := utils.GetUserInfo(c)
-	j := &utils.JWT{SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey)} // 唯一签名
 	claims.AuthorityId = sua.AuthorityId
-	if token, err := j.CreateToken(*claims); err != nil {
+	token, err := utils.NewJWT().CreateToken(*claims)
+	if err != nil {
 		global.GVA_LOG.Error(global.Translate("general.modifyFail"), zap.Error(err))
 		response.FailWithMessage(err.Error(), c)
-	} else {
-		c.Header("new-token", token)
-		c.Header("new-expires-at", strconv.FormatInt(claims.ExpiresAt.Unix(), 10))
-		utils.SetToken(c, token, int((claims.ExpiresAt.Unix()-time.Now().Unix())/60))
-		response.OkWithMessage(global.Translate("general.modifySuccess"), c)
+		return
 	}
+	c.Header("new-token", token)
+	c.Header("new-expires-at", strconv.FormatInt(claims.ExpiresAt.Unix(), 10))
+	utils.SetToken(c, token, int((claims.ExpiresAt.Unix()-time.Now().Unix())/60))
+	response.OkWithMessage(global.Translate("general.modifySuccess"), c)
 }
 
 // SetUserAuthorities

server/core/server.go

@@ -40,7 +40,7 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	%s gin-vue-admin
-	%s: v2.7.8
+	%s: v2.7.9
 	%s
 	%s: https://github.com/flipped-aurora/gin-vue-admin
 	%s: https://plugin.gin-vue-admin.com