Skip to content

Commit 30d4ef7

Browse files
ArronDouArronDou
committed
replace package name and delete internal path
1 parent 2498f16 commit 30d4ef7

File tree

223 files changed

+580
-579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

223 files changed

+580
-579
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/vendor/
2+
.diea

‎api/apigen/gen.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"path/filepath"
99
"strings"
1010

11+
"github.com/dxc0522/goctlx/util"
12+
"github.com/dxc0522/goctlx/util/pathx"
1113
"github.com/gookit/color"
1214
"github.com/spf13/cobra"
13-
"github.com/zeromicro/go-zero/tools/goctl/util"
14-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
1515
)
1616

1717
//go:embed api.tpl

‎api/apigen/template.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package apigen
33
import (
44
"fmt"
55

6-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
6+
"github.com/dxc0522/goctlx/util/pathx"
77
)
88

99
const (

‎api/cmd.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package api
22

33
import (
4+
"github.com/dxc0522/goctlx/api/apigen"
5+
"github.com/dxc0522/goctlx/api/dartgen"
6+
"github.com/dxc0522/goctlx/api/docgen"
7+
"github.com/dxc0522/goctlx/api/format"
8+
"github.com/dxc0522/goctlx/api/gogen"
9+
"github.com/dxc0522/goctlx/api/javagen"
10+
"github.com/dxc0522/goctlx/api/ktgen"
11+
"github.com/dxc0522/goctlx/api/new"
12+
"github.com/dxc0522/goctlx/api/tsgen"
13+
"github.com/dxc0522/goctlx/api/validate"
14+
"github.com/dxc0522/goctlx/config"
15+
"github.com/dxc0522/goctlx/internal/cobrax"
16+
"github.com/dxc0522/goctlx/plugin"
417
"github.com/spf13/cobra"
5-
"github.com/zeromicro/go-zero/tools/goctl/api/apigen"
6-
"github.com/zeromicro/go-zero/tools/goctl/api/dartgen"
7-
"github.com/zeromicro/go-zero/tools/goctl/api/docgen"
8-
"github.com/zeromicro/go-zero/tools/goctl/api/format"
9-
"github.com/zeromicro/go-zero/tools/goctl/api/gogen"
10-
"github.com/zeromicro/go-zero/tools/goctl/api/javagen"
11-
"github.com/zeromicro/go-zero/tools/goctl/api/ktgen"
12-
"github.com/zeromicro/go-zero/tools/goctl/api/new"
13-
"github.com/zeromicro/go-zero/tools/goctl/api/tsgen"
14-
"github.com/zeromicro/go-zero/tools/goctl/api/validate"
15-
"github.com/zeromicro/go-zero/tools/goctl/config"
16-
"github.com/zeromicro/go-zero/tools/goctl/internal/cobrax"
17-
"github.com/zeromicro/go-zero/tools/goctl/plugin"
1818
)
1919

2020
var (

‎api/dartgen/gen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"fmt"
66
"strings"
77

8+
"github.com/dxc0522/goctlx/api/parser"
89
"github.com/spf13/cobra"
910
"github.com/zeromicro/go-zero/core/logx"
10-
"github.com/zeromicro/go-zero/tools/goctl/api/parser"
1111
)
1212

1313
var (

‎api/dartgen/genapi.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"strings"
66
"text/template"
77

8-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
8+
"github.com/dxc0522/goctlx/api/spec"
99
)
1010

1111
const apiTemplate = `import 'api.dart';

‎api/dartgen/gendata.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strings"
77
"text/template"
88

9-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
9+
"github.com/dxc0522/goctlx/api/spec"
1010
)
1111

1212
const dataTemplate = `// --{{with .APISpec.Info}}{{.Title}}{{end}}--

‎api/dartgen/util.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"path"
88
"strings"
99

10-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
11-
"github.com/zeromicro/go-zero/tools/goctl/api/util"
10+
"github.com/dxc0522/goctlx/api/spec"
11+
"github.com/dxc0522/goctlx/api/util"
1212
)
1313

