Skip to content

Commit 66b3ecf

Browse files
jaronniejaronnie
committed
feat(swagger): 适配 goctl v1.8.3
1 parent d22646f commit 66b3ecf

File tree

14 files changed

+324
-100
lines changed

14 files changed

+324
-100
lines changed

‎.template/frame/api/app/.jzero.yaml.tpl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ syntax: v1
33
gen:
44
hooks:
55
after:
6-
- jzero gen swagger
7-
8-
split-api-types-dir: true
6+
- jzero gen swagger

‎.template/frame/api/app/desc/api/version.api.tpl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
syntax = "v1"
22

3-
info (
4-
go_package: "version"
5-
)
6-
73
type GetRequest {}
84

95
type GetResponse {
@@ -14,7 +10,7 @@ type GetResponse {
1410
}
1511

1612
@server(
17-
prefix: /api{{ if has "serverless" .Features }}/{{ .APP }}{{end}}/v1
13+
prefix: /api/v1/{{ if has "serverless" .Features }}/{{ .APP }}{{end}}
1814
group: version
1915
)
2016
service {{ .APP | ToCamel }} {

‎.template/frame/gateway/app/desc/proto/v1/hello.proto

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎.template/frame/gateway/app/desc/proto/v1/version.proto

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
syntax = "proto3";
2+
3+
package versionpb;
4+
5+
import "google/api/annotations.proto";
6+
import "grpc-gateway/protoc-gen-openapiv2/options/annotations.proto";
7+
8+
option go_package = "./pb/versionpb";
9+
10+
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
11+
info: {
12+
version: "v1";
13+
};
14+
};
15+
16+
message GetRequest {}
17+
18+
message GetResponse {
19+
string version = 1;
20+
string goVersion = 2;
21+
string commit = 3;
22+
string string = 4;
23+
}
24+
25+
service Version {
26+
rpc Say(GetRequest) returns(GetResponse) {
27+
option (google.api.http) = {
28+
get: "/api/v1/version"
29+
};
30+
};
31+
}

‎.template/frame/rpc/app/desc/proto/v1/hello.proto

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.template/frame/rpc/app/desc/proto/v1/version.proto

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
syntax = "proto3";
2+
3+
package versionpb;
4+
5+
option go_package = "./pb/versionpb";
6+
7+
message GetRequest {}
8+
9+
message GetResponse {
10+
string version = 1;
11+
string goVersion = 2;
12+
string commit = 3;
13+
string string = 4;
14+
}
15+
16+
service Version {
17+
rpc Say(GetRequest) returns(GetResponse) {};
18+
}

‎README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222

2323
中文 | [ENGLISH](README-EN.md)
2424

25+
## 重要‼️
26+
27+
如果升级了最新版本的 goctl, goctl version >= 1.8.3
28+
29+
```shell
30+
goctl env -w GOCTL_EXPERIMENTAL=off
31+
```
32+
2533
## 介绍
2634

2735
通过模板创建项目，并基于 proto/api/sql 文件生成 Server/Client/Model 代码。

‎cmd/gen.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ func init() {
201201

202202
genSwaggerCmd.Flags().StringP("output", "o", filepath.Join("desc", "swagger"), "set swagger output dir")
203203
genSwaggerCmd.Flags().BoolP("route2code", "", false, "is generate route2code")
204+
genSwaggerCmd.Flags().BoolP("merge", "", false, "is merge muti swagger to one file, goctl version >= v1.8.3 available")
204205
}
205206

206207
{

‎config/config.go

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,11 @@ import (
66
"path/filepath"
77
"strings"
88

9+
"github.com/hashicorp/go-version"
910
"github.com/spf13/pflag"
1011
"github.com/spf13/viper"
12+
"github.com/zeromicro/go-zero/core/logx"
13+
"github.com/zeromicro/go-zero/tools/goctl/rpc/execx"
1114
)
1215

1316
// C global command flags
@@ -128,6 +131,7 @@ type GenSwaggerConfig struct {
128131
DescIgnore []string `mapstructure:"desc-ignore"`
129132
Output string `mapstructure:"output"`
130133
Route2Code bool `mapstructure:"route2code"`
134+
Merge bool `mapstructure:"merge"`
131135
}
132136

133137
type GenZrpcclientConfig struct {
@@ -247,6 +251,31 @@ func (c *Config) SqlDir() string {
247251
return filepath.Join("desc", "sql")
248252
}
249253

254+
func (c *Config) SwaggerDir() string {
255+
return filepath.Join("desc", "swagger")
256+
}
257+
258+
func (c *Config) GoctlVersion() *version.Version {
259+
goctlVersionResp, err := execx.Run("goctl -v", "")
260+
if err != nil {
261+
panic(err)
262+
}
263+
264+
logx.Debugf("goctl version: %s", goctlVersionResp)
265+
versionInfo := strings.Split(goctlVersionResp, " ")
266+
var goctlVersion *version.Version
267+
if len(versionInfo) >= 3 {
268+
goctlVersion, err = version.NewVersion(versionInfo[2])
269+
if err != nil {
270+
panic(err)
271+
}
272+
} else {
273+
panic("unknown goctl version")
274+
}
275+
276+
return goctlVersion
277+
}
278+
250279
func SetConfig(command string, flagSet *pflag.FlagSet) error {
251280
flagSet.VisitAll(func(flag *pflag.Flag) {
252281
if command == "" {

‎go.mod

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ require (
1212
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1
1313
github.com/hashicorp/go-version v1.7.0
1414
github.com/iancoleman/orderedmap v0.3.0
15+
github.com/jaronnie/genius v0.5.2
1516
github.com/jhump/protoreflect v1.17.0
1617
github.com/jzero-io/desc v0.0.1
1718
github.com/jzero-io/jzero-contrib v0.21.4
@@ -25,8 +26,8 @@ require (
2526
github.com/spf13/pflag v1.0.6
2627
github.com/spf13/viper v1.19.0
2728
github.com/stretchr/testify v1.10.0
28-
github.com/zeromicro/go-zero v1.8.1
29-
github.com/zeromicro/go-zero/tools/goctl v1.8.1
29+
github.com/zeromicro/go-zero v1.8.3
30+
github.com/zeromicro/go-zero/tools/goctl v1.8.3
3031
golang.org/x/mod v0.23.0
3132
golang.org/x/sync v0.11.0
3233
golang.org/x/tools v0.30.0
@@ -51,7 +52,7 @@ require (
5152
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
5253
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5354
github.com/eddieowens/opts v0.1.0 // indirect
54-
github.com/emicklei/proto v1.14.0 // indirect
55+
github.com/emicklei/proto v1.14.1 // indirect
5556
github.com/emirpasic/gods v1.18.1 // indirect
5657
github.com/fatih/color v1.18.0 // indirect
5758
github.com/fatih/structtag v1.2.0 // indirect
@@ -83,10 +84,11 @@ require (
8384
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8485
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8586
github.com/openzipkin/zipkin-go v0.4.3 // indirect
87+
github.com/pelletier/go-toml v1.9.5 // indirect
8688
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
8789
github.com/pjbgf/sha1cd v0.3.2 // indirect
8890
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
89-
github.com/prometheus/client_golang v1.21.0 // indirect
91+
github.com/prometheus/client_golang v1.21.1 // indirect
9092
github.com/prometheus/client_model v0.6.1 // indirect
9193
github.com/prometheus/common v0.62.0 // indirect
9294
github.com/prometheus/procfs v0.15.1 // indirect

‎go.sum

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
3636
github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
3737
github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
3838
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
39+
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
3940
github.com/cyphar/filepath-securejoin v0.3.6 h1:4d9N5ykBnSp5Xn2JkhocYDkOpURL/18CYMpo6xB9uWM=
4041
github.com/cyphar/filepath-securejoin v0.3.6/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
4142
github.com/dave/dst v0.27.3 h1:P1HPoMza3cMEquVf9kKy8yXsFirry4zEnWOdYPOoIzY=
@@ -60,8 +61,8 @@ github.com/eddieowens/opts v0.1.0 h1:h/4KUhh/XD3W+KmnF2o6w3nVj4zV8i0FA9w6aoRjB6s
6061
github.com/eddieowens/opts v0.1.0/go.mod h1:sG2QH2EbNTFM0EOY/a7kPjBp8aX9urm1wUb6kp0Mfrc=
6162
github.com/elazarl/goproxy v1.4.0 h1:4GyuSbFa+s26+3rmYNSuUVsx+HgPrV1bk1jXI0l9wjM=
6263
github.com/elazarl/goproxy v1.4.0/go.mod h1:X/5W/t+gzDyLfHW4DrMdpjqYjpXsURlBt9lpBDxZZZQ=
63-
github.com/emicklei/proto v1.14.0 h1:WYxC0OrBuuC+FUCTZvb8+fzEHdZMwLEF+OnVfZA3LXU=
64-
github.com/emicklei/proto v1.14.0/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
64+
github.com/emicklei/proto v1.14.1 h1:fFq+Bj70XXZWXWikcVRvYZxrMS4KIIiPAqdJ8vPrenY=
65+
github.com/emicklei/proto v1.14.1/go.mod h1:rn1FgRS/FANiZdD2djyH7TMA9jdRDcYQ9IEN9yvjX0A=
6566
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
6667
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
6768
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
@@ -70,6 +71,7 @@ github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4
7071
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
7172
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
7273
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
74+
github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
7375
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
7476
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
7577
github.com/fsgo/fst v0.0.5 h1:c12J39shorNiS3X9QsK6sg/KUzw8FOA3IoKPb/upj7E=
@@ -103,6 +105,7 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l
103105
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
104106
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
105107
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
108+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
106109
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
107110
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
108111
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -128,6 +131,8 @@ github.com/iancoleman/orderedmap v0.3.0 h1:5cbR2grmZR/DiVt+VJopEhtVs9YGInGIxAoMJ
128131
github.com/iancoleman/orderedmap v0.3.0/go.mod h1:XuLcCUkdL5owUCQeF2Ue9uuw1EptkJDkXXS7VoV7XGE=
129132
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
130133
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
134+
github.com/jaronnie/genius v0.5.2 h1:9wm3yDPwfUwV1NF8SDJJVLCtGGGa9Iu52pscGw6mu14=
135+
github.com/jaronnie/genius v0.5.2/go.mod h1:8JV/ENGBhpWkUVjxLCWT1MitnYNj1W+IutAdLzfW/H8=
131136
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
132137
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
133138
github.com/jhump/protoreflect v1.17.0 h1:qOEr613fac2lOuTgWN4tPAtLL7fUSbuJL5X5XumQh94=
@@ -188,19 +193,22 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ
188193
github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
189194
github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg=
190195
github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c=
196+
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
197+
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
191198
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
192199
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
193200
github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=
194201
github.com/pjbgf/sha1cd v0.3.2/go.mod h1:zQWigSxVmsHEZow5qaLtPYxpcKMMQpa09ixqBxuCS6A=
202+
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
195203
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
196204
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
197205
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
198206
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
199207
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
200208
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
201209
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
202-
github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA=
203-
github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
210+
github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
211+
github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
204212
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
205213
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
206214
github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
@@ -211,6 +219,7 @@ github.com/rinchsan/gosimports v0.3.8 h1:X4Pb9yFf6teHvogorT04yK/0W2Df7eHO79biCcY
211219
github.com/rinchsan/gosimports v0.3.8/go.mod h1:t0567k69sUHjLvJMPDsV31THZC+8UIbY1oL7NW+0I2c=
212220
github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
213221
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
222+
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
214223
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
215224
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
216225
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -233,6 +242,7 @@ github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0b
233242
github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
234243
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
235244
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
245+
github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
236246
github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
237247
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
238248
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
@@ -265,10 +275,10 @@ github.com/zeromicro/antlr v0.0.1 h1:CQpIn/dc0pUjgGQ81y98s/NGOm2Hfru2NNio2I9mQgk
265275
github.com/zeromicro/antlr v0.0.1/go.mod h1:nfpjEwFR6Q4xGDJMcZnCL9tEfQRgszMwu3rDz2Z+p5M=
266276
github.com/zeromicro/ddl-parser v1.0.5 h1:LaVqHdzMTjasua1yYpIYaksxKqRzFrEukj2Wi2EbWaQ=
267277
github.com/zeromicro/ddl-parser v1.0.5/go.mod h1:ISU/8NuPyEpl9pa17Py9TBPetMjtsiHrb9f5XGiYbo8=
268-
github.com/zeromicro/go-zero v1.8.1 h1:iUYQEMQzS9Pb8ebzJtV3FGtv/YTjZxAh/NvLW/316wo=
269-
github.com/zeromicro/go-zero v1.8.1/go.mod h1:gc54Ad4qt7OJ0PbKajnYsSKsZBYN4JLRIXKlqDX2A2I=
270-
github.com/zeromicro/go-zero/tools/goctl v1.8.1 h1:PgzmR4VMgaWCSKbqgcmxj9iSq8qK9Hk4icIl9hm0lYc=
271-
github.com/zeromicro/go-zero/tools/goctl v1.8.1/go.mod h1:ioCZo6Xeyi7mRwWnJhkoUzzJ/3I7AETrUB23+TKuQ+Q=
278+
github.com/zeromicro/go-zero v1.8.3 h1:AwpBJQLAsZAt4OOnK0eR8UU1Ja2RFBIXfKkHdnXQKfc=
279+
github.com/zeromicro/go-zero v1.8.3/go.mod h1:EnuEA3XdIQvAvc4WWTskRTO0jM2/aQi7OXv1gKWRNJ0=
280+
github.com/zeromicro/go-zero/tools/goctl v1.8.3 h1:7kqT21Uc/z/qpjuF/kL9YG6G6KHNHbtlUXSZEhYnpos=
281+
github.com/zeromicro/go-zero/tools/goctl v1.8.3/go.mod h1:x3uJXTb26j1HKwBEfa94l+D+qMRrk5QaM1HsD/fyLaA=
272282
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
273283
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
274284
go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=

‎internal/gen/gensdk/gen.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"os"
55
"path/filepath"
66

7+
"github.com/pkg/errors"
78
"github.com/rinchsan/gosimports"
89
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
910

@@ -46,7 +47,7 @@ func GenSdk(genModule bool) error {
4647
if filepath.Ext(v.Path) == ".go" {
4748
formated, err := gosimports.Process("", v.Content.Bytes(), nil)
4849
if err != nil {
49-
return err
50+
return errors.Errorf("format go file %s %s meet error: %v", v.Path, v.Content.Bytes(), err)
5051
}
5152
if err = os.WriteFile(filepath.Join(config.C.Gen.Sdk.Output, v.Path), formated, 0o644); err != nil {
5253
return err

0 commit comments

Comments
 (0)