Skip to content

Commit beb74d7

Browse files
pixelmaxQmtasktesunpiexlMax(奇淼clh021
authored
public:发布i18n 2.7.5正式版 (#1903)
* Beta:发布v2.7.5测试版本 (#1896) * 生产环境时移除console * 更新第三方库道最新版本，修正导致的兼容问题 * feat: 版本号变更，修复自动化历史的结构体描述 * feat: 放弃element的按需引用，增加自定义表单组件,替换原始的iframe引入模式。 * feat: 放开表单生成器的key输入 * feat: 自动化代码关联属性支持跨数据库关联 * fixed: 修复跨库关联模板 * feat: 允许清空跨数据关联的业务库选项 * feat: 增加用户搜索功能 * feat: 允许单条API同步 --------- Co-authored-by: task <121913992@qq.com> Co-authored-by: task <ms.yangdan@gmail.com> * feat: 更新逻辑内容至2.7.5版本，等待同步 * feat: update go.sum * fixed: 修复暗夜模式失效的bug * feat: 配置保存按钮移动到顶部 * fix: support pluginPath svg file as component show list when dev mode (#1902) * feat: i18n 前端增加繁体中文 * feat: i18n 后端增加繁体 * feat: i18n 前端增加繁体中文 * feat: i18n 细节调整 发布正式i18n版本 --------- Co-authored-by: task <121913992@qq.com> Co-authored-by: task <ms.yangdan@gmail.com> Co-authored-by: piexlMax(奇淼 <qimiaojiangjizhao@gmail.com> Co-authored-by: chenlianghong <clh021@gmail.com> Co-authored-by: krank <emosick@qq.com>
1 parent 6c3252f commit beb74d7

File tree

44 files changed

+1786
-296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1786
-296
lines changed

‎server/api/v1/system/sys_user.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,11 @@ func (b *BaseApi) ChangePassword(c *gin.Context) {
200200
// @Security ApiKeyAuth
201201
// @accept application/json
202202
// @Produce application/json
203-
// @Param data body request.PageInfo true "页码, 每页大小"
203+
// @Param data body systemReq.GetUserList true "页码, 每页大小"
204204
// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取用户列表,返回包括列表,总数,页码,每页数量"
205205
// @Router /user/getUserList [post]
206206
func (b *BaseApi) GetUserList(c *gin.Context) {
207-
var pageInfo request.PageInfo
207+
var pageInfo systemReq.GetUserList
208208
err := c.ShouldBindJSON(&pageInfo)
209209
if err != nil {
210210
response.FailWithMessage(err.Error(), c)

‎server/core/server.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ func RunWindowsServer() {
3232
}
3333

3434
Router := initialize.Routers()
35-
Router.Static("/form-generator", "./resource/page")
3635

3736
address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)
3837
s := initServer(address, Router)
@@ -41,7 +40,7 @@ func RunWindowsServer() {
4140

4241
fmt.Printf(`
4342
%s gin-vue-admin
44-
%s:v2.7.4
43+
%s:v2.7.5
4544
加群方式:微信号：shouzi_1994 QQ群：470239250
4645
项目地址：https://github.com/flipped-aurora/gin-vue-admin
4746
插件市场:https://plugin.gin-vue-admin.com

‎server/docs/docs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8087,7 +8087,7 @@ const docTemplate = `{
80878087

80888088
// SwaggerInfo holds exported Swagger Info so clients can modify it
80898089
var SwaggerInfo = &swag.Spec{
8090-
Version: "v2.7.4",
8090+
Version: "v2.7.5",
80918091
Host: "",
80928092
BasePath: "",
80938093
Schemes: []string{},

‎server/docs/swagger.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "使用gin+vue进行极速开发的全栈开发基础平台",
55
"title": "Gin-Vue-Admin Swagger API接口文档",
66
"contact": {},
7-
"version": "v2.7.4"
7+
"version": "v2.7.5"
88
},
99
"paths": {
1010
"/api/createApi": {

‎server/docs/swagger.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,7 @@ info:
16341634
contact: {}
16351635
description: 使用gin+vue进行极速开发的全栈开发基础平台
16361636
title: Gin-Vue-Admin Swagger API接口文档
1637-
version: v2.7.4
1637+
version: v2.7.5
16381638
paths:
16391639
/api/createApi:
16401640
post:

‎server/main.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package main
22

33
import (
4-
_ "go.uber.org/automaxprocs"
5-
"go.uber.org/zap"
6-
74
"github.com/flipped-aurora/gin-vue-admin/server/core"
85
"github.com/flipped-aurora/gin-vue-admin/server/global"
96
"github.com/flipped-aurora/gin-vue-admin/server/initialize"
7+
_ "go.uber.org/automaxprocs"
8+
"go.uber.org/zap"
109
"github.com/flipped-aurora/gin-vue-admin/server/utils/translate"
1110
)
1211

@@ -16,7 +15,7 @@ import (
1615
//go:generate go mod download
1716

1817
// @title Gin-Vue-Admin Swagger API接口文档
19-
// @version v2.7.4
18+
// @version v2.7.5
2019
// @description 使用gin+vue进行极速开发的全栈开发基础平台
2120
// @securityDefinitions.apikey ApiKeyAuth
2221
// @in header

‎server/model/system/request/sys_auto_code.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ type AutoCode struct {
4343
}
4444

4545
type DataSource struct {
46+
DBName string `json:"dbName"`
4647
Table string `json:"table"`
4748
Label string `json:"label"`
4849
Value string `json:"value"`

‎server/model/system/request/sys_user.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package request
22

33
import (
4+
common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
45
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
56
)
67

@@ -54,3 +55,11 @@ type ChangeUserInfo struct {
5455
Enable int `json:"enable" gorm:"comment:冻结用户"` //冻结用户
5556
Authorities []system.SysAuthority `json:"-" gorm:"many2many:sys_user_authority;"`
5657
}
58+
59+
type GetUserList struct {
60+
common.PageInfo
61+
Username string `json:"username" form:"username"`
62+
NickName string `json:"nickName" form:"nickName"`
63+
Phone string `json:"phone" form:"phone"`
64+
Email string `json:"email" form:"email"`
65+
}

0 commit comments

Comments
 (0)