Merge pull request #21 from bootun/master

update context dependency and fix test case bug
GrantZheng · Jan 14, 2022 · ce87867 · ce87867
2 parents 87d8ccd + a080d08
commit ce87867
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/generator/add_transport.go b/generator/add_transport.go
@@ -1137,7 +1137,7 @@ func (g *generateGRPCTransport) Generate() (err error) {
 				n,
 				jen.Id(stp).Id("*grpcServer"),
 				[]jen.Code{
-					jen.Id("ctx").Qual("golang.org/x/net/context", "Context"),
+					jen.Id("ctx").Qual("context", "Context"),
 					jen.Id("req").Id("*").Qual(pbImport, n+"Request"),
 				},
 				[]jen.Code{

diff --git a/generator/generator.go b/generator/generator.go
@@ -87,7 +87,7 @@ func (b *BaseGenerator) GenerateNameBySample(sample string, exclude []parser.Nam
 		if v.Name == name {
 			sn++
 			if sn > len(sample) {
-				sample = string(len(sample) - sn)
+				sample = strconv.Itoa(len(sample) - sn)
 			}
 			name = utils.ToLowerFirstCamelCase(sample)[:sn]
 		}