Merge branch 'i18n' of https://github.com/flipped-aurora/gin-vue-admin into i18n

Author: MohamedHassanNasr

server/api/v1/system/sys_user.go

@@ -200,11 +200,11 @@ func (b *BaseApi) ChangePassword(c *gin.Context) {
 // @Security  ApiKeyAuth
 // @accept    application/json
 // @Produce   application/json
-// @Param     data  body      request.PageInfo                                        true  "页码, 每页大小"
+// @Param     data  body      systemReq.GetUserList                                        true  "页码, 每页大小"
 // @Success   200   {object}  response.Response{data=response.PageResult,msg=string}  "分页获取用户列表,返回包括列表,总数,页码,每页数量"
 // @Router    /user/getUserList [post]
 func (b *BaseApi) GetUserList(c *gin.Context) {
-	var pageInfo request.PageInfo
+	var pageInfo systemReq.GetUserList
 	err := c.ShouldBindJSON(&pageInfo)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)

server/core/server.go

@@ -32,7 +32,6 @@ func RunWindowsServer() {
 	}
 
 	Router := initialize.Routers()
-	Router.Static("/form-generator", "./resource/page")
 
 	address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)
 	s := initServer(address, Router)
@@ -41,7 +40,7 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	%s gin-vue-admin
-	%s:v2.7.4
+	%s:v2.7.5
     加群方式:微信号：shouzi_1994 QQ群：470239250
 	项目地址：https://github.com/flipped-aurora/gin-vue-admin
 	插件市场:https://plugin.gin-vue-admin.com

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.4",
+	Version:          "v2.7.5",
 	Host:             "",
 	BasePath:         "",
 	Schemes:          []string{},

server/docs/swagger.json

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

server/docs/swagger.yaml

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

server/main.go

@@ -1,12 +1,11 @@
 package main
 
 import (
-	_ "go.uber.org/automaxprocs"
-	"go.uber.org/zap"
-
 	"github.com/flipped-aurora/gin-vue-admin/server/core"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/initialize"
+	_ "go.uber.org/automaxprocs"
+	"go.uber.org/zap"
 	"github.com/flipped-aurora/gin-vue-admin/server/utils/translate"
 )
 
@@ -16,7 +15,7 @@ import (
 //go:generate go mod download
 
 // @title                       Gin-Vue-Admin Swagger API接口文档
-// @version                     v2.7.4
+// @version                     v2.7.5
 // @description                 使用gin+vue进行极速开发的全栈开发基础平台
 // @securityDefinitions.apikey  ApiKeyAuth
 // @in                          header

server/model/system/request/sys_auto_code.go

@@ -43,6 +43,7 @@ type AutoCode struct {
 }
 
 type DataSource struct {
+	DBName      string `json:"dbName"`
 	Table       string `json:"table"`
 	Label       string `json:"label"`
 	Value       string `json:"value"`

server/model/system/request/sys_user.go

@@ -1,6 +1,7 @@
 package request
 
 import (
+	common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 )
 
@@ -54,3 +55,11 @@ type ChangeUserInfo struct {
 	Enable       int                   `json:"enable" gorm:"comment:冻结用户"`                                                           //冻结用户
 	Authorities  []system.SysAuthority `json:"-" gorm:"many2many:sys_user_authority;"`
 }
+
+type GetUserList struct {
+	common.PageInfo
+	Username string `json:"username" form:"username"`
+	NickName string `json:"nickName" form:"nickName"`
+	Phone    string `json:"phone" form:"phone"`
+	Email    string `json:"email" form:"email"`
+}