Skip to content

Commit 86cffba

Browse files
pixelmaxQmtasktesun
authored
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>
1 parent 2086a73 commit 86cffba

File tree

36 files changed

+637
-477
lines changed

36 files changed

+637
-477
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
@@ -31,7 +31,6 @@ func RunWindowsServer() {
3131
}
3232

3333
Router := initialize.Routers()
34-
Router.Static("/form-generator", "./resource/page")
3534

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

4140
fmt.Printf(`
4241
欢迎使用 gin-vue-admin
43-
当前版本:v2.7.4
42+
当前版本:v2.7.5
4443
加群方式:微信号：shouzi_1994 QQ群：470239250
4544
项目地址：https://github.com/flipped-aurora/gin-vue-admin
4645
插件市场: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/go.mod‎

Lines changed: 109 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,163 +1,171 @@
11
module github.com/flipped-aurora/gin-vue-admin/server
22

3-
go 1.22
3+
go 1.22.0
4+
5+
toolchain go1.22.2
46

57
require (
6-
github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible
7-
github.com/aws/aws-sdk-go v1.44.307
8-
github.com/casbin/casbin/v2 v2.87.1
9-
github.com/casbin/gorm-adapter/v3 v3.18.0
8+
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
9+
github.com/aws/aws-sdk-go v1.55.5
10+
github.com/casbin/casbin/v2 v2.100.0
11+
github.com/casbin/gorm-adapter/v3 v3.28.0
1012
github.com/flipped-aurora/ws v1.0.2
11-
github.com/fsnotify/fsnotify v1.6.0
13+
github.com/fsnotify/fsnotify v1.7.0
1214
github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6
13-
github.com/gin-gonic/gin v1.9.1
14-
github.com/glebarez/sqlite v1.8.0
15+
github.com/gin-gonic/gin v1.10.0
16+
github.com/glebarez/sqlite v1.11.0
1517
github.com/go-sql-driver/mysql v1.8.1
16-
github.com/goccy/go-json v0.10.2
17-
github.com/gofrs/uuid/v5 v5.0.0
18+
github.com/goccy/go-json v0.10.3
19+
github.com/gofrs/uuid/v5 v5.3.0
1820
github.com/golang-jwt/jwt/v4 v4.5.0
1921
github.com/gookit/color v1.5.4
20-
github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible
21-
github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
22+
github.com/huaweicloud/huaweicloud-sdk-go-obs v3.24.6+incompatible
23+
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
2224
github.com/mholt/archiver/v4 v4.0.0-alpha.8
2325
github.com/mojocn/base64Captcha v1.3.6
24-
github.com/otiai10/copy v1.7.0
26+
github.com/otiai10/copy v1.14.0
2527
github.com/pkg/errors v0.9.1
26-
github.com/qiniu/api.v7/v7 v7.4.1
28+
github.com/qiniu/api.v7/v7 v7.8.2
2729
github.com/qiniu/qmgo v1.1.8
28-
github.com/redis/go-redis/v9 v9.0.5
30+
github.com/redis/go-redis/v9 v9.6.1
2931
github.com/robfig/cron/v3 v3.0.1
30-
github.com/shirou/gopsutil/v3 v3.23.6
31-
github.com/songzhibin97/gkit v1.2.11
32-
github.com/spf13/viper v1.16.0
33-
github.com/stretchr/testify v1.8.4
32+
github.com/shirou/gopsutil/v3 v3.24.5
33+
github.com/songzhibin97/gkit v1.2.13
34+
github.com/spf13/viper v1.19.0
35+
github.com/stretchr/testify v1.9.0
3436
github.com/swaggo/files v1.0.1
3537
github.com/swaggo/gin-swagger v1.6.0
36-
github.com/swaggo/swag v1.16.2
37-
github.com/tencentyun/cos-go-sdk-v5 v0.7.42
38-
github.com/unrolled/secure v1.13.0
39-
github.com/xuri/excelize/v2 v2.8.0
40-
go.mongodb.org/mongo-driver v1.12.1
38+
github.com/swaggo/swag v1.16.3
39+
github.com/tencentyun/cos-go-sdk-v5 v0.7.55
40+
github.com/unrolled/secure v1.15.0
41+
github.com/xuri/excelize/v2 v2.8.1
42+
go.mongodb.org/mongo-driver v1.17.0
4143
go.uber.org/automaxprocs v1.5.3
42-
go.uber.org/zap v1.24.0
43-
golang.org/x/crypto v0.22.0
44-
golang.org/x/sync v0.6.0
45-
golang.org/x/text v0.14.0
46-
gorm.io/datatypes v1.2.1
47-
gorm.io/driver/mysql v1.5.6
48-
gorm.io/driver/postgres v1.5.7
49-
gorm.io/driver/sqlserver v1.5.1
44+
go.uber.org/zap v1.27.0
45+
golang.org/x/crypto v0.27.0
46+
golang.org/x/sync v0.8.0
47+
golang.org/x/text v0.18.0
48+
gorm.io/datatypes v1.2.2
49+
gorm.io/driver/mysql v1.5.7
50+
gorm.io/driver/postgres v1.5.9
51+
gorm.io/driver/sqlserver v1.5.3
5052
gorm.io/gen v0.3.26
51-
gorm.io/gorm v1.25.10
52-
nhooyr.io/websocket v1.8.7
53+
gorm.io/gorm v1.25.12
54+
nhooyr.io/websocket v1.8.17
5355
)
5456

5557
require (
5658
filippo.io/edwards25519 v1.1.0 // indirect
5759
github.com/KyleBanks/depth v1.2.1 // indirect
58-
github.com/andybalholm/brotli v1.0.4 // indirect
59-
github.com/bodgit/plumbing v1.2.0 // indirect
60-
github.com/bodgit/sevenzip v1.3.0 // indirect
61-
github.com/bodgit/windows v1.0.0 // indirect
62-
github.com/bytedance/sonic v1.9.1 // indirect
63-
github.com/casbin/govaluate v1.1.1 // indirect
64-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
65-
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
60+
github.com/andybalholm/brotli v1.1.0 // indirect
61+
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
62+
github.com/bodgit/plumbing v1.3.0 // indirect
63+
github.com/bodgit/sevenzip v1.5.2 // indirect
64+
github.com/bodgit/windows v1.0.1 // indirect
65+
github.com/bytedance/sonic v1.12.2 // indirect
66+
github.com/bytedance/sonic/loader v0.2.0 // indirect
67+
github.com/casbin/govaluate v1.2.0 // indirect
68+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
6669
github.com/clbanning/mxj v1.8.4 // indirect
67-
github.com/connesc/cipherio v0.2.1 // indirect
68-
github.com/davecgh/go-spew v1.1.1 // indirect
70+
github.com/cloudwego/base64x v0.1.4 // indirect
71+
github.com/cloudwego/iasm v0.2.0 // indirect
72+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
6973
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
7074
github.com/dsnet/compress v0.0.1 // indirect
7175
github.com/dustin/go-humanize v1.0.1 // indirect
72-
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
76+
github.com/gabriel-vasile/mimetype v1.4.5 // indirect
7377
github.com/gin-contrib/sse v0.1.0 // indirect
74-
github.com/glebarez/go-sqlite v1.21.1 // indirect
75-
github.com/go-ole/go-ole v1.2.6 // indirect
76-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
77-
github.com/go-openapi/jsonreference v0.20.3 // indirect
78-
github.com/go-openapi/spec v0.20.12 // indirect
79-
github.com/go-openapi/swag v0.22.5 // indirect
78+
github.com/glebarez/go-sqlite v1.22.0 // indirect
79+
github.com/go-ole/go-ole v1.3.0 // indirect
80+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
81+
github.com/go-openapi/jsonreference v0.21.0 // indirect
82+
github.com/go-openapi/spec v0.21.0 // indirect
83+
github.com/go-openapi/swag v0.23.0 // indirect
8084
github.com/go-playground/locales v0.14.1 // indirect
8185
github.com/go-playground/universal-translator v0.18.1 // indirect
82-
github.com/go-playground/validator/v10 v10.14.0 // indirect
86+
github.com/go-playground/validator/v10 v10.22.1 // indirect
8387
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
8488
github.com/golang-sql/sqlexp v0.1.0 // indirect
8589
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
8690
github.com/golang/snappy v0.0.4 // indirect
87-
github.com/google/go-querystring v1.0.0 // indirect
88-
github.com/google/uuid v1.3.0 // indirect
91+
github.com/google/go-querystring v1.1.0 // indirect
92+
github.com/google/uuid v1.6.0 // indirect
8993
github.com/hashicorp/errwrap v1.1.0 // indirect
9094
github.com/hashicorp/go-multierror v1.1.1 // indirect
95+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
9196
github.com/hashicorp/hcl v1.0.0 // indirect
9297
github.com/jackc/pgpassfile v1.0.0 // indirect
93-
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
94-
github.com/jackc/pgx/v5 v5.5.5 // indirect
95-
github.com/jackc/puddle/v2 v2.2.1 // indirect
98+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
99+
github.com/jackc/pgx/v5 v5.7.1 // indirect
100+
github.com/jackc/puddle/v2 v2.2.2 // indirect
96101
github.com/jinzhu/inflection v1.0.0 // indirect
97102
github.com/jinzhu/now v1.1.5 // indirect
98103
github.com/jmespath/go-jmespath v0.4.0 // indirect
99104
github.com/josharian/intern v1.0.0 // indirect
100105
github.com/json-iterator/go v1.1.12 // indirect
101-
github.com/klauspost/compress v1.15.9 // indirect
102-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
103-
github.com/klauspost/pgzip v1.2.5 // indirect
104-
github.com/leodido/go-urn v1.2.4 // indirect
105-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
106+
github.com/klauspost/compress v1.17.9 // indirect
107+
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
108+
github.com/klauspost/pgzip v1.2.6 // indirect
109+
github.com/leodido/go-urn v1.4.0 // indirect
110+
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
106111
github.com/magiconair/properties v1.8.7 // indirect
107112
github.com/mailru/easyjson v0.7.7 // indirect
108-
github.com/mattn/go-isatty v0.0.19 // indirect
109-
github.com/microsoft/go-mssqldb v1.1.0 // indirect
113+
github.com/mattn/go-isatty v0.0.20 // indirect
114+
github.com/microsoft/go-mssqldb v1.7.2 // indirect
110115
github.com/mitchellh/mapstructure v1.5.0 // indirect
111116
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
112117
github.com/modern-go/reflect2 v1.0.2 // indirect
113118
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
114-
github.com/montanaflynn/stats v0.7.0 // indirect
115-
github.com/mozillazg/go-httpheader v0.2.1 // indirect
119+
github.com/montanaflynn/stats v0.7.1 // indirect
120+
github.com/mozillazg/go-httpheader v0.4.0 // indirect
121+
github.com/ncruces/go-strftime v0.1.9 // indirect
116122
github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
117-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
118-
github.com/pierrec/lz4/v4 v4.1.15 // indirect
119-
github.com/pmezard/go-difflib v1.0.0 // indirect
120-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
123+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
124+
github.com/pierrec/lz4/v4 v4.1.21 // indirect
125+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
126+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
121127
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
122128
github.com/richardlehane/mscfb v1.0.4 // indirect
123-
github.com/richardlehane/msoleps v1.0.3 // indirect
129+
github.com/richardlehane/msoleps v1.0.4 // indirect
130+
github.com/sagikazarmark/locafero v0.6.0 // indirect
131+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
124132
github.com/shoenig/go-m1cpu v0.1.6 // indirect
125-
github.com/spf13/afero v1.9.5 // indirect
126-
github.com/spf13/cast v1.5.1 // indirect
127-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
133+
github.com/sourcegraph/conc v0.3.0 // indirect
134+
github.com/spf13/afero v1.11.0 // indirect
135+
github.com/spf13/cast v1.7.0 // indirect
128136
github.com/spf13/pflag v1.0.5 // indirect
129-
github.com/subosito/gotenv v1.4.2 // indirect
137+
github.com/subosito/gotenv v1.6.0 // indirect
130138
github.com/therootcompany/xz v1.0.1 // indirect
131-
github.com/tklauser/go-sysconf v0.3.11 // indirect
132-
github.com/tklauser/numcpus v0.6.0 // indirect
139+
github.com/tklauser/go-sysconf v0.3.14 // indirect
140+
github.com/tklauser/numcpus v0.8.0 // indirect
133141
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
134-
github.com/ugorji/go/codec v1.2.11 // indirect
135-
github.com/ulikunitz/xz v0.5.10 // indirect
142+
github.com/ugorji/go/codec v1.2.12 // indirect
143+
github.com/ulikunitz/xz v0.5.12 // indirect
136144
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
137145
github.com/xdg-go/scram v1.1.2 // indirect
138146
github.com/xdg-go/stringprep v1.0.4 // indirect
139-
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
140-
github.com/xuri/efp v0.0.0-20230802181842-ad255f2331ca // indirect
141-
github.com/xuri/nfp v0.0.0-20230819163627-dc951e3ffe1a // indirect
142-
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
143-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
144-
go.uber.org/atomic v1.9.0 // indirect
145-
go.uber.org/multierr v1.8.0 // indirect
146-
go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
147-
golang.org/x/arch v0.3.0 // indirect
148-
golang.org/x/image v0.15.0 // indirect
149-
golang.org/x/mod v0.14.0 // indirect
150-
golang.org/x/net v0.21.0 // indirect
151-
golang.org/x/sys v0.19.0 // indirect
152-
golang.org/x/time v0.1.0 // indirect
153-
golang.org/x/tools v0.17.0 // indirect
154-
google.golang.org/protobuf v1.33.0 // indirect
147+
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
148+
github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
149+
github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // indirect
150+
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
151+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
152+
go.uber.org/multierr v1.11.0 // indirect
153+
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
154+
golang.org/x/arch v0.10.0 // indirect
155+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
156+
golang.org/x/image v0.20.0 // indirect
157+
golang.org/x/mod v0.21.0 // indirect
158+
golang.org/x/net v0.29.0 // indirect
159+
golang.org/x/sys v0.25.0 // indirect
160+
golang.org/x/time v0.6.0 // indirect
161+
golang.org/x/tools v0.25.0 // indirect
162+
google.golang.org/protobuf v1.34.2 // indirect
155163
gopkg.in/ini.v1 v1.67.0 // indirect
156164
gopkg.in/yaml.v3 v3.0.1 // indirect
157-
gorm.io/hints v1.1.0 // indirect
158-
gorm.io/plugin/dbresolver v1.5.0 // indirect
159-
modernc.org/libc v1.24.1 // indirect
160-
modernc.org/mathutil v1.5.0 // indirect
161-
modernc.org/memory v1.6.0 // indirect
162-
modernc.org/sqlite v1.23.0 // indirect
165+
gorm.io/hints v1.1.2 // indirect
166+
gorm.io/plugin/dbresolver v1.5.3 // indirect
167+
modernc.org/libc v1.61.0 // indirect
168+
modernc.org/mathutil v1.6.0 // indirect
169+
modernc.org/memory v1.8.0 // indirect
170+
modernc.org/sqlite v1.33.1 // indirect
163171
)

0 commit comments

Comments
 (0)