1414
const (

‎api/dartgen/util_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dartgen
33
import (
44
"testing"
55

6-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
6+
"github.com/dxc0522/goctlx/api/spec"
77
)
88

99
func Test_getPropertyFromMember(t *testing.T) {

‎api/docgen/doc.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"strconv"
1010
"strings"
1111

12+
"github.com/dxc0522/goctlx/api/spec"
13+
apiutil "github.com/dxc0522/goctlx/api/util"
14+
"github.com/dxc0522/goctlx/util"
1215
"github.com/zeromicro/go-zero/core/stringx"
13-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
14-
apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util"
15-
"github.com/zeromicro/go-zero/tools/goctl/util"
1616
)
1717

1818
//go:embed markdown.tpl

‎api/docgen/gen.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"path/filepath"
88
"strings"
99

10+
"github.com/dxc0522/goctlx/api/parser"
11+
"github.com/dxc0522/goctlx/util/pathx"
1012
"github.com/spf13/cobra"
11-
"github.com/zeromicro/go-zero/tools/goctl/api/parser"
12-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
1313
)
1414

1515
var (

‎api/format/format.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ import (
1111
"path/filepath"
1212
"strings"
1313

14+
"github.com/dxc0522/goctlx/api/parser"
15+
"github.com/dxc0522/goctlx/api/util"
16+
"github.com/dxc0522/goctlx/pkg/env"
17+
apiF "github.com/dxc0522/goctlx/pkg/parser/api/format"
18+
"github.com/dxc0522/goctlx/util/pathx"
1419
"github.com/spf13/cobra"
1520
"github.com/zeromicro/go-zero/core/errorx"
16-
"github.com/zeromicro/go-zero/tools/goctl/api/parser"
17-
"github.com/zeromicro/go-zero/tools/goctl/api/util"
18-
"github.com/zeromicro/go-zero/tools/goctl/pkg/env"
19-
apiF "github.com/zeromicro/go-zero/tools/goctl/pkg/parser/api/format"
20-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
2121
)
2222

2323
const (

‎api/gogen/gen.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ import (
1111
"sync"
1212
"time"
1313

14+
apiformat "github.com/dxc0522/goctlx/api/format"
15+
"github.com/dxc0522/goctlx/api/parser"
16+
apiutil "github.com/dxc0522/goctlx/api/util"
17+
"github.com/dxc0522/goctlx/config"
18+
"github.com/dxc0522/goctlx/pkg/golang"
19+
"github.com/dxc0522/goctlx/util"
20+
"github.com/dxc0522/goctlx/util/pathx"
1421
"github.com/gookit/color"
1522
"github.com/spf13/cobra"
1623
"github.com/zeromicro/go-zero/core/logx"
17-
apiformat "github.com/zeromicro/go-zero/tools/goctl/api/format"
18-
"github.com/zeromicro/go-zero/tools/goctl/api/parser"
19-
apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util"
20-
"github.com/zeromicro/go-zero/tools/goctl/config"
21-
"github.com/zeromicro/go-zero/tools/goctl/pkg/golang"
22-
"github.com/zeromicro/go-zero/tools/goctl/util"
23-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
2424
)
2525

2626
const tmpFile = "%s-%d"

‎api/gogen/gen_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import (
1313
"strings"
1414
"testing"
1515

16+
"github.com/dxc0522/goctlx/api/parser"
17+
"github.com/dxc0522/goctlx/pkg/env"
18+
"github.com/dxc0522/goctlx/rpc/execx"
19+
"github.com/dxc0522/goctlx/util/pathx"
1620
"github.com/stretchr/testify/assert"
17-
"github.com/zeromicro/go-zero/tools/goctl/api/parser"
18-
"github.com/zeromicro/go-zero/tools/goctl/pkg/env"
19-
"github.com/zeromicro/go-zero/tools/goctl/rpc/execx"
20-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
2121
)
2222

2323
var (

‎api/gogen/genconfig.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
9-
"github.com/zeromicro/go-zero/tools/goctl/config"
10-
"github.com/zeromicro/go-zero/tools/goctl/util/format"
11-
"github.com/zeromicro/go-zero/tools/goctl/vars"
8+
"github.com/dxc0522/goctlx/api/spec"
9+
"github.com/dxc0522/goctlx/config"
10+
"github.com/dxc0522/goctlx/util/format"
11+
"github.com/dxc0522/goctlx/vars"
1212
)
1313

1414
const (

‎api/gogen/genetc.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"fmt"
66
"strconv"
77

8-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
9-
"github.com/zeromicro/go-zero/tools/goctl/config"
10-
"github.com/zeromicro/go-zero/tools/goctl/util/format"
8+
"github.com/dxc0522/goctlx/api/spec"
9+
"github.com/dxc0522/goctlx/config"
10+
"github.com/dxc0522/goctlx/util/format"
1111
)
1212

1313
const (

‎api/gogen/genhandlers.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66
"path"
77
"strings"
88

9-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
10-
"github.com/zeromicro/go-zero/tools/goctl/config"
11-
"github.com/zeromicro/go-zero/tools/goctl/util"
12-
"github.com/zeromicro/go-zero/tools/goctl/util/format"
13-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
9+
"github.com/dxc0522/goctlx/api/spec"
10+
"github.com/dxc0522/goctlx/config"
11+
"github.com/dxc0522/goctlx/util"
12+
"github.com/dxc0522/goctlx/util/format"
13+
"github.com/dxc0522/goctlx/util/pathx"
1414
)
1515

1616
const defaultLogicPackage = "logic"

‎api/gogen/genlogic.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import (
77
"strconv"
88
"strings"
99

10-
"github.com/zeromicro/go-zero/tools/goctl/api/parser/g4/gen/api"
11-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
12-
"github.com/zeromicro/go-zero/tools/goctl/config"
13-
"github.com/zeromicro/go-zero/tools/goctl/util/format"
14-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
15-
"github.com/zeromicro/go-zero/tools/goctl/vars"
10+
"github.com/dxc0522/goctlx/api/parser/g4/gen/api"
11+
"github.com/dxc0522/goctlx/api/spec"
12+
"github.com/dxc0522/goctlx/config"
13+
"github.com/dxc0522/goctlx/util/format"
14+
"github.com/dxc0522/goctlx/util/pathx"
15+
"github.com/dxc0522/goctlx/vars"
1616
)
1717

1818
//go:embed logic.tpl

‎api/gogen/genmain.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
9-
"github.com/zeromicro/go-zero/tools/goctl/config"
10-
"github.com/zeromicro/go-zero/tools/goctl/util/format"
11-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
12-
"github.com/zeromicro/go-zero/tools/goctl/vars"
8+
"github.com/dxc0522/goctlx/api/spec"
9+
"github.com/dxc0522/goctlx/config"
10+
"github.com/dxc0522/goctlx/util/format"
11+
"github.com/dxc0522/goctlx/util/pathx"
12+
"github.com/dxc0522/goctlx/vars"
1313
)
1414

1515
//go:embed main.tpl

‎api/gogen/genmiddleware.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
_ "embed"
55
"strings"
66

7-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
8-
"github.com/zeromicro/go-zero/tools/goctl/config"
9-
"github.com/zeromicro/go-zero/tools/goctl/util/format"
7+
"github.com/dxc0522/goctlx/api/spec"
8+
"github.com/dxc0522/goctlx/config"
9+
"github.com/dxc0522/goctlx/util/format"
1010
)
1111

