From c69a7d9fd9c89417d35ba5abcf10d582164bc84d Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Fri, 28 Aug 2020 00:02:53 +0800 Subject: [PATCH] feat: format reference --- apis/log/loginlog.go | 4 +- apis/log/operlog.go | 4 +- apis/monitor/server.go | 4 +- apis/public/file.go | 4 +- apis/syscategory/syscategory.go | 1 + apis/syscontent/syscontent.go | 1 + apis/sysfiledir/dir.go | 1 + apis/sysfileinfo/sysfileinfo.go | 1 + apis/sysjob/sysjob.go | 4 +- apis/system/captcha.go | 1 + apis/system/config.go | 4 +- apis/system/dept.go | 1 + apis/system/dict/dictdata.go | 4 +- apis/system/dict/dicttype.go | 19 ++- apis/system/info.go | 1 + apis/system/menu.go | 1 + apis/system/post.go | 1 + apis/system/role.go | 1 + apis/system/rolemenu.go | 4 +- apis/system/settings.go | 5 +- apis/system/sysuser.go | 1 + apis/tools/dbcolumns.go | 4 +- apis/tools/dbtables.go | 4 +- apis/tools/gen.go | 6 +- apis/tools/systables.go | 6 +- cmd/api/server.go | 12 +- cmd/cobra.go | 4 +- cmd/config/server.go | 3 +- cmd/migrate/server.go | 11 +- cmd/version/server.go | 2 + config/db.sql | 4 +- database/mysql-drive.go | 18 +-- database/pgsql-driver.go | 9 +- database/sqlite3-driver.go | 7 +- docs/docs.go | 236 ++++++++++++++++++++++++++++++-- docs/swagger.json | 234 +++++++++++++++++++++++++++++-- docs/swagger.yaml | 167 ++++++++++++++++++++-- examples/run.go | 9 +- go.mod | 10 +- go.sum | 125 ++++++++++++++++- handler/auth.go | 4 +- handler/httpshandler.go | 1 + handler/nofound.go | 7 +- handler/sd/check.go | 8 +- jobs/jobbase.go | 6 +- middleware/auth.go | 3 +- middleware/customerror.go | 3 +- middleware/header.go | 3 +- middleware/logger.go | 7 +- middleware/permission.go | 5 +- models/config.go | 9 +- models/datascope.go | 4 +- models/dept.go | 5 +- models/dictdata.go | 7 +- models/dicttype.go | 14 +- models/filedir.go | 2 +- models/gorm/data.go | 88 ++++++++++++ models/gorm/gorm.go | 107 ++++----------- models/initdb.go | 7 +- models/loginlog.go | 9 +- models/menu.go | 1 + models/operlog.go | 9 +- models/post.go | 6 +- models/role.go | 7 +- models/roledept.go | 1 + models/rolemenu.go | 1 + models/syscategory.go | 6 +- models/syscontent.go | 6 +- models/sysfileinfo.go | 6 +- models/sysjob.go | 8 +- models/sysuser.go | 12 +- models/tools/dbcolumns.go | 12 +- models/tools/dbtables.go | 12 +- models/tools/syscolumns.go | 2 +- models/tools/systables.go | 13 +- pkg/cache/memory_test.go | 3 +- pkg/cache/redis.go | 3 +- pkg/cache/redis_test.go | 3 +- pkg/casbin/mycasbin.go | 36 ++--- template/model.go.template | 5 +- test/model.go.template | 5 +- tools/captcha/captcha.go | 3 +- tools/config/config.go | 3 +- tools/string.go | 3 +- tools/url.go | 3 +- tools/user.go | 2 + tools/utils.go | 3 +- 87 files changed, 1124 insertions(+), 287 deletions(-) create mode 100644 models/gorm/data.go diff --git a/apis/log/loginlog.go b/apis/log/loginlog.go index 30e20c9..3fc9290 100644 --- a/apis/log/loginlog.go +++ b/apis/log/loginlog.go @@ -1,12 +1,14 @@ package log import ( + "net/http" + "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" - "net/http" ) // @Summary 登录日志列表 diff --git a/apis/log/operlog.go b/apis/log/operlog.go index a9b9fc1..b8b540d 100644 --- a/apis/log/operlog.go +++ b/apis/log/operlog.go @@ -1,12 +1,14 @@ package log import ( + "net/http" + "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" - "net/http" ) // @Summary 登录日志列表 diff --git a/apis/monitor/server.go b/apis/monitor/server.go index f8c6127..48928fe 100644 --- a/apis/monitor/server.go +++ b/apis/monitor/server.go @@ -1,13 +1,15 @@ package monitor import ( + "runtime" + "github.com/gin-gonic/gin" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/disk" "github.com/shirou/gopsutil/mem" + "go-admin/tools" "go-admin/tools/app" - "runtime" ) const ( diff --git a/apis/public/file.go b/apis/public/file.go index b9bc893..48a71c4 100644 --- a/apis/public/file.go +++ b/apis/public/file.go @@ -4,11 +4,13 @@ import ( "encoding/base64" "errors" "fmt" + "io/ioutil" + "github.com/gin-gonic/gin" "github.com/google/uuid" + "go-admin/pkg/utils" "go-admin/tools/app" - "io/ioutil" ) // @Summary 上传图片 diff --git a/apis/syscategory/syscategory.go b/apis/syscategory/syscategory.go index d35e3ee..b847d63 100644 --- a/apis/syscategory/syscategory.go +++ b/apis/syscategory/syscategory.go @@ -3,6 +3,7 @@ package syscategory import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" diff --git a/apis/syscontent/syscontent.go b/apis/syscontent/syscontent.go index 78fe750..b04c311 100644 --- a/apis/syscontent/syscontent.go +++ b/apis/syscontent/syscontent.go @@ -3,6 +3,7 @@ package syscontent import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" diff --git a/apis/sysfiledir/dir.go b/apis/sysfiledir/dir.go index c90a53c..fd42ef8 100644 --- a/apis/sysfiledir/dir.go +++ b/apis/sysfiledir/dir.go @@ -3,6 +3,7 @@ package sysfiledir import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" diff --git a/apis/sysfileinfo/sysfileinfo.go b/apis/sysfileinfo/sysfileinfo.go index 2ee4bb7..a36a9b2 100644 --- a/apis/sysfileinfo/sysfileinfo.go +++ b/apis/sysfileinfo/sysfileinfo.go @@ -3,6 +3,7 @@ package sysfileinfo import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" diff --git a/apis/sysjob/sysjob.go b/apis/sysjob/sysjob.go index 5c487cd..42ba266 100644 --- a/apis/sysjob/sysjob.go +++ b/apis/sysjob/sysjob.go @@ -1,13 +1,15 @@ package sysjob import ( + "time" + "github.com/gin-gonic/gin" + "go-admin/jobs" "go-admin/models" "go-admin/tools" "go-admin/tools/app" "go-admin/tools/app/msg" - "time" ) func GetSysJobList(c *gin.Context) { diff --git a/apis/system/captcha.go b/apis/system/captcha.go index 9c2d3fe..26439a1 100644 --- a/apis/system/captcha.go +++ b/apis/system/captcha.go @@ -2,6 +2,7 @@ package system import ( "github.com/gin-gonic/gin" + "go-admin/tools" "go-admin/tools/app" "go-admin/tools/captcha" diff --git a/apis/system/config.go b/apis/system/config.go index eca9515..71f2923 100644 --- a/apis/system/config.go +++ b/apis/system/config.go @@ -1,13 +1,15 @@ package system import ( + "net/http" + "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" "go-admin/tools/app/msg" - "net/http" ) // @Summary 配置列表数据 diff --git a/apis/system/dept.go b/apis/system/dept.go index 2114aac..40dcb33 100644 --- a/apis/system/dept.go +++ b/apis/system/dept.go @@ -3,6 +3,7 @@ package system import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" diff --git a/apis/system/dict/dictdata.go b/apis/system/dict/dictdata.go index f802fd5..37127b1 100644 --- a/apis/system/dict/dictdata.go +++ b/apis/system/dict/dictdata.go @@ -1,12 +1,14 @@ package dict import ( + "net/http" + "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" - "net/http" ) // @Summary 字典数据列表 diff --git a/apis/system/dict/dicttype.go b/apis/system/dict/dicttype.go index 95b21c2..efb8d49 100644 --- a/apis/system/dict/dicttype.go +++ b/apis/system/dict/dicttype.go @@ -1,12 +1,14 @@ package dict import ( + "net/http" + "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" - "net/http" ) // @Summary 字典类型列表数据 @@ -17,7 +19,7 @@ import ( // @Param dictType query string false "dictType" // @Param pageSize query int false "页条数" // @Param pageIndex query int false "页码" -// @Success 200 {object} app.Response "{"code": 200, "data": [...]}" +// @Success 200 {object} app.PageResponse "{"code": 200, "data": [...]}" // @Router /api/v1/dict/type/list [get] // @Security Bearer func GetDictTypeList(c *gin.Context) { @@ -42,14 +44,11 @@ func GetDictTypeList(c *gin.Context) { result, count, err := data.GetPage(pageSize, pageIndex) tools.HasError(err, "", -1) - var mp = make(map[string]interface{}, 3) - mp["list"] = result - mp["count"] = count - mp["pageIndex"] = pageIndex - mp["pageSize"] = pageSize - - var res app.Response - res.Data = mp + var res app.PageResponse + res.Data.List = result + res.Data.Count = count + res.Data.PageIndex = pageIndex + res.Data.PageSize = pageSize c.JSON(http.StatusOK, res.ReturnOK()) } diff --git a/apis/system/info.go b/apis/system/info.go index 42b9a7f..7c41019 100644 --- a/apis/system/info.go +++ b/apis/system/info.go @@ -2,6 +2,7 @@ package system import ( "github.com/gin-gonic/gin" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" diff --git a/apis/system/menu.go b/apis/system/menu.go index 2f50a35..9eba7f5 100644 --- a/apis/system/menu.go +++ b/apis/system/menu.go @@ -3,6 +3,7 @@ package system import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" diff --git a/apis/system/post.go b/apis/system/post.go index a231dca..86fdde6 100644 --- a/apis/system/post.go +++ b/apis/system/post.go @@ -2,6 +2,7 @@ package system import ( "github.com/gin-gonic/gin" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" diff --git a/apis/system/role.go b/apis/system/role.go index 884ed00..3187b2f 100644 --- a/apis/system/role.go +++ b/apis/system/role.go @@ -2,6 +2,7 @@ package system import ( "github.com/gin-gonic/gin" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" diff --git a/apis/system/rolemenu.go b/apis/system/rolemenu.go index ca96fc8..dcefa9f 100644 --- a/apis/system/rolemenu.go +++ b/apis/system/rolemenu.go @@ -2,10 +2,12 @@ package system import ( "fmt" + "net/http" + "github.com/gin-gonic/gin" + "go-admin/models" "go-admin/tools/app" - "net/http" ) // @Summary RoleMenu列表数据 diff --git a/apis/system/settings.go b/apis/system/settings.go index f2fdca4..7878344 100644 --- a/apis/system/settings.go +++ b/apis/system/settings.go @@ -3,11 +3,14 @@ package system import ( "errors" "fmt" + "strings" + "github.com/gin-gonic/gin" + "go-admin/models" "go-admin/tools" "go-admin/tools/app" - "strings" + ) // @Summary 查询系统信息 diff --git a/apis/system/sysuser.go b/apis/system/sysuser.go index e4dcf66..5f637aa 100644 --- a/apis/system/sysuser.go +++ b/apis/system/sysuser.go @@ -4,6 +4,7 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/google/uuid" + "go-admin/global" "go-admin/models" "go-admin/tools" diff --git a/apis/tools/dbcolumns.go b/apis/tools/dbcolumns.go index 64b008b..4616d72 100644 --- a/apis/tools/dbcolumns.go +++ b/apis/tools/dbcolumns.go @@ -1,11 +1,13 @@ package tools import ( + "net/http" + "github.com/gin-gonic/gin" + "go-admin/models/tools" tools2 "go-admin/tools" "go-admin/tools/app" - "net/http" ) // @Summary 分页列表数据 / page list data diff --git a/apis/tools/dbtables.go b/apis/tools/dbtables.go index 8f5cedf..b5d46f0 100644 --- a/apis/tools/dbtables.go +++ b/apis/tools/dbtables.go @@ -1,12 +1,14 @@ package tools import ( + "net/http" + "github.com/gin-gonic/gin" + "go-admin/models/tools" tools2 "go-admin/tools" "go-admin/tools/app" "go-admin/tools/config" - "net/http" ) // @Summary 分页列表数据 / page list data diff --git a/apis/tools/gen.go b/apis/tools/gen.go index 4d8bb21..db545f6 100644 --- a/apis/tools/gen.go +++ b/apis/tools/gen.go @@ -2,15 +2,17 @@ package tools import ( "bytes" + "net/http" + "text/template" + "github.com/gin-gonic/gin" + "go-admin/global" "go-admin/models" "go-admin/models/tools" tools2 "go-admin/tools" "go-admin/tools/app" "go-admin/tools/config" - "net/http" - "text/template" ) func Preview(c *gin.Context) { diff --git a/apis/tools/systables.go b/apis/tools/systables.go index 3185d0e..08b4c8f 100644 --- a/apis/tools/systables.go +++ b/apis/tools/systables.go @@ -1,12 +1,14 @@ package tools import ( + "net/http" + "strings" + "github.com/gin-gonic/gin" + "go-admin/models/tools" tools2 "go-admin/tools" "go-admin/tools/app" - "net/http" - "strings" ) // @Summary 分页列表数据 diff --git a/cmd/api/server.go b/cmd/api/server.go index 51ed6e4..2d51a09 100644 --- a/cmd/api/server.go +++ b/cmd/api/server.go @@ -3,9 +3,16 @@ package api import ( "context" "fmt" + "io/ioutil" + "net/http" + "os" + "os/signal" + "time" + "github.com/gin-gonic/gin" "github.com/spf13/cobra" "github.com/spf13/viper" + "go-admin/database" "go-admin/global" "go-admin/jobs" @@ -14,11 +21,6 @@ import ( "go-admin/router" "go-admin/tools" "go-admin/tools/config" - "io/ioutil" - "net/http" - "os" - "os/signal" - "time" ) var ( diff --git a/cmd/cobra.go b/cmd/cobra.go index bbf0c88..cbd6003 100644 --- a/cmd/cobra.go +++ b/cmd/cobra.go @@ -3,14 +3,16 @@ package cmd import ( "errors" "fmt" + "os" + "github.com/spf13/cobra" + "go-admin/cmd/api" "go-admin/cmd/config" "go-admin/cmd/migrate" "go-admin/cmd/version" "go-admin/global" "go-admin/tools" - "os" ) var rootCmd = &cobra.Command{ diff --git a/cmd/config/server.go b/cmd/config/server.go index c99a3d2..8cae4ca 100644 --- a/cmd/config/server.go +++ b/cmd/config/server.go @@ -3,9 +3,10 @@ package config import ( "encoding/json" "fmt" - "go-admin/tools/config" "github.com/spf13/cobra" + + "go-admin/tools/config" ) var ( diff --git a/cmd/migrate/server.go b/cmd/migrate/server.go index 574329a..45b84ca 100644 --- a/cmd/migrate/server.go +++ b/cmd/migrate/server.go @@ -2,14 +2,15 @@ package migrate import ( "fmt" + + "github.com/spf13/cobra" + "go-admin/database" "go-admin/global" "go-admin/models" "go-admin/models/gorm" "go-admin/pkg/logger" "go-admin/tools/config" - - "github.com/spf13/cobra" ) var ( @@ -52,7 +53,9 @@ func run() { func migrateModel() error { if config.DatabaseConfig.Driver == "mysql" { - global.Eloquent = global.Eloquent.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4") + global.Eloquent.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4") } - return gorm.AutoMigrate(global.Eloquent) + err := gorm.AutoMigrate(global.Eloquent) + //gorm.InitData(global.Eloquent) + return err } diff --git a/cmd/version/server.go b/cmd/version/server.go index 68846b3..d95f74a 100644 --- a/cmd/version/server.go +++ b/cmd/version/server.go @@ -2,7 +2,9 @@ package version import ( "fmt" + "github.com/spf13/cobra" + "go-admin/global" ) diff --git a/config/db.sql b/config/db.sql index a09dd2f..453c657 100644 --- a/config/db.sql +++ b/config/db.sql @@ -452,8 +452,8 @@ INSERT INTO sys_user VALUES (2, 'zhangwj', '13211111111', 3, NULL, NULL, '0', 'q INSERT INTO sys_setting VALUES (1, 'go-admin管理系统', 'https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png', '2020-08-05 14:27:34', '2020-08-07 10:13:31' ,NULL); -INSERT INTO sys_job VALUES (1, '接口测试', 'DEFAULT', 1, '0/5 * * * * ?', 'http://localhost:8000', NULL, 1, 1, 2, 1, '', '', '2020-08-03 14:54:03', '2020-08-25 16:49:46', NULL); -INSERT INTO sys_job VALUES (2, '函数测试', 'DEFAULT', 2, '0/5 * * * * ?', 'ExamplesOne', '参数', 1, 1, 2, 2, '', '', '2020-08-11 21:41:23', '2020-08-25 16:49:46', NULL); +INSERT INTO sys_job VALUES (1, '接口测试', 'DEFAULT', 1, '0/5 * * * * ', 'http://localhost:8000', NULL, 1, 1, 2, 1, '', '', '2020-08-03 14:54:03', '2020-08-25 16:49:46', NULL); +INSERT INTO sys_job VALUES (2, '函数测试', 'DEFAULT', 2, '0/5 * * * * ', 'ExamplesOne', '参数', 1, 1, 2, 2, '', '', '2020-08-11 21:41:23', '2020-08-25 16:49:46', NULL); COMMIT; -- 数据完成 ; \ No newline at end of file diff --git a/database/mysql-drive.go b/database/mysql-drive.go index 936a2d2..1a162b1 100644 --- a/database/mysql-drive.go +++ b/database/mysql-drive.go @@ -1,17 +1,13 @@ package database import ( + "gorm.io/driver/mysql" + "gorm.io/gorm" "gorm.io/gorm/schema" - "log" - "os" - "time" "go-admin/global" "go-admin/tools" "go-admin/tools/config" - "gorm.io/driver/mysql" - "gorm.io/gorm" - "gorm.io/gorm/logger" ) type Mysql struct { @@ -38,11 +34,11 @@ func (e *Mysql) Setup() { } if config.LoggerConfig.EnabledDB { - global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{ - SlowThreshold: time.Second, - Colorful: true, - LogLevel: logger.Info, - }) + //global.Eloquent.Logger = logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{ + // SlowThreshold: time.Second, + // Colorful: true, + // LogLevel: logger.Info, + //}) } } diff --git a/database/pgsql-driver.go b/database/pgsql-driver.go index c48faf1..8cedc34 100644 --- a/database/pgsql-driver.go +++ b/database/pgsql-driver.go @@ -1,16 +1,17 @@ package database import ( - "gorm.io/gorm/logger" - "gorm.io/gorm/schema" "log" "os" "time" - "go-admin/global" - "go-admin/tools/config" "gorm.io/driver/postgres" "gorm.io/gorm" + "gorm.io/gorm/logger" + "gorm.io/gorm/schema" + + "go-admin/global" + "go-admin/tools/config" ) type PgSql struct { diff --git a/database/sqlite3-driver.go b/database/sqlite3-driver.go index 9cdb394..06d2501 100644 --- a/database/sqlite3-driver.go +++ b/database/sqlite3-driver.go @@ -3,16 +3,17 @@ package database import ( - "gorm.io/gorm/schema" "log" "os" "time" - "go-admin/global" - "go-admin/tools/config" "gorm.io/driver/sqlite" "gorm.io/gorm" "gorm.io/gorm/logger" + "gorm.io/gorm/schema" + + "go-admin/global" + "go-admin/tools/config" ) type SqLite struct { diff --git a/docs/docs.go b/docs/docs.go index d0d3c30..e82ac1d 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1,6 +1,6 @@ // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT // This file was generated by swaggo/swag at -// 2020-08-23 22:49:09.111618 +0800 CST m=+0.142306844 +// 2020-08-27 14:47:40.749512 +0800 CST m=+0.171410739 package docs @@ -510,9 +510,9 @@ var doc = `{ "application/json" ], "tags": [ - "配置" + "字典数据" ], - "summary": "添加配置", + "summary": "添加字典数据", "parameters": [ { "description": "data", @@ -521,7 +521,7 @@ var doc = `{ "required": true, "schema": { "type": "object", - "$ref": "#/definitions/models.SysConfig" + "$ref": "#/definitions/models.DictType" } } ], @@ -795,7 +795,7 @@ var doc = `{ "200": { "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "$ref": "#/definitions/app.Response" + "$ref": "#/definitions/app.PageResponse" } } } @@ -2222,6 +2222,70 @@ var doc = `{ } } }, + "/api/v1/syscategory": { + "post": { + "description": "获取JSON", + "consumes": [ + "application/json" + ], + "tags": [ + "分类" + ], + "summary": "添加分类", + "parameters": [ + { + "description": "data", + "name": "data", + "in": "body", + "required": true, + "schema": { + "type": "object", + "$ref": "#/definitions/models.SysCategory" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "schema": { + "type": "string" + } + } + } + } + }, + "/api/v1/syscontent": { + "post": { + "description": "获取JSON", + "consumes": [ + "application/json" + ], + "tags": [ + "内容管理" + ], + "summary": "添加内容管理", + "parameters": [ + { + "description": "data", + "name": "data", + "in": "body", + "required": true, + "schema": { + "type": "object", + "$ref": "#/definitions/models.SysContent" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/api/v1/sysfiledir": { "post": { "description": "获取JSON", @@ -2555,6 +2619,42 @@ var doc = `{ } }, "definitions": { + "app.Page": { + "type": "object", + "properties": { + "count": { + "type": "integer" + }, + "list": { + "type": "object" + }, + "pageIndex": { + "type": "integer" + }, + "pageSize": { + "type": "integer" + } + } + }, + "app.PageResponse": { + "type": "object", + "properties": { + "code": { + "description": "代码", + "type": "integer", + "example": 200 + }, + "data": { + "description": "数据集", + "type": "object", + "$ref": "#/definitions/app.Page" + }, + "msg": { + "description": "消息", + "type": "string" + } + } + }, "app.Response": { "type": "object", "properties": { @@ -2851,6 +2951,58 @@ var doc = `{ } } }, + "models.SysCategory": { + "type": "object", + "properties": { + "createBy": { + "description": "创建者", + "type": "string" + }, + "createdAt": { + "type": "string" + }, + "dataScope": { + "type": "string" + }, + "deletedAt": { + "type": "string" + }, + "id": { + "description": "分类Id", + "type": "integer" + }, + "img": { + "description": "图片", + "type": "string" + }, + "name": { + "description": "名称", + "type": "string" + }, + "params": { + "type": "string" + }, + "remark": { + "description": "备注", + "type": "string" + }, + "sort": { + "description": "排序", + "type": "string" + }, + "status": { + "description": "状态", + "type": "string" + }, + "updateBy": { + "description": "更新者", + "type": "string" + }, + "updatedAt": { + "type": "string" + } + } + }, "models.SysConfig": { "type": "object", "properties": { @@ -2901,6 +3053,66 @@ var doc = `{ } } }, + "models.SysContent": { + "type": "object", + "properties": { + "cateId": { + "description": "分类id", + "type": "string" + }, + "content": { + "description": "内容", + "type": "string" + }, + "createBy": { + "description": "创建者", + "type": "string" + }, + "createdAt": { + "type": "string" + }, + "dataScope": { + "type": "string" + }, + "deletedAt": { + "type": "string" + }, + "id": { + "description": "id", + "type": "integer" + }, + "img": { + "description": "图片", + "type": "string" + }, + "name": { + "description": "名称", + "type": "string" + }, + "params": { + "type": "string" + }, + "remark": { + "description": "备注", + "type": "string" + }, + "sort": { + "description": "排序", + "type": "string" + }, + "status": { + "description": "状态", + "type": "string" + }, + "updateBy": { + "description": "更新者", + "type": "string" + }, + "updatedAt": { + "type": "string" + } + } + }, "models.SysDept": { "type": "object", "properties": { @@ -3322,14 +3534,20 @@ var doc = `{ "$ref": "#/definitions/tools.SysColumns" } }, - "fkLableId": { - "type": "integer" + "fkLabelId": { + "type": "string" }, - "fkLableName": { + "fkLabelName": { "type": "string" }, "fkTableName": { - "type": "integer" + "type": "string" + }, + "fkTableNameClass": { + "type": "string" + }, + "fkTableNamePackage": { + "type": "string" }, "goField": { "type": "string" diff --git a/docs/swagger.json b/docs/swagger.json index 8b9d1bf..f2bfe3f 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -492,9 +492,9 @@ "application/json" ], "tags": [ - "配置" + "字典数据" ], - "summary": "添加配置", + "summary": "添加字典数据", "parameters": [ { "description": "data", @@ -503,7 +503,7 @@ "required": true, "schema": { "type": "object", - "$ref": "#/definitions/models.SysConfig" + "$ref": "#/definitions/models.DictType" } } ], @@ -777,7 +777,7 @@ "200": { "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "$ref": "#/definitions/app.Response" + "$ref": "#/definitions/app.PageResponse" } } } @@ -2204,6 +2204,70 @@ } } }, + "/api/v1/syscategory": { + "post": { + "description": "获取JSON", + "consumes": [ + "application/json" + ], + "tags": [ + "分类" + ], + "summary": "添加分类", + "parameters": [ + { + "description": "data", + "name": "data", + "in": "body", + "required": true, + "schema": { + "type": "object", + "$ref": "#/definitions/models.SysCategory" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "schema": { + "type": "string" + } + } + } + } + }, + "/api/v1/syscontent": { + "post": { + "description": "获取JSON", + "consumes": [ + "application/json" + ], + "tags": [ + "内容管理" + ], + "summary": "添加内容管理", + "parameters": [ + { + "description": "data", + "name": "data", + "in": "body", + "required": true, + "schema": { + "type": "object", + "$ref": "#/definitions/models.SysContent" + } + } + ], + "responses": { + "200": { + "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/api/v1/sysfiledir": { "post": { "description": "获取JSON", @@ -2537,6 +2601,42 @@ } }, "definitions": { + "app.Page": { + "type": "object", + "properties": { + "count": { + "type": "integer" + }, + "list": { + "type": "object" + }, + "pageIndex": { + "type": "integer" + }, + "pageSize": { + "type": "integer" + } + } + }, + "app.PageResponse": { + "type": "object", + "properties": { + "code": { + "description": "代码", + "type": "integer", + "example": 200 + }, + "data": { + "description": "数据集", + "type": "object", + "$ref": "#/definitions/app.Page" + }, + "msg": { + "description": "消息", + "type": "string" + } + } + }, "app.Response": { "type": "object", "properties": { @@ -2833,6 +2933,58 @@ } } }, + "models.SysCategory": { + "type": "object", + "properties": { + "createBy": { + "description": "创建者", + "type": "string" + }, + "createdAt": { + "type": "string" + }, + "dataScope": { + "type": "string" + }, + "deletedAt": { + "type": "string" + }, + "id": { + "description": "分类Id", + "type": "integer" + }, + "img": { + "description": "图片", + "type": "string" + }, + "name": { + "description": "名称", + "type": "string" + }, + "params": { + "type": "string" + }, + "remark": { + "description": "备注", + "type": "string" + }, + "sort": { + "description": "排序", + "type": "string" + }, + "status": { + "description": "状态", + "type": "string" + }, + "updateBy": { + "description": "更新者", + "type": "string" + }, + "updatedAt": { + "type": "string" + } + } + }, "models.SysConfig": { "type": "object", "properties": { @@ -2883,6 +3035,66 @@ } } }, + "models.SysContent": { + "type": "object", + "properties": { + "cateId": { + "description": "分类id", + "type": "string" + }, + "content": { + "description": "内容", + "type": "string" + }, + "createBy": { + "description": "创建者", + "type": "string" + }, + "createdAt": { + "type": "string" + }, + "dataScope": { + "type": "string" + }, + "deletedAt": { + "type": "string" + }, + "id": { + "description": "id", + "type": "integer" + }, + "img": { + "description": "图片", + "type": "string" + }, + "name": { + "description": "名称", + "type": "string" + }, + "params": { + "type": "string" + }, + "remark": { + "description": "备注", + "type": "string" + }, + "sort": { + "description": "排序", + "type": "string" + }, + "status": { + "description": "状态", + "type": "string" + }, + "updateBy": { + "description": "更新者", + "type": "string" + }, + "updatedAt": { + "type": "string" + } + } + }, "models.SysDept": { "type": "object", "properties": { @@ -3304,14 +3516,20 @@ "$ref": "#/definitions/tools.SysColumns" } }, - "fkLableId": { - "type": "integer" + "fkLabelId": { + "type": "string" }, - "fkLableName": { + "fkLabelName": { "type": "string" }, "fkTableName": { - "type": "integer" + "type": "string" + }, + "fkTableNameClass": { + "type": "string" + }, + "fkTableNamePackage": { + "type": "string" }, "goField": { "type": "string" diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 2fd05d9..f1d0542 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1,4 +1,29 @@ definitions: + app.Page: + properties: + count: + type: integer + list: + type: object + pageIndex: + type: integer + pageSize: + type: integer + type: object + app.PageResponse: + properties: + code: + description: 代码 + example: 200 + type: integer + data: + $ref: '#/definitions/app.Page' + description: 数据集 + type: object + msg: + description: 消息 + type: string + type: object app.Response: properties: code: @@ -205,6 +230,43 @@ definitions: updatedAt: type: string type: object + models.SysCategory: + properties: + createBy: + description: 创建者 + type: string + createdAt: + type: string + dataScope: + type: string + deletedAt: + type: string + id: + description: 分类Id + type: integer + img: + description: 图片 + type: string + name: + description: 名称 + type: string + params: + type: string + remark: + description: 备注 + type: string + sort: + description: 排序 + type: string + status: + description: 状态 + type: string + updateBy: + description: 更新者 + type: string + updatedAt: + type: string + type: object models.SysConfig: properties: configId: @@ -240,6 +302,49 @@ definitions: updatedAt: type: string type: object + models.SysContent: + properties: + cateId: + description: 分类id + type: string + content: + description: 内容 + type: string + createBy: + description: 创建者 + type: string + createdAt: + type: string + dataScope: + type: string + deletedAt: + type: string + id: + description: id + type: integer + img: + description: 图片 + type: string + name: + description: 名称 + type: string + params: + type: string + remark: + description: 备注 + type: string + sort: + description: 排序 + type: string + status: + description: 状态 + type: string + updateBy: + description: 更新者 + type: string + updatedAt: + type: string + type: object models.SysDept: properties: children: @@ -536,12 +641,16 @@ definitions: items: $ref: '#/definitions/tools.SysColumns' type: array - fkLableId: - type: integer - fkLableName: + fkLabelId: + type: string + fkLabelName: type: string fkTableName: - type: integer + type: string + fkTableNameClass: + type: string + fkTableNamePackage: + type: string goField: type: string goType: @@ -965,7 +1074,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/models.SysConfig' + $ref: '#/definitions/models.DictType' type: object responses: "200": @@ -974,9 +1083,9 @@ paths: type: string security: - Bearer: [] - summary: 添加配置 + summary: 添加字典数据 tags: - - 配置 + - 字典数据 put: consumes: - application/json @@ -1195,7 +1304,7 @@ paths: "200": description: '{"code": 200, "data": [...]}' schema: - $ref: '#/definitions/app.Response' + $ref: '#/definitions/app.PageResponse' security: - Bearer: [] summary: 字典类型列表数据 @@ -2064,6 +2173,48 @@ paths: summary: 列表用户信息数据 tags: - 用户 + /api/v1/syscategory: + post: + consumes: + - application/json + description: 获取JSON + parameters: + - description: data + in: body + name: data + required: true + schema: + $ref: '#/definitions/models.SysCategory' + type: object + responses: + "200": + description: '{"code": -1, "message": "添加失败"}' + schema: + type: string + summary: 添加分类 + tags: + - 分类 + /api/v1/syscontent: + post: + consumes: + - application/json + description: 获取JSON + parameters: + - description: data + in: body + name: data + required: true + schema: + $ref: '#/definitions/models.SysContent' + type: object + responses: + "200": + description: '{"code": -1, "message": "添加失败"}' + schema: + type: string + summary: 添加内容管理 + tags: + - 内容管理 /api/v1/sysfiledir: post: consumes: diff --git a/examples/run.go b/examples/run.go index 85a8ec2..47d555e 100644 --- a/examples/run.go +++ b/examples/run.go @@ -1,18 +1,21 @@ package main import ( + "log" + "github.com/gin-gonic/gin" + "gorm.io/driver/mysql" + "gorm.io/gorm" + "go-admin/global" mycasbin "go-admin/pkg/casbin" "go-admin/pkg/logger" "go-admin/router" - "gorm.io/gorm" - "log" ) func main() { var err error - global.Eloquent, err = gorm.Open("mysql", "root:123456@tcp/inmg?charset=utf8&parseTime=True&loc=Local") + global.Eloquent, err = gorm.Open(mysql.Open("root:123456@tcp/inmg?charset=utf8&parseTime=True&loc=Local"), &gorm.Config{}) if err != nil { panic(err) } diff --git a/go.mod b/go.mod index da4236f..c283ea2 100644 --- a/go.mod +++ b/go.mod @@ -3,15 +3,20 @@ module go-admin go 1.14 require ( + github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/casbin/casbin/v2 v2.11.2 - github.com/casbin/gorm-adapter/v3 v3.0.2 + github.com/casbin/gorm-adapter/v3 v3.0.2 // indirect github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/gin-gonic/gin v1.6.3 + github.com/go-ole/go-ole v1.2.4 // indirect + github.com/go-redis/redis/v7 v7.4.0 github.com/go-sql-driver/mysql v1.5.0 github.com/gogf/gf v1.13.4 github.com/google/uuid v1.1.1 github.com/gorilla/websocket v1.4.2 + github.com/matchstalk/redisqueue v1.0.3 + github.com/matchstalk/utils v0.0.0-20200812140024-84ae2a31f594 github.com/mojocn/base64Captcha v1.3.1 github.com/mssola/user_agent v0.5.2 github.com/pkg/errors v0.9.1 @@ -23,9 +28,10 @@ require ( github.com/swaggo/gin-swagger v1.2.0 github.com/swaggo/swag v1.6.7 github.com/unrolled/secure v1.0.8 + go.uber.org/multierr v1.5.0 // indirect golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a gorm.io/driver/mysql v0.3.2 gorm.io/driver/postgres v0.2.9 gorm.io/driver/sqlite v1.0.9 - gorm.io/gorm v0.2.37 + gorm.io/gorm v0.2.36 ) diff --git a/go.sum b/go.sum index 754e4cc..7b8c3b2 100644 --- a/go.sum +++ b/go.sum @@ -11,12 +11,17 @@ cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqCl cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/AlecAivazis/survey/v2 v2.0.5/go.mod h1:WYBhg6f0y/fNYUuesWQc0PKbJcEliGcYHB9sNT3Bg74= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DeanThompson/ginpprof v0.0.0-20190408063150-3be636683586/go.mod h1:kMi/fSDAgvjo9TYfYwYeQ2vkyj+VTR/tB6u/Tjh39t0= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= +github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw= +github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc= github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -24,6 +29,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-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= +github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -37,16 +44,20 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bsm/redislock v0.5.0 h1:ODM11/cbuUXQqLgZWK6XQnufaTjsBE2UcwBc2EAFNDA= +github.com/bsm/redislock v0.5.0/go.mod h1:qagqKlV+xiLy26iV34Y3zRPxRcJjQYbV7pZfWFeSZ8M= github.com/casbin/casbin v1.9.1 h1:ucjbS5zTrmSLtH4XogqOG920Poe6QatdXtz1FEbApeM= github.com/casbin/casbin/v2 v2.2.2/go.mod h1:XXtYGrs/0zlOsJMeRteEdVi/FsB0ph7KgNfjoCoJUD8= github.com/casbin/casbin/v2 v2.11.2 h1:kdJ3ZMfPtz6uzKwAaW4G4NIld0U2KeHrgFcEhi40evc= github.com/casbin/casbin/v2 v2.11.2/go.mod h1:XXtYGrs/0zlOsJMeRteEdVi/FsB0ph7KgNfjoCoJUD8= -github.com/casbin/gorm-adapter v1.0.0 h1:s6U2gJQ4reenRde0L85YsrwNt8k0bv6iUAfRigi1/cM= github.com/casbin/gorm-adapter/v3 v3.0.2 h1:4F2VFElwPyFzvHfgwizD2JQxk2OFLwvRFZct1np0yBg= github.com/casbin/gorm-adapter/v3 v3.0.2/go.mod h1:mQI09sqvXfy5p6kZB5HBzZrgKWwxaJ4xMWpd5OGfHRY= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/clbanning/mxj v1.8.5-0.20200714211355-ff02cfb8ea28 h1:LdXxtjzvZYhhUaonAaAKArG3pyC67kGL3YY+6hGG8G4= github.com/clbanning/mxj v1.8.5-0.20200714211355-ff02cfb8ea28/go.mod h1:BVjHeAH+rl9rs6f+QIpeRl0tfu10SXn1pUSa5PVGJng= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= @@ -58,8 +69,10 @@ github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzqk8QCaRC4os14xoKDdbHqqlJtJA0oc1ZAjg= github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= @@ -68,9 +81,12 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/gzip v0.0.1 h1:ezvKOL6jH+jlzdHNE4h9h8q8uMpDQjyl0NN0Jd7jozc= github.com/gin-contrib/gzip v0.0.1/go.mod h1:fGBJBCdt6qCZuCAOwWuFhBB4OOq9EFqlo5dEaFhhu5w= github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= @@ -80,10 +96,14 @@ github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= +github.com/git-chglog/git-chglog v0.0.0-20190923122001-6050f20bcdb0 h1:rdQovo0JtjoBTUQzzrTqnXxxFi4etuhvXrUZHwI9z7w= +github.com/git-chglog/git-chglog v0.0.0-20190923122001-6050f20bcdb0/go.mod h1:Dcsy1kii/xFyNad5JqY/d0GO5mu91sungp5xotbm3Yk= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= 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.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI= +github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w= @@ -100,6 +120,7 @@ github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= @@ -107,9 +128,16 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/go-redis/redis v6.15.7+incompatible h1:3skhDh95XQMpnqeqNftPkQD9jL9e5e36z/1SUm6dy1U= +github.com/go-redis/redis v6.15.7+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= +github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= +github.com/go-redis/redis/v7 v7.2.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= +github.com/go-redis/redis/v7 v7.4.0 h1:7obg6wUoj05T0EpY0o8B59S9w5yeMWql7sw2kwNW1x4= +github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogf/gf v1.13.4 h1:+IWX/L/SNYjwp9C0tXABZ8vJfYaFKyx0cTAb2DE2a1Y= github.com/gogf/gf v1.13.4/go.mod h1:dGX0/BElXDBYbdJGascqfrWScj8IMeOietDjVD6/5Fc= @@ -129,6 +157,7 @@ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -143,6 +172,7 @@ github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= @@ -150,6 +180,7 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gqcn/structs v1.1.1 h1:cyzGRwfmn3d1d54fwW3KUNyG9QxR0ldIeqwFGeBt638= github.com/gqcn/structs v1.1.1/go.mod h1:/aBhTBSsKQ2Ec9pbnYdGphtdWXHFn4KrCL0fXM/Adok= +github.com/grokify/html-strip-tags-go v0.0.0-20190921062105-daaa06bf1aaf h1:wIOAyJMMen0ELGiFzlmqxdcV1yGbkyHBAB6PolcNbLA= github.com/grokify/html-strip-tags-go v0.0.0-20190921062105-daaa06bf1aaf/go.mod h1:2Su6romC5/1VXOQMaWL2yb618ARB8iVo6/DR99A6d78= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= @@ -175,6 +206,13 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ= +github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ= +github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= @@ -192,6 +230,7 @@ github.com/jackc/pgconn v1.6.4 h1:S7T6cx5o2OqmxdHaXLH1ZeD1SbI8jBznyYE9Ec0RCQ8= github.com/jackc/pgconn v1.6.4/go.mod h1:w2pne1C2tZgP+TvjqLpOigGzNqjBgQW9dUw/4Chex78= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8= +github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA= github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= @@ -240,23 +279,33 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= 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/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= +github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU= github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= @@ -265,9 +314,15 @@ github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/matchstalk/redisqueue v1.0.3 h1:ZRrEhnvA6/YxLu2EbzdZYeQHQQYT8yZBAi1qv/USEQA= +github.com/matchstalk/redisqueue v1.0.3/go.mod h1:5DZ3X4w9t+6Wv9vz9wmUt/i15gsOorGXRnqzGhBP6zI= +github.com/matchstalk/utils v0.0.0-20200812140024-84ae2a31f594 h1:pCUzdHvnk1iNV4WlN2/5mfwMSixOMrSBHNIQUwgvX2A= +github.com/matchstalk/utils v0.0.0-20200812140024-84ae2a31f594/go.mod h1:8OF/DvDHuBhk6fCKDXm4Lc/yJwIKt2P9GgS3Y9hTHDc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -275,12 +330,18 @@ github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.14.0 h1:mLyGNKR8+Vv9CAU7PphKa2hkEqxxhn8i32J6FPj1/QA= github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus= +github.com/mattn/goveralls v0.0.5 h1:spfq8AyZ0cCk57Za6/juJ5btQxeE1FaEGMdfcI+XO48= +github.com/mattn/goveralls v0.0.5/go.mod h1:Xg2LHi51faXLyKXwsndxiW6uxEEQT9+3sjGzzwU4xy0= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -291,6 +352,8 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.3.3 h1:SzB1nHZ2Xi+17FP0zVQBHIZqvwRN9408fJO8h+eeNA8= +github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -299,11 +362,21 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mojocn/base64Captcha v1.3.1 h1:2Wbkt8Oc8qjmNJ5GyOfSo4tgVQPsbKMftqASnq8GlT0= github.com/mojocn/base64Captcha v1.3.1/go.mod h1:wAQCKEc5bDujxKRmbT6/vTnTt5CjStQ8bRfPWUuz/iY= +github.com/monnand/dhkx v0.0.0-20180522003156-9e5b033f1ac4/go.mod h1:/cxRiYq8L/bpGLJJJ7mN66Qv2nj915TfJdujDVyYVGA= github.com/mssola/user_agent v0.5.2 h1:CZkTUahjL1+OcZ5zv3kZr8QiJ8jy2H08vZIEkBeRbxo= github.com/mssola/user_agent v0.5.2/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88= github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.0 h1:Iw5WCbBcaAAd0fpRb1c9r5YCylv4XDoCSigm1zLevwU= +github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= +github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -311,6 +384,8 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= @@ -338,19 +413,29 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/shirou/gopsutil v2.20.7+incompatible h1:Ymv4OD12d6zm+2yONe39VSmp2XooJe8za7ngOLW/o/w= github.com/shirou/gopsutil v2.20.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= +github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY= github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/snwfdhmp/errlog v0.0.0-20191219134421-4c9e67f11ebc/go.mod h1:W2jTAwIgQNPZAd1VzqQs+ikk5Ei76Vbr4D5smY35hpY= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.3.4 h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc= +github.com/spf13/afero v1.3.4/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= @@ -363,9 +448,11 @@ github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5q github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -376,6 +463,8 @@ github.com/swaggo/swag v1.5.1/go.mod h1:1Bl9F/ZBpVWh22nY0zmYyASPO1lI/zIwRDrpZU+t github.com/swaggo/swag v1.6.7 h1:e8GC2xDllJZr3omJkm9YfmK0Y56+rMO3cg0JBKNz09s= github.com/swaggo/swag v1.6.7/go.mod h1:xDhTyuFIujYiN3DKWC/H/83xcfHp+UE/IzWWampG7Zc= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tsuyoshiwada/go-gitcmd v0.0.0-20180205145712-5f1f5f9475df h1:Y2l28Jr3vOEeYtxfVbMtVfOdAwuUqWaP9fvNKiBVeXY= +github.com/tsuyoshiwada/go-gitcmd v0.0.0-20180205145712-5f1f5f9475df/go.mod h1:pnyouUty/nBr/zm3GYwTIt+qFTLWbdjeLjZmJdzJOu8= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.5-pre/go.mod h1:FwP/aQVg39TXzItUBMwnWp9T9gPQnXw4Poh4/oBQZ/0= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= @@ -387,7 +476,10 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY github.com/unrolled/secure v1.0.8 h1:JaMvKbe4CRt8oyxVXn+xY+6jlqd7pyJNSVkmsBxxQsM= github.com/unrolled/secure v1.0.8/go.mod h1:fO+mEan+FLB0CdEnHf6Q4ZZVNqG+5fuLFnP8p0BXDPI= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.3 h1:FpNT6zq26xNpHZy08emi755QwzLPs6Pukqjlc7RfOMU= +github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= +github.com/urfave/negroni v1.0.0 h1:kIimOitoypq34K7TG7DUaJ9kq/N4Ofuwi1sjz0KipXc= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= @@ -403,16 +495,19 @@ go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKY go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a h1:vclmkQCjlDX5OydZ9wv8rBCcS0QyQY66Mpf/7BZbInM= @@ -437,9 +532,11 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -458,6 +555,7 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM= @@ -473,6 +571,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -485,12 +584,16 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190530182044-ad28b68e88f1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -503,6 +606,7 @@ golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -528,9 +632,12 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc h1:NCy3Ohtk6Iny5V/reW2Ktypo4zIpWBdRJ1uFMjBxdg8= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200113040837-eac381796e91 h1:OOkytthzFBKHY5EfEgLUabprb0LtJVkQtNxAQ02+UE4= +golang.org/x/tools v0.0.0-20200113040837-eac381796e91/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= @@ -555,22 +662,35 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +gopkg.in/AlecAivazis/survey.v1 v1.8.8 h1:5UtTowJZTz1j7NxVzDGKTz6Lm9IWm8DDF6b7a2wq9VY= +gopkg.in/AlecAivazis/survey.v1 v1.8.8/go.mod h1:CaHjv79TCgAvXMSFJSVgonHXYWxnhzI3eoHtnX5UgUo= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/kyokomi/emoji.v1 v1.5.1 h1:beetH5mWDMzFznJ+Qzd5KVHp79YKhVUMcdO8LpRLeGw= +gopkg.in/kyokomi/emoji.v1 v1.5.1/go.mod h1:N9AZ6hi1jHOPn34PsbpufQZUcKftSD7WgS2pgpmH4Lg= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v0.3.0/go.mod h1:A7H1JD9dKdcjeUTpTuWKEC+E1a74qzW7/zaXqKaTbfM= gorm.io/driver/mysql v0.3.2 h1:Kaa0S+IHW+4qow6dRAdekNYaKeGBboIkh44pYdLWjIE= @@ -585,9 +705,8 @@ gorm.io/driver/sqlserver v0.2.4/go.mod h1:TcPfkdce5b8qlCMgyUeUdm7HQa1ZzWUuxzI+od gorm.io/gorm v0.2.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v0.2.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= gorm.io/gorm v0.2.23/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= +gorm.io/gorm v0.2.36 h1:mxqXJo5SET3VzKCilIqLL6ua4BtpReu/0PieEkEBu5M= gorm.io/gorm v0.2.36/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= -gorm.io/gorm v0.2.37 h1:mt7yH0eNqQ45SSTq2nXUTqJ8OF0ccAJ2TGvtPHF7chY= -gorm.io/gorm v0.2.37/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/handler/auth.go b/handler/auth.go index c8c1415..03a9722 100644 --- a/handler/auth.go +++ b/handler/auth.go @@ -1,15 +1,17 @@ package handler import ( + "net/http" + "github.com/gin-gonic/gin" "github.com/mojocn/base64Captcha" "github.com/mssola/user_agent" + "go-admin/global" "go-admin/models" jwt "go-admin/pkg/jwtauth" "go-admin/tools" "go-admin/tools/config" - "net/http" ) var store = base64Captcha.DefaultMemStore diff --git a/handler/httpshandler.go b/handler/httpshandler.go index cc3da1d..e812305 100644 --- a/handler/httpshandler.go +++ b/handler/httpshandler.go @@ -3,6 +3,7 @@ package handler import ( "github.com/gin-gonic/gin" "github.com/unrolled/secure" + "go-admin/tools/config" ) diff --git a/handler/nofound.go b/handler/nofound.go index 093cd28..80a6518 100644 --- a/handler/nofound.go +++ b/handler/nofound.go @@ -1,10 +1,13 @@ package handler import ( - "github.com/gin-gonic/gin" - jwt "go-admin/pkg/jwtauth" "log" "net/http" + + "github.com/gin-gonic/gin" + + jwt "go-admin/pkg/jwtauth" + ) func NoFound(c *gin.Context) { diff --git a/handler/sd/check.go b/handler/sd/check.go index 7b0622c..d082c5b 100644 --- a/handler/sd/check.go +++ b/handler/sd/check.go @@ -2,15 +2,17 @@ package sd import ( "fmt" + "net/http" + "runtime" + "time" + "github.com/gin-gonic/gin" "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/disk" "github.com/shirou/gopsutil/load" "github.com/shirou/gopsutil/mem" + "go-admin/tools/app" - "net/http" - "runtime" - "time" ) const ( diff --git a/jobs/jobbase.go b/jobs/jobbase.go index 756641e..4fbfd86 100644 --- a/jobs/jobbase.go +++ b/jobs/jobbase.go @@ -2,13 +2,15 @@ package jobs import ( "fmt" + "sync" + "time" + "github.com/robfig/cron/v3" + "go-admin/global" "go-admin/models" "go-admin/pkg" "go-admin/pkg/cronjob" - "sync" - "time" ) var timeFormat = "2006-01-02 15:04:05" diff --git a/middleware/auth.go b/middleware/auth.go index ee08620..9ed2816 100644 --- a/middleware/auth.go +++ b/middleware/auth.go @@ -1,10 +1,11 @@ package middleware import ( + "time" + "go-admin/handler" jwt "go-admin/pkg/jwtauth" "go-admin/tools/config" - "time" ) func AuthInit() (*jwt.GinJWTMiddleware, error) { diff --git a/middleware/customerror.go b/middleware/customerror.go index d48028d..4c56bae 100644 --- a/middleware/customerror.go +++ b/middleware/customerror.go @@ -2,11 +2,12 @@ package middleware import ( "fmt" - "github.com/gin-gonic/gin" "net/http" "strconv" "strings" "time" + + "github.com/gin-gonic/gin" ) func CustomError(c *gin.Context) { diff --git a/middleware/header.go b/middleware/header.go index 6ece741..b1411e5 100644 --- a/middleware/header.go +++ b/middleware/header.go @@ -1,9 +1,10 @@ package middleware import ( - "github.com/gin-gonic/gin" "net/http" "time" + + "github.com/gin-gonic/gin" ) // NoCache is a middleware function that appends headers diff --git a/middleware/logger.go b/middleware/logger.go index 8796bc4..d595dd9 100644 --- a/middleware/logger.go +++ b/middleware/logger.go @@ -2,13 +2,16 @@ package middleware import ( "fmt" + "strings" + "time" + "github.com/gin-gonic/gin" + "go-admin/global" "go-admin/models" "go-admin/tools" config2 "go-admin/tools/config" - "strings" - "time" + ) // 日志记录到文件 diff --git a/middleware/permission.go b/middleware/permission.go index ade29ff..c4adef4 100644 --- a/middleware/permission.go +++ b/middleware/permission.go @@ -2,12 +2,13 @@ package middleware import ( "fmt" + "net/http" + "github.com/gin-gonic/gin" + mycasbin "go-admin/pkg/casbin" "go-admin/pkg/jwtauth" - _ "go-admin/pkg/jwtauth" "go-admin/tools" - "net/http" ) //权限检查中间件 diff --git a/models/config.go b/models/config.go index 215ea0e..05ac8c8 100644 --- a/models/config.go +++ b/models/config.go @@ -2,9 +2,10 @@ package models import ( "errors" + _ "time" + orm "go-admin/global" "go-admin/tools" - _ "time" ) type SysConfig struct { @@ -71,7 +72,7 @@ func (e *SysConfig) Get() (SysConfig, error) { func (e *SysConfig) GetPage(pageSize int, pageIndex int) ([]SysConfig, int, error) { var doc []SysConfig - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.ConfigName != "" { table = table.Where("config_name = ?", e.ConfigName) @@ -92,10 +93,10 @@ func (e *SysConfig) GetPage(pageSize int, pageIndex int) ([]SysConfig, int, erro } var count int64 - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/datascope.go b/models/datascope.go index 015e51a..6020135 100644 --- a/models/datascope.go +++ b/models/datascope.go @@ -3,9 +3,11 @@ package models import ( "errors" "fmt" + + "gorm.io/gorm" + "go-admin/tools" "go-admin/tools/config" - "gorm.io/gorm" ) type DataPermission struct { diff --git a/models/dept.go b/models/dept.go index 3c59a49..8bf504f 100644 --- a/models/dept.go +++ b/models/dept.go @@ -2,9 +2,10 @@ package models import ( "errors" + _ "time" + orm "go-admin/global" "go-admin/tools" - _ "time" ) type SysDept struct { @@ -101,7 +102,7 @@ func (e *SysDept) GetList() ([]SysDept, error) { func (e *SysDept) GetPage(bl bool) ([]SysDept, error) { var doc []SysDept - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.DeptId != 0 { table = table.Where("dept_id = ?", e.DeptId) } diff --git a/models/dictdata.go b/models/dictdata.go index 8260662..72d7428 100644 --- a/models/dictdata.go +++ b/models/dictdata.go @@ -2,6 +2,7 @@ package models import ( "errors" + orm "go-admin/global" "go-admin/tools" ) @@ -90,7 +91,7 @@ func (e *DictData) Get() ([]DictData, error) { func (e *DictData) GetPage(pageSize int, pageIndex int) ([]DictData, int, error) { var doc []DictData - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.DictCode != 0 { table = table.Where("dict_code = ?", e.DictCode) } @@ -113,10 +114,10 @@ func (e *DictData) GetPage(pageSize int, pageIndex int) ([]DictData, int, error) } var count int64 - if err := table.Order("dict_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("dict_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/dicttype.go b/models/dicttype.go index c4b720f..9f72ef6 100644 --- a/models/dicttype.go +++ b/models/dicttype.go @@ -2,6 +2,9 @@ package models import ( "errors" + + "gorm.io/gorm" + orm "go-admin/global" "go-admin/tools" ) @@ -83,13 +86,14 @@ func (e *DictType) GetList() ([]DictType, error) { func (e *DictType) GetPage(pageSize int, pageIndex int) ([]DictType, int, error) { var doc []DictType + var db *gorm.DB - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.DictId != 0 { - table = table.Where("dict_id = ?", e.DictId) + db = db.Where("dict_id = ?", e.DictId) } if e.DictName != "" { - table = table.Where("dict_name = ?", e.DictName) + db = db.Where("dict_name = ?", e.DictName) } // 数据权限控制 @@ -101,10 +105,10 @@ func (e *DictType) GetPage(pageSize int, pageIndex int) ([]DictType, int, error) } var count int64 - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Count(&count) return doc, int(count), nil } diff --git a/models/filedir.go b/models/filedir.go index 7fa3acf..82cdbfd 100644 --- a/models/filedir.go +++ b/models/filedir.go @@ -71,7 +71,7 @@ func (e *SysFileDir) Get() (SysFileDir, error) { func (e *SysFileDir) GetPage() ([]SysFileDir, int, error) { var doc []SysFileDir - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) // 数据权限控制(如果不需要数据权限请将此处去掉) //dataPermission := new(DataPermission) diff --git a/models/gorm/data.go b/models/gorm/data.go new file mode 100644 index 0000000..f3bf0bb --- /dev/null +++ b/models/gorm/data.go @@ -0,0 +1,88 @@ +package gorm + +import ( + "gorm.io/gorm" + + "go-admin/models" +) + +func InitData(db *gorm.DB) { + + list := []models.CasbinRule{ + {"p", "admin", "/api/v1/menulist", "GET", "", "", ""}, + {"p", "admin", "/api/v1/menu", "POST", "", "", ""}, + {"p", "admin", "/api/v1/dict/databytype/", "GET", "", "", ""}, + {"p", "admin", "/api/v1/menu", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/menu/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/sysUserList", "GET", "", "", ""}, + {"p", "admin", "/api/v1/sysUser/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/sysUser/", "GET", "", "", ""}, + {"p", "admin", "/api/v1/sysUser", "POST", "", "", ""}, + {"p", "admin", "/api/v1/sysUser", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/sysUser/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/user/profile", "GET", "", "", ""}, + {"p", "admin", "/api/v1/rolelist", "GET", "", "", ""}, + {"p", "admin", "/api/v1/role/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/role", "POST", "", "", ""}, + {"p", "admin", "/api/v1/role", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/role/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/configList", "GET", "", "", ""}, + {"p", "admin", "/api/v1/config/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/config", "POST", "", "", ""}, + {"p", "admin", "/api/v1/config", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/config/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/menurole", "GET", "", "", ""}, + {"p", "admin", "/api/v1/roleMenuTreeselect/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/menuTreeselect", "GET", "", "", ""}, + {"p", "admin", "/api/v1/rolemenu", "GET", "", "", ""}, + {"p", "admin", "/api/v1/rolemenu", "POST", "", "", ""}, + {"p", "admin", "/api/v1/rolemenu/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/deptList", "GET", "", "", ""}, + {"p", "admin", "/api/v1/dept/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/dept", "POST", "", "", ""}, + {"p", "admin", "/api/v1/dept", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/dept/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/dict/datalist", "GET", "", "", ""}, + {"p", "admin", "/api/v1/dict/data/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/dict/databytype/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/dict/data", "POST", "", "", ""}, + {"p", "admin", "/api/v1/dict/data/", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/dict/data/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/dict/typelist", "GET", "", "", ""}, + {"p", "admin", "/api/v1/dict/type/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/dict/type", "POST", "", "", ""}, + {"p", "admin", "/api/v1/dict/type", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/dict/type/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/postlist", "GET", "", "", ""}, + {"p", "admin", "/api/v1/post/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/post", "POST", "", "", ""}, + {"p", "admin", "/api/v1/post", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/post/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/menu/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/menuids", "GET", "", "", ""}, + {"p", "admin", "/api/v1/loginloglist", "GET", "", "", ""}, + {"p", "admin", "/api/v1/loginlog/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/operloglist", "GET", "", "", ""}, + {"p", "admin", "/api/v1/getinfo", "GET", "", "", ""}, + {"p", "admin", "/api/v1/roledatascope", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/roleDeptTreeselect/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/deptTree", "GET", "", "", ""}, + {"p", "admin", "/api/v1/configKey/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/logout", "POST", "", "", ""}, + {"p", "admin", "/api/v1/user/avatar", "POST", "", "", ""}, + {"p", "admin", "/api/v1/user/pwd", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/dict/typeoptionselect", "GET", "", "", ""}, + {"p", "admin", "/api/v1/sysjobList", "GET", "", "", ""}, + {"p", "admin", "/api/v1/sysjob/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/sysjob", "POST", "", "", ""}, + {"p", "admin", "/api/v1/sysjob", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/sysjob/:id", "DELETE", "", "", ""}, + {"p", "admin", "/api/v1/syssettingList", "GET", "", "", ""}, + {"p", "admin", "/api/v1/syssetting/:id", "GET", "", "", ""}, + {"p", "admin", "/api/v1/syssetting", "POST", "", "", ""}, + {"p", "admin", "/api/v1/syssetting", "PUT", "", "", ""}, + {"p", "admin", "/api/v1/syssetting/:id", "DELETE", "", "", ""}, + } + + db.Table("casbin_rule").Create(list) +} diff --git a/models/gorm/gorm.go b/models/gorm/gorm.go index 28d5cb6..a2d050e 100644 --- a/models/gorm/gorm.go +++ b/models/gorm/gorm.go @@ -1,93 +1,34 @@ package gorm import ( + "gorm.io/gorm" + "go-admin/models" "go-admin/models/tools" - "gorm.io/gorm" ) -func AutoMigrate(db *gorm.DB) error { - err := db.AutoMigrate(new(models.CasbinRule)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysDept)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysConfig)) - if err != nil { - return err - } - err = db.AutoMigrate(new(tools.SysTables)) - if err != nil { - return err - } - err = db.AutoMigrate(new(tools.SysColumns)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.Menu)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.LoginLog)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysOperLog)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.RoleMenu)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysRoleDept)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysUser)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysRole)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.Post)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.DictData)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.DictType)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysJob)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysConfig)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysSetting)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysFileDir)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysCategory)) - if err != nil { - return err - } - err = db.AutoMigrate(new(models.SysContent)) +func AutoMigrate(db *gorm.DB) (err error) { + err = db.AutoMigrate(new(models.CasbinRule), + new(models.SysDept), + new(models.SysConfig), + new(tools.SysTables), + new(tools.SysColumns), + new(models.Menu), + new(models.LoginLog), + new(models.SysOperLog), + new(models.RoleMenu), + new(models.SysRoleDept), + new(models.SysUser), + new(models.SysRole), + new(models.Post), + new(models.DictData), + new(models.DictType), + new(models.SysJob), + new(models.SysConfig), + new(models.SysSetting), + new(models.SysFileDir), + new(models.SysCategory), + new(models.SysContent)) if err != nil { return err } diff --git a/models/initdb.go b/models/initdb.go index 79e5b7c..25a35a9 100644 --- a/models/initdb.go +++ b/models/initdb.go @@ -2,15 +2,16 @@ package models import ( "fmt" - "go-admin/global" "io/ioutil" "log" "strings" + + "go-admin/global" ) -func InitDb() error { +func InitDb() (err error) { filePath := "config/db.sql" - err := ExecSql(filePath) + err = ExecSql(filePath) if global.Driver == "postgres" { filePath = "config/pg.sql" err = ExecSql(filePath) diff --git a/models/loginlog.go b/models/loginlog.go index 163db2d..8af509e 100644 --- a/models/loginlog.go +++ b/models/loginlog.go @@ -1,8 +1,9 @@ package models import ( - orm "go-admin/global" "time" + + orm "go-admin/global" ) type LoginLog struct { @@ -48,7 +49,7 @@ func (e *LoginLog) Get() (LoginLog, error) { func (e *LoginLog) GetPage(pageSize int, pageIndex int) ([]LoginLog, int, error) { var doc []LoginLog - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.Ipaddr != "" { table = table.Where("ipaddr = ?", e.Ipaddr) } @@ -61,10 +62,10 @@ func (e *LoginLog) GetPage(pageSize int, pageIndex int) ([]LoginLog, int, error) var count int64 - if err := table.Order("info_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("info_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/menu.go b/models/menu.go index 042014a..a04c40b 100644 --- a/models/menu.go +++ b/models/menu.go @@ -2,6 +2,7 @@ package models import ( "errors" + orm "go-admin/global" "go-admin/tools" ) diff --git a/models/operlog.go b/models/operlog.go index 5bfec97..4346cd5 100644 --- a/models/operlog.go +++ b/models/operlog.go @@ -1,8 +1,9 @@ package models import ( - orm "go-admin/global" "time" + + orm "go-admin/global" ) //sys_operlog @@ -57,7 +58,7 @@ func (e *SysOperLog) Get() (SysOperLog, error) { func (e *SysOperLog) GetPage(pageSize int, pageIndex int) ([]SysOperLog, int, error) { var doc []SysOperLog - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.OperIp != "" { table = table.Where("oper_ip = ?", e.OperIp) } @@ -73,10 +74,10 @@ func (e *SysOperLog) GetPage(pageSize int, pageIndex int) ([]SysOperLog, int, er var count int64 - if err := table.Order("oper_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("oper_id desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/post.go b/models/post.go index 1892ede..088fb3e 100644 --- a/models/post.go +++ b/models/post.go @@ -83,7 +83,7 @@ func (e *Post) GetList() ([]Post, error) { func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int, error) { var doc []Post - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.PostId != 0 { table = table.Where("post_id = ?", e.PostId) } @@ -106,10 +106,10 @@ func (e *Post) GetPage(pageSize int, pageIndex int) ([]Post, int, error) { } var count int64 - if err := table.Order("sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/role.go b/models/role.go index dd842b4..80d6c22 100644 --- a/models/role.go +++ b/models/role.go @@ -2,6 +2,7 @@ package models import ( "github.com/pkg/errors" + orm "go-admin/global" "go-admin/tools" ) @@ -35,7 +36,7 @@ type MenuIdList struct { func (role *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error) { var doc []SysRole - table := orm.Eloquent.Select("*").Table("sys_role") + table := orm.Eloquent.Table("sys_role") if role.RoleId != 0 { table = table.Where("role_id = ?", role.RoleId) } @@ -58,10 +59,10 @@ func (role *SysRole) GetPage(pageSize int, pageIndex int) ([]SysRole, int, error } var count int64 - if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Order("role_sort").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/roledept.go b/models/roledept.go index 6150c2b..da43693 100644 --- a/models/roledept.go +++ b/models/roledept.go @@ -2,6 +2,7 @@ package models import ( "fmt" + orm "go-admin/global" ) diff --git a/models/rolemenu.go b/models/rolemenu.go index 24ab9a2..6a4110c 100644 --- a/models/rolemenu.go +++ b/models/rolemenu.go @@ -2,6 +2,7 @@ package models import ( "fmt" + orm "go-admin/global" "go-admin/tools" ) diff --git a/models/syscategory.go b/models/syscategory.go index a535cb5..6878e44 100644 --- a/models/syscategory.go +++ b/models/syscategory.go @@ -62,7 +62,7 @@ func (e *SysCategory) Get() (SysCategory, error) { func (e *SysCategory) GetPage(pageSize int, pageIndex int) ([]SysCategory, int, error) { var doc []SysCategory - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.Name != "" { table = table.Where("name = ?", e.Name) @@ -81,10 +81,10 @@ func (e *SysCategory) GetPage(pageSize int, pageIndex int) ([]SysCategory, int, } var count int64 - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/syscontent.go b/models/syscontent.go index c67833d..28d1d28 100644 --- a/models/syscontent.go +++ b/models/syscontent.go @@ -68,7 +68,7 @@ func (e *SysContent) Get() (SysContent, error) { func (e *SysContent) GetPage(pageSize int, pageIndex int) ([]SysContent, int, error) { var doc []SysContent - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.CateId != "" { table = table.Where("cate_id = ?", e.CateId) @@ -91,10 +91,10 @@ func (e *SysContent) GetPage(pageSize int, pageIndex int) ([]SysContent, int, er } var count int64 - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/sysfileinfo.go b/models/sysfileinfo.go index 0cb13af..48e7f29 100644 --- a/models/sysfileinfo.go +++ b/models/sysfileinfo.go @@ -56,7 +56,7 @@ func (e *SysFileInfo) Get() (SysFileInfo, error) { func (e *SysFileInfo) GetPage(pageSize int, pageIndex int) ([]SysFileInfo, int, error) { var doc []SysFileInfo - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.PId != 0 { table = table.Where("p_id = ?", e.PId) @@ -71,10 +71,10 @@ func (e *SysFileInfo) GetPage(pageSize int, pageIndex int) ([]SysFileInfo, int, } var count int64 - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/sysjob.go b/models/sysjob.go index 26847be..e348ba0 100644 --- a/models/sysjob.go +++ b/models/sysjob.go @@ -78,7 +78,7 @@ func (e *SysJob) Get() (SysJob, error) { func (e *SysJob) GetPage(pageSize int, pageIndex int) ([]SysJob, int, error) { var doc []SysJob - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) if e.JobId != 0 { table = table.Where("job_id = ?", e.JobId) @@ -113,17 +113,17 @@ func (e *SysJob) GetPage(pageSize int, pageIndex int) ([]SysJob, int, error) { } var count int64 - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } func (e *SysJob) GetList() ([]SysJob, error) { var doc []SysJob - table := orm.Eloquent.Select("*").Table(e.TableName()) + table := orm.Eloquent.Table(e.TableName()) table = table.Where("status = ?", 2) diff --git a/models/sysuser.go b/models/sysuser.go index 6b562d9..9b7955c 100644 --- a/models/sysuser.go +++ b/models/sysuser.go @@ -2,11 +2,13 @@ package models import ( "errors" - orm "go-admin/global" - "go-admin/tools" - "golang.org/x/crypto/bcrypt" "log" "strings" + + "golang.org/x/crypto/bcrypt" + + orm "go-admin/global" + "go-admin/tools" ) // User @@ -222,10 +224,10 @@ func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, erro } var count int64 - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("sys_user.deleted_at IS NULL").Count(&count) + //table.Where("sys_user.deleted_at IS NULL").Count(&count) return doc, int(count), nil } diff --git a/models/tools/dbcolumns.go b/models/tools/dbcolumns.go index abc8a00..08d6b4c 100644 --- a/models/tools/dbcolumns.go +++ b/models/tools/dbcolumns.go @@ -2,10 +2,12 @@ package tools import ( "errors" + + "gorm.io/gorm" + orm "go-admin/global" "go-admin/tools" config2 "go-admin/tools/config" - "gorm.io/gorm" ) type DBColumns struct { @@ -29,7 +31,7 @@ func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, erro table := new(gorm.DB) if config2.DatabaseConfig.Driver == "mysql" { - table = orm.Eloquent.Select("*").Table("information_schema.`COLUMNS`") + table = orm.Eloquent.Table("information_schema.`COLUMNS`") table = table.Where("table_schema= ? ", config2.GenConfig.DBName) if e.TableName != "" { @@ -39,10 +41,10 @@ func (e *DBColumns) GetPage(pageSize int, pageIndex int) ([]DBColumns, int, erro table = table.Where("TABLE_NAME = ?", e.TableName) } - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Count(&count) + //table.Count(&count) return doc, int(count), nil } @@ -56,7 +58,7 @@ func (e *DBColumns) GetList() ([]DBColumns, error) { } if config2.DatabaseConfig.Driver == "mysql" { - table = orm.Eloquent.Select("*").Table("information_schema.columns") + table = orm.Eloquent.Table("information_schema.columns") table = table.Where("table_schema= ? ", config2.GenConfig.DBName) table = table.Where("TABLE_NAME = ?", e.TableName).Order("ORDINAL_POSITION asc") diff --git a/models/tools/dbtables.go b/models/tools/dbtables.go index 9bfa6b8..a802f68 100644 --- a/models/tools/dbtables.go +++ b/models/tools/dbtables.go @@ -2,10 +2,12 @@ package tools import ( "errors" + + "gorm.io/gorm" + orm "go-admin/global" "go-admin/tools" config2 "go-admin/tools/config" - "gorm.io/gorm" ) type DBTables struct { @@ -24,21 +26,21 @@ func (e *DBTables) GetPage(pageSize int, pageIndex int) ([]DBTables, int, error) var count int64 if config2.DatabaseConfig.Driver == "mysql" { - table = orm.Eloquent.Select("*").Table("information_schema.tables") + table = orm.Eloquent.Table("information_schema.tables") table = table.Where("TABLE_NAME not in (select table_name from " + config2.GenConfig.DBName + ".sys_tables) ") table = table.Where("table_schema= ? ", config2.GenConfig.DBName) if e.TableName != "" { table = table.Where("TABLE_NAME = ?", e.TableName) } - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } } else { tools.Assert(true, "目前只支持mysql数据库", 500) } - table.Count(&count) + //table.Count(&count) return doc, int(count), nil } @@ -46,7 +48,7 @@ func (e *DBTables) Get() (DBTables, error) { var doc DBTables table := new(gorm.DB) if config2.DatabaseConfig.Driver == "mysql" { - table = orm.Eloquent.Select("*").Table("information_schema.tables") + table = orm.Eloquent.Table("information_schema.tables") table = table.Where("table_schema= ? ", config2.GenConfig.DBName) if e.TableName == "" { return doc, errors.New("table name cannot be empty!") diff --git a/models/tools/syscolumns.go b/models/tools/syscolumns.go index 06f7017..12a79ef 100644 --- a/models/tools/syscolumns.go +++ b/models/tools/syscolumns.go @@ -54,7 +54,7 @@ func (SysColumns) TableName() string { func (e *SysColumns) GetList() ([]SysColumns, error) { var doc []SysColumns - table := orm.Eloquent.Select("*").Table("sys_columns") + table := orm.Eloquent.Table("sys_columns") table = table.Where("table_id = ?", e.TableId) diff --git a/models/tools/systables.go b/models/tools/systables.go index f7124d2..af73bff 100644 --- a/models/tools/systables.go +++ b/models/tools/systables.go @@ -1,9 +1,10 @@ package tools import ( + "strings" + orm "go-admin/global" "go-admin/models" - "strings" ) type SysTables struct { @@ -52,7 +53,7 @@ type Params struct { func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int, error) { var doc []SysTables - table := orm.Eloquent.Select("*").Table("sys_tables") + table := orm.Eloquent.Table("sys_tables") if e.TBName != "" { table = table.Where("table_name = ?", e.TBName) @@ -63,17 +64,17 @@ func (e *SysTables) GetPage(pageSize int, pageIndex int) ([]SysTables, int, erro var count int64 - if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { + if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } - table.Where("`deleted_at` IS NULL").Count(&count) + //table.Where("`deleted_at` IS NULL").Count(&count) return doc, int(count), nil } func (e *SysTables) Get() (SysTables, error) { var doc SysTables var err error - table := orm.Eloquent.Select("*").Table("sys_tables") + table := orm.Eloquent.Table("sys_tables") if e.TBName != "" { table = table.Where("table_name = ?", e.TBName) @@ -100,7 +101,7 @@ func (e *SysTables) Get() (SysTables, error) { func (e *SysTables) GetTree() ([]SysTables, error) { var doc []SysTables var err error - table := orm.Eloquent.Select("*").Table("sys_tables") + table := orm.Eloquent.Table("sys_tables") if e.TBName != "" { table = table.Where("table_name = ?", e.TBName) diff --git a/pkg/cache/memory_test.go b/pkg/cache/memory_test.go index c4d7bee..367e4b0 100644 --- a/pkg/cache/memory_test.go +++ b/pkg/cache/memory_test.go @@ -2,9 +2,10 @@ package cache import ( "fmt" - "github.com/matchstalk/utils/cache" "testing" "time" + + "github.com/matchstalk/utils/cache" ) func TestInitMemory(t *testing.T) { diff --git a/pkg/cache/redis.go b/pkg/cache/redis.go index 2b92c78..cf48c0e 100644 --- a/pkg/cache/redis.go +++ b/pkg/cache/redis.go @@ -1,10 +1,11 @@ package cache import ( + "time" + "github.com/go-redis/redis/v7" "github.com/matchstalk/redisqueue" "github.com/matchstalk/utils/cache" - "time" ) var RedisAdapter Adapter diff --git a/pkg/cache/redis_test.go b/pkg/cache/redis_test.go index 55d4335..9cc795a 100644 --- a/pkg/cache/redis_test.go +++ b/pkg/cache/redis_test.go @@ -2,9 +2,10 @@ package cache import ( "fmt" - "github.com/matchstalk/utils/cache" "testing" "time" + + "github.com/matchstalk/utils/cache" ) func TestInitRedis(t *testing.T) { diff --git a/pkg/casbin/mycasbin.go b/pkg/casbin/mycasbin.go index 57fe9a2..512ec5b 100644 --- a/pkg/casbin/mycasbin.go +++ b/pkg/casbin/mycasbin.go @@ -1,12 +1,12 @@ package mycasbin import ( - "github.com/casbin/casbin/v2" - "github.com/casbin/casbin/v2/model" - gormAdapter "github.com/casbin/gorm-adapter/v3" - _ "github.com/go-sql-driver/mysql" - "go-admin/global" "log" + + "github.com/casbin/casbin/v2" + _ "github.com/go-sql-driver/mysql" + + "go-admin/global" ) // Initialize the model from a string. @@ -25,19 +25,19 @@ m = r.sub == p.sub && (keyMatch2(r.obj, p.obj) || keyMatch(r.obj, p.obj)) && (r. ` func Setup() { - Apter, err := gormAdapter.NewAdapterByDB(global.Eloquent) - if err != nil { - panic(err) - } - m, err := model.NewModelFromString(text) - if err != nil { - panic(err) - } - e, err := casbin.NewSyncedEnforcer(m, Apter) - if err != nil { - panic(err) - } - global.CasbinEnforcer = e + //Apter, err := gormAdapter.NewAdapterByDB(global.Eloquent) + //if err != nil { + // panic(err) + //} + //m, err := model.NewModelFromString(text) + //if err != nil { + // panic(err) + //} + //e, err := casbin.NewSyncedEnforcer(m, Apter) + //if err != nil { + // panic(err) + //} + //global.CasbinEnforcer = e } func Casbin() (*casbin.SyncedEnforcer, error) { diff --git a/template/model.go.template b/template/model.go.template index 682685c..532e0c6 100644 --- a/template/model.go.template +++ b/template/model.go.template @@ -69,7 +69,7 @@ return doc, nil func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}}, int, error) { var doc []{{.ClassName}} -table := orm.Eloquent.Select("*").Table(e.TableName()) +table := orm.Eloquent.Table(e.TableName()) {{ range .Columns }} {{- if .IsQuery }} if e.{{.GoField}} != {{if eq .GoType "string" -}} "" {{ else if eq .GoType "int" -}} 0 {{- end}} { @@ -87,10 +87,9 @@ return nil, 0, err } var count int -if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Error; err != nil { +if err := table.Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } -table.Where("`deleted_at` IS NULL").Count(&count) return doc, count, nil } diff --git a/test/model.go.template b/test/model.go.template index 74ad51d..6d9eaaa 100644 --- a/test/model.go.template +++ b/test/model.go.template @@ -52,7 +52,7 @@ return doc, nil func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int) ([]{{.ClassName}}, int32, error) { var doc []{{.ClassName}} -table := orm.Eloquent.Select("*").Table("{{.TableName}}") +table := orm.Eloquent.Table("{{.TableName}}") {{ range .Columns -}} {{$z := .IsQuery}} {{- if ($z) -}}if e.{{.GoField}} != "" { @@ -70,10 +70,9 @@ return nil, 0, err } var count int32 table = table.Offset((pageIndex - 1) * pageSize).Limit(pageSize) -if err := table.Find(&doc).Error; err != nil { +if err := table.Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil { return nil, 0, err } -table.Count(&count) return doc, count, nil } diff --git a/tools/captcha/captcha.go b/tools/captcha/captcha.go index c17bc30..1ce3693 100644 --- a/tools/captcha/captcha.go +++ b/tools/captcha/captcha.go @@ -1,9 +1,10 @@ package captcha import ( + "image/color" + "github.com/google/uuid" "github.com/mojocn/base64Captcha" - "image/color" ) var store = base64Captcha.DefaultMemStore diff --git a/tools/config/config.go b/tools/config/config.go index 7d7ec6c..62c6b92 100644 --- a/tools/config/config.go +++ b/tools/config/config.go @@ -2,11 +2,12 @@ package config import ( "fmt" - "github.com/spf13/viper" "io/ioutil" "log" "os" "strings" + + "github.com/spf13/viper" ) // 数据库配置项 diff --git a/tools/string.go b/tools/string.go index bb741bf..7eaa9b6 100644 --- a/tools/string.go +++ b/tools/string.go @@ -3,10 +3,11 @@ package tools import ( "encoding/json" "fmt" - "github.com/gin-gonic/gin" "io/ioutil" "strconv" "time" + + "github.com/gin-gonic/gin" ) func StringToInt64(e string) (int64, error) { diff --git a/tools/url.go b/tools/url.go index 755cd26..784aaa0 100644 --- a/tools/url.go +++ b/tools/url.go @@ -1,8 +1,9 @@ package tools import ( - "github.com/gin-gonic/gin" "strings" + + "github.com/gin-gonic/gin" ) //获取URL中批量id并解析 diff --git a/tools/user.go b/tools/user.go index a150722..d32a5f6 100644 --- a/tools/user.go +++ b/tools/user.go @@ -2,7 +2,9 @@ package tools import ( "fmt" + "github.com/gin-gonic/gin" + jwt "go-admin/pkg/jwtauth" ) diff --git a/tools/utils.go b/tools/utils.go index 71a233d..b9f0234 100644 --- a/tools/utils.go +++ b/tools/utils.go @@ -1,8 +1,9 @@ package tools import ( - "golang.org/x/crypto/bcrypt" "strconv" + + "golang.org/x/crypto/bcrypt" ) // 不建议使用的方法(即将过时)