Skip to content

Commit 7de9c47

Browse files
committed
fix: 修改小问题
1 parent 81039e6 commit 7de9c47

18 files changed

Lines changed: 53 additions & 176 deletions

File tree

File renamed without changes.

tool/gin/create/CreateService.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ func Create2Service(addr, pkg string, service []*parse.Service) error {
4545
return nil
4646
}
4747

48+
// 字符串首字母大写
4849
func maxFirstLetter(s string) string {
4950
if len(s) == 0 {
5051
return s

tool/gin/create/CreateWire.go

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

tool/gin/create/copy.go

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

tool/gin/create/document.go

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ import (
88
)
99

1010
// 已存在就不覆盖
11-
func CreateDocument(output, dir, addr string) ([]*parse.Api, error) {
12-
dir = path.Join(output, dir)
11+
func CreateDocument(output, addr string) ([]*parse.Api, error) {
1312
dirs := []string{
14-
dir,
15-
path.Join(dir, "api"),
16-
path.Join(dir, "handler"),
17-
path.Join(dir, "router"),
18-
path.Join(dir, "router", "middleware"),
13+
output,
14+
path.Join(output, "handler"),
15+
path.Join(output, "router"),
1916
}
2017

2118
for _, d := range dirs {
@@ -26,10 +23,6 @@ func CreateDocument(output, dir, addr string) ([]*parse.Api, error) {
2623
}
2724
}
2825

29-
if err := CopyAllApi(addr, path.Join(dir, "api")); err != nil {
30-
return nil, err
31-
}
32-
3326
apis, err := parse.ParseAll(addr)
3427
if err != nil {
3528
return nil, err

tool/gin/create/service.go

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package create
33
import (
44
"os"
55
"path"
6+
"path/filepath"
67

78
"github.com/muxi-Infra/muxi-micro/tool/gin/parse"
89
)
@@ -30,20 +31,24 @@ func CreateService(addr string, api *parse.Api) error {
3031
return nil
3132
}
3233

33-
func CreateAllService(addr, dir string, apis []*parse.Api) error {
34+
func CreateAllService(addr string, apis []*parse.Api) error {
3435
for _, api := range apis {
35-
if err := CreateService(path.Join(addr, dir, "handler"), api); err != nil {
36+
if err := CreateService(path.Join(addr, "handler"), api); err != nil {
3637
return err
3738
}
3839
}
39-
if err := CreateRouter(path.Join(addr, dir, "router"), dir, apis); err != nil {
40+
// 获取根目录名
41+
dir := GetDirName(addr)
42+
if err := CreateRouter(path.Join(addr, "router"), dir, apis); err != nil {
4043
return err
4144
}
42-
if err := CreateMain(path.Join(addr, dir), dir); err != nil {
43-
return err
44-
}
45-
if err := CreateWire(path.Join(addr, dir), dir, apis); err != nil {
45+
if err := CreateMain(addr, dir); err != nil {
4646
return err
4747
}
4848
return nil
4949
}
50+
51+
func GetDirName(addr string) string {
52+
currentDir, _ := os.Getwd()
53+
return filepath.Base(filepath.Join(currentDir, addr))
54+
}

0 commit comments

Comments
 (0)