1212
//go:embed middleware.tpl

‎api/gogen/genroutes.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ import (
1010
"text/template"
1111
"time"
1212

13+
"github.com/dxc0522/goctlx/api/spec"
14+
"github.com/dxc0522/goctlx/config"
15+
"github.com/dxc0522/goctlx/internal/version"
16+
"github.com/dxc0522/goctlx/util/format"
17+
"github.com/dxc0522/goctlx/util/pathx"
18+
"github.com/dxc0522/goctlx/vars"
1319
"github.com/zeromicro/go-zero/core/collection"
14-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
15-
"github.com/zeromicro/go-zero/tools/goctl/config"
16-
"github.com/zeromicro/go-zero/tools/goctl/internal/version"
17-
"github.com/zeromicro/go-zero/tools/goctl/util/format"
18-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
19-
"github.com/zeromicro/go-zero/tools/goctl/vars"
2020
)
2121

2222
const (

‎api/gogen/gensvc.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
9-
"github.com/zeromicro/go-zero/tools/goctl/config"
10-
"github.com/zeromicro/go-zero/tools/goctl/util/format"
11-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
12-
"github.com/zeromicro/go-zero/tools/goctl/vars"
8+
"github.com/dxc0522/goctlx/api/spec"
9+
"github.com/dxc0522/goctlx/config"
10+
"github.com/dxc0522/goctlx/util/format"
11+
"github.com/dxc0522/goctlx/util/pathx"
12+
"github.com/dxc0522/goctlx/vars"
1313
)
1414

