zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: change interface{} to any (#2818)

Browse Source 
* chore: change interface{} to any

* chore: update goctl version to 1.5.0

* chore: update goctl deps
This commit is contained in:
Kevin Wan
2023-01-24 16:32:02 +08:00
committed by GitHub
parent 7e0ac77139
commit ae87114282
221 changed files with 1910 additions and 2207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/goctl/util/console/console.go
View File

@@ -14,12 +14,12 @@ type (
// by default, it implemented the colorConsole to provide the colorful output to the console
// and the ideaConsole to output with prefix for the plugin of intellij
Console interface {
Success(format string, a ...interface{})
Info(format string, a ...interface{})
Debug(format string, a ...interface{})
Warning(format string, a ...interface{})
Error(format string, a ...interface{})
Fatalln(format string, a ...interface{})
Success(format string, a ...any)
Info(format string, a ...any)
Debug(format string, a ...any)
Warning(format string, a ...any)
Error(format string, a ...any)
Fatalln(format string, a ...any)
MarkDone()
Must(err error)
}
@@ -51,7 +51,7 @@ func NewColorConsole(enable ...bool) Console {
}
}
func (c *colorConsole) Info(format string, a ...interface{}) {
func (c *colorConsole) Info(format string, a ...any) {
if !c.enable {
return
}
@@ -59,7 +59,7 @@ func (c *colorConsole) Info(format string, a ...interface{}) {
fmt.Println(msg)
}
func (c *colorConsole) Debug(format string, a ...interface{}) {
func (c *colorConsole) Debug(format string, a ...any) {
if !c.enable {
return
}
@@ -67,7 +67,7 @@ func (c *colorConsole) Debug(format string, a ...interface{}) {
println(aurora.BrightCyan(msg))
}
func (c *colorConsole) Success(format string, a ...interface{}) {
func (c *colorConsole) Success(format string, a ...any) {
if !c.enable {
return
}
@@ -75,7 +75,7 @@ func (c *colorConsole) Success(format string, a ...interface{}) {
println(aurora.BrightGreen(msg))
}
func (c *colorConsole) Warning(format string, a ...interface{}) {
func (c *colorConsole) Warning(format string, a ...any) {
if !c.enable {
return
}
@@ -83,7 +83,7 @@ func (c *colorConsole) Warning(format string, a ...interface{}) {
println(aurora.BrightYellow(msg))
}
func (c *colorConsole) Error(format string, a ...interface{}) {
func (c *colorConsole) Error(format string, a ...any) {
if !c.enable {
return
}
@@ -91,7 +91,7 @@ func (c *colorConsole) Error(format string, a ...interface{}) {
println(aurora.BrightRed(msg))
}
func (c *colorConsole) Fatalln(format string, a ...interface{}) {
func (c *colorConsole) Fatalln(format string, a ...any) {
if !c.enable {
return
}
@@ -120,7 +120,7 @@ func NewIdeaConsole() Console {
return &ideaConsole{}
}
func (i *ideaConsole) Info(format string, a ...interface{}) {
func (i *ideaConsole) Info(format string, a ...any) {
msg := fmt.Sprintf(format, a...)
fmt.Println(msg)
}

2
tools/goctl/util/head.go
View File

@@ -10,7 +10,7 @@ const (
// GetHead returns a code head string with source filename
func GetHead(source string) string {
buffer, _ := With("head").Parse(headTemplate).Execute(map[string]interface{}{
buffer, _ := With("head").Parse(headTemplate).Execute(map[string]any{
"source": source,
})
return buffer.String()

4
tools/goctl/util/templatex.go
View File

@@ -39,7 +39,7 @@ func (t *DefaultTemplate) GoFmt(format bool) *DefaultTemplate {
}
// SaveTo writes the codes to the target path
func (t *DefaultTemplate) SaveTo(data interface{}, path string, forceUpdate bool) error {
func (t *DefaultTemplate) SaveTo(data any, path string, forceUpdate bool) error {
if pathx.FileExists(path) && !forceUpdate {
return nil
}
@@ -53,7 +53,7 @@ func (t *DefaultTemplate) SaveTo(data interface{}, path string, forceUpdate bool
}
// Execute returns the codes after the template executed
func (t *DefaultTemplate) Execute(data interface{}) (*bytes.Buffer, error) {
func (t *DefaultTemplate) Execute(data any) (*bytes.Buffer, error) {
tem, err := template.New(t.name).Parse(t.text)
if err != nil {
return nil, errorx.Wrap(err, "template parse error:", t.text)