Revert "fix:修复文件上传进度显示bug&按钮样式优化 (#1979)"

This reverts commit d4c2ba5.

.gitignore

@@ -1,3 +1,4 @@
+.idea/
 /web/node_modules
 /web/dist
 
@@ -32,11 +33,3 @@ server/uploads/
 *.iml
 web/.pnpm-debug.log
 web/pnpm-lock.yaml
-
-# binary files
-*.exe
-
-# SQLite database files
-*.db
-*.sqlite
-*.sqlite3

Makefile

@@ -13,9 +13,16 @@ CONFIG_FILE         = config.yaml
 IMAGE_NAME          = gva
 #镜像地址
 REPOSITORY          = registry.cn-hangzhou.aliyuncs.com/${IMAGE_NAME}
-#镜像版本
-TAGS_OPT           ?= latest
-PLUGIN             ?= email
+
+ifeq ($(TAGS_OPT),)
+TAGS_OPT            = latest
+else
+endif
+
+ifeq ($(PLUGIN),)
+PLUGIN            = email
+else
+endif
 
 #容器环境前后端共同打包
 build: build-web build-server
@@ -41,7 +48,7 @@ build-image-server:
 build-local:
 	if [ -d "build" ];then rm -rf build; else echo "OK!"; fi \
 	&& if [ -f "/.dockerenv" ];then echo "OK!"; else  make build-web-local && make build-server-local; fi \
-	&& mkdir build && cp -r web/dist build/ && cp server/server build/ && cp -r server/resource build/resource
+	&& mkdir build && cp -r web/dist build/ && cp server/server build/ && cp -r server/resource build/resource 
 
 #本地环境打包前端
 build-web-local:
@@ -56,17 +63,13 @@ build-server-local:
 	&& go build -ldflags "-B 0x$(shell head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -X main.Version=${TAGS_OPT}" -v
 
 #打包前后端二合一镜像
-image: build
+image: build 
 	docker build -t ${REPOSITORY}/gin-vue-admin:${TAGS_OPT} -f deploy/docker/Dockerfile .
 
 #尝鲜版
 images: build build-image-web build-image-server
 	docker build -t ${REPOSITORY}/all:${TAGS_OPT} -f deploy/docker/Dockerfile .
-
-#swagger 文档生成
-doc:
-	@cd server && swag init
-
+
 #插件快捷打包： make plugin PLUGIN="这里是插件文件夹名称,默认为email"
 plugin:
 	if [ -d ".plugin" ];then rm -rf .plugin ; else echo "OK!"; fi && mkdir -p .plugin/${PLUGIN}/{server/plugin,web/plugin} \

server/api/v1/system/sys_export_template.go