1515
const contextFilename = "service_context"

‎api/gogen/gentypes.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import (
88
"path"
99
"strings"
1010

11-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
12-
apiutil "github.com/zeromicro/go-zero/tools/goctl/api/util"
13-
"github.com/zeromicro/go-zero/tools/goctl/config"
14-
"github.com/zeromicro/go-zero/tools/goctl/internal/version"
15-
"github.com/zeromicro/go-zero/tools/goctl/util"
16-
"github.com/zeromicro/go-zero/tools/goctl/util/format"
11+
"github.com/dxc0522/goctlx/api/spec"
12+
apiutil "github.com/dxc0522/goctlx/api/util"
13+
"github.com/dxc0522/goctlx/config"
14+
"github.com/dxc0522/goctlx/internal/version"
15+
"github.com/dxc0522/goctlx/util"
16+
"github.com/dxc0522/goctlx/util/format"
1717
)
1818

1919
const typesFile = "types"

‎api/gogen/template.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gogen
33
import (
44
"fmt"
55

6-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
6+
"github.com/dxc0522/goctlx/util/pathx"
77
)
88

99
const (

‎api/gogen/template_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"path/filepath"
66
"testing"
77

8+
"github.com/dxc0522/goctlx/util/pathx"
89
"github.com/stretchr/testify/assert"
9-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
1010
)
1111

1212
func TestGenTemplates(t *testing.T) {

‎api/gogen/util.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import (
77
"strings"
88
"text/template"
99

10+
"github.com/dxc0522/goctlx/api/spec"
11+
"github.com/dxc0522/goctlx/api/util"
12+
"github.com/dxc0522/goctlx/pkg/golang"
13+
"github.com/dxc0522/goctlx/util/pathx"
1014
"github.com/zeromicro/go-zero/core/collection"
11-
"github.com/zeromicro/go-zero/tools/goctl/api/spec"
12-
"github.com/zeromicro/go-zero/tools/goctl/api/util"
13-
"github.com/zeromicro/go-zero/tools/goctl/pkg/golang"
14-
"github.com/zeromicro/go-zero/tools/goctl/util/pathx"
1515
)
1616

1717
type fileGenConfig struct {

‎api/gogen/vars.go

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package gogen
22

33
const (
4-
internal = "internal/"
54
typesPacket = "types"
6-
configDir = internal + "config"
7-
contextDir = internal + "svc"
8-
handlerDir = internal + "handler"
9-
logicDir = internal + "logic"
10-
middlewareDir = internal + "middleware"
11-
typesDir = internal + typesPacket
5+
configDir = "config"
6+
contextDir = "svc"
7+
handlerDir = "handler"
8+
logicDir = "logic"
9+
middlewareDir = "middleware"
10+
typesDir = typesPacket
1211
groupProperty = "group"
1312
)

0 commit comments

Comments
 (0)