v2.5.1 beta2 (#1048)

* 修复日志中间件报文过大的报错问题

* 修复 Token 失效后导致的白屏问题

* 增加自动创建插件模板功能

* 密码加密方式改为 hash

* 增加刷新防抖

Co-authored-by: songzhibin97 <[email protected]>
Co-authored-by: icedays <[email protected]>
Co-authored-by: hedeqiang <[email protected]>

Author: 4 people

server/api/v1/system/sys_auto_code.go

@@ -211,3 +211,26 @@ func (autoApi *AutoCodeApi) DelPackage(c *gin.Context) {
 		response.OkWithMessage("删除成功", c)
 	}
 }
+
+// DelPackage
+// @Tags AutoCode
+// @Summary 创建插件模板
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysAutoCode true "创建插件模板"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "创建插件模板成功"
+// @Router /autoCode/createPlug [post]
+func (autoApi *AutoCodeApi) AutoPlug(c *gin.Context) {
+	var a system.AutoPlugReq
+	_ = c.ShouldBindJSON(&a)
+	a.Snake = strings.ToLower(a.PlugName)
+	a.NeedModel = a.HasRequest || a.HasResponse
+	err := autoCodeService.CreatePlug(a)
+	if err != nil {
+		global.GVA_LOG.Error("预览失败!", zap.Error(err))
+		response.FailWithMessage("预览失败", c)
+	} else {
+		response.Ok(c)
+	}
+}

server/config.yaml

@@ -111,6 +111,7 @@ autocode:
   # 请不要手动配置,他会在项目加载的时候识别出根路径
   root: ""
   server: /server
+  server-plug: /plugin/%s
   server-api: /api/v1/%s
   server-initialize: /initialize
   server-model: /model/%s

server/config/auto_code.go

@@ -5,6 +5,7 @@ type Autocode struct {
 	Root            string `mapstructure:"root" json:"root" yaml:"root"`
 	Server          string `mapstructure:"server" json:"server" yaml:"server"`
 	SApi            string `mapstructure:"server-api" json:"server-api" yaml:"server-api"`
+	SPlug           string `mapstructure:"server-plug" json:"server-plug" yaml:"server-plug"`
 	SInitialize     string `mapstructure:"server-initialize" json:"server-initialize" yaml:"server-initialize"`
 	SModel          string `mapstructure:"server-model" json:"server-model" yaml:"server-model"`
 	SRequest        string `mapstructure:"server-request" json:"server-request"  yaml:"server-request"`

server/middleware/operation.go

@@ -8,6 +8,7 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
@@ -21,6 +22,14 @@ import (
 
 var operationRecordService = service.ServiceGroupApp.SystemServiceGroup.OperationRecordService
 
+var respPool sync.Pool
+
+func init() {
+	respPool.New = func() interface{} {
+		return make([]byte, 1024)
+	}
+}
+
 func OperationRecord() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		var body []byte
@@ -64,12 +73,18 @@ func OperationRecord() gin.HandlerFunc {
 			Body:   string(body),
 			UserID: userId,
 		}
+
 		// 上传文件时候 中间件日志进行裁断操作
 		if strings.Index(c.GetHeader("Content-Type"), "multipart/form-data") > -1 {
-			if len(record.Body) > 512 {
-				record.Body = "File or Length out of limit"
+			if len(record.Body) > 1024 {
+				// 截断
+				newBody := respPool.Get().([]byte)
+				copy(newBody, record.Body)
+				record.Body = string(newBody)
+				defer respPool.Put(newBody[:0])
 			}
 		}
+
 		writer := responseBodyWriter{
 			ResponseWriter: c.Writer,
 			body:           &bytes.Buffer{},
@@ -85,6 +100,24 @@ func OperationRecord() gin.HandlerFunc {
 		record.Latency = latency
 		record.Resp = writer.body.String()
 
+		if strings.Index(c.Writer.Header().Get("Pragma"), "public") > -1 ||
+			strings.Index(c.Writer.Header().Get("Expires"), "0") > -1 ||
+			strings.Index(c.Writer.Header().Get("Cache-Control"), "must-revalidate, post-check=0, pre-check=0") > -1 ||
+			strings.Index(c.Writer.Header().Get("Content-Type"), "application/force-download") > -1 ||
+			strings.Index(c.Writer.Header().Get("Content-Type"), "application/octet-stream") > -1 ||
+			strings.Index(c.Writer.Header().Get("Content-Type"), "application/vnd.ms-excel") > -1 ||
+			strings.Index(c.Writer.Header().Get("Content-Type"), "application/download") > -1 ||
+			strings.Index(c.Writer.Header().Get("Content-Disposition"), "attachment") > -1 ||
+			strings.Index(c.Writer.Header().Get("Content-Transfer-Encoding"), "binary") > -1 {
+			if len(record.Resp) > 1024 {
+				// 截断
+				newBody := respPool.Get().([]byte)
+				copy(newBody, record.Resp)
+				record.Body = string(newBody)
+				defer respPool.Put(newBody[:0])
+			}
+		}
+
 		if err := operationRecordService.CreateSysOperationRecord(record); err != nil {
 			global.GVA_LOG.Error("create operation record error:", zap.Error(err))
 		}

server/model/system/sys_auto_code.go

@@ -17,8 +17,8 @@ type AutoCodeStruct struct {
 	AutoMoveFile       bool     `json:"autoMoveFile"`       // 是否自动移动文件
 	Fields             []*Field `json:"fields"`
 	DictTypes          []string `json:"-"`
-	Package			string   `json:"package"`
-	PackageT		string  	`json:"-"`
+	Package            string   `json:"package"`
+	PackageT           string   `json:"-"`
 }
 
 type Field struct {
@@ -38,6 +38,31 @@ var AutoMoveErr error = errors.New("创建代码成功并移动文件成功")
 type SysAutoCode struct {
 	global.GVA_MODEL
 	PackageName string `json:"packageName" gorm:"comment:包名"`
-	Label        string `json:"label" gorm:"comment:展示名"`
+	Label       string `json:"label" gorm:"comment:展示名"`
 	Desc        string `json:"desc" gorm:"comment:描述"`
 }
+
+type AutoPlugReq struct {
+	PlugName    string `json:"plugName"` // 必然大写开头
+	Snake       string `json:"snake"`    // 后端自动转为 snake
+	RouterGroup string `json:"routerGroup"`
+	HasGlobal   bool   `json:"hasGlobal"`
+	HasRequest  bool   `json:"hasRequest"`
+	HasResponse bool   `json:"hasResponse"`
+	NeedModel   bool   `json:"needModel"`
+	Global      []struct {
+		Key  string `json:"key"`
+		Type string `json:"type"`
+		Desc string `json:"desc"`
+	} `json:"global"`
+	Request []struct {
+		Key  string `json:"key"`
+		Type string `json:"type"`
+		Desc string `json:"desc"`
+	} `json:"request"`
+	Response []struct {
+		Key  string `json:"key"`
+		Type string `json:"type"`
+		Desc string `json:"desc"`
+	} `json:"response"`
+}