@@ -213,7 +213,7 @@ func (sysExportTemplateApi *SysExportTemplateApi) ExportExcel(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Router /sysExportTemplate/ExportTemplate [get]
+// @Router /sysExportTemplate/exportExcel [get]
 func (sysExportTemplateApi *SysExportTemplateApi) ExportTemplate(c *gin.Context) {
 	templateID := c.Query("templateID")
 	if templateID == "" {

server/core/server.go

@@ -39,8 +39,8 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	欢迎使用 gin-vue-admin
-	当前版本:v2.7.8
-	加群方式:微信号：shouzi_1994 QQ群：470239250
+	当前版本:v2.7.8-beta1
+    加群方式:微信号：shouzi_1994 QQ群：470239250
 	项目地址：https://github.com/flipped-aurora/gin-vue-admin
 	插件市场:https://plugin.gin-vue-admin.com
 	GVA讨论社区:https://support.qq.com/products/371961

server/initialize/internal/gorm.go

@@ -6,6 +6,8 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
+	"log"
+	"os"
 	"time"
 )
 
@@ -32,7 +34,7 @@ func (g *_gorm) Config(prefix string, singular bool) *gorm.Config {
 		general = global.GVA_CONFIG.Mysql.GeneralDB
 	}
 	return &gorm.Config{
-		Logger: logger.New(NewWriter(general), logger.Config{
+		Logger: logger.New(NewWriter(general, log.New(os.Stdout, "\r\n", log.LstdFlags)), logger.Config{
 			SlowThreshold: 200 * time.Millisecond,
 			LogLevel:      general.LogLevel(),
 			Colorful:      true,

server/initialize/internal/gorm_logger_writer.go

@@ -3,7 +3,7 @@ package internal
 import (
 	"fmt"
 	"github.com/flipped-aurora/gin-vue-admin/server/config"
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"go.uber.org/zap"
 	"gorm.io/gorm/logger"
 )
 
@@ -12,30 +12,26 @@ type Writer struct {
 	writer logger.Writer
 }
 
-func NewWriter(config config.GeneralDB) *Writer {
-	return &Writer{config: config}
+func NewWriter(config config.GeneralDB, writer logger.Writer) *Writer {
+	return &Writer{config: config, writer: writer}
 }
 
 // Printf 格式化打印日志
 func (c *Writer) Printf(message string, data ...any) {
-
-	// 当有日志时候均需要输出到控制台
-	fmt.Printf(message, data...)
-
-	// 当开启了zap的情况，会打印到日志记录
 	if c.config.LogZap {
 		switch c.config.LogLevel() {
 		case logger.Silent:
-			global.GVA_LOG.Debug(fmt.Sprintf(message, data...))
+			zap.L().Debug(fmt.Sprintf(message, data...))
 		case logger.Error:
-			global.GVA_LOG.Error(fmt.Sprintf(message, data...))
+			zap.L().Error(fmt.Sprintf(message, data...))
 		case logger.Warn:
-			global.GVA_LOG.Warn(fmt.Sprintf(message, data...))
+			zap.L().Warn(fmt.Sprintf(message, data...))
 		case logger.Info:
-			global.GVA_LOG.Info(fmt.Sprintf(message, data...))
+			zap.L().Info(fmt.Sprintf(message, data...))
 		default:
-			global.GVA_LOG.Info(fmt.Sprintf(message, data...))
+			zap.L().Info(fmt.Sprintf(message, data...))
 		}
 		return
 	}
+	c.writer.Printf(message, data...)
 }

server/main.go

@@ -13,15 +13,8 @@ import (
 //go:generate go mod tidy
 //go:generate go mod download
 
-// 这部分 @Tag 设置用于排序, 需要排序的接口请按照下面的格式添加
-// swag init 对 @Tag 只会从入口文件解析, 默认 main.go
-// 也可通过 --generalInfo flag 指定其他文件
-// @Tag.Name        Base
-// @Tag.Name        SysUser
-// @Tag.Description 用户
-
 // @title                       Gin-Vue-Admin Swagger API接口文档
-// @version                     v2.7.8
+// @version                     v2.7.8-beta1
 // @description                 使用gin+vue进行极速开发的全栈开发基础平台
 // @securityDefinitions.apikey  ApiKeyAuth
 // @in                          header

server/middleware/limit_ip.go

@@ -27,7 +27,7 @@ type LimitConfig struct {
 func (l LimitConfig) LimitWithTime() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		if err := l.CheckOrMark(l.GenerationKey(c), l.Expire, l.Limit); err != nil {
-			c.JSON(http.StatusOK, gin.H{"code": response.ERROR, "msg": err.Error()})
+			c.JSON(http.StatusOK, gin.H{"code": response.ERROR, "msg": err})
 			c.Abort()
 			return
 		} else {

server/plugin/announcement/model/info.go

@@ -8,10 +8,10 @@ import (
 // Info 公告 结构体
 type Info struct {
 	global.GVA_MODEL
-	Title       string         `json:"title" form:"title" gorm:"column:title;comment:公告标题;"`                                              //标题
-	Content     string         `json:"content" form:"content" gorm:"column:content;comment:公告内容;type:text;"`                              //内容
-	UserID      *int           `json:"userID" form:"userID" gorm:"column:user_id;comment:发布者;"`                                           //作者
-	Attachments datatypes.JSON `json:"attachments" form:"attachments" gorm:"column:attachments;comment:相关附件;" swaggertype:"array,object"` //附件
+	Title       string         `json:"title" form:"title" gorm:"column:title;comment:公告标题;"`                                             //标题
+	Content     string         `json:"content" form:"content" gorm:"column:content;comment:公告内容;type:text;"`                             //内容
+	UserID      *int           `json:"userID" form:"userID" gorm:"column:user_id;comment:发布者;"`                                          //作者
+	Attachments datatypes.JSON `json:"attachments" form:"attachments" gorm:"column:attachments;comment:相关附件;"swaggertype:"array,object"` //附件
 }
 
 // TableName 公告 Info自定义表名 gva_announcements_info

server/resource/function/api.go.tpl

@@ -2,7 +2,7 @@
 // {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
 // @Summary {{.FuncDesc}}
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
 // @Router /{{.Abbreviation}}/{{.Router}} [{{.Method}}]
@@ -22,7 +22,7 @@ func (a *{{.Abbreviation}}) {{.FuncName}}(c *gin.Context) {
 // {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
 // @Summary {{.FuncDesc}}
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Param data query {{.Package}}Req.{{.StructName}}Search true "成功"
 // @Success 200 {object} response.Response{data=object,msg=string} "成功"
@@ -37,4 +37,4 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api){{.FuncName}}(c *gin.Context) {
    	}
    	response.OkWithData("返回数据",c)
 }
-{{end}}
+{{end}}

server/resource/function/api.js.tpl

@@ -2,7 +2,7 @@
 // {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
 // @Summary {{.FuncDesc}}
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
 // @Router /{{.Abbreviation}}/{{.Router}} [{{.Method}}]
@@ -18,7 +18,7 @@ export const {{.Router}} = () => {
 // {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
 // @Summary {{.FuncDesc}}
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{data=object,msg=string} "成功"
 // @Router /{{.Abbreviation}}/{{.Router}} [{{.Method}}]
@@ -29,4 +29,4 @@ export const {{.Router}} = () => {
   })
 }
 
-{{- end -}}
+{{- end -}}

server/resource/package/server/api/api.go.tpl

@@ -27,7 +27,7 @@ type {{.StructName}}Api struct {}
 // @Tags {{.StructName}}
 // @Summary 创建{{.Description}}
 // @Security ApiKeyAuth
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Param data body {{.Package}}.{{.StructName}} true "创建{{.Description}}"
 // @Success 200 {object} response.Response{msg=string} "创建成功"
@@ -55,7 +55,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Create{{.StructName}}(c *gin.Con
 // @Tags {{.StructName}}
 // @Summary 删除{{.Description}}
 // @Security ApiKeyAuth
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Param data body {{.Package}}.{{.StructName}} true "删除{{.Description}}"
 // @Success 200 {object} response.Response{msg=string} "删除成功"
@@ -78,7 +78,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}(c *gin.Con
 // @Tags {{.StructName}}
 // @Summary 批量删除{{.Description}}
 // @Security ApiKeyAuth
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{msg=string} "批量删除成功"
 // @Router /{{.Abbreviation}}/delete{{.StructName}}ByIds [delete]
@@ -100,7 +100,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}ByIds(c *gi
 // @Tags {{.StructName}}
 // @Summary 更新{{.Description}}
 // @Security ApiKeyAuth
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Param data body {{.Package}}.{{.StructName}} true "更新{{.Description}}"
 // @Success 200 {object} response.Response{msg=string} "更新成功"
@@ -128,9 +128,9 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Con
 // @Tags {{.StructName}}
 // @Summary 用id查询{{.Description}}
 // @Security ApiKeyAuth
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
-// @Param {{.PrimaryField.FieldJson}} query {{.PrimaryField.FieldType}} true "用id查询{{.Description}}"
+// @Param data query {{.Package}}.{{.StructName}} true "用id查询{{.Description}}"
 // @Success 200 {object} response.Response{data={{.Package}}.{{.StructName}},msg=string} "查询成功"
 // @Router /{{.Abbreviation}}/find{{.StructName}} [get]
 func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Context) {
@@ -149,7 +149,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Conte
 // @Tags {{.StructName}}
 // @Summary 分页获取{{.Description}}列表
 // @Security ApiKeyAuth
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
 // @Router /{{.Abbreviation}}/get{{.StructName}}List [get]
@@ -167,7 +167,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Co
 // @Tags {{.StructName}}
 // @Summary 分页获取{{.Description}}列表
 // @Security ApiKeyAuth
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Param data query {{.Package}}Req.{{.StructName}}Search true "分页获取{{.Description}}列表"
 // @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
@@ -198,7 +198,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Co
 // Get{{.StructName}}DataSource 获取{{.StructName}}的数据源
 // @Tags {{.StructName}}
 // @Summary 获取{{.StructName}}的数据源
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{data=object,msg=string} "查询成功"
 // @Router /{{.Abbreviation}}/get{{.StructName}}DataSource [get]
@@ -219,7 +219,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}DataSource(c *
 // Get{{.StructName}}Public 不需要鉴权的{{.Description}}接口
 // @Tags {{.StructName}}
 // @Summary 不需要鉴权的{{.Description}}接口
-// @Accept application/json
+// @accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
 // @Router /{{.Abbreviation}}/get{{.StructName}}Public [get]