{content}
',iframeTabPane:''},l=[{type:"main",title:"main",content:"Demo page
Welcome to use bootstrap multi-tabs :)
"}],d=function(b,c){var d=this;d.$element=a(b),d._init(c)._listen()._final()};d.prototype={constructor:d,create:function(a,b){this.options;var d,e;return(d=this._getParam(a))?(e=this._exist(d),e&&!d.isNewTab?(this.active(e),this):(d.active=d.active?d.active:b,e=this._createNavTab(d),this._createTabPane(d),this._storage(d.did,d),d.active&&this.active(e),this)):this},_createTabPane:function(a){var b=this,c=b.$element;return c.tabContent.append(b._getTabPaneHtml(a)),c.tabContent.find("#"+a.did)},_getTabPaneHtml:function(a){var b=this,c=b.options;return!a.content&&a.iframe?k.iframeTabPane.replace("{class}",c.content.iframe.class).replace("{tabPaneId}",a.did):k.ajaxTabPane.replace("{class}",c.content.ajax.class).replace("{tabPaneId}",a.did).replace("{content}",a.content)},_createNavTab:function(a){var b=this,c=b.$element,d=b._getNavTabHtml(a),e=c.navPanelList.find('a[data-type="'+a.type+'"][data-index="'+a.index+'"]').parent("li");return e.length?(e.html(d),b._getTabPane(e.find("a:first")).remove()):c.navPanelList.append(''}),on=l({},Xe.DefaultType,{content:"(string|element|function)"}),rn="fade",sn="show",an=".popover-header",ln=".popover-body",cn={HIDE:"hide"+Je,HIDDEN:"hidden"+Je,SHOW:"show"+Je,SHOWN:"shown"+Je,INSERTED:"inserted"+Je,CLICK:"click"+Je,FOCUSIN:"focusin"+Je,FOCUSOUT:"focusout"+Je,MOUSEENTER:"mouseenter"+Je,MOUSELEAVE:"mouseleave"+Je},hn=function(t){function i(){return t.apply(this,arguments)||this}!function(t,e){t.prototype=Object.create(e.prototype),(t.prototype.constructor=t).__proto__=e}(i,t);var e=i.prototype;return e.isWithContent=function(){return this.getTitle()||this._getContent()},e.addAttachmentClass=function(t){g(this.getTipElement()).addClass(tn+"-"+t)},e.getTipElement=function(){return this.tip=this.tip||g(this.config.template)[0],this.tip},e.setContent=function(){var t=g(this.getTipElement());this.setElementContent(t.find(an),this.getTitle());var e=this._getContent();"function"==typeof e&&(e=e.call(this.element)),this.setElementContent(t.find(ln),e),t.removeClass(rn+" "+sn)},e._getContent=function(){return this.element.getAttribute("data-content")||this.config.content},e._cleanTipClass=function(){var t=g(this.getTipElement()),e=t.attr("class").match(en);null!==e&&0
×
+
+
+
+
diff --git a/assets/templates/dashboard/dashboard.html b/assets/templates/dashboard/dashboard.html
new file mode 100644
index 00000000..a64aed45
--- /dev/null
+++ b/assets/templates/dashboard/dashboard.html
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 配置信息
+
+
+ MySQL
+主库信息：{{.MySQL.Write.Addr}}，账号：{{.MySQL.Write.User}}，数据库：{{.MySQL.Write.Name}}
+从库信息：{{.MySQL.Read.Addr}}，账号：{{.MySQL.Read.User}}，数据库：{{.MySQL.Read.Name}}
+最大连接数：{{ .MySQL.Base.MaxOpenConn }}
+空闲连接数：{{ .MySQL.Base.MaxIdleConn }}
+
+
+
+ Redis
+地址：{{ .Redis.Addr }}
+最大连接数：{{ .Redis.PoolSize }}
+空闲连接数：{{ .Redis.MinIdleConns }}
+
+ Mail
+
+
+ 邮箱服务器：{{ .Mail.Host }}
+发件人邮箱地址：{{ .Mail.User }}
+收件人邮箱地址：{{ .Mail.To }}
+
+
+
+
+
+
diff --git a/assets/templates/gencode/gencode_gorm.html b/assets/templates/gencode/gencode_gorm.html
new file mode 100644
index 00000000..5c24dcc5
--- /dev/null
+++ b/assets/templates/gencode/gencode_gorm.html
@@ -0,0 +1,90 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 内存信息
+
+
+ 总量：{{ .MemTotal }}
+已使用：{{ .MemUsed }}
+使用率：{{ .MemUsedPercent }}%
+
+
+
+
+
+
+
+ 硬盘信息
+
+
+ 总量：{{ .DiskTotal }}
+已使用：{{ .DiskUsed }}
+使用率：{{ .DiskUsedPercent }}%
+
+
+
+
+
+
+
+ CPU 信息
+
+
+ CPU：{{ .CpuName }}
+核数：{{ .CpuCores }}
+CPU 使用率：{{ .CpuUsedPercent }}%
+
+
+
+
+
+
+
+ 项目信息
+
+
+ 操作系统：{{ .GoOS }} {{ .GoArch }}
+项目地址：{{ .ProjectPath }}
+项目域名：{{ .Host }} {{ .Env }}
+GOPATH：{{ .GoPath }}
+Version：{{ .GoVersion }}
+Goroutine：{{ .Goroutine }}
+ + +
+
+
+
+
+
+
+
+
diff --git a/assets/templates/gencode/gencode_handler.html b/assets/templates/gencode/gencode_handler.html
new file mode 100644
index 00000000..fcdd4058
--- /dev/null
+++ b/assets/templates/gencode/gencode_handler.html
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ gormgen 代码生成工具
+
+ 注意：请在
+
+ Mac 或 Linux 环境执行。
+
+
+
+
+ + + +
+ +
+
+
+
+
+ 执行结果
+
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/templates/gencode/gencode_init.html b/assets/templates/gencode/gencode_init.html
new file mode 100644
index 00000000..049cfd5e
--- /dev/null
+++ b/assets/templates/gencode/gencode_init.html
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ handlergen 代码生成工具
+
+ 注意：请在
+
+ Mac 或 Linux 环境执行。
+
+
+
+
+ + + +
+ +
+
+
+
+
+ 执行结果
+
+
+
+
+
+
+
+
+
+
diff --git a/assets/templates/index/index.html b/assets/templates/index/index.html
new file mode 100644
index 00000000..e03657d8
--- /dev/null
+++ b/assets/templates/index/index.html
@@ -0,0 +1,211 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 初始化
+
+ 注意：请在
+ Mac 或 Linux 环境执行。初始化项目所需信息：
+ + MySQL 数据表：user_demo ；
+ + +
+
+
+
+
+
+ 执行结果
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cmd/gormgen/pkg/generator.go b/cmd/gormgen/pkg/generator.go
index 5ae0d908..eac67bce 100644
--- a/cmd/gormgen/pkg/generator.go
+++ b/cmd/gormgen/pkg/generator.go
@@ -3,6 +3,7 @@ package pkg
import (
"bytes"
"errors"
+ "fmt"
"go/format"
"io/ioutil"
"log"
@@ -119,6 +120,7 @@ func (g *Generator) Flush() error {
if err := ioutil.WriteFile(filename, g.buf[k].Bytes(), 0777); err != nil {
log.Fatalln(err)
}
+ fmt.Println(" └── file : ", fmt.Sprintf("%s_repo/gen_%s.go", strings.ToLower(k), strings.ToLower(k)))
}
return nil
}
diff --git a/cmd/gormgen/pkg/template.go b/cmd/gormgen/pkg/template.go
index 0829d7aa..73311061 100644
--- a/cmd/gormgen/pkg/template.go
+++ b/cmd/gormgen/pkg/template.go
@@ -52,7 +52,7 @@ func (t *{{.StructName}}) Delete(db *gorm.DB) (err error) {
}
func (t *{{.StructName}}) Updates(db *gorm.DB, m map[string]interface{}) (err error) {
- if err = db.Model(&UserDemo{}).Where("id = ?", t.Id).Updates(m).Error; err != nil {
+ if err = db.Model(&{{.StructName}}{}).Where("id = ?", t.Id).Updates(m).Error; err != nil {
return errors.Wrap(err, "updates err")
}
return nil
diff --git a/cmd/handlergen/main.go b/cmd/handlergen/main.go
index 7b77351e..294d9952 100644
--- a/cmd/handlergen/main.go
+++ b/cmd/handlergen/main.go
@@ -4,6 +4,7 @@ import (
"flag"
"fmt"
"go/token"
+ "io/ioutil"
"log"
"os"
"strings"
@@ -24,10 +25,15 @@ func init() {
func main() {
fs := token.NewFileSet()
- file := fmt.Sprintf("./internal/api/controller/%s/handler.go", handlerName)
- parsedFile, err := decorator.ParseFile(fs, file, nil, 0)
+ filePath := fmt.Sprintf("./internal/api/controller/%s", handlerName)
+ parsedFile, err := decorator.ParseFile(fs, filePath+"/handler.go", nil, 0)
if err != nil {
- log.Fatalf("parsing package: %s: %s\n", file, err)
+ log.Fatalf("parsing package: %s: %s\n", filePath, err)
+ }
+
+ files, _ := ioutil.ReadDir(filePath)
+ if len(files) > 1 {
+ log.Fatalf("请先确保 %s 目录中，有且仅有 handler.go 一个文件。", filePath)
}
dst.Inspect(parsedFile, func(n dst.Node) bool {
@@ -59,6 +65,7 @@ func main() {
if err != nil {
fmt.Printf("create and open func file error %v\n", err.Error())
}
+ fmt.Println(" └── file : ", filename)
funcContent := fmt.Sprintf("package %s\n\n", handlerName)
funcContent += "import (\n"
diff --git a/cmd/init/db/main.go b/cmd/init/db/main.go
index e0826274..9d025611 100644
--- a/cmd/init/db/main.go
+++ b/cmd/init/db/main.go
@@ -33,20 +33,19 @@ func main() {
// 初始化 DB
db, err := mysql.New(dbAddr, dbUser, dbPass, dbName)
if err != nil {
- log.Fatal("new db err", err)
+ log.Fatal("new db err: ", err.Error())
}
defer func() {
if err := db.DbClose(); err != nil {
- log.Println("db close err", err)
+ log.Fatal("db close err: ", err.Error())
}
}()
// 创建 user_demo 表
err = db.GetDb().Exec(mysql.CreateUserDemoTableSql()).Error
if err != nil {
- log.Println("create user_demo table err", err)
- return
+ log.Fatal("create user_demo table err: ", err.Error())
}
log.Println("create user_demo table success")
diff --git a/cmd/init/db/mysql/mysql.go b/cmd/init/db/mysql/mysql.go
index 4ebfecfb..74a46ff2 100644
--- a/cmd/init/db/mysql/mysql.go
+++ b/cmd/init/db/mysql/mysql.go
@@ -6,7 +6,6 @@ import (
"github.com/pkg/errors"
"gorm.io/driver/mysql"
"gorm.io/gorm"
- "gorm.io/gorm/logger"
"gorm.io/gorm/schema"
)
@@ -35,7 +34,7 @@ func New(dbAddr, dbUser, dbPass, dbName string) (Repo, error) {
NamingStrategy: schema.NamingStrategy{
SingularTable: true,
},
- Logger: logger.Default.LogMode(logger.Info), // 日志配置
+ //Logger: logger.Default.LogMode(logger.Info), // 日志配置
})
if err != nil {
diff --git a/cmd/mysqlmd/main.go b/cmd/mysqlmd/main.go
index 9d664226..965f7ea2 100644
--- a/cmd/mysqlmd/main.go
+++ b/cmd/mysqlmd/main.go
@@ -78,13 +78,15 @@ func main() {
filepath := "./internal/api/repository/db_repo/" + table.Name + "_repo"
_ = os.Mkdir(filepath, 0766)
+ fmt.Println("create dir : ", filepath)
mdName := fmt.Sprintf("%s/gen_table.md", filepath)
mdFile, err := os.OpenFile(mdName, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0766)
if err != nil {
- fmt.Printf("create and open markdown file error %v\n", err.Error())
+ fmt.Printf("markdown file error %v\n", err.Error())
return
}
+ fmt.Println(" └── file : ", table.Name+"_repo/gen_table.md")
modelName := fmt.Sprintf("%s/gen_model.go", filepath)
modelFile, err := os.OpenFile(modelName, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0766)
@@ -92,6 +94,7 @@ func main() {
fmt.Printf("create and open model file error %v\n", err.Error())
return
}
+ fmt.Println(" └── file : ", table.Name+"_repo/gen_model.go")
modelContent := fmt.Sprintf("package %s%s\n", table.Name, "_repo")
modelContent += fmt.Sprintf(`import "time"`)
diff --git a/go.mod b/go.mod
index c7fca59b..ab6570b6 100644
--- a/go.mod
+++ b/go.mod
@@ -4,33 +4,37 @@ go 1.15
require (
github.com/99designs/gqlgen v0.13.0
+ github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 // indirect
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
github.com/dave/dst v0.26.2
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/gin-contrib/pprof v1.2.1
github.com/gin-gonic/gin v1.6.3
+ github.com/go-ole/go-ole v1.2.5 // indirect
github.com/go-openapi/spec v0.20.0 // indirect
github.com/go-redis/redis/v7 v7.4.0
github.com/golang/protobuf v1.4.3
github.com/google/go-cmp v0.5.4 // indirect
github.com/jinzhu/gorm v1.9.16
+ github.com/koketama/errors v1.0.0
github.com/onsi/ginkgo v1.14.2 // indirect
github.com/onsi/gomega v1.10.4 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v0.9.3
github.com/rs/cors v1.7.0
+ github.com/shirou/gopsutil v3.21.2+incompatible
github.com/spf13/cast v1.3.0
github.com/spf13/viper v1.7.1
github.com/swaggo/gin-swagger v1.3.0
github.com/swaggo/swag v1.7.0
+ github.com/tklauser/go-sysconf v0.3.4 // indirect
github.com/vektah/gqlparser/v2 v2.1.0
go.uber.org/multierr v1.5.0
go.uber.org/zap v1.16.0
golang.org/x/mod v0.4.0 // indirect
golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect
- golang.org/x/sys v0.0.0-20201223074533-0d417f636930 // indirect
golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0
- golang.org/x/tools v0.0.0-20201226215659-b1c90890d22a // indirect
+ golang.org/x/tools v0.0.0-20201226215659-b1c90890d22a
google.golang.org/grpc v1.27.0
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
diff --git a/go.sum b/go.sum
index cc24824b..42669766 100644
--- a/go.sum
+++ b/go.sum
@@ -25,6 +25,8 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
+github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46 h1:5sXbqlSomvdjlRbWyNqkPsJ3Fg+tQZCbgeX1VGljbQY=
+github.com/StackExchange/wmi v0.0.0-20210224194228-fe8f1750fd46/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM=
github.com/agnivade/levenshtein v1.0.3 h1:M5ZnqLOoZR8ygVq0FfkXsNOKzMCk0xRiow0R5+5VkQ0=
github.com/agnivade/levenshtein v1.0.3/go.mod h1:4SFRZbbXWLF4MU1T9Qg0pGgH3Pjs+t6ie5efyrwRJXs=
@@ -101,6 +103,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY=
+github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
@@ -228,6 +232,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/koketama/errors v1.0.0 h1:4JO7SGSkBROkTuacd+cgPtBDr7fisixXoajkNh4eW3M=
+github.com/koketama/errors v1.0.0/go.mod h1:SIU03UGMkhp6tyB5+EvhDI9i9ZDa4rQolJCt9ZrFrbU=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -332,6 +338,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0=
github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
+github.com/shirou/gopsutil v3.21.2+incompatible h1:U+YvJfjCh6MslYlIAXvPtzhW3YZEtc9uncueUNpD/0A=
+github.com/shirou/gopsutil v3.21.2+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
@@ -369,6 +377,10 @@ github.com/swaggo/gin-swagger v1.3.0/go.mod h1:oy1BRA6WvgtCp848lhxce7BnWH4C8Bxa0
github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+tv8Y=
github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E=
github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
+github.com/tklauser/go-sysconf v0.3.4 h1:HT8SVixZd3IzLdfs/xlpq0jeSfTX57g1v6wB1EuzV7M=
+github.com/tklauser/go-sysconf v0.3.4/go.mod h1:Cl2c8ZRWfHD5IrfHo9VN+FX9kCFjIOyVklgXycLB6ek=
+github.com/tklauser/numcpus v0.2.1 h1:ct88eFm+Q7m2ZfXJdan1xYoXKlmwsfP+k88q05KvlZc=
+github.com/tklauser/numcpus v0.2.1/go.mod h1:9aU+wOc6WjUIZEwWMP62PL/41d65P+iks1gBkr4QyP8=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
@@ -496,6 +508,7 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -504,8 +517,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201223074533-0d417f636930 h1:vRgIt+nup/B/BwIS0g2oC0haq0iqbV3ZA+u6+0TlNCo=
-golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210217105451-b926d437f341 h1:2/QtM1mL37YmcsT8HaDNHDgTqqFVw+zr8UzMiBVLzYU=
+golang.org/x/sys v0.0.0-20210217105451-b926d437f341/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
diff --git a/internal/api/router/router.go b/internal/api/router/router.go
deleted file mode 100644
index 8b76b118..00000000
--- a/internal/api/router/router.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package router
-
-import (
- "github.com/xinliangnote/go-gin-api/internal/api/controller/demo_handler"
- "github.com/xinliangnote/go-gin-api/internal/api/controller/user_handler"
- "github.com/xinliangnote/go-gin-api/internal/api/router/middleware"
- "github.com/xinliangnote/go-gin-api/internal/graph/handler"
- "github.com/xinliangnote/go-gin-api/internal/pkg/cache"
- "github.com/xinliangnote/go-gin-api/internal/pkg/core"
- "github.com/xinliangnote/go-gin-api/internal/pkg/db"
- "github.com/xinliangnote/go-gin-api/internal/pkg/grpc"
- "github.com/xinliangnote/go-gin-api/internal/pkg/metrics"
- "github.com/xinliangnote/go-gin-api/internal/pkg/notify"
-
- "github.com/pkg/errors"
- "go.uber.org/zap"
-)
-
-func NewHTTPMux(logger *zap.Logger, db db.Repo, cache cache.Repo, grpConn grpc.ClientConn) (core.Mux, error) {
-
- if logger == nil {
- return nil, errors.New("logger required")
- }
-
- mux, err := core.New(logger,
- core.WithEnableCors(),
- core.WithEnableRate(),
- core.WithPanicNotify(notify.OnPanicNotify),
- core.WithRecordMetrics(metrics.RecordMetrics),
- )
-
- if err != nil {
- panic(err)
- }
-
- // 中间件
- middles := middleware.New(logger, cache)
-
- // graphQL 控制器
- gqlHandler := handler.New(logger, db, cache)
-
- gql := mux.Group("/graphql")
- {
- gql.GET("", gqlHandler.Playground())
- gql.POST("/query", gqlHandler.Query())
- }
-
- // demo 控制器
- demoHandler := demo_handler.New(logger, db, cache, grpConn)
- demo := mux.Group("/demo", core.WrapAuthHandler(middles.Jwt)) // 使用 jwt 验证
- {
- // 为了演示 Trace ，增加了一些看起来无意义的调试信息和 SQL 信息。
- demo.GET("/trace", demoHandler.Trace())
-
- // 模拟数据
- demo.GET("get/:name", core.AliasForRecordMetrics("/demo/get"), demoHandler.Get())
- demo.POST("post", demoHandler.Post())
- }
-
- demoNoAuth := mux.Group("/auth") // 不使用 jwt 验证
- {
- demoNoAuth.POST("/get", demoHandler.Auth())
- }
-
- // user 控制器
- userHandler := user_handler.New(logger, db, cache)
- user := mux.Group("/user", core.WrapAuthHandler(middles.Jwt))
- {
- user.POST("/create", userHandler.Create())
- user.PUT("/update", userHandler.UpdateNickNameByID())
- user.PATCH("/delete/:id", userHandler.Delete())
- user.GET("/info/:username", core.AliasForRecordMetrics("/user/info"), userHandler.Detail())
- }
-
- return mux, nil
-}
diff --git a/internal/pkg/core/context.go b/internal/pkg/core/context.go
index 0cad7747..d74a5c27 100644
--- a/internal/pkg/core/context.go
+++ b/internal/pkg/core/context.go
@@ -97,6 +97,9 @@ type Context interface {
GraphPayload(payload interface{})
getGraphPayload() interface{}
+ // HTML 返回界面
+ HTML(name string, obj interface{})
+
// AbortWithError 错误返回
AbortWithError(err errno.Error)
abortError() errno.Error
@@ -251,6 +254,10 @@ func (c *context) GraphPayload(payload interface{}) {
c.ctx.Set(_GraphPayloadName, payload)
}
+func (c *context) HTML(name string, obj interface{}) {
+ c.ctx.HTML(200, name+".html", obj)
+}
+
func (c *context) Header() http.Header {
header := c.ctx.Request.Header
diff --git a/internal/pkg/core/core.go b/internal/pkg/core/core.go
index 242d997b..40b2ffca 100644
--- a/internal/pkg/core/core.go
+++ b/internal/pkg/core/core.go
@@ -246,6 +246,9 @@ func New(logger *zap.Logger, options ...Option) (Mux, error) {
fmt.Println(color.Green(fmt.Sprintf("* [register port %s]", configs.ProjectPort())))
fmt.Println(color.Green(fmt.Sprintf("* [register env %s]", env.Active().Value())))
+ mux.engine.StaticFS("bootstrap", http.Dir("./assets/bootstrap"))
+ mux.engine.LoadHTMLGlob("./assets/templates/**/*")
+
// withoutLogPaths 这些请求，默认不记录日志
withoutTracePaths := map[string]bool{
"/metrics": true,
diff --git a/internal/router/middleware/middle_disablelog.go b/internal/router/middleware/middle_disablelog.go
new file mode 100644
index 00000000..73035b80
--- /dev/null
+++ b/internal/router/middleware/middle_disablelog.go
@@ -0,0 +1,9 @@
+package middleware
+
+import "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+
+func (m *middleware) DisableLog() core.HandlerFunc {
+ return func(c core.Context) {
+ core.DisableTrace(c)
+ }
+}
diff --git a/internal/api/router/middleware/middle_jwt.go b/internal/router/middleware/middle_jwt.go
similarity index 100%
rename from internal/api/router/middleware/middle_jwt.go
rename to internal/router/middleware/middle_jwt.go
diff --git a/internal/api/router/middleware/middle_resubmit.go b/internal/router/middleware/middle_resubmit.go
similarity index 100%
rename from internal/api/router/middleware/middle_resubmit.go
rename to internal/router/middleware/middle_resubmit.go
diff --git a/internal/api/router/middleware/middlerware.go b/internal/router/middleware/middlerware.go
similarity index 72%
rename from internal/api/router/middleware/middlerware.go
rename to internal/router/middleware/middlerware.go
index e4c363c9..980c0fbb 100644
--- a/internal/api/router/middleware/middlerware.go
+++ b/internal/router/middleware/middlerware.go
@@ -1,10 +1,8 @@
package middleware
import (
- "github.com/xinliangnote/go-gin-api/internal/api/service/user_service"
"github.com/xinliangnote/go-gin-api/internal/pkg/cache"
"github.com/xinliangnote/go-gin-api/internal/pkg/core"
- "github.com/xinliangnote/go-gin-api/internal/pkg/grpc"
"github.com/xinliangnote/go-gin-api/pkg/errno"
"go.uber.org/zap"
@@ -21,13 +19,14 @@ type Middleware interface {
// Resubmit 中间件
Resubmit() core.HandlerFunc
+
+ // DisableLog 不记录日志
+ DisableLog() core.HandlerFunc
}
type middleware struct {
- logger *zap.Logger
- cache cache.Repo
- grpConn grpc.ClientConn
- userService user_service.UserService
+ logger *zap.Logger
+ cache cache.Repo
}
func New(logger *zap.Logger, cache cache.Repo) Middleware {
diff --git a/internal/router/router.go b/internal/router/router.go
new file mode 100644
index 00000000..b8cb7ff2
--- /dev/null
+++ b/internal/router/router.go
@@ -0,0 +1,60 @@
+package router
+
+import (
+ "github.com/xinliangnote/go-gin-api/internal/pkg/cache"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/db"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/grpc"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/metrics"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/notify"
+ "github.com/xinliangnote/go-gin-api/internal/router/middleware"
+
+ "github.com/pkg/errors"
+ "go.uber.org/zap"
+)
+
+type resource struct {
+ mux core.Mux
+ logger *zap.Logger
+ db db.Repo
+ cache cache.Repo
+ grpConn grpc.ClientConn
+ middles middleware.Middleware
+}
+
+func NewHTTPMux(logger *zap.Logger, db db.Repo, cache cache.Repo, grpConn grpc.ClientConn) (core.Mux, error) {
+
+ if logger == nil {
+ return nil, errors.New("logger required")
+ }
+
+ mux, err := core.New(logger,
+ core.WithEnableCors(),
+ core.WithEnableRate(),
+ core.WithPanicNotify(notify.OnPanicNotify),
+ core.WithRecordMetrics(metrics.RecordMetrics),
+ )
+
+ if err != nil {
+ panic(err)
+ }
+
+ r := new(resource)
+ r.mux = mux
+ r.logger = logger
+ r.db = db
+ r.cache = cache
+ r.grpConn = grpConn
+ r.middles = middleware.New(logger, cache)
+
+ // 设置 WEB 路由
+ setWebRouter(r)
+
+ // 设置 API 路由
+ setApiRouter(r)
+
+ // 设置 GraphQL 路由
+ setGraphQLRouter(r)
+
+ return mux, nil
+}
diff --git a/internal/router/router_api.go b/internal/router/router_api.go
new file mode 100644
index 00000000..590d0b9f
--- /dev/null
+++ b/internal/router/router_api.go
@@ -0,0 +1,36 @@
+package router
+
+import (
+ "github.com/xinliangnote/go-gin-api/internal/api/controller/demo_handler"
+ "github.com/xinliangnote/go-gin-api/internal/api/controller/user_handler"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+)
+
+func setApiRouter(r *resource) {
+ // demo 控制器
+ demoHandler := demo_handler.New(r.logger, r.db, r.cache, r.grpConn)
+ demo := r.mux.Group("/demo", core.WrapAuthHandler(r.middles.Jwt)) // 使用 jwt 验证
+ {
+ // 为了演示 Trace ，增加了一些看起来无意义的调试信息和 SQL 信息。
+ demo.GET("/trace", demoHandler.Trace())
+
+ // 模拟数据
+ demo.GET("get/:name", core.AliasForRecordMetrics("/demo/get"), demoHandler.Get())
+ demo.POST("post", demoHandler.Post())
+ }
+
+ demoNoAuth := r.mux.Group("/auth") // 不使用 jwt 验证
+ {
+ demoNoAuth.POST("/get", demoHandler.Auth())
+ }
+
+ // user 控制器
+ userHandler := user_handler.New(r.logger, r.db, r.cache)
+ user := r.mux.Group("/user", core.WrapAuthHandler(r.middles.Jwt))
+ {
+ user.POST("/create", userHandler.Create())
+ user.PUT("/update", userHandler.UpdateNickNameByID())
+ user.PATCH("/delete/:id", userHandler.Delete())
+ user.GET("/info/:username", core.AliasForRecordMetrics("/user/info"), userHandler.Detail())
+ }
+}
diff --git a/internal/router/router_graphql.go b/internal/router/router_graphql.go
new file mode 100644
index 00000000..6c067a85
--- /dev/null
+++ b/internal/router/router_graphql.go
@@ -0,0 +1,14 @@
+package router
+
+import "github.com/xinliangnote/go-gin-api/internal/graph/handler"
+
+func setGraphQLRouter(r *resource) {
+ // graphQL 控制器
+ gqlHandler := handler.New(r.logger, r.db, r.cache)
+
+ gql := r.mux.Group("/graphql")
+ {
+ gql.GET("", gqlHandler.Playground())
+ gql.POST("/query", gqlHandler.Query())
+ }
+}
diff --git a/internal/router/router_web.go b/internal/router/router_web.go
new file mode 100644
index 00000000..7299b474
--- /dev/null
+++ b/internal/router/router_web.go
@@ -0,0 +1,39 @@
+package router
+
+import (
+ "github.com/xinliangnote/go-gin-api/internal/web/controller/configinfo_handler"
+ "github.com/xinliangnote/go-gin-api/internal/web/controller/dashboard_handler"
+ "github.com/xinliangnote/go-gin-api/internal/web/controller/gencode_handler"
+ "github.com/xinliangnote/go-gin-api/internal/web/controller/index_handler"
+)
+
+func setWebRouter(r *resource) {
+
+ indexHandler := index_handler.New(r.logger, r.db, r.cache)
+ dashboardHandler := dashboard_handler.New(r.logger, r.db, r.cache)
+ genCodeHandler := gencode_handler.New(r.logger, r.db, r.cache)
+ configInfoHandler := configinfo_handler.New(r.logger, r.db, r.cache)
+
+ web := r.mux.Group("", r.middles.DisableLog())
+ {
+ // 首页侧边栏
+ web.GET("", indexHandler.View())
+
+ // 仪表盘
+ web.GET("/dashboard", dashboardHandler.View())
+
+ // 配置信息
+ web.GET("/configinfo", configInfoHandler.View())
+
+ // 代码生成
+ web.GET("/init", genCodeHandler.InitView())
+ web.POST("/init_exec", genCodeHandler.InitExecute())
+
+ web.GET("/gormgen", genCodeHandler.GormView())
+ web.POST("/gormgen_exec", genCodeHandler.GormExecute())
+
+ web.GET("/handlergen", genCodeHandler.HandlerView())
+ web.POST("/handlergen_exec", genCodeHandler.HandlerExecute())
+
+ }
+}
diff --git a/internal/web/controller/configinfo_handler/func_view.go b/internal/web/controller/configinfo_handler/func_view.go
new file mode 100644
index 00000000..cbe68d4a
--- /dev/null
+++ b/internal/web/controller/configinfo_handler/func_view.go
@@ -0,0 +1,12 @@
+package configinfo_handler
+
+import (
+ "github.com/xinliangnote/go-gin-api/configs"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+)
+
+func (h *handler) View() core.HandlerFunc {
+ return func(c core.Context) {
+ c.HTML("configinfo", configs.Get())
+ }
+}
diff --git a/internal/web/controller/configinfo_handler/handler.go b/internal/web/controller/configinfo_handler/handler.go
new file mode 100644
index 00000000..ecb6df5e
--- /dev/null
+++ b/internal/web/controller/configinfo_handler/handler.go
@@ -0,0 +1,31 @@
+package configinfo_handler
+
+import (
+ "github.com/xinliangnote/go-gin-api/internal/pkg/cache"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/db"
+
+ "go.uber.org/zap"
+)
+
+var _ Handler = (*handler)(nil)
+
+type Handler interface {
+ i()
+
+ View() core.HandlerFunc
+}
+
+type handler struct {
+ logger *zap.Logger
+ cache cache.Repo
+}
+
+func New(logger *zap.Logger, db db.Repo, cache cache.Repo) Handler {
+ return &handler{
+ logger: logger,
+ cache: cache,
+ }
+}
+
+func (h *handler) i() {}
diff --git a/internal/web/controller/dashboard_handler/func_view.go b/internal/web/controller/dashboard_handler/func_view.go
new file mode 100644
index 00000000..fc32826f
--- /dev/null
+++ b/internal/web/controller/dashboard_handler/func_view.go
@@ -0,0 +1,89 @@
+package dashboard_handler
+
+import (
+ "fmt"
+ "os"
+ "runtime"
+ "strconv"
+ "strings"
+ "time"
+
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+ "github.com/xinliangnote/go-gin-api/pkg/env"
+
+ "github.com/shirou/gopsutil/cpu"
+ "github.com/shirou/gopsutil/disk"
+ "github.com/shirou/gopsutil/host"
+ "github.com/shirou/gopsutil/mem"
+)
+
+const (
+ B = 1
+ KB = 1024 * B
+ MB = 1024 * KB
+ GB = 1024 * MB
+)
+
+type viewResponse struct {
+ MemTotal string
+ MemUsed string
+ MemUsedPercent float64
+
+ DiskTotal string
+ DiskUsed string
+ DiskUsedPercent float64
+
+ HostOS string
+ HostName string
+
+ CpuName string
+ CpuCores int32
+ CpuUsedPercent float64
+
+ GoPath string
+ GoVersion string
+ Goroutine int
+ ProjectPath string
+ Env string
+ Host string
+ GoOS string
+ GoArch string
+}
+
+func (h *handler) View() core.HandlerFunc {
+ return func(c core.Context) {
+ memInfo, _ := mem.VirtualMemory()
+ diskInfo, _ := disk.Usage("/")
+ hostInfo, _ := host.Info()
+ cpuInfo, _ := cpu.Info()
+ cpuPercent, _ := cpu.Percent(time.Second, false)
+
+ obj := new(viewResponse)
+ obj.MemTotal = fmt.Sprintf("%d GB", memInfo.Total/GB)
+ obj.MemUsed = fmt.Sprintf("%d GB", memInfo.Used/GB)
+ obj.MemUsedPercent, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", memInfo.UsedPercent), 64)
+
+ obj.DiskTotal = fmt.Sprintf("%d GB", diskInfo.Total/GB)
+ obj.DiskUsed = fmt.Sprintf("%d GB", diskInfo.Used/GB)
+ obj.DiskUsedPercent, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", diskInfo.UsedPercent), 64)
+
+ obj.HostOS = fmt.Sprintf("%s(%s) %s", hostInfo.Platform, hostInfo.PlatformFamily, hostInfo.PlatformVersion)
+ obj.HostName = hostInfo.Hostname
+
+ obj.CpuName = cpuInfo[0].ModelName
+ obj.CpuCores = cpuInfo[0].Cores
+ obj.CpuUsedPercent, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", cpuPercent[0]), 64)
+
+ obj.GoPath = runtime.GOROOT()
+ obj.GoVersion = runtime.Version()
+ obj.Goroutine = runtime.NumGoroutine()
+ dir, _ := os.Getwd()
+ obj.ProjectPath = strings.Replace(dir, "\\", "/", -1)
+ obj.Host = c.Host()
+ obj.Env = env.Active().Value()
+ obj.GoOS = runtime.GOOS
+ obj.GoArch = runtime.GOARCH
+
+ c.HTML("dashboard", obj)
+ }
+}
diff --git a/internal/web/controller/dashboard_handler/handler.go b/internal/web/controller/dashboard_handler/handler.go
new file mode 100644
index 00000000..c8fe0ce1
--- /dev/null
+++ b/internal/web/controller/dashboard_handler/handler.go
@@ -0,0 +1,31 @@
+package dashboard_handler
+
+import (
+ "github.com/xinliangnote/go-gin-api/internal/pkg/cache"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/db"
+
+ "go.uber.org/zap"
+)
+
+var _ Handler = (*handler)(nil)
+
+type Handler interface {
+ i()
+
+ View() core.HandlerFunc
+}
+
+type handler struct {
+ logger *zap.Logger
+ cache cache.Repo
+}
+
+func New(logger *zap.Logger, db db.Repo, cache cache.Repo) Handler {
+ return &handler{
+ logger: logger,
+ cache: cache,
+ }
+}
+
+func (h *handler) i() {}
diff --git a/internal/web/controller/gencode_handler/func_gormexecute.go b/internal/web/controller/gencode_handler/func_gormexecute.go
new file mode 100644
index 00000000..b5a214f7
--- /dev/null
+++ b/internal/web/controller/gencode_handler/func_gormexecute.go
@@ -0,0 +1,44 @@
+package gencode_handler
+
+import (
+ "bytes"
+ "fmt"
+ "os/exec"
+
+ "github.com/xinliangnote/go-gin-api/configs"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+)
+
+type gormExecuteRequest struct {
+ Tables string `form:"tables"`
+}
+
+func (h *handler) GormExecute() core.HandlerFunc {
+ return func(c core.Context) {
+
+ req := new(gormExecuteRequest)
+ if err := c.ShouldBindPostForm(req); err != nil {
+ c.Payload("参数传递有误")
+ return
+ }
+
+ mysqlConf := configs.Get().MySQL.Read
+ shellPath := fmt.Sprintf("./scripts/gormgen.sh %s %s %s %s %s", mysqlConf.Addr, mysqlConf.User, mysqlConf.Pass, mysqlConf.Name, req.Tables)
+
+ command := exec.Command("/bin/bash", "-c", shellPath) //初始化 Cmd
+
+ // windows 版本
+ //command := exec.Command("cmd", "/C", shellPath)
+
+ var stderr bytes.Buffer
+ command.Stderr = &stderr
+
+ output, err := command.Output()
+ if err != nil {
+ c.Payload(stderr.String())
+ return
+ }
+
+ c.Payload(string(output))
+ }
+}
diff --git a/internal/web/controller/gencode_handler/func_gormview.go b/internal/web/controller/gencode_handler/func_gormview.go
new file mode 100644
index 00000000..ea642a8b
--- /dev/null
+++ b/internal/web/controller/gencode_handler/func_gormview.go
@@ -0,0 +1,42 @@
+package gencode_handler
+
+import (
+ "fmt"
+
+ "github.com/xinliangnote/go-gin-api/configs"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+)
+
+func (h *handler) GormView() core.HandlerFunc {
+ return func(c core.Context) {
+
+ type tableInfo struct {
+ Name string `db:"table_name"` // name
+ Comment string `db:"table_comment"` // comment
+ }
+
+ var tableCollect []tableInfo
+
+ mysqlConf := configs.Get().MySQL.Read
+ sqlTables := fmt.Sprintf("SELECT `table_name`,`table_comment` FROM `information_schema`.`tables` WHERE `table_schema`= '%s'", mysqlConf.Name)
+ rows, err := h.db.GetDbR().Raw(sqlTables).Rows()
+ if err != nil {
+ c.HTML("gormgen", tableCollect)
+ return
+ }
+ defer rows.Close()
+
+ for rows.Next() {
+ var info tableInfo
+ err = rows.Scan(&info.Name, &info.Comment)
+ if err != nil {
+ fmt.Printf("execute query tables action error,had ignored, detail is [%v]\n", err.Error())
+ continue
+ }
+
+ tableCollect = append(tableCollect, info)
+ }
+
+ c.HTML("gencode_gorm", tableCollect)
+ }
+}
diff --git a/internal/web/controller/gencode_handler/func_handlerexecute.go b/internal/web/controller/gencode_handler/func_handlerexecute.go
new file mode 100644
index 00000000..40faed18
--- /dev/null
+++ b/internal/web/controller/gencode_handler/func_handlerexecute.go
@@ -0,0 +1,40 @@
+package gencode_handler
+
+import (
+ "bytes"
+ "fmt"
+ "os/exec"
+
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+)
+
+type handlerExecuteRequest struct {
+ Name string `form:"name"`
+}
+
+func (h *handler) HandlerExecute() core.HandlerFunc {
+ return func(c core.Context) {
+ req := new(handlerExecuteRequest)
+ if err := c.ShouldBindPostForm(req); err != nil {
+ c.Payload("参数传递有误")
+ return
+ }
+
+ shellPath := fmt.Sprintf("./scripts/handlergen.sh %s", req.Name)
+ command := exec.Command("/bin/bash", "-c", shellPath) //初始化 Cmd
+
+ // windows 版本
+ //command := exec.Command("cmd", "/C", shellPath)
+
+ var stderr bytes.Buffer
+ command.Stderr = &stderr
+
+ output, err := command.Output()
+ if err != nil {
+ c.Payload(stderr.String())
+ return
+ }
+
+ c.Payload(string(output))
+ }
+}
diff --git a/internal/web/controller/gencode_handler/func_handlerview.go b/internal/web/controller/gencode_handler/func_handlerview.go
new file mode 100644
index 00000000..f8f35d5f
--- /dev/null
+++ b/internal/web/controller/gencode_handler/func_handlerview.go
@@ -0,0 +1,11 @@
+package gencode_handler
+
+import (
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+)
+
+func (h *handler) HandlerView() core.HandlerFunc {
+ return func(c core.Context) {
+ c.HTML("gencode_handler", nil)
+ }
+}
diff --git a/internal/web/controller/gencode_handler/func_initexecute.go b/internal/web/controller/gencode_handler/func_initexecute.go
new file mode 100644
index 00000000..da07454d
--- /dev/null
+++ b/internal/web/controller/gencode_handler/func_initexecute.go
@@ -0,0 +1,33 @@
+package gencode_handler
+
+import (
+ "bytes"
+ "fmt"
+ "os/exec"
+
+ "github.com/xinliangnote/go-gin-api/configs"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+)
+
+func (h *handler) InitExecute() core.HandlerFunc {
+ return func(c core.Context) {
+ mysqlConf := configs.Get().MySQL.Read
+ shellPath := fmt.Sprintf("./scripts/init.sh %s %s %s %s", mysqlConf.Addr, mysqlConf.User, mysqlConf.Pass, mysqlConf.Name)
+
+ command := exec.Command("/bin/bash", "-c", shellPath) //初始化 Cmd
+
+ // windows 版本
+ //command := exec.Command("cmd", "/C", shellPath)
+
+ var stderr bytes.Buffer
+ command.Stderr = &stderr
+
+ output, err := command.Output()
+ if err != nil {
+ c.Payload(stderr.String())
+ return
+ }
+
+ c.Payload(string(output))
+ }
+}
diff --git a/internal/web/controller/gencode_handler/func_initview.go b/internal/web/controller/gencode_handler/func_initview.go
new file mode 100644
index 00000000..32a8cb71
--- /dev/null
+++ b/internal/web/controller/gencode_handler/func_initview.go
@@ -0,0 +1,9 @@
+package gencode_handler
+
+import "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+
+func (h *handler) InitView() core.HandlerFunc {
+ return func(c core.Context) {
+ c.HTML("gencode_init", nil)
+ }
+}
diff --git a/internal/web/controller/gencode_handler/handler.go b/internal/web/controller/gencode_handler/handler.go
new file mode 100644
index 00000000..c1c03a44
--- /dev/null
+++ b/internal/web/controller/gencode_handler/handler.go
@@ -0,0 +1,40 @@
+package gencode_handler
+
+import (
+ "github.com/xinliangnote/go-gin-api/internal/pkg/cache"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/db"
+
+ "go.uber.org/zap"
+)
+
+var _ Handler = (*handler)(nil)
+
+type Handler interface {
+ i()
+
+ InitView() core.HandlerFunc
+ InitExecute() core.HandlerFunc
+
+ HandlerView() core.HandlerFunc
+ HandlerExecute() core.HandlerFunc
+
+ GormView() core.HandlerFunc
+ GormExecute() core.HandlerFunc
+}
+
+type handler struct {
+ db db.Repo
+ logger *zap.Logger
+ cache cache.Repo
+}
+
+func New(logger *zap.Logger, db db.Repo, cache cache.Repo) Handler {
+ return &handler{
+ logger: logger,
+ cache: cache,
+ db: db,
+ }
+}
+
+func (h *handler) i() {}
diff --git a/internal/web/controller/index_handler/func_view.go b/internal/web/controller/index_handler/func_view.go
new file mode 100644
index 00000000..c8f3e6a7
--- /dev/null
+++ b/internal/web/controller/index_handler/func_view.go
@@ -0,0 +1,9 @@
+package index_handler
+
+import "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+
+func (h *handler) View() core.HandlerFunc {
+ return func(c core.Context) {
+ c.HTML("index", nil)
+ }
+}
diff --git a/internal/web/controller/index_handler/handler.go b/internal/web/controller/index_handler/handler.go
new file mode 100644
index 00000000..a0a196a2
--- /dev/null
+++ b/internal/web/controller/index_handler/handler.go
@@ -0,0 +1,31 @@
+package index_handler
+
+import (
+ "github.com/xinliangnote/go-gin-api/internal/pkg/cache"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/core"
+ "github.com/xinliangnote/go-gin-api/internal/pkg/db"
+
+ "go.uber.org/zap"
+)
+
+var _ Handler = (*handler)(nil)
+
+type Handler interface {
+ i()
+
+ View() core.HandlerFunc
+}
+
+type handler struct {
+ logger *zap.Logger
+ cache cache.Repo
+}
+
+func New(logger *zap.Logger, db db.Repo, cache cache.Repo) Handler {
+ return &handler{
+ logger: logger,
+ cache: cache,
+ }
+}
+
+func (h *handler) i() {}
diff --git a/main.go b/main.go
index f2f1f152..dd1a69df 100644
--- a/main.go
+++ b/main.go
@@ -7,10 +7,10 @@ import (
"time"
"github.com/xinliangnote/go-gin-api/configs"
- "github.com/xinliangnote/go-gin-api/internal/api/router"
"github.com/xinliangnote/go-gin-api/internal/pkg/cache"
"github.com/xinliangnote/go-gin-api/internal/pkg/db"
"github.com/xinliangnote/go-gin-api/internal/pkg/grpc"
+ "github.com/xinliangnote/go-gin-api/internal/router"
"github.com/xinliangnote/go-gin-api/pkg/env"
"github.com/xinliangnote/go-gin-api/pkg/logger"
"github.com/xinliangnote/go-gin-api/pkg/shutdown"
diff --git a/scripts/gormgen.sh b/scripts/gormgen.sh
index 61bb0bec..37de54d7 100755
--- a/scripts/gormgen.sh
+++ b/scripts/gormgen.sh
@@ -8,11 +8,11 @@ if [ $1 -eq 1 ]; then
fi
}
-printf "\nRegenerating mysql file\n\n"
+printf "\nRegenerating file\n\n"
time go run -v ./cmd/mysqlmd/main.go -addr $1 -user $2 -pass $3 -name $4 -tables $5
shellExit $?
-printf "\nRegenerating code\n\n"
+printf "\ncreate curd code : \n"
time go build -o gormgen ./cmd/gormgen/main.go
shellExit $?
@@ -23,7 +23,7 @@ go generate ./...
shellExit $?
printf "\nFormatting code\n\n"
-time go run -v github.com/koketama/mfmt
+time go run -v ./cmd/mfmt/main.go
shellExit $?
printf "\nDone.\n\n"
diff --git a/scripts/handlergen.sh b/scripts/handlergen.sh
index dd6d79be..d02d8aa2 100755
--- a/scripts/handlergen.sh
+++ b/scripts/handlergen.sh
@@ -13,7 +13,7 @@ time go run -v ./cmd/handlergen/main.go -handler $1
shellExit $?
printf "\nFormatting code\n\n"
-time go run -v github.com/koketama/mfmt
+time go run -v ./cmd/mfmt/main.go
shellExit $?
printf "\nDone.\n\n"
diff --git a/scripts/init.sh b/scripts/init.sh
index e1c1940e..28eb65a1 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -1,4 +1,16 @@
#!/bin/bash
+
+shellExit()
+{
+if [ $1 -eq 1 ]; then
+ printf "\nfailed!!!\n\n"
+ exit 1
+fi
+}
+
printf "\nInit db\n\n"
+
time go run -v ./cmd/init/db/main.go -addr $1 -user $2 -pass $3 -name $4
+shellExit $?
+
printf "\nDone.\n\n"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+