Skip to content

Commit b22b160

Browse files
Dot-LiuDot-Liu
committed
修复openapiv2保存失败的问题
1 parent debf19b commit b22b160

4 files changed

Lines changed: 14 additions & 36 deletions

File tree

‎frontend/packages/common/src/locales/scan/en-GB.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@
650650
"K4bf109e8": "View All Applications",
651651
"Keceae2": "View All Services",
652652
"K7c866f28": "View All Teams",
653-
"Kf9dcef3a": "Routing",
653+
"Kf9dcef3a": "Routes",
654654
"K6134bbe8": "Add Route",
655655
"Kad6d2797": "Search Routes by Name and URL",
656656
"K28435c5c": "Route Details",

‎go.mod‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ require (
1111
github.com/gabriel-vasile/mimetype v1.4.4
1212
github.com/getkin/kin-openapi v0.127.0
1313
github.com/gin-gonic/gin v1.10.0
14-
github.com/go-openapi/loads v0.22.0
15-
github.com/go-openapi/validate v0.24.0
1614
github.com/google/uuid v1.6.0
1715
github.com/influxdata/influxdb-client-go/v2 v2.14.0
1816
github.com/urfave/cli/v2 v2.27.2
@@ -23,7 +21,6 @@ require (
2321

2422
require (
2523
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
26-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2724
github.com/bytedance/sonic v1.11.6 // indirect
2825
github.com/bytedance/sonic/loader v0.1.1 // indirect
2926
github.com/cespare/xxhash/v2 v2.2.0 // indirect
@@ -35,12 +32,7 @@ require (
3532
github.com/ghodss/yaml v1.0.0 // indirect
3633
github.com/gin-contrib/gzip v1.0.1 // indirect
3734
github.com/gin-contrib/sse v0.1.0 // indirect
38-
github.com/go-openapi/analysis v0.23.0 // indirect
39-
github.com/go-openapi/errors v0.22.0 // indirect
4035
github.com/go-openapi/jsonpointer v0.21.0 // indirect
41-
github.com/go-openapi/jsonreference v0.21.0 // indirect
42-
github.com/go-openapi/spec v0.21.0 // indirect
43-
github.com/go-openapi/strfmt v0.23.0 // indirect
4436
github.com/go-openapi/swag v0.23.0 // indirect
4537
github.com/go-playground/locales v0.14.1 // indirect
4638
github.com/go-playground/universal-translator v0.18.1 // indirect
@@ -59,12 +51,10 @@ require (
5951
github.com/leodido/go-urn v1.4.0 // indirect
6052
github.com/mailru/easyjson v0.7.7 // indirect
6153
github.com/mattn/go-isatty v0.0.20 // indirect
62-
github.com/mitchellh/mapstructure v1.5.0 // indirect
6354
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6455
github.com/modern-go/reflect2 v1.0.2 // indirect
6556
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
6657
github.com/oapi-codegen/runtime v1.0.0 // indirect
67-
github.com/oklog/ulid v1.3.1 // indirect
6858
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
6959
github.com/perimeterx/marshmallow v1.1.5 // indirect
7060
github.com/pkg/errors v0.9.1 // indirect
@@ -74,7 +64,6 @@ require (
7464
github.com/ugorji/go/codec v1.2.12 // indirect
7565
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
7666
go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
77-
go.mongodb.org/mongo-driver v1.14.0 // indirect
7867
go.uber.org/atomic v1.7.0 // indirect
7968
go.uber.org/multierr v1.6.0 // indirect
8069
go.uber.org/zap v1.23.0 // indirect

‎go.sum‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk=
22
github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
33
github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
4-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
5-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
64
github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
75
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
86
github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w=
@@ -47,24 +45,10 @@ github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE
4745
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
4846
github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
4947
github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
50-
github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU=
51-
github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo=
52-
github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w=
53-
github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE=
5448
github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
5549
github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
56-
github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
57-
github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
58-
github.com/go-openapi/loads v0.22.0 h1:ECPGd4jX1U6NApCGG1We+uEozOAvXvJSF4nnwHZ8Aco=
59-
github.com/go-openapi/loads v0.22.0/go.mod h1:yLsaTCS92mnSAZX5WWoxszLj0u+Ojl+Zs5Stn1oF+rs=
60-
github.com/go-openapi/spec v0.21.0 h1:LTVzPc3p/RzRnkQqLRndbAzjY0d0BCL72A6j3CdL9ZY=
61-
github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5XwVMotYk=
62-
github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c=
63-
github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4=
6450
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
6551
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
66-
github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3BumrGD58=
67-
github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ=
6852
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
6953
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
7054
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
@@ -115,8 +99,6 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
11599
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
116100
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
117101
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
118-
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
119-
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
120102
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
121103
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
122104
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -126,8 +108,6 @@ github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 h1:RWengNIwukTxcDr9
126108
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826/go.mod h1:TaXosZuwdSHYgviHp1DAtfrULt5eUgsSMsZf+YrPgl8=
127109
github.com/oapi-codegen/runtime v1.0.0 h1:P4rqFX5fMFWqRzY9M/3YF9+aPSPPB06IzP2P7oOxrWo=
128110
github.com/oapi-codegen/runtime v1.0.0/go.mod h1:LmCUMQuPB4M/nLXilQXhHw+BLZdDb18B34OO356yJ/A=
129-
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
130-
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
131111
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
132112
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
133113
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
@@ -165,8 +145,6 @@ github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 h1:+qGGcbkzsfDQNPPe
165145
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913/go.mod h1:4aEEwZQutDLsQv2Deui4iYQ6DWTxR14g6m8Wv88+Xqk=
166146
go.etcd.io/etcd/client/pkg/v3 v3.5.13 h1:RVZSAnWWWiI5IrYAXjQorajncORbS0zI48LQlE2kQWg=
167147
go.etcd.io/etcd/client/pkg/v3 v3.5.13/go.mod h1:XxHT4u1qU12E2+po+UVPrEeL94Um6zL58ppuJWXSAB8=
168-
go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80=
169-
go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
170148
go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
171149
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
172150
go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=

‎service/api-doc/service.go‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ func NewDocLoader(content string) (*DocLoader, error) {
5454
if err != nil {
5555
return nil, fmt.Errorf("load openAPI3Doc error:%v", err)
5656
}
57-
5857
return &DocLoader{openAPI3Doc: doc}, nil
5958
}
6059

@@ -63,7 +62,19 @@ func (d *DocLoader) Valid() error {
6362
return fmt.Errorf("openAPI3Doc is nil")
6463
}
6564

66-
return d.openAPI3Doc.Validate(openapi3Loader.Context)
65+
if d.openAPI3Doc.Paths == nil {
66+
return fmt.Errorf("openAPI3Doc.Paths is nil")
67+
}
68+
//err := d.openAPI3Doc.Validate(openapi3Loader.Context)
69+
//if err != nil {
70+
// openAPI2Doc, err := openapi2conv.FromV3(d.openAPI3Doc)
71+
// if err != nil {
72+
// return err
73+
// }
74+
// validate.
75+
//
76+
//}
77+
return nil
6778
}
6879

6980
func (d *DocLoader) APICount() int64 {

0 commit comments

Comments
 (0)