diff --git a/assets/templates/generator/generator_handler.html b/assets/templates/generator/generator_handler.html index 57f3210..4192c38 100644 --- a/assets/templates/generator/generator_handler.html +++ b/assets/templates/generator/generator_handler.html @@ -16,7 +16,7 @@
生成控制器方法
- +
diff --git a/cmd/gormgen/pkg/template.go b/cmd/gormgen/pkg/template.go index 8788eeb..2249799 100644 --- a/cmd/gormgen/pkg/template.go +++ b/cmd/gormgen/pkg/template.go @@ -23,7 +23,7 @@ import ( "fmt" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "github.com/pkg/errors" "gorm.io/gorm" @@ -135,7 +135,7 @@ func (qb *{{.QueryBuilderName}}) Offset(offset int) *{{.QueryBuilderName}} { {{$queryBuilderName := .QueryBuilderName}} {{range .OptionFields}} -func (qb *{{$queryBuilderName}}) Where{{call $.Helpers.Titelize .FieldName}}(p db_repo.Predicate, value {{.FieldType}}) *{{$queryBuilderName}} { +func (qb *{{$queryBuilderName}}) Where{{call $.Helpers.Titelize .FieldName}}(p mysql.Predicate, value {{.FieldType}}) *{{$queryBuilderName}} { qb.where = append(qb.where, struct { prefix string value interface{} diff --git a/cmd/handlergen/README.md b/cmd/handlergen/README.md deleted file mode 100644 index b0dc86e..0000000 --- a/cmd/handlergen/README.md +++ /dev/null @@ -1,102 +0,0 @@ -## 执行命令 - -```$xslt -// test_handler 为 ./internal/api/controller/ 中的包名 -./scripts/handlergen.sh test_handler -``` - -## 模板文件参考 - -```go -package test_handler - -import ( - "github.com/xinliangnote/go-gin-api/internal/api/service/user_service" - "github.com/xinliangnote/go-gin-api/internal/pkg/cache" - "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" - - "go.uber.org/zap" -) - -var _ Handler = (*handler)(nil) - -type Handler interface { - // i 为了避免被其他包实现 - i() - - // Create 创建用户 - // @Tags Test - // @Router /test/create [post] - Create() core.HandlerFunc - - // Update 编辑用户 - // @Tags Test - // @Router /test/update [post] - Update() core.HandlerFunc - - // Delete 删除用户 - // @Tags Test - // @Router /test/delete [post] - Delete() core.HandlerFunc - - // Detail 用户详情 - // @Tags Test - // @Router /test/detail [post] - Detail() core.HandlerFunc -} - -type handler struct { - logger *zap.Logger - cache cache.Repo - userService user_service.UserService -} - -func New(logger *zap.Logger, db db.Repo, cache cache.Repo) Handler { - return &handler{ - logger: logger, - cache: cache, - userService: user_service.NewUserService(db, cache), - } -} - -func (h *handler) i() {} - -``` - -以上会生成 4 个文件 -- func_create.go -- func_update.go -- func_delete.go -- func_detail.go - -## func_create.go 参考 - -```go -package test_handler - -import ( - "github.com/xinliangnote/go-gin-api/internal/pkg/core" -) - -type createRequest struct{} - -type createResponse struct{} - -// Create 创建用户 -// @Summary 创建用户 -// @Description 创建用户 -// @Tags Test -// @Accept json -// @Produce json -// @Param Request body createRequest true "请求信息" -// @Success 200 {object} createResponse -// @Failure 400 {object} code.Failure -// @Router /test/create [post] -func (h *handler) Create() core.HandlerFunc { - return func(c core.Context) { - - } -} - -``` \ No newline at end of file diff --git a/cmd/handlergen/main.go b/cmd/handlergen/main.go index 020b961..d005778 100644 --- a/cmd/handlergen/main.go +++ b/cmd/handlergen/main.go @@ -25,7 +25,7 @@ func init() { func main() { fs := token.NewFileSet() - filePath := fmt.Sprintf("./internal/api/controller/%s", handlerName) + filePath := fmt.Sprintf("./internal/api/%s", handlerName) parsedFile, err := decorator.ParseFile(fs, filePath+"/handler.go", nil, 0) if err != nil { log.Fatalf("parsing package: %s: %s\n", filePath, err) @@ -59,7 +59,7 @@ func main() { continue } - filepath := "./internal/api/controller/" + handlerName + filepath := "./internal/api/" + handlerName filename := fmt.Sprintf("%s/func_%s.go", filepath, strings.ToLower(v.Names[0].String())) funcFile, err := os.OpenFile(filename, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0766) if err != nil { @@ -89,7 +89,7 @@ func main() { funcContent += fmt.Sprintf("// @Description%s \n", nameArr[1]) // Tags funcContent += fmt.Sprintf("%s \n", v.Decorations().Start.All()[1]) - funcContent += fmt.Sprintf("// @Accept json \n") + funcContent += fmt.Sprintf("// @Accept multipart/form-data \n") funcContent += fmt.Sprintf("// @Produce json \n") funcContent += fmt.Sprintf("// @Param Request body %sRequest true \"请求信息\" \n", Lcfirst(v.Names[0].String())) funcContent += fmt.Sprintf("// @Success 200 {object} %sResponse \n", Lcfirst(v.Names[0].String())) diff --git a/cmd/mysqlmd/main.go b/cmd/mysqlmd/main.go index bf3ae68..654390c 100644 --- a/cmd/mysqlmd/main.go +++ b/cmd/mysqlmd/main.go @@ -75,7 +75,7 @@ func main() { for _, table := range tables { - filepath := "./internal/api/repository/db_repo/" + table.Name + "_repo" + filepath := "./internal/repository/mysql/" + table.Name _ = os.Mkdir(filepath, 0766) fmt.Println("create dir : ", filepath) @@ -85,7 +85,7 @@ func main() { fmt.Printf("markdown file error %v\n", err.Error()) return } - fmt.Println(" └── file : ", table.Name+"_repo/gen_table.md") + fmt.Println(" └── file : ", table.Name+"/gen_table.md") modelName := fmt.Sprintf("%s/gen_model.go", filepath) modelFile, err := os.OpenFile(modelName, os.O_CREATE|os.O_TRUNC|os.O_RDWR, 0766) @@ -93,9 +93,9 @@ func main() { fmt.Printf("create and open model file error %v\n", err.Error()) return } - fmt.Println(" └── file : ", table.Name+"_repo/gen_model.go") + fmt.Println(" └── file : ", table.Name+"/gen_model.go") - modelContent := fmt.Sprintf("package %s%s\n", table.Name, "_repo") + modelContent := fmt.Sprintf("package %s\n", table.Name) modelContent += fmt.Sprintf(`import "time"`) modelContent += fmt.Sprintf("\n\n// %s %s \n", capitalize(table.Name), table.Comment.String) modelContent += fmt.Sprintf("//go:generate gormgen -structs %s -input . \n", capitalize(table.Name)) diff --git a/docs/docs.go b/docs/docs.go index 16d3659..629dd36 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -76,7 +76,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.listResponse" + "$ref": "#/definitions/admin.listResponse" } }, "400": { @@ -133,7 +133,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.createResponse" + "$ref": "#/definitions/admin.createResponse" } }, "400": { @@ -162,7 +162,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.detailResponse" + "$ref": "#/definitions/admin.detailResponse" } }, "400": { @@ -207,7 +207,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.loginResponse" + "$ref": "#/definitions/admin.loginResponse" } }, "400": { @@ -236,7 +236,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.logoutResponse" + "$ref": "#/definitions/admin.logoutResponse" } }, "400": { @@ -281,7 +281,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.createResponse" + "$ref": "#/definitions/admin.createResponse" } }, "400": { @@ -319,7 +319,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.listAdminMenuResponse" + "$ref": "#/definitions/admin.listAdminMenuResponse" } }, "400": { @@ -364,7 +364,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.modifyPasswordResponse" + "$ref": "#/definitions/admin.modifyPasswordResponse" } }, "400": { @@ -409,7 +409,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.modifyPersonalInfoResponse" + "$ref": "#/definitions/admin.modifyPersonalInfoResponse" } }, "400": { @@ -447,7 +447,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.offlineResponse" + "$ref": "#/definitions/admin.offlineResponse" } }, "400": { @@ -485,7 +485,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.resetPasswordResponse" + "$ref": "#/definitions/admin.resetPasswordResponse" } }, "400": { @@ -530,7 +530,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.updateUsedResponse" + "$ref": "#/definitions/admin.updateUsedResponse" } }, "400": { @@ -568,7 +568,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.deleteResponse" + "$ref": "#/definitions/admin.deleteResponse" } }, "400": { @@ -635,7 +635,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.listResponse" + "$ref": "#/definitions/authorized.listResponse" } }, "400": { @@ -685,7 +685,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.createResponse" + "$ref": "#/definitions/authorized.createResponse" } }, "400": { @@ -730,7 +730,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.updateUsedResponse" + "$ref": "#/definitions/authorized.updateUsedResponse" } }, "400": { @@ -768,7 +768,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.deleteResponse" + "$ref": "#/definitions/authorized.deleteResponse" } }, "400": { @@ -806,7 +806,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.listAPIResponse" + "$ref": "#/definitions/authorized.listAPIResponse" } }, "400": { @@ -856,7 +856,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.createAPIResponse" + "$ref": "#/definitions/authorized.createAPIResponse" } }, "400": { @@ -894,7 +894,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.deleteAPIResponse" + "$ref": "#/definitions/authorized.deleteAPIResponse" } }, "400": { @@ -960,7 +960,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/config_handler.emailResponse" + "$ref": "#/definitions/config.emailResponse" } }, "400": { @@ -1021,7 +1021,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.listResponse" + "$ref": "#/definitions/cron.listResponse" } }, "400": { @@ -1143,7 +1143,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.createResponse" + "$ref": "#/definitions/cron.createResponse" } }, "400": { @@ -1181,7 +1181,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.detailResponse" + "$ref": "#/definitions/cron.detailResponse" } }, "400": { @@ -1217,7 +1217,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.detailResponse" + "$ref": "#/definitions/cron.detailResponse" } }, "400": { @@ -1262,7 +1262,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.updateUsedResponse" + "$ref": "#/definitions/cron.updateUsedResponse" } }, "400": { @@ -1393,7 +1393,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.modifyResponse" + "$ref": "#/definitions/cron.modifyResponse" } }, "400": { @@ -1422,7 +1422,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.listResponse" + "$ref": "#/definitions/menu.listResponse" } }, "400": { @@ -1452,7 +1452,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/menu_handler.createRequest" + "$ref": "#/definitions/menu.createRequest" } } ], @@ -1460,7 +1460,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.createResponse" + "$ref": "#/definitions/menu.createResponse" } }, "400": { @@ -1505,7 +1505,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.updateSortResponse" + "$ref": "#/definitions/menu.updateSortResponse" } }, "400": { @@ -1550,7 +1550,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.updateUsedResponse" + "$ref": "#/definitions/menu.updateUsedResponse" } }, "400": { @@ -1588,7 +1588,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.detailResponse" + "$ref": "#/definitions/menu.detailResponse" } }, "400": { @@ -1624,7 +1624,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.deleteResponse" + "$ref": "#/definitions/menu.deleteResponse" } }, "400": { @@ -1662,7 +1662,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.listActionResponse" + "$ref": "#/definitions/menu.listActionResponse" } }, "400": { @@ -1712,7 +1712,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.createActionResponse" + "$ref": "#/definitions/menu.createActionResponse" } }, "400": { @@ -1750,127 +1750,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.deleteActionResponse" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/code.Failure" - } - } - } - } - }, - "/api/order/cancel": { - "post": { - "description": "取消订单", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "API.order" - ], - "summary": "取消订单", - "parameters": [ - { - "description": "请求信息", - "name": "Request", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/order_handler.cancelRequest" - } - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/order_handler.cancelResponse" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/code.Failure" - } - } - } - } - }, - "/api/order/create": { - "post": { - "description": "创建订单", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "API.order" - ], - "summary": "创建订单", - "parameters": [ - { - "description": "请求信息", - "name": "Request", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/order_handler.createRequest" - } - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/order_handler.createResponse" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/code.Failure" - } - } - } - } - }, - "/api/order/{id}": { - "get": { - "description": "取消订单", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "API.order" - ], - "summary": "取消订单", - "parameters": [ - { - "description": "请求信息", - "name": "Request", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/order_handler.detailRequest" - } - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/order_handler.detailResponse" + "$ref": "#/definitions/menu.deleteActionResponse" } }, "400": { @@ -1908,7 +1788,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.searchCacheResponse" + "$ref": "#/definitions/tool.searchCacheResponse" } }, "400": { @@ -1946,7 +1826,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.searchCacheResponse" + "$ref": "#/definitions/tool.searchCacheResponse" } }, "400": { @@ -1975,7 +1855,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.dbsResponse" + "$ref": "#/definitions/tool.dbsResponse" } }, "400": { @@ -2027,7 +1907,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.searchMySQLResponse" + "$ref": "#/definitions/tool.searchMySQLResponse" } }, "400": { @@ -2065,7 +1945,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.tablesResponse" + "$ref": "#/definitions/tool.tablesResponse" } }, "400": { @@ -2103,7 +1983,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.hashIdsDecodeResponse" + "$ref": "#/definitions/tool.hashIdsDecodeResponse" } }, "400": { @@ -2141,7 +2021,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.hashIdsEncodeResponse" + "$ref": "#/definitions/tool.hashIdsEncodeResponse" } }, "400": { @@ -2179,7 +2059,7 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.sendMessageResponse" + "$ref": "#/definitions/tool.sendMessageResponse" } }, "400": { @@ -2239,7 +2119,7 @@ var doc = `{ } } }, - "admin_handler.createResponse": { + "admin.createResponse": { "type": "object", "properties": { "id": { @@ -2248,7 +2128,7 @@ var doc = `{ } } }, - "admin_handler.deleteResponse": { + "admin.deleteResponse": { "type": "object", "properties": { "id": { @@ -2257,7 +2137,7 @@ var doc = `{ } } }, - "admin_handler.detailResponse": { + "admin.detailResponse": { "type": "object", "properties": { "menu": { @@ -2281,7 +2161,7 @@ var doc = `{ } } }, - "admin_handler.listAdminMenuResponse": { + "admin.listAdminMenuResponse": { "type": "object", "properties": { "list": { @@ -2295,7 +2175,7 @@ var doc = `{ } } }, - "admin_handler.listData": { + "admin.listData": { "type": "object", "properties": { "created_at": { @@ -2344,13 +2224,13 @@ var doc = `{ } } }, - "admin_handler.listResponse": { + "admin.listResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/admin_handler.listData" + "$ref": "#/definitions/admin.listData" } }, "pagination": { @@ -2369,7 +2249,7 @@ var doc = `{ } } }, - "admin_handler.loginResponse": { + "admin.loginResponse": { "type": "object", "properties": { "token": { @@ -2378,7 +2258,7 @@ var doc = `{ } } }, - "admin_handler.logoutResponse": { + "admin.logoutResponse": { "type": "object", "properties": { "username": { @@ -2387,7 +2267,7 @@ var doc = `{ } } }, - "admin_handler.modifyPasswordResponse": { + "admin.modifyPasswordResponse": { "type": "object", "properties": { "username": { @@ -2396,7 +2276,7 @@ var doc = `{ } } }, - "admin_handler.modifyPersonalInfoResponse": { + "admin.modifyPersonalInfoResponse": { "type": "object", "properties": { "username": { @@ -2405,7 +2285,7 @@ var doc = `{ } } }, - "admin_handler.offlineResponse": { + "admin.offlineResponse": { "type": "object", "properties": { "id": { @@ -2414,7 +2294,7 @@ var doc = `{ } } }, - "admin_handler.resetPasswordResponse": { + "admin.resetPasswordResponse": { "type": "object", "properties": { "id": { @@ -2423,7 +2303,7 @@ var doc = `{ } } }, - "admin_handler.updateUsedResponse": { + "admin.updateUsedResponse": { "type": "object", "properties": { "id": { @@ -2432,7 +2312,7 @@ var doc = `{ } } }, - "authorized_handler.createAPIResponse": { + "authorized.createAPIResponse": { "type": "object", "properties": { "id": { @@ -2441,7 +2321,7 @@ var doc = `{ } } }, - "authorized_handler.createResponse": { + "authorized.createResponse": { "type": "object", "properties": { "id": { @@ -2450,7 +2330,7 @@ var doc = `{ } } }, - "authorized_handler.deleteAPIResponse": { + "authorized.deleteAPIResponse": { "type": "object", "properties": { "id": { @@ -2459,7 +2339,7 @@ var doc = `{ } } }, - "authorized_handler.deleteResponse": { + "authorized.deleteResponse": { "type": "object", "properties": { "id": { @@ -2468,7 +2348,7 @@ var doc = `{ } } }, - "authorized_handler.listAPIData": { + "authorized.listAPIData": { "type": "object", "properties": { "api": { @@ -2489,7 +2369,7 @@ var doc = `{ } } }, - "authorized_handler.listAPIResponse": { + "authorized.listAPIResponse": { "type": "object", "properties": { "business_key": { @@ -2499,12 +2379,12 @@ var doc = `{ "list": { "type": "array", "items": { - "$ref": "#/definitions/authorized_handler.listAPIData" + "$ref": "#/definitions/authorized.listAPIData" } } } }, - "authorized_handler.listData": { + "authorized.listData": { "type": "object", "properties": { "business_developer": { @@ -2553,13 +2433,13 @@ var doc = `{ } } }, - "authorized_handler.listResponse": { + "authorized.listResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/authorized_handler.listData" + "$ref": "#/definitions/authorized.listData" } }, "pagination": { @@ -2578,7 +2458,7 @@ var doc = `{ } } }, - "authorized_handler.updateUsedResponse": { + "authorized.updateUsedResponse": { "type": "object", "properties": { "id": { @@ -2600,7 +2480,7 @@ var doc = `{ } } }, - "config_handler.emailResponse": { + "config.emailResponse": { "type": "object", "properties": { "email": { @@ -2609,7 +2489,7 @@ var doc = `{ } } }, - "cron_handler.createResponse": { + "cron.createResponse": { "type": "object", "properties": { "id": { @@ -2618,7 +2498,7 @@ var doc = `{ } } }, - "cron_handler.detailResponse": { + "cron.detailResponse": { "type": "object", "properties": { "command": { @@ -2679,7 +2559,7 @@ var doc = `{ } } }, - "cron_handler.listData": { + "cron.listData": { "type": "object", "properties": { "command": { @@ -2764,13 +2644,13 @@ var doc = `{ } } }, - "cron_handler.listResponse": { + "cron.listResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/cron_handler.listData" + "$ref": "#/definitions/cron.listData" } }, "pagination": { @@ -2789,7 +2669,7 @@ var doc = `{ } } }, - "cron_handler.modifyResponse": { + "cron.modifyResponse": { "type": "object", "properties": { "id": { @@ -2798,7 +2678,7 @@ var doc = `{ } } }, - "cron_handler.updateUsedResponse": { + "cron.updateUsedResponse": { "type": "object", "properties": { "id": { @@ -2807,7 +2687,7 @@ var doc = `{ } } }, - "menu_handler.createActionResponse": { + "menu.createActionResponse": { "type": "object", "properties": { "id": { @@ -2816,7 +2696,7 @@ var doc = `{ } } }, - "menu_handler.createRequest": { + "menu.createRequest": { "type": "object", "properties": { "icon": { @@ -2845,7 +2725,7 @@ var doc = `{ } } }, - "menu_handler.createResponse": { + "menu.createResponse": { "type": "object", "properties": { "id": { @@ -2854,7 +2734,7 @@ var doc = `{ } } }, - "menu_handler.deleteActionResponse": { + "menu.deleteActionResponse": { "type": "object", "properties": { "id": { @@ -2863,7 +2743,7 @@ var doc = `{ } } }, - "menu_handler.deleteResponse": { + "menu.deleteResponse": { "type": "object", "properties": { "id": { @@ -2872,7 +2752,7 @@ var doc = `{ } } }, - "menu_handler.detailResponse": { + "menu.detailResponse": { "type": "object", "properties": { "icon": { @@ -2897,7 +2777,7 @@ var doc = `{ } } }, - "menu_handler.listActionData": { + "menu.listActionData": { "type": "object", "properties": { "api": { @@ -2918,13 +2798,13 @@ var doc = `{ } } }, - "menu_handler.listActionResponse": { + "menu.listActionResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/menu_handler.listActionData" + "$ref": "#/definitions/menu.listActionData" } }, "menu_name": { @@ -2932,7 +2812,7 @@ var doc = `{ } } }, - "menu_handler.listData": { + "menu.listData": { "type": "object", "properties": { "hashid": { @@ -2969,18 +2849,18 @@ var doc = `{ } } }, - "menu_handler.listResponse": { + "menu.listResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/menu_handler.listData" + "$ref": "#/definitions/menu.listData" } } } }, - "menu_handler.updateSortResponse": { + "menu.updateSortResponse": { "type": "object", "properties": { "id": { @@ -2989,7 +2869,7 @@ var doc = `{ } } }, - "menu_handler.updateUsedResponse": { + "menu.updateUsedResponse": { "type": "object", "properties": { "id": { @@ -2998,25 +2878,7 @@ var doc = `{ } } }, - "order_handler.cancelRequest": { - "type": "object" - }, - "order_handler.cancelResponse": { - "type": "object" - }, - "order_handler.createRequest": { - "type": "object" - }, - "order_handler.createResponse": { - "type": "object" - }, - "order_handler.detailRequest": { - "type": "object" - }, - "order_handler.detailResponse": { - "type": "object" - }, - "tool_handler.dbData": { + "tool.dbData": { "type": "object", "properties": { "db_name": { @@ -3025,19 +2887,19 @@ var doc = `{ } } }, - "tool_handler.dbsResponse": { + "tool.dbsResponse": { "type": "object", "properties": { "list": { "description": "数据库列表", "type": "array", "items": { - "$ref": "#/definitions/tool_handler.dbData" + "$ref": "#/definitions/tool.dbData" } } } }, - "tool_handler.hashIdsDecodeResponse": { + "tool.hashIdsDecodeResponse": { "type": "object", "properties": { "val": { @@ -3046,7 +2908,7 @@ var doc = `{ } } }, - "tool_handler.hashIdsEncodeResponse": { + "tool.hashIdsEncodeResponse": { "type": "object", "properties": { "val": { @@ -3055,7 +2917,7 @@ var doc = `{ } } }, - "tool_handler.searchCacheResponse": { + "tool.searchCacheResponse": { "type": "object", "properties": { "ttl": { @@ -3068,7 +2930,7 @@ var doc = `{ } } }, - "tool_handler.searchMySQLResponse": { + "tool.searchMySQLResponse": { "type": "object", "properties": { "cols": { @@ -3082,7 +2944,7 @@ var doc = `{ "description": "行信息", "type": "array", "items": { - "$ref": "#/definitions/tool_handler.tableColumn" + "$ref": "#/definitions/tool.tableColumn" } }, "list": { @@ -3095,7 +2957,7 @@ var doc = `{ } } }, - "tool_handler.sendMessageResponse": { + "tool.sendMessageResponse": { "type": "object", "properties": { "status": { @@ -3104,7 +2966,7 @@ var doc = `{ } } }, - "tool_handler.tableColumn": { + "tool.tableColumn": { "type": "object", "properties": { "column_comment": { @@ -3117,7 +2979,7 @@ var doc = `{ } } }, - "tool_handler.tableData": { + "tool.tableData": { "type": "object", "properties": { "table_comment": { @@ -3130,14 +2992,14 @@ var doc = `{ } } }, - "tool_handler.tablesResponse": { + "tool.tablesResponse": { "type": "object", "properties": { "list": { "description": "数据表列表", "type": "array", "items": { - "$ref": "#/definitions/tool_handler.tableData" + "$ref": "#/definitions/tool.tableData" } } } diff --git a/docs/swagger.json b/docs/swagger.json index 66ffe61..2b07639 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -60,7 +60,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.listResponse" + "$ref": "#/definitions/admin.listResponse" } }, "400": { @@ -117,7 +117,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.createResponse" + "$ref": "#/definitions/admin.createResponse" } }, "400": { @@ -146,7 +146,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.detailResponse" + "$ref": "#/definitions/admin.detailResponse" } }, "400": { @@ -191,7 +191,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.loginResponse" + "$ref": "#/definitions/admin.loginResponse" } }, "400": { @@ -220,7 +220,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.logoutResponse" + "$ref": "#/definitions/admin.logoutResponse" } }, "400": { @@ -265,7 +265,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.createResponse" + "$ref": "#/definitions/admin.createResponse" } }, "400": { @@ -303,7 +303,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.listAdminMenuResponse" + "$ref": "#/definitions/admin.listAdminMenuResponse" } }, "400": { @@ -348,7 +348,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.modifyPasswordResponse" + "$ref": "#/definitions/admin.modifyPasswordResponse" } }, "400": { @@ -393,7 +393,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.modifyPersonalInfoResponse" + "$ref": "#/definitions/admin.modifyPersonalInfoResponse" } }, "400": { @@ -431,7 +431,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.offlineResponse" + "$ref": "#/definitions/admin.offlineResponse" } }, "400": { @@ -469,7 +469,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.resetPasswordResponse" + "$ref": "#/definitions/admin.resetPasswordResponse" } }, "400": { @@ -514,7 +514,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.updateUsedResponse" + "$ref": "#/definitions/admin.updateUsedResponse" } }, "400": { @@ -552,7 +552,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/admin_handler.deleteResponse" + "$ref": "#/definitions/admin.deleteResponse" } }, "400": { @@ -619,7 +619,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.listResponse" + "$ref": "#/definitions/authorized.listResponse" } }, "400": { @@ -669,7 +669,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.createResponse" + "$ref": "#/definitions/authorized.createResponse" } }, "400": { @@ -714,7 +714,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.updateUsedResponse" + "$ref": "#/definitions/authorized.updateUsedResponse" } }, "400": { @@ -752,7 +752,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.deleteResponse" + "$ref": "#/definitions/authorized.deleteResponse" } }, "400": { @@ -790,7 +790,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.listAPIResponse" + "$ref": "#/definitions/authorized.listAPIResponse" } }, "400": { @@ -840,7 +840,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.createAPIResponse" + "$ref": "#/definitions/authorized.createAPIResponse" } }, "400": { @@ -878,7 +878,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/authorized_handler.deleteAPIResponse" + "$ref": "#/definitions/authorized.deleteAPIResponse" } }, "400": { @@ -944,7 +944,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/config_handler.emailResponse" + "$ref": "#/definitions/config.emailResponse" } }, "400": { @@ -1005,7 +1005,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.listResponse" + "$ref": "#/definitions/cron.listResponse" } }, "400": { @@ -1127,7 +1127,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.createResponse" + "$ref": "#/definitions/cron.createResponse" } }, "400": { @@ -1165,7 +1165,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.detailResponse" + "$ref": "#/definitions/cron.detailResponse" } }, "400": { @@ -1201,7 +1201,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.detailResponse" + "$ref": "#/definitions/cron.detailResponse" } }, "400": { @@ -1246,7 +1246,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.updateUsedResponse" + "$ref": "#/definitions/cron.updateUsedResponse" } }, "400": { @@ -1377,7 +1377,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/cron_handler.modifyResponse" + "$ref": "#/definitions/cron.modifyResponse" } }, "400": { @@ -1406,7 +1406,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.listResponse" + "$ref": "#/definitions/menu.listResponse" } }, "400": { @@ -1436,7 +1436,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/menu_handler.createRequest" + "$ref": "#/definitions/menu.createRequest" } } ], @@ -1444,7 +1444,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.createResponse" + "$ref": "#/definitions/menu.createResponse" } }, "400": { @@ -1489,7 +1489,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.updateSortResponse" + "$ref": "#/definitions/menu.updateSortResponse" } }, "400": { @@ -1534,7 +1534,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.updateUsedResponse" + "$ref": "#/definitions/menu.updateUsedResponse" } }, "400": { @@ -1572,7 +1572,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.detailResponse" + "$ref": "#/definitions/menu.detailResponse" } }, "400": { @@ -1608,7 +1608,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.deleteResponse" + "$ref": "#/definitions/menu.deleteResponse" } }, "400": { @@ -1646,7 +1646,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.listActionResponse" + "$ref": "#/definitions/menu.listActionResponse" } }, "400": { @@ -1696,7 +1696,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.createActionResponse" + "$ref": "#/definitions/menu.createActionResponse" } }, "400": { @@ -1734,127 +1734,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/menu_handler.deleteActionResponse" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/code.Failure" - } - } - } - } - }, - "/api/order/cancel": { - "post": { - "description": "取消订单", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "API.order" - ], - "summary": "取消订单", - "parameters": [ - { - "description": "请求信息", - "name": "Request", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/order_handler.cancelRequest" - } - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/order_handler.cancelResponse" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/code.Failure" - } - } - } - } - }, - "/api/order/create": { - "post": { - "description": "创建订单", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "API.order" - ], - "summary": "创建订单", - "parameters": [ - { - "description": "请求信息", - "name": "Request", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/order_handler.createRequest" - } - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/order_handler.createResponse" - } - }, - "400": { - "description": "Bad Request", - "schema": { - "$ref": "#/definitions/code.Failure" - } - } - } - } - }, - "/api/order/{id}": { - "get": { - "description": "取消订单", - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "API.order" - ], - "summary": "取消订单", - "parameters": [ - { - "description": "请求信息", - "name": "Request", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/order_handler.detailRequest" - } - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/order_handler.detailResponse" + "$ref": "#/definitions/menu.deleteActionResponse" } }, "400": { @@ -1892,7 +1772,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.searchCacheResponse" + "$ref": "#/definitions/tool.searchCacheResponse" } }, "400": { @@ -1930,7 +1810,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.searchCacheResponse" + "$ref": "#/definitions/tool.searchCacheResponse" } }, "400": { @@ -1959,7 +1839,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.dbsResponse" + "$ref": "#/definitions/tool.dbsResponse" } }, "400": { @@ -2011,7 +1891,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.searchMySQLResponse" + "$ref": "#/definitions/tool.searchMySQLResponse" } }, "400": { @@ -2049,7 +1929,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.tablesResponse" + "$ref": "#/definitions/tool.tablesResponse" } }, "400": { @@ -2087,7 +1967,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.hashIdsDecodeResponse" + "$ref": "#/definitions/tool.hashIdsDecodeResponse" } }, "400": { @@ -2125,7 +2005,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.hashIdsEncodeResponse" + "$ref": "#/definitions/tool.hashIdsEncodeResponse" } }, "400": { @@ -2163,7 +2043,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/tool_handler.sendMessageResponse" + "$ref": "#/definitions/tool.sendMessageResponse" } }, "400": { @@ -2223,7 +2103,7 @@ } } }, - "admin_handler.createResponse": { + "admin.createResponse": { "type": "object", "properties": { "id": { @@ -2232,7 +2112,7 @@ } } }, - "admin_handler.deleteResponse": { + "admin.deleteResponse": { "type": "object", "properties": { "id": { @@ -2241,7 +2121,7 @@ } } }, - "admin_handler.detailResponse": { + "admin.detailResponse": { "type": "object", "properties": { "menu": { @@ -2265,7 +2145,7 @@ } } }, - "admin_handler.listAdminMenuResponse": { + "admin.listAdminMenuResponse": { "type": "object", "properties": { "list": { @@ -2279,7 +2159,7 @@ } } }, - "admin_handler.listData": { + "admin.listData": { "type": "object", "properties": { "created_at": { @@ -2328,13 +2208,13 @@ } } }, - "admin_handler.listResponse": { + "admin.listResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/admin_handler.listData" + "$ref": "#/definitions/admin.listData" } }, "pagination": { @@ -2353,7 +2233,7 @@ } } }, - "admin_handler.loginResponse": { + "admin.loginResponse": { "type": "object", "properties": { "token": { @@ -2362,7 +2242,7 @@ } } }, - "admin_handler.logoutResponse": { + "admin.logoutResponse": { "type": "object", "properties": { "username": { @@ -2371,7 +2251,7 @@ } } }, - "admin_handler.modifyPasswordResponse": { + "admin.modifyPasswordResponse": { "type": "object", "properties": { "username": { @@ -2380,7 +2260,7 @@ } } }, - "admin_handler.modifyPersonalInfoResponse": { + "admin.modifyPersonalInfoResponse": { "type": "object", "properties": { "username": { @@ -2389,7 +2269,7 @@ } } }, - "admin_handler.offlineResponse": { + "admin.offlineResponse": { "type": "object", "properties": { "id": { @@ -2398,7 +2278,7 @@ } } }, - "admin_handler.resetPasswordResponse": { + "admin.resetPasswordResponse": { "type": "object", "properties": { "id": { @@ -2407,7 +2287,7 @@ } } }, - "admin_handler.updateUsedResponse": { + "admin.updateUsedResponse": { "type": "object", "properties": { "id": { @@ -2416,7 +2296,7 @@ } } }, - "authorized_handler.createAPIResponse": { + "authorized.createAPIResponse": { "type": "object", "properties": { "id": { @@ -2425,7 +2305,7 @@ } } }, - "authorized_handler.createResponse": { + "authorized.createResponse": { "type": "object", "properties": { "id": { @@ -2434,7 +2314,7 @@ } } }, - "authorized_handler.deleteAPIResponse": { + "authorized.deleteAPIResponse": { "type": "object", "properties": { "id": { @@ -2443,7 +2323,7 @@ } } }, - "authorized_handler.deleteResponse": { + "authorized.deleteResponse": { "type": "object", "properties": { "id": { @@ -2452,7 +2332,7 @@ } } }, - "authorized_handler.listAPIData": { + "authorized.listAPIData": { "type": "object", "properties": { "api": { @@ -2473,7 +2353,7 @@ } } }, - "authorized_handler.listAPIResponse": { + "authorized.listAPIResponse": { "type": "object", "properties": { "business_key": { @@ -2483,12 +2363,12 @@ "list": { "type": "array", "items": { - "$ref": "#/definitions/authorized_handler.listAPIData" + "$ref": "#/definitions/authorized.listAPIData" } } } }, - "authorized_handler.listData": { + "authorized.listData": { "type": "object", "properties": { "business_developer": { @@ -2537,13 +2417,13 @@ } } }, - "authorized_handler.listResponse": { + "authorized.listResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/authorized_handler.listData" + "$ref": "#/definitions/authorized.listData" } }, "pagination": { @@ -2562,7 +2442,7 @@ } } }, - "authorized_handler.updateUsedResponse": { + "authorized.updateUsedResponse": { "type": "object", "properties": { "id": { @@ -2584,7 +2464,7 @@ } } }, - "config_handler.emailResponse": { + "config.emailResponse": { "type": "object", "properties": { "email": { @@ -2593,7 +2473,7 @@ } } }, - "cron_handler.createResponse": { + "cron.createResponse": { "type": "object", "properties": { "id": { @@ -2602,7 +2482,7 @@ } } }, - "cron_handler.detailResponse": { + "cron.detailResponse": { "type": "object", "properties": { "command": { @@ -2663,7 +2543,7 @@ } } }, - "cron_handler.listData": { + "cron.listData": { "type": "object", "properties": { "command": { @@ -2748,13 +2628,13 @@ } } }, - "cron_handler.listResponse": { + "cron.listResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/cron_handler.listData" + "$ref": "#/definitions/cron.listData" } }, "pagination": { @@ -2773,7 +2653,7 @@ } } }, - "cron_handler.modifyResponse": { + "cron.modifyResponse": { "type": "object", "properties": { "id": { @@ -2782,7 +2662,7 @@ } } }, - "cron_handler.updateUsedResponse": { + "cron.updateUsedResponse": { "type": "object", "properties": { "id": { @@ -2791,7 +2671,7 @@ } } }, - "menu_handler.createActionResponse": { + "menu.createActionResponse": { "type": "object", "properties": { "id": { @@ -2800,7 +2680,7 @@ } } }, - "menu_handler.createRequest": { + "menu.createRequest": { "type": "object", "properties": { "icon": { @@ -2829,7 +2709,7 @@ } } }, - "menu_handler.createResponse": { + "menu.createResponse": { "type": "object", "properties": { "id": { @@ -2838,7 +2718,7 @@ } } }, - "menu_handler.deleteActionResponse": { + "menu.deleteActionResponse": { "type": "object", "properties": { "id": { @@ -2847,7 +2727,7 @@ } } }, - "menu_handler.deleteResponse": { + "menu.deleteResponse": { "type": "object", "properties": { "id": { @@ -2856,7 +2736,7 @@ } } }, - "menu_handler.detailResponse": { + "menu.detailResponse": { "type": "object", "properties": { "icon": { @@ -2881,7 +2761,7 @@ } } }, - "menu_handler.listActionData": { + "menu.listActionData": { "type": "object", "properties": { "api": { @@ -2902,13 +2782,13 @@ } } }, - "menu_handler.listActionResponse": { + "menu.listActionResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/menu_handler.listActionData" + "$ref": "#/definitions/menu.listActionData" } }, "menu_name": { @@ -2916,7 +2796,7 @@ } } }, - "menu_handler.listData": { + "menu.listData": { "type": "object", "properties": { "hashid": { @@ -2953,18 +2833,18 @@ } } }, - "menu_handler.listResponse": { + "menu.listResponse": { "type": "object", "properties": { "list": { "type": "array", "items": { - "$ref": "#/definitions/menu_handler.listData" + "$ref": "#/definitions/menu.listData" } } } }, - "menu_handler.updateSortResponse": { + "menu.updateSortResponse": { "type": "object", "properties": { "id": { @@ -2973,7 +2853,7 @@ } } }, - "menu_handler.updateUsedResponse": { + "menu.updateUsedResponse": { "type": "object", "properties": { "id": { @@ -2982,25 +2862,7 @@ } } }, - "order_handler.cancelRequest": { - "type": "object" - }, - "order_handler.cancelResponse": { - "type": "object" - }, - "order_handler.createRequest": { - "type": "object" - }, - "order_handler.createResponse": { - "type": "object" - }, - "order_handler.detailRequest": { - "type": "object" - }, - "order_handler.detailResponse": { - "type": "object" - }, - "tool_handler.dbData": { + "tool.dbData": { "type": "object", "properties": { "db_name": { @@ -3009,19 +2871,19 @@ } } }, - "tool_handler.dbsResponse": { + "tool.dbsResponse": { "type": "object", "properties": { "list": { "description": "数据库列表", "type": "array", "items": { - "$ref": "#/definitions/tool_handler.dbData" + "$ref": "#/definitions/tool.dbData" } } } }, - "tool_handler.hashIdsDecodeResponse": { + "tool.hashIdsDecodeResponse": { "type": "object", "properties": { "val": { @@ -3030,7 +2892,7 @@ } } }, - "tool_handler.hashIdsEncodeResponse": { + "tool.hashIdsEncodeResponse": { "type": "object", "properties": { "val": { @@ -3039,7 +2901,7 @@ } } }, - "tool_handler.searchCacheResponse": { + "tool.searchCacheResponse": { "type": "object", "properties": { "ttl": { @@ -3052,7 +2914,7 @@ } } }, - "tool_handler.searchMySQLResponse": { + "tool.searchMySQLResponse": { "type": "object", "properties": { "cols": { @@ -3066,7 +2928,7 @@ "description": "行信息", "type": "array", "items": { - "$ref": "#/definitions/tool_handler.tableColumn" + "$ref": "#/definitions/tool.tableColumn" } }, "list": { @@ -3079,7 +2941,7 @@ } } }, - "tool_handler.sendMessageResponse": { + "tool.sendMessageResponse": { "type": "object", "properties": { "status": { @@ -3088,7 +2950,7 @@ } } }, - "tool_handler.tableColumn": { + "tool.tableColumn": { "type": "object", "properties": { "column_comment": { @@ -3101,7 +2963,7 @@ } } }, - "tool_handler.tableData": { + "tool.tableData": { "type": "object", "properties": { "table_comment": { @@ -3114,14 +2976,14 @@ } } }, - "tool_handler.tablesResponse": { + "tool.tablesResponse": { "type": "object", "properties": { "list": { "description": "数据表列表", "type": "array", "items": { - "$ref": "#/definitions/tool_handler.tableData" + "$ref": "#/definitions/tool.tableData" } } } diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 4d77140..a8657ba 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -32,19 +32,19 @@ definitions: description: 父类ID type: integer type: object - admin_handler.createResponse: + admin.createResponse: properties: id: description: 主键ID type: integer type: object - admin_handler.deleteResponse: + admin.deleteResponse: properties: id: description: 主键ID type: integer type: object - admin_handler.detailResponse: + admin.detailResponse: properties: menu: description: 菜单栏 @@ -61,7 +61,7 @@ definitions: description: 用户名 type: string type: object - admin_handler.listAdminMenuResponse: + admin.listAdminMenuResponse: properties: list: items: @@ -70,7 +70,7 @@ definitions: username: type: string type: object - admin_handler.listData: + admin.listData: properties: created_at: description: 创建时间 @@ -106,11 +106,11 @@ definitions: description: 用户名 type: string type: object - admin_handler.listResponse: + admin.listResponse: properties: list: items: - $ref: '#/definitions/admin_handler.listData' + $ref: '#/definitions/admin.listData' type: array pagination: properties: @@ -122,73 +122,73 @@ definitions: type: integer type: object type: object - admin_handler.loginResponse: + admin.loginResponse: properties: token: description: 用户身份标识 type: string type: object - admin_handler.logoutResponse: + admin.logoutResponse: properties: username: description: 用户账号 type: string type: object - admin_handler.modifyPasswordResponse: + admin.modifyPasswordResponse: properties: username: description: 用户账号 type: string type: object - admin_handler.modifyPersonalInfoResponse: + admin.modifyPersonalInfoResponse: properties: username: description: 用户账号 type: string type: object - admin_handler.offlineResponse: + admin.offlineResponse: properties: id: description: 主键ID type: integer type: object - admin_handler.resetPasswordResponse: + admin.resetPasswordResponse: properties: id: description: 主键ID type: integer type: object - admin_handler.updateUsedResponse: + admin.updateUsedResponse: properties: id: description: 主键ID type: integer type: object - authorized_handler.createAPIResponse: + authorized.createAPIResponse: properties: id: description: 主键ID type: integer type: object - authorized_handler.createResponse: + authorized.createResponse: properties: id: description: 主键ID type: integer type: object - authorized_handler.deleteAPIResponse: + authorized.deleteAPIResponse: properties: id: description: 主键ID type: integer type: object - authorized_handler.deleteResponse: + authorized.deleteResponse: properties: id: description: 主键ID type: integer type: object - authorized_handler.listAPIData: + authorized.listAPIData: properties: api: description: 调用方对接人 @@ -203,17 +203,17 @@ definitions: description: 调用方secret type: string type: object - authorized_handler.listAPIResponse: + authorized.listAPIResponse: properties: business_key: description: 调用方key type: string list: items: - $ref: '#/definitions/authorized_handler.listAPIData' + $ref: '#/definitions/authorized.listAPIData' type: array type: object - authorized_handler.listData: + authorized.listData: properties: business_developer: description: 调用方对接人 @@ -249,11 +249,11 @@ definitions: description: 更新人 type: string type: object - authorized_handler.listResponse: + authorized.listResponse: properties: list: items: - $ref: '#/definitions/authorized_handler.listData' + $ref: '#/definitions/authorized.listData' type: array pagination: properties: @@ -265,7 +265,7 @@ definitions: type: integer type: object type: object - authorized_handler.updateUsedResponse: + authorized.updateUsedResponse: properties: id: description: 主键ID @@ -280,19 +280,19 @@ definitions: description: 描述信息 type: string type: object - config_handler.emailResponse: + config.emailResponse: properties: email: description: 邮箱地址 type: string type: object - cron_handler.createResponse: + cron.createResponse: properties: id: description: 主键ID type: integer type: object - cron_handler.detailResponse: + cron.detailResponse: properties: command: description: 执行命令 @@ -337,7 +337,7 @@ definitions: description: 超时时间(单位:秒) type: integer type: object - cron_handler.listData: + cron.listData: properties: command: description: 执行命令 @@ -400,11 +400,11 @@ definitions: description: 更新人 type: string type: object - cron_handler.listResponse: + cron.listResponse: properties: list: items: - $ref: '#/definitions/cron_handler.listData' + $ref: '#/definitions/cron.listData' type: array pagination: properties: @@ -416,25 +416,25 @@ definitions: type: integer type: object type: object - cron_handler.modifyResponse: + cron.modifyResponse: properties: id: description: 主键ID type: integer type: object - cron_handler.updateUsedResponse: + cron.updateUsedResponse: properties: id: description: 主键ID type: integer type: object - menu_handler.createActionResponse: + menu.createActionResponse: properties: id: description: 主键ID type: integer type: object - menu_handler.createRequest: + menu.createRequest: properties: icon: description: 图标 @@ -455,25 +455,25 @@ definitions: description: 父类ID type: integer type: object - menu_handler.createResponse: + menu.createResponse: properties: id: description: 主键ID type: integer type: object - menu_handler.deleteActionResponse: + menu.deleteActionResponse: properties: id: description: 主键ID type: integer type: object - menu_handler.deleteResponse: + menu.deleteResponse: properties: id: description: 主键ID type: integer type: object - menu_handler.detailResponse: + menu.detailResponse: properties: icon: description: 图标 @@ -491,7 +491,7 @@ definitions: description: 父类ID type: integer type: object - menu_handler.listActionData: + menu.listActionData: properties: api: description: 调用方对接人 @@ -506,16 +506,16 @@ definitions: description: 调用方secret type: string type: object - menu_handler.listActionResponse: + menu.listActionResponse: properties: list: items: - $ref: '#/definitions/menu_handler.listActionData' + $ref: '#/definitions/menu.listActionData' type: array menu_name: type: string type: object - menu_handler.listData: + menu.listData: properties: hashid: description: hashid @@ -542,64 +542,52 @@ definitions: description: 排序 type: integer type: object - menu_handler.listResponse: + menu.listResponse: properties: list: items: - $ref: '#/definitions/menu_handler.listData' + $ref: '#/definitions/menu.listData' type: array type: object - menu_handler.updateSortResponse: + menu.updateSortResponse: properties: id: description: 主键ID type: integer type: object - menu_handler.updateUsedResponse: + menu.updateUsedResponse: properties: id: description: 主键ID type: integer type: object - order_handler.cancelRequest: - type: object - order_handler.cancelResponse: - type: object - order_handler.createRequest: - type: object - order_handler.createResponse: - type: object - order_handler.detailRequest: - type: object - order_handler.detailResponse: - type: object - tool_handler.dbData: + tool.dbData: properties: db_name: description: 数据库名称 type: string type: object - tool_handler.dbsResponse: + tool.dbsResponse: properties: list: description: 数据库列表 items: - $ref: '#/definitions/tool_handler.dbData' + $ref: '#/definitions/tool.dbData' type: array type: object - tool_handler.hashIdsDecodeResponse: + tool.hashIdsDecodeResponse: properties: val: description: 解密后的值 type: integer type: object - tool_handler.hashIdsEncodeResponse: + tool.hashIdsEncodeResponse: properties: val: description: 加密后的值 type: string type: object - tool_handler.searchCacheResponse: + tool.searchCacheResponse: properties: ttl: description: 过期时间 @@ -608,7 +596,7 @@ definitions: description: 查询后的值 type: string type: object - tool_handler.searchMySQLResponse: + tool.searchMySQLResponse: properties: cols: description: 查询后的行 @@ -618,7 +606,7 @@ definitions: cols_info: description: 行信息 items: - $ref: '#/definitions/tool_handler.tableColumn' + $ref: '#/definitions/tool.tableColumn' type: array list: description: 查询后的数据 @@ -627,13 +615,13 @@ definitions: type: object type: array type: object - tool_handler.sendMessageResponse: + tool.sendMessageResponse: properties: status: description: 状态 type: string type: object - tool_handler.tableColumn: + tool.tableColumn: properties: column_comment: description: 字段注释 @@ -642,7 +630,7 @@ definitions: description: 字段名称 type: string type: object - tool_handler.tableData: + tool.tableData: properties: table_comment: description: 数据表备注 @@ -651,12 +639,12 @@ definitions: description: 数据表名称 type: string type: object - tool_handler.tablesResponse: + tool.tablesResponse: properties: list: description: 数据表列表 items: - $ref: '#/definitions/tool_handler.tableData' + $ref: '#/definitions/tool.tableData' type: array type: object host: 127.0.0.1:9999 @@ -700,7 +688,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.listResponse' + $ref: '#/definitions/admin.listResponse' "400": description: Bad Request schema: @@ -739,7 +727,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.createResponse' + $ref: '#/definitions/admin.createResponse' "400": description: Bad Request schema: @@ -764,7 +752,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.deleteResponse' + $ref: '#/definitions/admin.deleteResponse' "400": description: Bad Request schema: @@ -783,7 +771,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.detailResponse' + $ref: '#/definitions/admin.detailResponse' "400": description: Bad Request schema: @@ -813,7 +801,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.loginResponse' + $ref: '#/definitions/admin.loginResponse' "400": description: Bad Request schema: @@ -832,7 +820,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.logoutResponse' + $ref: '#/definitions/admin.logoutResponse' "400": description: Bad Request schema: @@ -862,7 +850,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.createResponse' + $ref: '#/definitions/admin.createResponse' "400": description: Bad Request schema: @@ -887,7 +875,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.listAdminMenuResponse' + $ref: '#/definitions/admin.listAdminMenuResponse' "400": description: Bad Request schema: @@ -917,7 +905,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.modifyPasswordResponse' + $ref: '#/definitions/admin.modifyPasswordResponse' "400": description: Bad Request schema: @@ -947,7 +935,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.modifyPersonalInfoResponse' + $ref: '#/definitions/admin.modifyPersonalInfoResponse' "400": description: Bad Request schema: @@ -972,7 +960,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.offlineResponse' + $ref: '#/definitions/admin.offlineResponse' "400": description: Bad Request schema: @@ -997,7 +985,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.resetPasswordResponse' + $ref: '#/definitions/admin.resetPasswordResponse' "400": description: Bad Request schema: @@ -1027,7 +1015,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/admin_handler.updateUsedResponse' + $ref: '#/definitions/admin.updateUsedResponse' "400": description: Bad Request schema: @@ -1071,7 +1059,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/authorized_handler.listResponse' + $ref: '#/definitions/authorized.listResponse' "400": description: Bad Request schema: @@ -1105,7 +1093,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/authorized_handler.createResponse' + $ref: '#/definitions/authorized.createResponse' "400": description: Bad Request schema: @@ -1130,7 +1118,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/authorized_handler.deleteResponse' + $ref: '#/definitions/authorized.deleteResponse' "400": description: Bad Request schema: @@ -1160,7 +1148,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/authorized_handler.updateUsedResponse' + $ref: '#/definitions/authorized.updateUsedResponse' "400": description: Bad Request schema: @@ -1185,7 +1173,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/authorized_handler.listAPIResponse' + $ref: '#/definitions/authorized.listAPIResponse' "400": description: Bad Request schema: @@ -1219,7 +1207,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/authorized_handler.createAPIResponse' + $ref: '#/definitions/authorized.createAPIResponse' "400": description: Bad Request schema: @@ -1244,7 +1232,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/authorized_handler.deleteAPIResponse' + $ref: '#/definitions/authorized.deleteAPIResponse' "400": description: Bad Request schema: @@ -1289,7 +1277,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/config_handler.emailResponse' + $ref: '#/definitions/config.emailResponse' "400": description: Bad Request schema: @@ -1329,7 +1317,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/cron_handler.listResponse' + $ref: '#/definitions/cron.listResponse' "400": description: Bad Request schema: @@ -1413,7 +1401,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/cron_handler.createResponse' + $ref: '#/definitions/cron.createResponse' "400": description: Bad Request schema: @@ -1438,7 +1426,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/cron_handler.detailResponse' + $ref: '#/definitions/cron.detailResponse' "400": description: Bad Request schema: @@ -1462,7 +1450,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/cron_handler.detailResponse' + $ref: '#/definitions/cron.detailResponse' "400": description: Bad Request schema: @@ -1552,7 +1540,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/cron_handler.modifyResponse' + $ref: '#/definitions/cron.modifyResponse' "400": description: Bad Request schema: @@ -1582,7 +1570,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/cron_handler.updateUsedResponse' + $ref: '#/definitions/cron.updateUsedResponse' "400": description: Bad Request schema: @@ -1601,7 +1589,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/menu_handler.listResponse' + $ref: '#/definitions/menu.listResponse' "400": description: Bad Request schema: @@ -1619,14 +1607,14 @@ paths: name: Request required: true schema: - $ref: '#/definitions/menu_handler.createRequest' + $ref: '#/definitions/menu.createRequest' produces: - application/json responses: "200": description: OK schema: - $ref: '#/definitions/menu_handler.createResponse' + $ref: '#/definitions/menu.createResponse' "400": description: Bad Request schema: @@ -1651,7 +1639,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/menu_handler.deleteResponse' + $ref: '#/definitions/menu.deleteResponse' "400": description: Bad Request schema: @@ -1675,7 +1663,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/menu_handler.detailResponse' + $ref: '#/definitions/menu.detailResponse' "400": description: Bad Request schema: @@ -1705,7 +1693,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/menu_handler.updateSortResponse' + $ref: '#/definitions/menu.updateSortResponse' "400": description: Bad Request schema: @@ -1735,7 +1723,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/menu_handler.updateUsedResponse' + $ref: '#/definitions/menu.updateUsedResponse' "400": description: Bad Request schema: @@ -1760,7 +1748,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/menu_handler.listActionResponse' + $ref: '#/definitions/menu.listActionResponse' "400": description: Bad Request schema: @@ -1794,7 +1782,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/menu_handler.createActionResponse' + $ref: '#/definitions/menu.createActionResponse' "400": description: Bad Request schema: @@ -1819,7 +1807,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/menu_handler.deleteActionResponse' + $ref: '#/definitions/menu.deleteActionResponse' "400": description: Bad Request schema: @@ -1827,84 +1815,6 @@ paths: summary: 删除功能权限 tags: - API.menu - /api/order/{id}: - get: - consumes: - - application/json - description: 取消订单 - parameters: - - description: 请求信息 - in: body - name: Request - required: true - schema: - $ref: '#/definitions/order_handler.detailRequest' - produces: - - application/json - responses: - "200": - description: OK - schema: - $ref: '#/definitions/order_handler.detailResponse' - "400": - description: Bad Request - schema: - $ref: '#/definitions/code.Failure' - summary: 取消订单 - tags: - - API.order - /api/order/cancel: - post: - consumes: - - application/json - description: 取消订单 - parameters: - - description: 请求信息 - in: body - name: Request - required: true - schema: - $ref: '#/definitions/order_handler.cancelRequest' - produces: - - application/json - responses: - "200": - description: OK - schema: - $ref: '#/definitions/order_handler.cancelResponse' - "400": - description: Bad Request - schema: - $ref: '#/definitions/code.Failure' - summary: 取消订单 - tags: - - API.order - /api/order/create: - post: - consumes: - - application/json - description: 创建订单 - parameters: - - description: 请求信息 - in: body - name: Request - required: true - schema: - $ref: '#/definitions/order_handler.createRequest' - produces: - - application/json - responses: - "200": - description: OK - schema: - $ref: '#/definitions/order_handler.createResponse' - "400": - description: Bad Request - schema: - $ref: '#/definitions/code.Failure' - summary: 创建订单 - tags: - - API.order /api/tool/cache/clear: patch: consumes: @@ -1922,7 +1832,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/tool_handler.searchCacheResponse' + $ref: '#/definitions/tool.searchCacheResponse' "400": description: Bad Request schema: @@ -1947,7 +1857,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/tool_handler.searchCacheResponse' + $ref: '#/definitions/tool.searchCacheResponse' "400": description: Bad Request schema: @@ -1966,7 +1876,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/tool_handler.dbsResponse' + $ref: '#/definitions/tool.dbsResponse' "400": description: Bad Request schema: @@ -2001,7 +1911,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/tool_handler.searchMySQLResponse' + $ref: '#/definitions/tool.searchMySQLResponse' "400": description: Bad Request schema: @@ -2026,7 +1936,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/tool_handler.tablesResponse' + $ref: '#/definitions/tool.tablesResponse' "400": description: Bad Request schema: @@ -2051,7 +1961,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/tool_handler.hashIdsDecodeResponse' + $ref: '#/definitions/tool.hashIdsDecodeResponse' "400": description: Bad Request schema: @@ -2076,7 +1986,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/tool_handler.hashIdsEncodeResponse' + $ref: '#/definitions/tool.hashIdsEncodeResponse' "400": description: Bad Request schema: @@ -2101,7 +2011,7 @@ paths: "200": description: OK schema: - $ref: '#/definitions/tool_handler.sendMessageResponse' + $ref: '#/definitions/tool.sendMessageResponse' "400": description: Bad Request schema: diff --git a/internal/api/controller/admin_handler/func_create.go b/internal/api/admin/func_create.go similarity index 93% rename from internal/api/controller/admin_handler/func_create.go rename to internal/api/admin/func_create.go index da36058..7da0032 100755 --- a/internal/api/controller/admin_handler/func_create.go +++ b/internal/api/admin/func_create.go @@ -1,4 +1,4 @@ -package admin_handler +package admin import ( "net/http" @@ -6,7 +6,7 @@ import ( "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/validation" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/errno" ) @@ -47,7 +47,7 @@ func (h *handler) Create() core.HandlerFunc { return } - createData := new(admin2.CreateAdminData) + createData := new(admin.CreateAdminData) createData.Nickname = req.Nickname createData.Username = req.Username createData.Mobile = req.Mobile diff --git a/internal/api/controller/admin_handler/func_createadminmenu.go b/internal/api/admin/func_createadminmenu.go similarity index 92% rename from internal/api/controller/admin_handler/func_createadminmenu.go rename to internal/api/admin/func_createadminmenu.go index 80d7840..7789266 100755 --- a/internal/api/controller/admin_handler/func_createadminmenu.go +++ b/internal/api/admin/func_createadminmenu.go @@ -1,11 +1,11 @@ -package admin_handler +package admin import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/errno" ) @@ -52,7 +52,7 @@ func (h *handler) CreateAdminMenu() core.HandlerFunc { return } - createData := new(admin2.CreateMenuData) + createData := new(admin.CreateMenuData) createData.AdminId = int32(ids[0]) createData.Actions = req.Actions diff --git a/internal/api/controller/admin_handler/func_delete.go b/internal/api/admin/func_delete.go similarity index 98% rename from internal/api/controller/admin_handler/func_delete.go rename to internal/api/admin/func_delete.go index e3cf2a0..c42fcf5 100755 --- a/internal/api/controller/admin_handler/func_delete.go +++ b/internal/api/admin/func_delete.go @@ -1,4 +1,4 @@ -package admin_handler +package admin import ( "net/http" diff --git a/internal/api/controller/admin_handler/func_detail.go b/internal/api/admin/func_detail.go similarity index 77% rename from internal/api/controller/admin_handler/func_detail.go rename to internal/api/admin/func_detail.go index 409bf87..6a8d903 100644 --- a/internal/api/controller/admin_handler/func_detail.go +++ b/internal/api/admin/func_detail.go @@ -1,25 +1,25 @@ -package admin_handler +package admin import ( "encoding/json" "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/spf13/cast" ) type detailResponse struct { - Username string `json:"username"` // 用户名 - Nickname string `json:"nickname"` // 昵称 - Mobile string `json:"mobile"` // 手机号 - Menu []admin2.ListMyMenuData `json:"menu"` // 菜单栏 + Username string `json:"username"` // 用户名 + Nickname string `json:"nickname"` // 昵称 + Mobile string `json:"mobile"` // 手机号 + Menu []admin.ListMyMenuData `json:"menu"` // 菜单栏 } // Detail 管理员详情 @@ -35,7 +35,7 @@ func (h *handler) Detail() core.HandlerFunc { return func(c core.Context) { res := new(detailResponse) - searchOneData := new(admin2.SearchOneData) + searchOneData := new(admin.SearchOneData) searchOneData.Id = cast.ToInt32(c.UserID()) searchOneData.IsUsed = 1 @@ -59,7 +59,7 @@ func (h *handler) Detail() core.HandlerFunc { return } - var menuData []admin2.ListMyMenuData + var menuData []admin.ListMyMenuData err = json.Unmarshal([]byte(menuCacheData), &menuData) if err != nil { c.AbortWithError(errno.NewError( diff --git a/internal/api/controller/admin_handler/func_list.go b/internal/api/admin/func_list.go similarity index 96% rename from internal/api/controller/admin_handler/func_list.go rename to internal/api/admin/func_list.go index ff223d0..b623077 100755 --- a/internal/api/controller/admin_handler/func_list.go +++ b/internal/api/admin/func_list.go @@ -1,4 +1,4 @@ -package admin_handler +package admin import ( "net/http" @@ -7,7 +7,7 @@ import ( "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/timeutil" @@ -82,7 +82,7 @@ func (h *handler) List() core.HandlerFunc { pageSize = 10 } - searchData := new(admin2.SearchData) + searchData := new(admin.SearchData) searchData.Page = page searchData.PageSize = pageSize searchData.Username = req.Username diff --git a/internal/api/controller/admin_handler/func_listadminmenu.go b/internal/api/admin/func_listadminmenu.go similarity index 86% rename from internal/api/controller/admin_handler/func_listadminmenu.go rename to internal/api/admin/func_listadminmenu.go index 4e6fe17..68db90d 100755 --- a/internal/api/controller/admin_handler/func_listadminmenu.go +++ b/internal/api/admin/func_listadminmenu.go @@ -1,11 +1,11 @@ -package admin_handler +package admin import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/errno" ) @@ -14,8 +14,8 @@ type listAdminMenuRequest struct { } type listAdminMenuResponse struct { - List []admin2.ListMenuData `json:"list"` - UserName string `json:"username"` + List []admin.ListMenuData `json:"list"` + UserName string `json:"username"` } // ListAdminMenu 菜单授权列表 @@ -51,7 +51,7 @@ func (h *handler) ListAdminMenu() core.HandlerFunc { return } - searchOneData := new(admin2.SearchOneData) + searchOneData := new(admin.SearchOneData) searchOneData.Id = int32(ids[0]) searchOneData.IsUsed = 1 @@ -67,7 +67,7 @@ func (h *handler) ListAdminMenu() core.HandlerFunc { res.UserName = info.Username - searchData := new(admin2.SearchListMenuData) + searchData := new(admin.SearchListMenuData) searchData.AdminId = int32(ids[0]) listData, err := h.adminService.ListMenu(c, searchData) diff --git a/internal/api/controller/admin_handler/func_login.go b/internal/api/admin/func_login.go similarity index 93% rename from internal/api/controller/admin_handler/func_login.go rename to internal/api/admin/func_login.go index 6141e12..8be2fbb 100644 --- a/internal/api/controller/admin_handler/func_login.go +++ b/internal/api/admin/func_login.go @@ -1,4 +1,4 @@ -package admin_handler +package admin import ( "encoding/json" @@ -6,11 +6,11 @@ import ( "time" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" ) @@ -48,7 +48,7 @@ func (h *handler) Login() core.HandlerFunc { return } - searchOneData := new(admin2.SearchOneData) + searchOneData := new(admin.SearchOneData) searchOneData.Username = req.Username searchOneData.Password = password.GeneratePassword(req.Password) searchOneData.IsUsed = 1 @@ -100,7 +100,7 @@ func (h *handler) Login() core.HandlerFunc { return } - searchMenuData := new(admin2.SearchMyMenuData) + searchMenuData := new(admin.SearchMyMenuData) searchMenuData.AdminId = info.Id menu, err := h.adminService.MyMenu(c, searchMenuData) if err != nil { @@ -126,7 +126,7 @@ func (h *handler) Login() core.HandlerFunc { return } - searchActionData := new(admin2.SearchMyActionData) + searchActionData := new(admin.SearchMyActionData) searchActionData.AdminId = info.Id action, err := h.adminService.MyAction(c, searchActionData) if err != nil { diff --git a/internal/api/controller/admin_handler/func_logout.go b/internal/api/admin/func_logout.go similarity index 92% rename from internal/api/controller/admin_handler/func_logout.go rename to internal/api/admin/func_logout.go index e64012d..ab52467 100644 --- a/internal/api/controller/admin_handler/func_logout.go +++ b/internal/api/admin/func_logout.go @@ -1,12 +1,12 @@ -package admin_handler +package admin import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" ) diff --git a/internal/api/controller/admin_handler/func_modifypassword.go b/internal/api/admin/func_modifypassword.go similarity index 93% rename from internal/api/controller/admin_handler/func_modifypassword.go rename to internal/api/admin/func_modifypassword.go index 654ce8b..f455b03 100644 --- a/internal/api/controller/admin_handler/func_modifypassword.go +++ b/internal/api/admin/func_modifypassword.go @@ -1,4 +1,4 @@ -package admin_handler +package admin import ( "net/http" @@ -6,7 +6,7 @@ import ( "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/spf13/cast" @@ -47,7 +47,7 @@ func (h *handler) ModifyPassword() core.HandlerFunc { userId := cast.ToInt32(c.UserID()) - searchOneData := new(admin2.SearchOneData) + searchOneData := new(admin.SearchOneData) searchOneData.Id = userId searchOneData.Password = password.GeneratePassword(req.OldPassword) searchOneData.IsUsed = 1 diff --git a/internal/api/controller/admin_handler/func_modifypersonalinfo.go b/internal/api/admin/func_modifypersonalinfo.go similarity index 92% rename from internal/api/controller/admin_handler/func_modifypersonalinfo.go rename to internal/api/admin/func_modifypersonalinfo.go index 4a4394f..a3533f5 100644 --- a/internal/api/controller/admin_handler/func_modifypersonalinfo.go +++ b/internal/api/admin/func_modifypersonalinfo.go @@ -1,11 +1,11 @@ -package admin_handler +package admin import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/spf13/cast" @@ -46,7 +46,7 @@ func (h *handler) ModifyPersonalInfo() core.HandlerFunc { userId := cast.ToInt32(c.UserID()) - modifyData := new(admin2.ModifyData) + modifyData := new(admin.ModifyData) modifyData.Nickname = req.Nickname modifyData.Mobile = req.Mobile diff --git a/internal/api/controller/admin_handler/func_offline.go b/internal/api/admin/func_offline.go similarity index 94% rename from internal/api/controller/admin_handler/func_offline.go rename to internal/api/admin/func_offline.go index 5fca136..44ba9c0 100755 --- a/internal/api/controller/admin_handler/func_offline.go +++ b/internal/api/admin/func_offline.go @@ -1,13 +1,13 @@ -package admin_handler +package admin import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/admin_handler/func_resetpassword.go b/internal/api/admin/func_resetpassword.go similarity index 98% rename from internal/api/controller/admin_handler/func_resetpassword.go rename to internal/api/admin/func_resetpassword.go index cc3670d..0764d33 100755 --- a/internal/api/controller/admin_handler/func_resetpassword.go +++ b/internal/api/admin/func_resetpassword.go @@ -1,4 +1,4 @@ -package admin_handler +package admin import ( "net/http" diff --git a/internal/api/controller/admin_handler/func_updateused.go b/internal/api/admin/func_updateused.go similarity index 98% rename from internal/api/controller/admin_handler/func_updateused.go rename to internal/api/admin/func_updateused.go index 4136d06..70e4052 100755 --- a/internal/api/controller/admin_handler/func_updateused.go +++ b/internal/api/admin/func_updateused.go @@ -1,4 +1,4 @@ -package admin_handler +package admin import ( "net/http" diff --git a/internal/api/controller/admin_handler/handler.go b/internal/api/admin/handler.go similarity index 85% rename from internal/api/controller/admin_handler/handler.go rename to internal/api/admin/handler.go index 0971599..4d1a46e 100644 --- a/internal/api/controller/admin_handler/handler.go +++ b/internal/api/admin/handler.go @@ -1,11 +1,11 @@ -package admin_handler +package admin import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/hash" "go.uber.org/zap" @@ -86,15 +86,15 @@ type handler struct { logger *zap.Logger cache redis.Repo hashids hash.Hash - adminService admin2.Service + adminService admin.Service } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) Handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) Handler { return &handler{ logger: logger, cache: cache, hashids: hash.New(configs.Get().HashIds.Secret, configs.Get().HashIds.Length), - adminService: admin2.New(db, cache), + adminService: admin.New(db, cache), } } diff --git a/internal/api/controller/authorized_handler/func_create.go b/internal/api/authorized/func_create.go similarity index 91% rename from internal/api/controller/authorized_handler/func_create.go rename to internal/api/authorized/func_create.go index 7103d5a..8ceb194 100755 --- a/internal/api/controller/authorized_handler/func_create.go +++ b/internal/api/authorized/func_create.go @@ -1,11 +1,11 @@ -package authorized_handler +package authorized import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - authorized2 "github.com/xinliangnote/go-gin-api/internal/services/authorized" + "github.com/xinliangnote/go-gin-api/internal/services/authorized" "github.com/xinliangnote/go-gin-api/pkg/errno" ) @@ -44,7 +44,7 @@ func (h *handler) Create() core.HandlerFunc { return } - createData := new(authorized2.CreateAuthorizedData) + createData := new(authorized.CreateAuthorizedData) createData.BusinessKey = req.BusinessKey createData.BusinessDeveloper = req.BusinessDeveloper createData.Remark = req.Remark diff --git a/internal/api/controller/authorized_handler/func_createapi.go b/internal/api/authorized/func_createapi.go similarity index 92% rename from internal/api/controller/authorized_handler/func_createapi.go rename to internal/api/authorized/func_createapi.go index e084238..69d7fab 100755 --- a/internal/api/controller/authorized_handler/func_createapi.go +++ b/internal/api/authorized/func_createapi.go @@ -1,11 +1,11 @@ -package authorized_handler +package authorized import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - authorized2 "github.com/xinliangnote/go-gin-api/internal/services/authorized" + "github.com/xinliangnote/go-gin-api/internal/services/authorized" "github.com/xinliangnote/go-gin-api/pkg/errno" ) @@ -67,7 +67,7 @@ func (h *handler) CreateAPI() core.HandlerFunc { return } - createAPIData := new(authorized2.CreateAuthorizedAPIData) + createAPIData := new(authorized.CreateAuthorizedAPIData) createAPIData.BusinessKey = authorizedInfo.BusinessKey createAPIData.Method = req.Method createAPIData.API = req.API diff --git a/internal/api/controller/authorized_handler/func_delete.go b/internal/api/authorized/func_delete.go similarity index 98% rename from internal/api/controller/authorized_handler/func_delete.go rename to internal/api/authorized/func_delete.go index c08cf5a..4a6c6a8 100755 --- a/internal/api/controller/authorized_handler/func_delete.go +++ b/internal/api/authorized/func_delete.go @@ -1,4 +1,4 @@ -package authorized_handler +package authorized import ( "net/http" diff --git a/internal/api/controller/authorized_handler/func_deleteapi.go b/internal/api/authorized/func_deleteapi.go similarity index 98% rename from internal/api/controller/authorized_handler/func_deleteapi.go rename to internal/api/authorized/func_deleteapi.go index e3f1ac0..c157a2b 100755 --- a/internal/api/controller/authorized_handler/func_deleteapi.go +++ b/internal/api/authorized/func_deleteapi.go @@ -1,4 +1,4 @@ -package authorized_handler +package authorized import ( "net/http" diff --git a/internal/api/controller/authorized_handler/func_list.go b/internal/api/authorized/func_list.go similarity index 96% rename from internal/api/controller/authorized_handler/func_list.go rename to internal/api/authorized/func_list.go index de184bb..16f19ff 100755 --- a/internal/api/controller/authorized_handler/func_list.go +++ b/internal/api/authorized/func_list.go @@ -1,11 +1,11 @@ -package authorized_handler +package authorized import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - authorized2 "github.com/xinliangnote/go-gin-api/internal/services/authorized" + "github.com/xinliangnote/go-gin-api/internal/services/authorized" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/timeutil" @@ -82,7 +82,7 @@ func (h *handler) List() core.HandlerFunc { pageSize = 10 } - searchData := new(authorized2.SearchData) + searchData := new(authorized.SearchData) searchData.Page = page searchData.PageSize = pageSize searchData.BusinessKey = req.BusinessKey diff --git a/internal/api/controller/authorized_handler/func_listapi.go b/internal/api/authorized/func_listapi.go similarity index 94% rename from internal/api/controller/authorized_handler/func_listapi.go rename to internal/api/authorized/func_listapi.go index 1e762e9..f0a0cb8 100755 --- a/internal/api/controller/authorized_handler/func_listapi.go +++ b/internal/api/authorized/func_listapi.go @@ -1,11 +1,11 @@ -package authorized_handler +package authorized import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - authorized2 "github.com/xinliangnote/go-gin-api/internal/services/authorized" + "github.com/xinliangnote/go-gin-api/internal/services/authorized" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/spf13/cast" @@ -75,7 +75,7 @@ func (h *handler) ListAPI() core.HandlerFunc { res.BusinessKey = authorizedInfo.BusinessKey - searchAPIData := new(authorized2.SearchAPIData) + searchAPIData := new(authorized.SearchAPIData) searchAPIData.BusinessKey = authorizedInfo.BusinessKey resListData, err := h.authorizedService.ListAPI(c, searchAPIData) diff --git a/internal/api/controller/authorized_handler/func_updateused.go b/internal/api/authorized/func_updateused.go similarity index 98% rename from internal/api/controller/authorized_handler/func_updateused.go rename to internal/api/authorized/func_updateused.go index d7837e5..38d1a13 100755 --- a/internal/api/controller/authorized_handler/func_updateused.go +++ b/internal/api/authorized/func_updateused.go @@ -1,4 +1,4 @@ -package authorized_handler +package authorized import ( "net/http" diff --git a/internal/api/controller/authorized_handler/handler.go b/internal/api/authorized/handler.go similarity index 79% rename from internal/api/controller/authorized_handler/handler.go rename to internal/api/authorized/handler.go index ff6c5ba..d4ebb87 100644 --- a/internal/api/controller/authorized_handler/handler.go +++ b/internal/api/authorized/handler.go @@ -1,11 +1,11 @@ -package authorized_handler +package authorized import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" - authorized2 "github.com/xinliangnote/go-gin-api/internal/services/authorized" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" + "github.com/xinliangnote/go-gin-api/internal/services/authorized" "github.com/xinliangnote/go-gin-api/pkg/hash" "go.uber.org/zap" @@ -55,15 +55,15 @@ type Handler interface { type handler struct { logger *zap.Logger cache redis.Repo - authorizedService authorized2.Service + authorizedService authorized.Service hashids hash.Hash } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) Handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) Handler { return &handler{ logger: logger, cache: cache, - authorizedService: authorized2.New(db, cache), + authorizedService: authorized.New(db, cache), hashids: hash.New(configs.Get().HashIds.Secret, configs.Get().HashIds.Length), } } diff --git a/internal/api/controller/config_handler/func_email.go b/internal/api/config/func_email.go similarity index 99% rename from internal/api/controller/config_handler/func_email.go rename to internal/api/config/func_email.go index 4067c32..b42e7be 100755 --- a/internal/api/controller/config_handler/func_email.go +++ b/internal/api/config/func_email.go @@ -1,4 +1,4 @@ -package config_handler +package config import ( "fmt" diff --git a/internal/api/controller/config_handler/handler.go b/internal/api/config/handler.go similarity index 66% rename from internal/api/controller/config_handler/handler.go rename to internal/api/config/handler.go index ed3d3eb..eb1eae6 100644 --- a/internal/api/controller/config_handler/handler.go +++ b/internal/api/config/handler.go @@ -1,9 +1,9 @@ -package config_handler +package config import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "go.uber.org/zap" ) @@ -24,7 +24,7 @@ type handler struct { cache redis.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) Handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) Handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/api/controller/README.md b/internal/api/controller/README.md deleted file mode 100644 index 7a7eb9b..0000000 --- a/internal/api/controller/README.md +++ /dev/null @@ -1,9 +0,0 @@ -## controller - -控制器层。 - -主要接收参数、验证参数、调用 `service` 层的业务逻辑处理，最后返回数据。 - -命名规范： - -- 包名以 `_handler` 结尾。 \ No newline at end of file diff --git a/internal/api/controller/cron_handler/func_create.go b/internal/api/cron/func_create.go similarity index 99% rename from internal/api/controller/cron_handler/func_create.go rename to internal/api/cron/func_create.go index 1accae0..812a06a 100755 --- a/internal/api/controller/cron_handler/func_create.go +++ b/internal/api/cron/func_create.go @@ -1,4 +1,4 @@ -package cron_handler +package cron import ( "net/http" diff --git a/internal/api/controller/cron_handler/func_detail.go b/internal/api/cron/func_detail.go similarity index 99% rename from internal/api/controller/cron_handler/func_detail.go rename to internal/api/cron/func_detail.go index efde64e..211ab17 100755 --- a/internal/api/controller/cron_handler/func_detail.go +++ b/internal/api/cron/func_detail.go @@ -1,4 +1,4 @@ -package cron_handler +package cron import ( "net/http" diff --git a/internal/api/controller/cron_handler/func_execute.go b/internal/api/cron/func_execute.go similarity index 98% rename from internal/api/controller/cron_handler/func_execute.go rename to internal/api/cron/func_execute.go index dc6f297..f373ed6 100755 --- a/internal/api/controller/cron_handler/func_execute.go +++ b/internal/api/cron/func_execute.go @@ -1,4 +1,4 @@ -package cron_handler +package cron import ( "net/http" diff --git a/internal/api/controller/cron_handler/func_list.go b/internal/api/cron/func_list.go similarity index 93% rename from internal/api/controller/cron_handler/func_list.go rename to internal/api/cron/func_list.go index 37a4d9b..812db3d 100755 --- a/internal/api/controller/cron_handler/func_list.go +++ b/internal/api/cron/func_list.go @@ -1,12 +1,12 @@ -package cron_handler +package cron import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/validation" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" "github.com/xinliangnote/go-gin-api/internal/services/cron" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/timeutil" @@ -139,18 +139,18 @@ func (h *handler) List() core.HandlerFunc { HashID: hashId, Name: v.Name, Protocol: cast.ToInt(v.Protocol), - ProtocolText: cron_task_repo.ProtocolText[v.Protocol], + ProtocolText: cron_task.ProtocolText[v.Protocol], Spec: v.Spec, Command: v.Command, HttpMethod: cast.ToInt(v.HttpMethod), - HttpMethodText: cron_task_repo.HttpMethodText[v.HttpMethod], + HttpMethodText: cron_task.HttpMethodText[v.HttpMethod], Timeout: cast.ToInt(v.Timeout), RetryTimes: cast.ToInt(v.RetryTimes), RetryInterval: cast.ToInt(v.RetryInterval), NotifyStatus: cast.ToInt(v.NotifyStatus), - NotifyStatusText: cron_task_repo.NotifyStatusText[v.NotifyStatus], + NotifyStatusText: cron_task.NotifyStatusText[v.NotifyStatus], IsUsed: cast.ToInt(v.IsUsed), - IsUsedText: cron_task_repo.IsUsedText[v.IsUsed], + IsUsedText: cron_task.IsUsedText[v.IsUsed], CreatedAt: v.CreatedAt.Format(timeutil.CSTLayout), CreatedUser: v.CreatedUser, UpdatedAt: v.UpdatedAt.Format(timeutil.CSTLayout), diff --git a/internal/api/controller/cron_handler/func_modify.go b/internal/api/cron/func_modify.go similarity index 99% rename from internal/api/controller/cron_handler/func_modify.go rename to internal/api/cron/func_modify.go index c6e77a1..82e5014 100755 --- a/internal/api/controller/cron_handler/func_modify.go +++ b/internal/api/cron/func_modify.go @@ -1,4 +1,4 @@ -package cron_handler +package cron import ( "net/http" diff --git a/internal/api/controller/cron_handler/func_updateused.go b/internal/api/cron/func_updateused.go similarity index 98% rename from internal/api/controller/cron_handler/func_updateused.go rename to internal/api/cron/func_updateused.go index 1d559a8..4772596 100755 --- a/internal/api/controller/cron_handler/func_updateused.go +++ b/internal/api/cron/func_updateused.go @@ -1,4 +1,4 @@ -package cron_handler +package cron import ( "net/http" diff --git a/internal/api/controller/cron_handler/handler.go b/internal/api/cron/handler.go similarity index 80% rename from internal/api/controller/cron_handler/handler.go rename to internal/api/cron/handler.go index 1bebab7..f4b692b 100644 --- a/internal/api/controller/cron_handler/handler.go +++ b/internal/api/cron/handler.go @@ -1,11 +1,11 @@ -package cron_handler +package cron import ( "github.com/xinliangnote/go-gin-api/configs" - cronServer "github.com/xinliangnote/go-gin-api/internal/api/repository/cron" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + cronRepo "github.com/xinliangnote/go-gin-api/internal/repository/cron" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/internal/services/cron" "github.com/xinliangnote/go-gin-api/pkg/hash" @@ -55,7 +55,7 @@ type handler struct { cronService cron.Service } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo, cronServer cronServer.Server) Handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo, cronServer cronRepo.Server) Handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/api/controller/menu_handler/func_create.go b/internal/api/menu/func_create.go similarity index 93% rename from internal/api/controller/menu_handler/func_create.go rename to internal/api/menu/func_create.go index d24245e..04a667c 100755 --- a/internal/api/controller/menu_handler/func_create.go +++ b/internal/api/menu/func_create.go @@ -1,11 +1,11 @@ -package menu_handler +package menu import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - menu2 "github.com/xinliangnote/go-gin-api/internal/services/menu" + "github.com/xinliangnote/go-gin-api/internal/services/menu" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/spf13/cast" @@ -60,7 +60,7 @@ func (h *handler) Create() core.HandlerFunc { id := int32(ids[0]) - updateData := new(menu2.UpdateMenuData) + updateData := new(menu.UpdateMenuData) updateData.Name = req.Name updateData.Icon = req.Icon updateData.Link = req.Link @@ -88,7 +88,7 @@ func (h *handler) Create() core.HandlerFunc { level = 1 } - createData := new(menu2.CreateMenuData) + createData := new(menu.CreateMenuData) createData.Pid = pid createData.Name = req.Name createData.Icon = req.Icon diff --git a/internal/api/controller/menu_handler/func_createaction.go b/internal/api/menu/func_createaction.go similarity index 92% rename from internal/api/controller/menu_handler/func_createaction.go rename to internal/api/menu/func_createaction.go index 07c4da9..30864a7 100755 --- a/internal/api/controller/menu_handler/func_createaction.go +++ b/internal/api/menu/func_createaction.go @@ -1,11 +1,11 @@ -package menu_handler +package menu import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - menu2 "github.com/xinliangnote/go-gin-api/internal/services/menu" + "github.com/xinliangnote/go-gin-api/internal/services/menu" "github.com/xinliangnote/go-gin-api/pkg/errno" ) @@ -56,7 +56,7 @@ func (h *handler) CreateAction() core.HandlerFunc { id := int32(ids[0]) - searchOneData := new(menu2.SearchOneData) + searchOneData := new(menu.SearchOneData) searchOneData.Id = id menuInfo, err := h.menuService.Detail(c, searchOneData) if err != nil { @@ -68,7 +68,7 @@ func (h *handler) CreateAction() core.HandlerFunc { return } - createActionData := new(menu2.CreateMenuActionData) + createActionData := new(menu.CreateMenuActionData) createActionData.MenuId = menuInfo.Id createActionData.Method = req.Method createActionData.API = req.API diff --git a/internal/api/controller/menu_handler/func_delete.go b/internal/api/menu/func_delete.go similarity index 98% rename from internal/api/controller/menu_handler/func_delete.go rename to internal/api/menu/func_delete.go index 3691e5a..da4fcd6 100755 --- a/internal/api/controller/menu_handler/func_delete.go +++ b/internal/api/menu/func_delete.go @@ -1,4 +1,4 @@ -package menu_handler +package menu import ( "net/http" diff --git a/internal/api/controller/menu_handler/func_deleteaction.go b/internal/api/menu/func_deleteaction.go similarity index 98% rename from internal/api/controller/menu_handler/func_deleteaction.go rename to internal/api/menu/func_deleteaction.go index f66f527..8ee1889 100755 --- a/internal/api/controller/menu_handler/func_deleteaction.go +++ b/internal/api/menu/func_deleteaction.go @@ -1,4 +1,4 @@ -package menu_handler +package menu import ( "net/http" diff --git a/internal/api/controller/menu_handler/func_detail.go b/internal/api/menu/func_detail.go similarity index 92% rename from internal/api/controller/menu_handler/func_detail.go rename to internal/api/menu/func_detail.go index 01c430b..d458853 100755 --- a/internal/api/controller/menu_handler/func_detail.go +++ b/internal/api/menu/func_detail.go @@ -1,11 +1,11 @@ -package menu_handler +package menu import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - menu2 "github.com/xinliangnote/go-gin-api/internal/services/menu" + "github.com/xinliangnote/go-gin-api/internal/services/menu" "github.com/xinliangnote/go-gin-api/pkg/errno" ) @@ -56,7 +56,7 @@ func (h *handler) Detail() core.HandlerFunc { id := int32(ids[0]) - searchOneData := new(menu2.SearchOneData) + searchOneData := new(menu.SearchOneData) searchOneData.Id = id info, err := h.menuService.Detail(c, searchOneData) diff --git a/internal/api/controller/menu_handler/func_list.go b/internal/api/menu/func_list.go similarity index 91% rename from internal/api/controller/menu_handler/func_list.go rename to internal/api/menu/func_list.go index 87b7ce0..e546cff 100755 --- a/internal/api/controller/menu_handler/func_list.go +++ b/internal/api/menu/func_list.go @@ -1,11 +1,11 @@ -package menu_handler +package menu import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - menu2 "github.com/xinliangnote/go-gin-api/internal/services/menu" + "github.com/xinliangnote/go-gin-api/internal/services/menu" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/spf13/cast" @@ -38,7 +38,7 @@ type listResponse struct { func (h *handler) List() core.HandlerFunc { return func(c core.Context) { res := new(listResponse) - resListData, err := h.menuService.List(c, new(menu2.SearchData)) + resListData, err := h.menuService.List(c, new(menu.SearchData)) if err != nil { c.AbortWithError(errno.NewError( http.StatusBadRequest, diff --git a/internal/api/controller/menu_handler/func_listaction.go b/internal/api/menu/func_listaction.go similarity index 93% rename from internal/api/controller/menu_handler/func_listaction.go rename to internal/api/menu/func_listaction.go index f680899..4bf9b78 100755 --- a/internal/api/controller/menu_handler/func_listaction.go +++ b/internal/api/menu/func_listaction.go @@ -1,11 +1,11 @@ -package menu_handler +package menu import ( "net/http" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - menu2 "github.com/xinliangnote/go-gin-api/internal/services/menu" + "github.com/xinliangnote/go-gin-api/internal/services/menu" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/spf13/cast" @@ -62,7 +62,7 @@ func (h *handler) ListAction() core.HandlerFunc { id := int32(ids[0]) - searchOneData := new(menu2.SearchOneData) + searchOneData := new(menu.SearchOneData) searchOneData.Id = id menuInfo, err := h.menuService.Detail(c, searchOneData) @@ -77,7 +77,7 @@ func (h *handler) ListAction() core.HandlerFunc { res.MenuName = menuInfo.Name - searchListData := new(menu2.SearchListActionData) + searchListData := new(menu.SearchListActionData) searchListData.MenuId = menuInfo.Id resListData, err := h.menuService.ListAction(c, searchListData) diff --git a/internal/api/controller/menu_handler/func_updatesort.go b/internal/api/menu/func_updatesort.go similarity index 98% rename from internal/api/controller/menu_handler/func_updatesort.go rename to internal/api/menu/func_updatesort.go index 39fc9e4..628e122 100755 --- a/internal/api/controller/menu_handler/func_updatesort.go +++ b/internal/api/menu/func_updatesort.go @@ -1,4 +1,4 @@ -package menu_handler +package menu import ( "net/http" diff --git a/internal/api/controller/menu_handler/func_updateused.go b/internal/api/menu/func_updateused.go similarity index 98% rename from internal/api/controller/menu_handler/func_updateused.go rename to internal/api/menu/func_updateused.go index 5d4f437..ae4d9f9 100755 --- a/internal/api/controller/menu_handler/func_updateused.go +++ b/internal/api/menu/func_updateused.go @@ -1,4 +1,4 @@ -package menu_handler +package menu import ( "net/http" diff --git a/internal/api/controller/menu_handler/handler.go b/internal/api/menu/handler.go similarity index 82% rename from internal/api/controller/menu_handler/handler.go rename to internal/api/menu/handler.go index 9d20bcd..d6df69b 100644 --- a/internal/api/controller/menu_handler/handler.go +++ b/internal/api/menu/handler.go @@ -1,11 +1,11 @@ -package menu_handler +package menu import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" - menu2 "github.com/xinliangnote/go-gin-api/internal/services/menu" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" + "github.com/xinliangnote/go-gin-api/internal/services/menu" "github.com/xinliangnote/go-gin-api/pkg/hash" "go.uber.org/zap" @@ -66,15 +66,15 @@ type handler struct { logger *zap.Logger cache redis.Repo hashids hash.Hash - menuService menu2.Service + menuService menu.Service } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) Handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) Handler { return &handler{ logger: logger, cache: cache, hashids: hash.New(configs.Get().HashIds.Secret, configs.Get().HashIds.Length), - menuService: menu2.New(db, cache), + menuService: menu.New(db, cache), } } diff --git a/internal/api/repository/db_repo/README.md b/internal/api/repository/db_repo/README.md deleted file mode 100644 index 4eb26a0..0000000 --- a/internal/api/repository/db_repo/README.md +++ /dev/null @@ -1,37 +0,0 @@ -## 使用示例 - -以 `user_demo` 为例： - -```go -// 查询：多条 + 分页 -page := 2 -num := 2 -offset := (page - 1) * num - -user, err = user_demo_repo.NewQueryBuilder(). - WhereIdNotIn([]int32{1, 2, 3}). - WhereUserName(db_repo.EqualPredicate, "tom"). - Limit(num). - Offset(offset). - QueryAll(u.db.GetDbR().WithContext(ctx.RequestContext())) - -// 查询：总数 -count, err := user_demo_repo.NewQueryBuilder(). - WhereIdNotIn([]int32{1, 2, 3}). - WhereUserName(db_repo.EqualPredicate, "tom"). - Count(u.db.GetDbR().WithContext(ctx.RequestContext())) - -// 查询：单条 -user, err = user_demo_repo.NewQueryBuilder(). - WhereUserName(db_repo.EqualPredicate, "tom"). - QueryOne(u.db.GetDbR().WithContext(ctx.RequestContext())) - -// 创建 -model := user_demo_repo.NewModel() -model.UserName = user.UserName -model.NickName = user.NickName -model.Mobile = user.Mobile - -id, err = model.Create(u.db.GetDbW().WithContext(ctx.RequestContext())) - -``` \ No newline at end of file diff --git a/internal/api/repository/db_repo/admin_menu_repo/gen_table.md b/internal/api/repository/db_repo/admin_menu_repo/gen_table.md deleted file mode 100755 index 698546e..0000000 --- a/internal/api/repository/db_repo/admin_menu_repo/gen_table.md +++ /dev/null @@ -1,10 +0,0 @@ -#### go_gin_api.admin_menu -管理员菜单栏表 - -| 序号 | 名称 | 描述 | 类型 | 键 | 为空 | 额外 | 默认值 | -| :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: | -| 1 | id | 主键 | int(11) unsigned | PRI | NO | auto_increment | | -| 2 | admin_id | 管理员ID | int(11) unsigned | MUL | NO | | 0 | -| 3 | menu_id | 菜单栏ID | int(11) unsigned | | NO | | 0 | -| 4 | created_at | 创建时间 | timestamp | | NO | | CURRENT_TIMESTAMP | -| 5 | created_user | 创建人 | varchar(60) | | NO | | | diff --git a/internal/api/repository/db_repo/db.go b/internal/api/repository/db_repo/db.go deleted file mode 100644 index 2e86900..0000000 --- a/internal/api/repository/db_repo/db.go +++ /dev/null @@ -1,14 +0,0 @@ -package db_repo - -// Predicate is a string that acts as a condition in the where clause -type Predicate string - -var ( - EqualPredicate = Predicate("=") - NotEqualPredicate = Predicate("<>") - GreaterThanPredicate = Predicate(">") - GreaterThanOrEqualPredicate = Predicate(">=") - SmallerThanPredicate = Predicate("<") - SmallerThanOrEqualPredicate = Predicate("<=") - LikePredicate = Predicate("LIKE") -) diff --git a/internal/api/controller/tool_handler/func_clearcache.go b/internal/api/tool/func_clearcache.go similarity index 94% rename from internal/api/controller/tool_handler/func_clearcache.go rename to internal/api/tool/func_clearcache.go index 6ceb04c..5b7355f 100644 --- a/internal/api/controller/tool_handler/func_clearcache.go +++ b/internal/api/tool/func_clearcache.go @@ -1,11 +1,11 @@ -package tool_handler +package tool import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/tool_handler/func_dbs.go b/internal/api/tool/func_dbs.go similarity index 97% rename from internal/api/controller/tool_handler/func_dbs.go rename to internal/api/tool/func_dbs.go index 983c40b..0f97af6 100644 --- a/internal/api/controller/tool_handler/func_dbs.go +++ b/internal/api/tool/func_dbs.go @@ -1,4 +1,4 @@ -package tool_handler +package tool import ( "github.com/xinliangnote/go-gin-api/configs" diff --git a/internal/api/controller/tool_handler/func_hashidsdecode.go b/internal/api/tool/func_hashidsdecode.go similarity index 98% rename from internal/api/controller/tool_handler/func_hashidsdecode.go rename to internal/api/tool/func_hashidsdecode.go index 87b577e..6bd2445 100755 --- a/internal/api/controller/tool_handler/func_hashidsdecode.go +++ b/internal/api/tool/func_hashidsdecode.go @@ -1,4 +1,4 @@ -package tool_handler +package tool import ( "net/http" diff --git a/internal/api/controller/tool_handler/func_hashidsencode.go b/internal/api/tool/func_hashidsencode.go similarity index 98% rename from internal/api/controller/tool_handler/func_hashidsencode.go rename to internal/api/tool/func_hashidsencode.go index 78cb120..49b6210 100755 --- a/internal/api/controller/tool_handler/func_hashidsencode.go +++ b/internal/api/tool/func_hashidsencode.go @@ -1,4 +1,4 @@ -package tool_handler +package tool import ( "net/http" diff --git a/internal/api/controller/tool_handler/func_searchcache.go b/internal/api/tool/func_searchcache.go similarity index 95% rename from internal/api/controller/tool_handler/func_searchcache.go rename to internal/api/tool/func_searchcache.go index e4ab637..fd9af20 100644 --- a/internal/api/controller/tool_handler/func_searchcache.go +++ b/internal/api/tool/func_searchcache.go @@ -1,11 +1,11 @@ -package tool_handler +package tool import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/tool_handler/func_searchmysql.go b/internal/api/tool/func_searchmysql.go similarity index 99% rename from internal/api/controller/tool_handler/func_searchmysql.go rename to internal/api/tool/func_searchmysql.go index c8e4aad..922af41 100644 --- a/internal/api/controller/tool_handler/func_searchmysql.go +++ b/internal/api/tool/func_searchmysql.go @@ -1,4 +1,4 @@ -package tool_handler +package tool import ( "fmt" diff --git a/internal/api/controller/tool_handler/func_sendmessage.go b/internal/api/tool/func_sendmessage.go similarity index 99% rename from internal/api/controller/tool_handler/func_sendmessage.go rename to internal/api/tool/func_sendmessage.go index 372c17d..6d52b9e 100644 --- a/internal/api/controller/tool_handler/func_sendmessage.go +++ b/internal/api/tool/func_sendmessage.go @@ -1,4 +1,4 @@ -package tool_handler +package tool import ( "encoding/json" diff --git a/internal/api/controller/tool_handler/func_tables.go b/internal/api/tool/func_tables.go similarity index 98% rename from internal/api/controller/tool_handler/func_tables.go rename to internal/api/tool/func_tables.go index 092d157..9aecdfd 100644 --- a/internal/api/controller/tool_handler/func_tables.go +++ b/internal/api/tool/func_tables.go @@ -1,4 +1,4 @@ -package tool_handler +package tool import ( "fmt" diff --git a/internal/api/controller/tool_handler/handler.go b/internal/api/tool/handler.go similarity index 86% rename from internal/api/controller/tool_handler/handler.go rename to internal/api/tool/handler.go index c0aea34..e709b79 100644 --- a/internal/api/controller/tool_handler/handler.go +++ b/internal/api/tool/handler.go @@ -1,10 +1,10 @@ -package tool_handler +package tool import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/hash" "go.uber.org/zap" @@ -58,12 +58,12 @@ type Handler interface { type handler struct { logger *zap.Logger - db db.Repo + db mysql.Repo cache redis.Repo hashids hash.Hash } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) Handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) Handler { return &handler{ logger: logger, db: db, diff --git a/internal/graph/handler/handler.go b/internal/graph/handler/handler.go index cbd954b..0a30293 100644 --- a/internal/graph/handler/handler.go +++ b/internal/graph/handler/handler.go @@ -2,13 +2,13 @@ package handler import ( "context" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/graph/generated" "github.com/xinliangnote/go-gin-api/internal/graph/resolvers" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql/handler" @@ -29,11 +29,11 @@ type Gql interface { type gql struct { logger *zap.Logger - db db.Repo + db mysql.Repo cache redis.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) Gql { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) Gql { return &gql{ logger: logger, cache: cache, diff --git a/internal/graph/resolvers/resolvers.go b/internal/graph/resolvers/resolvers.go index 645d7fd..7054fe3 100644 --- a/internal/graph/resolvers/resolvers.go +++ b/internal/graph/resolvers/resolvers.go @@ -2,11 +2,11 @@ package resolvers import ( "context" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/graph/generated" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "go.uber.org/zap" ) @@ -25,7 +25,7 @@ type Resolver struct { //userService user_service.UserService } -func NewRootResolvers(logger *zap.Logger, db db.Repo, cache redis.Repo) generated.Config { +func NewRootResolvers(logger *zap.Logger, db mysql.Repo, cache redis.Repo) generated.Config { c := generated.Config{ Resolvers: &Resolver{ logger: logger, diff --git a/internal/render/admin/admin.go b/internal/render/admin/admin.go index 1d5c5e2..0bbad3e 100644 --- a/internal/render/admin/admin.go +++ b/internal/render/admin/admin.go @@ -1,24 +1,24 @@ package admin import ( + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errno" "go.uber.org/zap" ) type handler struct { - db db.Repo + db mysql.Repo logger *zap.Logger cache redis.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/render/authorized/authorized.go b/internal/render/authorized/authorized.go index f5f7563..3753f2b 100644 --- a/internal/render/authorized/authorized.go +++ b/internal/render/authorized/authorized.go @@ -1,24 +1,24 @@ package authorized import ( + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errno" "go.uber.org/zap" ) type handler struct { - db db.Repo + db mysql.Repo logger *zap.Logger cache redis.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/render/config/config.go b/internal/render/config/config.go index dc1d291..832ec4c 100644 --- a/internal/render/config/config.go +++ b/internal/render/config/config.go @@ -1,14 +1,14 @@ package config import ( + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "go/token" "log" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/dave/dst" "github.com/dave/dst/decorator" @@ -23,7 +23,7 @@ type handler struct { cache redis.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/render/cron/cron.go b/internal/render/cron/cron.go index e01057a..5ae8959 100644 --- a/internal/render/cron/cron.go +++ b/internal/render/cron/cron.go @@ -1,12 +1,12 @@ package cron import ( + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errno" "go.uber.org/zap" @@ -15,10 +15,10 @@ import ( type handler struct { logger *zap.Logger cache redis.Repo - db db.Repo + db mysql.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/render/dashboard/dashboard.go b/internal/render/dashboard/dashboard.go index 235f092..706bedc 100644 --- a/internal/render/dashboard/dashboard.go +++ b/internal/render/dashboard/dashboard.go @@ -2,6 +2,7 @@ package dashboard import ( "fmt" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "os" "runtime" "strconv" @@ -9,9 +10,8 @@ import ( "time" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/env" "github.com/shirou/gopsutil/cpu" @@ -24,10 +24,10 @@ import ( type handler struct { logger *zap.Logger cache redis.Repo - db db.Repo + db mysql.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/render/generator/generator.go b/internal/render/generator/generator.go index cc9a3ff..5fbbd44 100644 --- a/internal/render/generator/generator.go +++ b/internal/render/generator/generator.go @@ -1,19 +1,19 @@ package generator_handler import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "go.uber.org/zap" ) type handler struct { - db db.Repo + db mysql.Repo logger *zap.Logger cache redis.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/render/index/index.go b/internal/render/index/index.go index b1ab162..d8eb9b4 100644 --- a/internal/render/index/index.go +++ b/internal/render/index/index.go @@ -1,9 +1,9 @@ package index import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "go.uber.org/zap" ) @@ -11,10 +11,10 @@ import ( type handler struct { logger *zap.Logger cache redis.Repo - db db.Repo + db mysql.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/render/tool/tool.go b/internal/render/tool/tool.go index b2827ee..b68a29c 100644 --- a/internal/render/tool/tool.go +++ b/internal/render/tool/tool.go @@ -2,11 +2,11 @@ package tool import ( "encoding/json" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/file" "go.uber.org/zap" @@ -17,7 +17,7 @@ type handler struct { cache redis.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/render/upgrade/upgrade.go b/internal/render/upgrade/upgrade.go index 82143ad..ec5d9e6 100644 --- a/internal/render/upgrade/upgrade.go +++ b/internal/render/upgrade/upgrade.go @@ -1,19 +1,19 @@ package upgrade import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "go.uber.org/zap" ) type handler struct { - db db.Repo + db mysql.Repo logger *zap.Logger cache redis.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache, diff --git a/internal/api/repository/cron/cron.go b/internal/repository/cron/cron.go similarity index 76% rename from internal/api/repository/cron/cron.go rename to internal/repository/cron/cron.go index d827010..7f0a4de 100644 --- a/internal/api/repository/cron/cron.go +++ b/internal/repository/cron/cron.go @@ -1,11 +1,11 @@ package cron import ( + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "sync" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errors" "github.com/jakecoffman/cron" @@ -42,7 +42,7 @@ func (tc *taskCount) Wait() { type server struct { logger *zap.Logger - db db.Repo + db mysql.Repo cache redis.Repo cron *cron.Cron taskCount *taskCount @@ -58,16 +58,16 @@ type Server interface { Stop() // AddTask 增加定时任务 - AddTask(task *cron_task_repo.CronTask) + AddTask(task *cron_task.CronTask) // RemoveTask 删除定时任务 RemoveTask(taskId int) // AddJob 增加定时任务执行的工作内容 - AddJob(task *cron_task_repo.CronTask) cron.FuncJob + AddJob(task *cron_task.CronTask) cron.FuncJob } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) (Server, error) { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) (Server, error) { if logger == nil { return nil, errors.New("logger required") } diff --git a/internal/api/repository/cron/cron_add_job.go b/internal/repository/cron/cron_add_job.go similarity index 74% rename from internal/api/repository/cron/cron_add_job.go rename to internal/repository/cron/cron_add_job.go index 5cf9917..50d4a3d 100644 --- a/internal/api/repository/cron/cron_add_job.go +++ b/internal/repository/cron/cron_add_job.go @@ -3,12 +3,12 @@ package cron import ( "fmt" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" "github.com/jakecoffman/cron" ) -func (s *server) AddJob(task *cron_task_repo.CronTask) cron.FuncJob { +func (s *server) AddJob(task *cron_task.CronTask) cron.FuncJob { return func() { s.taskCount.Add() defer s.taskCount.Done() diff --git a/internal/api/repository/cron/cron_add_task.go b/internal/repository/cron/cron_add_task.go similarity index 56% rename from internal/api/repository/cron/cron_add_task.go rename to internal/repository/cron/cron_add_task.go index 032362c..3607ee8 100644 --- a/internal/api/repository/cron/cron_add_task.go +++ b/internal/repository/cron/cron_add_task.go @@ -3,12 +3,12 @@ package cron import ( "strings" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" "github.com/spf13/cast" ) -func (s *server) AddTask(task *cron_task_repo.CronTask) { +func (s *server) AddTask(task *cron_task.CronTask) { spec := "0 " + strings.TrimSpace(task.Spec) name := cast.ToString(task.Id) diff --git a/internal/api/repository/cron/cron_remove_task.go b/internal/repository/cron/cron_remove_task.go similarity index 100% rename from internal/api/repository/cron/cron_remove_task.go rename to internal/repository/cron/cron_remove_task.go diff --git a/internal/api/repository/cron/cron_start.go b/internal/repository/cron/cron_start.go similarity index 69% rename from internal/api/repository/cron/cron_start.go rename to internal/repository/cron/cron_start.go index b5811d2..17b3508 100644 --- a/internal/api/repository/cron/cron_start.go +++ b/internal/repository/cron/cron_start.go @@ -4,8 +4,8 @@ import ( "fmt" "math" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" "go.uber.org/zap" ) @@ -14,8 +14,8 @@ func (s *server) Start() { s.cron.Start() go s.taskCount.Wait() - qb := cron_task_repo.NewQueryBuilder() - qb.WhereIsUsed(db_repo.EqualPredicate, cron_task_repo.IsUsedYES) + qb := cron_task.NewQueryBuilder() + qb.WhereIsUsed(mysql.EqualPredicate, cron_task.IsUsedYES) totalNum, err := qb.Count(s.db.GetDbR()) if err != nil { s.logger.Fatal("cron initialize tasks count err", zap.Error(err)) @@ -28,8 +28,8 @@ func (s *server) Start() { s.logger.Info("开始初始化后台任务") for page := 1; page <= maxPage; page++ { - qb = cron_task_repo.NewQueryBuilder() - qb.WhereIsUsed(db_repo.EqualPredicate, cron_task_repo.IsUsedYES) + qb = cron_task.NewQueryBuilder() + qb.WhereIsUsed(mysql.EqualPredicate, cron_task.IsUsedYES) listData, err := qb. Limit(pageSize). Offset((page - 1) * pageSize). diff --git a/internal/api/repository/cron/cron_stop.go b/internal/repository/cron/cron_stop.go similarity index 100% rename from internal/api/repository/cron/cron_stop.go rename to internal/repository/cron/cron_stop.go diff --git a/internal/api/repository/db_repo/admin_repo/gen_admin.go b/internal/repository/mysql/admin/gen_admin.go similarity index 61% rename from internal/api/repository/db_repo/admin_repo/gen_admin.go rename to internal/repository/mysql/admin/gen_admin.go index dc502a7..f5e9dbc 100755 --- a/internal/api/repository/db_repo/admin_repo/gen_admin.go +++ b/internal/repository/mysql/admin/gen_admin.go @@ -3,13 +3,13 @@ // ANY CHANGES DONE HERE WILL BE LOST // /////////////////////////////////////////////////////////// -package admin_repo +package admin import ( "fmt" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "github.com/pkg/errors" "gorm.io/gorm" @@ -19,8 +19,8 @@ func NewModel() *Admin { return new(Admin) } -func NewQueryBuilder() *adminRepoQueryBuilder { - return new(adminRepoQueryBuilder) +func NewQueryBuilder() *adminQueryBuilder { + return new(adminQueryBuilder) } func (t *Admin) Create(db *gorm.DB) (id int32, err error) { @@ -30,7 +30,7 @@ func (t *Admin) Create(db *gorm.DB) (id int32, err error) { return t.Id, nil } -type adminRepoQueryBuilder struct { +type adminQueryBuilder struct { order []string where []struct { prefix string @@ -40,7 +40,7 @@ type adminRepoQueryBuilder struct { offset int } -func (qb *adminRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { +func (qb *adminQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { ret := db for _, where := range qb.where { ret = ret.Where(where.prefix, where.value) @@ -52,7 +52,7 @@ func (qb *adminRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { return ret } -func (qb *adminRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { +func (qb *adminQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { db = db.Model(&Admin{}) for _, where := range qb.where { @@ -65,7 +65,7 @@ func (qb *adminRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) return nil } -func (qb *adminRepoQueryBuilder) Delete(db *gorm.DB) (err error) { +func (qb *adminQueryBuilder) Delete(db *gorm.DB) (err error) { for _, where := range qb.where { db = db.Where(where.prefix, where.value) } @@ -76,7 +76,7 @@ func (qb *adminRepoQueryBuilder) Delete(db *gorm.DB) (err error) { return nil } -func (qb *adminRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { +func (qb *adminQueryBuilder) Count(db *gorm.DB) (int64, error) { var c int64 res := qb.buildQuery(db).Model(&Admin{}).Count(&c) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -85,7 +85,7 @@ func (qb *adminRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { return c, res.Error } -func (qb *adminRepoQueryBuilder) First(db *gorm.DB) (*Admin, error) { +func (qb *adminQueryBuilder) First(db *gorm.DB) (*Admin, error) { ret := &Admin{} res := qb.buildQuery(db).First(ret) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -94,7 +94,7 @@ func (qb *adminRepoQueryBuilder) First(db *gorm.DB) (*Admin, error) { return ret, res.Error } -func (qb *adminRepoQueryBuilder) QueryOne(db *gorm.DB) (*Admin, error) { +func (qb *adminQueryBuilder) QueryOne(db *gorm.DB) (*Admin, error) { qb.limit = 1 ret, err := qb.QueryAll(db) if len(ret) > 0 { @@ -103,23 +103,23 @@ func (qb *adminRepoQueryBuilder) QueryOne(db *gorm.DB) (*Admin, error) { return nil, err } -func (qb *adminRepoQueryBuilder) QueryAll(db *gorm.DB) ([]*Admin, error) { +func (qb *adminQueryBuilder) QueryAll(db *gorm.DB) ([]*Admin, error) { var ret []*Admin err := qb.buildQuery(db).Find(&ret).Error return ret, err } -func (qb *adminRepoQueryBuilder) Limit(limit int) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) Limit(limit int) *adminQueryBuilder { qb.limit = limit return qb } -func (qb *adminRepoQueryBuilder) Offset(offset int) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) Offset(offset int) *adminQueryBuilder { qb.offset = offset return qb } -func (qb *adminRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereId(p mysql.Predicate, value int32) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -130,7 +130,7 @@ func (qb *adminRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *admi return qb } -func (qb *adminRepoQueryBuilder) WhereIdIn(value []int32) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereIdIn(value []int32) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -141,7 +141,7 @@ func (qb *adminRepoQueryBuilder) WhereIdIn(value []int32) *adminRepoQueryBuilder return qb } -func (qb *adminRepoQueryBuilder) WhereIdNotIn(value []int32) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereIdNotIn(value []int32) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -152,7 +152,7 @@ func (qb *adminRepoQueryBuilder) WhereIdNotIn(value []int32) *adminRepoQueryBuil return qb } -func (qb *adminRepoQueryBuilder) OrderById(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderById(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -162,7 +162,7 @@ func (qb *adminRepoQueryBuilder) OrderById(asc bool) *adminRepoQueryBuilder { return qb } -func (qb *adminRepoQueryBuilder) WhereUsername(p db_repo.Predicate, value string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereUsername(p mysql.Predicate, value string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -173,7 +173,7 @@ func (qb *adminRepoQueryBuilder) WhereUsername(p db_repo.Predicate, value string return qb } -func (qb *adminRepoQueryBuilder) WhereUsernameIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereUsernameIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -184,7 +184,7 @@ func (qb *adminRepoQueryBuilder) WhereUsernameIn(value []string) *adminRepoQuery return qb } -func (qb *adminRepoQueryBuilder) WhereUsernameNotIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereUsernameNotIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -195,7 +195,7 @@ func (qb *adminRepoQueryBuilder) WhereUsernameNotIn(value []string) *adminRepoQu return qb } -func (qb *adminRepoQueryBuilder) OrderByUsername(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByUsername(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -205,7 +205,7 @@ func (qb *adminRepoQueryBuilder) OrderByUsername(asc bool) *adminRepoQueryBuilde return qb } -func (qb *adminRepoQueryBuilder) WherePassword(p db_repo.Predicate, value string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WherePassword(p mysql.Predicate, value string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -216,7 +216,7 @@ func (qb *adminRepoQueryBuilder) WherePassword(p db_repo.Predicate, value string return qb } -func (qb *adminRepoQueryBuilder) WherePasswordIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WherePasswordIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -227,7 +227,7 @@ func (qb *adminRepoQueryBuilder) WherePasswordIn(value []string) *adminRepoQuery return qb } -func (qb *adminRepoQueryBuilder) WherePasswordNotIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WherePasswordNotIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -238,7 +238,7 @@ func (qb *adminRepoQueryBuilder) WherePasswordNotIn(value []string) *adminRepoQu return qb } -func (qb *adminRepoQueryBuilder) OrderByPassword(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByPassword(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -248,7 +248,7 @@ func (qb *adminRepoQueryBuilder) OrderByPassword(asc bool) *adminRepoQueryBuilde return qb } -func (qb *adminRepoQueryBuilder) WhereNickname(p db_repo.Predicate, value string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereNickname(p mysql.Predicate, value string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -259,7 +259,7 @@ func (qb *adminRepoQueryBuilder) WhereNickname(p db_repo.Predicate, value string return qb } -func (qb *adminRepoQueryBuilder) WhereNicknameIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereNicknameIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -270,7 +270,7 @@ func (qb *adminRepoQueryBuilder) WhereNicknameIn(value []string) *adminRepoQuery return qb } -func (qb *adminRepoQueryBuilder) WhereNicknameNotIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereNicknameNotIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -281,7 +281,7 @@ func (qb *adminRepoQueryBuilder) WhereNicknameNotIn(value []string) *adminRepoQu return qb } -func (qb *adminRepoQueryBuilder) OrderByNickname(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByNickname(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -291,7 +291,7 @@ func (qb *adminRepoQueryBuilder) OrderByNickname(asc bool) *adminRepoQueryBuilde return qb } -func (qb *adminRepoQueryBuilder) WhereMobile(p db_repo.Predicate, value string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereMobile(p mysql.Predicate, value string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -302,7 +302,7 @@ func (qb *adminRepoQueryBuilder) WhereMobile(p db_repo.Predicate, value string) return qb } -func (qb *adminRepoQueryBuilder) WhereMobileIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereMobileIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -313,7 +313,7 @@ func (qb *adminRepoQueryBuilder) WhereMobileIn(value []string) *adminRepoQueryBu return qb } -func (qb *adminRepoQueryBuilder) WhereMobileNotIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereMobileNotIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -324,7 +324,7 @@ func (qb *adminRepoQueryBuilder) WhereMobileNotIn(value []string) *adminRepoQuer return qb } -func (qb *adminRepoQueryBuilder) OrderByMobile(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByMobile(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -334,7 +334,7 @@ func (qb *adminRepoQueryBuilder) OrderByMobile(asc bool) *adminRepoQueryBuilder return qb } -func (qb *adminRepoQueryBuilder) WhereIsUsed(p db_repo.Predicate, value int32) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereIsUsed(p mysql.Predicate, value int32) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -345,7 +345,7 @@ func (qb *adminRepoQueryBuilder) WhereIsUsed(p db_repo.Predicate, value int32) * return qb } -func (qb *adminRepoQueryBuilder) WhereIsUsedIn(value []int32) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereIsUsedIn(value []int32) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -356,7 +356,7 @@ func (qb *adminRepoQueryBuilder) WhereIsUsedIn(value []int32) *adminRepoQueryBui return qb } -func (qb *adminRepoQueryBuilder) WhereIsUsedNotIn(value []int32) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereIsUsedNotIn(value []int32) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -367,7 +367,7 @@ func (qb *adminRepoQueryBuilder) WhereIsUsedNotIn(value []int32) *adminRepoQuery return qb } -func (qb *adminRepoQueryBuilder) OrderByIsUsed(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByIsUsed(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -377,7 +377,7 @@ func (qb *adminRepoQueryBuilder) OrderByIsUsed(asc bool) *adminRepoQueryBuilder return qb } -func (qb *adminRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, value int32) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereIsDeleted(p mysql.Predicate, value int32) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -388,7 +388,7 @@ func (qb *adminRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, value int32 return qb } -func (qb *adminRepoQueryBuilder) WhereIsDeletedIn(value []int32) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereIsDeletedIn(value []int32) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -399,7 +399,7 @@ func (qb *adminRepoQueryBuilder) WhereIsDeletedIn(value []int32) *adminRepoQuery return qb } -func (qb *adminRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereIsDeletedNotIn(value []int32) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -410,7 +410,7 @@ func (qb *adminRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *adminRepoQu return qb } -func (qb *adminRepoQueryBuilder) OrderByIsDeleted(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByIsDeleted(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -420,7 +420,7 @@ func (qb *adminRepoQueryBuilder) OrderByIsDeleted(asc bool) *adminRepoQueryBuild return qb } -func (qb *adminRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value time.Time) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereCreatedAt(p mysql.Predicate, value time.Time) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -431,7 +431,7 @@ func (qb *adminRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value time. return qb } -func (qb *adminRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereCreatedAtIn(value []time.Time) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -442,7 +442,7 @@ func (qb *adminRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *adminRepoQ return qb } -func (qb *adminRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -453,7 +453,7 @@ func (qb *adminRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *adminRe return qb } -func (qb *adminRepoQueryBuilder) OrderByCreatedAt(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByCreatedAt(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -463,7 +463,7 @@ func (qb *adminRepoQueryBuilder) OrderByCreatedAt(asc bool) *adminRepoQueryBuild return qb } -func (qb *adminRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereCreatedUser(p mysql.Predicate, value string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -474,7 +474,7 @@ func (qb *adminRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value str return qb } -func (qb *adminRepoQueryBuilder) WhereCreatedUserIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereCreatedUserIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -485,7 +485,7 @@ func (qb *adminRepoQueryBuilder) WhereCreatedUserIn(value []string) *adminRepoQu return qb } -func (qb *adminRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereCreatedUserNotIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -496,7 +496,7 @@ func (qb *adminRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *adminRep return qb } -func (qb *adminRepoQueryBuilder) OrderByCreatedUser(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByCreatedUser(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -506,7 +506,7 @@ func (qb *adminRepoQueryBuilder) OrderByCreatedUser(asc bool) *adminRepoQueryBui return qb } -func (qb *adminRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value time.Time) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereUpdatedAt(p mysql.Predicate, value time.Time) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -517,7 +517,7 @@ func (qb *adminRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value time. return qb } -func (qb *adminRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereUpdatedAtIn(value []time.Time) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -528,7 +528,7 @@ func (qb *adminRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *adminRepoQ return qb } -func (qb *adminRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -539,7 +539,7 @@ func (qb *adminRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *adminRe return qb } -func (qb *adminRepoQueryBuilder) OrderByUpdatedAt(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByUpdatedAt(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -549,7 +549,7 @@ func (qb *adminRepoQueryBuilder) OrderByUpdatedAt(asc bool) *adminRepoQueryBuild return qb } -func (qb *adminRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, value string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereUpdatedUser(p mysql.Predicate, value string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -560,7 +560,7 @@ func (qb *adminRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, value str return qb } -func (qb *adminRepoQueryBuilder) WhereUpdatedUserIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereUpdatedUserIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -571,7 +571,7 @@ func (qb *adminRepoQueryBuilder) WhereUpdatedUserIn(value []string) *adminRepoQu return qb } -func (qb *adminRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) WhereUpdatedUserNotIn(value []string) *adminQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -582,7 +582,7 @@ func (qb *adminRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *adminRep return qb } -func (qb *adminRepoQueryBuilder) OrderByUpdatedUser(asc bool) *adminRepoQueryBuilder { +func (qb *adminQueryBuilder) OrderByUpdatedUser(asc bool) *adminQueryBuilder { order := "DESC" if asc { order = "ASC" diff --git a/internal/api/repository/db_repo/admin_repo/gen_model.go b/internal/repository/mysql/admin/gen_model.go similarity index 96% rename from internal/api/repository/db_repo/admin_repo/gen_model.go rename to internal/repository/mysql/admin/gen_model.go index 7c00150..0379f2e 100755 --- a/internal/api/repository/db_repo/admin_repo/gen_model.go +++ b/internal/repository/mysql/admin/gen_model.go @@ -1,4 +1,4 @@ -package admin_repo +package admin import "time" diff --git a/internal/api/repository/db_repo/admin_repo/gen_table.md b/internal/repository/mysql/admin/gen_table.md similarity index 70% rename from internal/api/repository/db_repo/admin_repo/gen_table.md rename to internal/repository/mysql/admin/gen_table.md index 2235851..5b7173c 100755 --- a/internal/api/repository/db_repo/admin_repo/gen_table.md +++ b/internal/repository/mysql/admin/gen_table.md @@ -3,14 +3,14 @@ | 序号 | 名称 | 描述 | 类型 | 键 | 为空 | 额外 | 默认值 | | :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: | -| 1 | id | 主键 | int(11) unsigned | PRI | NO | auto_increment | | +| 1 | id | 主键 | int unsigned | PRI | NO | auto_increment | | | 2 | username | 用户名 | varchar(32) | UNI | NO | | | | 3 | password | 密码 | varchar(100) | | NO | | | | 4 | nickname | 昵称 | varchar(60) | | NO | | | | 5 | mobile | 手机号 | varchar(20) | | NO | | | | 6 | is_used | 是否启用 1:是 -1:否 | tinyint(1) | | NO | | 1 | | 7 | is_deleted | 是否删除 1:是 -1:否 | tinyint(1) | | NO | | -1 | -| 8 | created_at | 创建时间 | timestamp | | NO | | CURRENT_TIMESTAMP | +| 8 | created_at | 创建时间 | timestamp | | NO | DEFAULT_GENERATED | CURRENT_TIMESTAMP | | 9 | created_user | 创建人 | varchar(60) | | NO | | | -| 10 | updated_at | 更新时间 | timestamp | | NO | on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | +| 10 | updated_at | 更新时间 | timestamp | | NO | DEFAULT_GENERATED on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | | 11 | updated_user | 更新人 | varchar(60) | | NO | | | diff --git a/internal/api/repository/db_repo/admin_menu_repo/gen_admin_menu.go b/internal/repository/mysql/admin_menu/gen_admin_menu.go similarity index 61% rename from internal/api/repository/db_repo/admin_menu_repo/gen_admin_menu.go rename to internal/repository/mysql/admin_menu/gen_admin_menu.go index e3743ad..114cb46 100755 --- a/internal/api/repository/db_repo/admin_menu_repo/gen_admin_menu.go +++ b/internal/repository/mysql/admin_menu/gen_admin_menu.go @@ -3,13 +3,13 @@ // ANY CHANGES DONE HERE WILL BE LOST // /////////////////////////////////////////////////////////// -package admin_menu_repo +package admin_menu import ( "fmt" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "github.com/pkg/errors" "gorm.io/gorm" @@ -19,8 +19,8 @@ func NewModel() *AdminMenu { return new(AdminMenu) } -func NewQueryBuilder() *adminMenuRepoQueryBuilder { - return new(adminMenuRepoQueryBuilder) +func NewQueryBuilder() *adminMenuQueryBuilder { + return new(adminMenuQueryBuilder) } func (t *AdminMenu) Create(db *gorm.DB) (id int32, err error) { @@ -30,7 +30,7 @@ func (t *AdminMenu) Create(db *gorm.DB) (id int32, err error) { return t.Id, nil } -type adminMenuRepoQueryBuilder struct { +type adminMenuQueryBuilder struct { order []string where []struct { prefix string @@ -40,7 +40,7 @@ type adminMenuRepoQueryBuilder struct { offset int } -func (qb *adminMenuRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { +func (qb *adminMenuQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { ret := db for _, where := range qb.where { ret = ret.Where(where.prefix, where.value) @@ -52,7 +52,7 @@ func (qb *adminMenuRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { return ret } -func (qb *adminMenuRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { +func (qb *adminMenuQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { db = db.Model(&AdminMenu{}) for _, where := range qb.where { @@ -65,7 +65,7 @@ func (qb *adminMenuRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface return nil } -func (qb *adminMenuRepoQueryBuilder) Delete(db *gorm.DB) (err error) { +func (qb *adminMenuQueryBuilder) Delete(db *gorm.DB) (err error) { for _, where := range qb.where { db = db.Where(where.prefix, where.value) } @@ -76,7 +76,7 @@ func (qb *adminMenuRepoQueryBuilder) Delete(db *gorm.DB) (err error) { return nil } -func (qb *adminMenuRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { +func (qb *adminMenuQueryBuilder) Count(db *gorm.DB) (int64, error) { var c int64 res := qb.buildQuery(db).Model(&AdminMenu{}).Count(&c) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -85,7 +85,7 @@ func (qb *adminMenuRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { return c, res.Error } -func (qb *adminMenuRepoQueryBuilder) First(db *gorm.DB) (*AdminMenu, error) { +func (qb *adminMenuQueryBuilder) First(db *gorm.DB) (*AdminMenu, error) { ret := &AdminMenu{} res := qb.buildQuery(db).First(ret) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -94,7 +94,7 @@ func (qb *adminMenuRepoQueryBuilder) First(db *gorm.DB) (*AdminMenu, error) { return ret, res.Error } -func (qb *adminMenuRepoQueryBuilder) QueryOne(db *gorm.DB) (*AdminMenu, error) { +func (qb *adminMenuQueryBuilder) QueryOne(db *gorm.DB) (*AdminMenu, error) { qb.limit = 1 ret, err := qb.QueryAll(db) if len(ret) > 0 { @@ -103,23 +103,23 @@ func (qb *adminMenuRepoQueryBuilder) QueryOne(db *gorm.DB) (*AdminMenu, error) { return nil, err } -func (qb *adminMenuRepoQueryBuilder) QueryAll(db *gorm.DB) ([]*AdminMenu, error) { +func (qb *adminMenuQueryBuilder) QueryAll(db *gorm.DB) ([]*AdminMenu, error) { var ret []*AdminMenu err := qb.buildQuery(db).Find(&ret).Error return ret, err } -func (qb *adminMenuRepoQueryBuilder) Limit(limit int) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) Limit(limit int) *adminMenuQueryBuilder { qb.limit = limit return qb } -func (qb *adminMenuRepoQueryBuilder) Offset(offset int) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) Offset(offset int) *adminMenuQueryBuilder { qb.offset = offset return qb } -func (qb *adminMenuRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereId(p mysql.Predicate, value int32) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -130,7 +130,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) * return qb } -func (qb *adminMenuRepoQueryBuilder) WhereIdIn(value []int32) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereIdIn(value []int32) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -141,7 +141,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereIdIn(value []int32) *adminMenuRepoQuer return qb } -func (qb *adminMenuRepoQueryBuilder) WhereIdNotIn(value []int32) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereIdNotIn(value []int32) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -152,7 +152,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereIdNotIn(value []int32) *adminMenuRepoQ return qb } -func (qb *adminMenuRepoQueryBuilder) OrderById(asc bool) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) OrderById(asc bool) *adminMenuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -162,7 +162,7 @@ func (qb *adminMenuRepoQueryBuilder) OrderById(asc bool) *adminMenuRepoQueryBuil return qb } -func (qb *adminMenuRepoQueryBuilder) WhereAdminId(p db_repo.Predicate, value int32) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereAdminId(p mysql.Predicate, value int32) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -173,7 +173,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereAdminId(p db_repo.Predicate, value int return qb } -func (qb *adminMenuRepoQueryBuilder) WhereAdminIdIn(value []int32) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereAdminIdIn(value []int32) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -184,7 +184,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereAdminIdIn(value []int32) *adminMenuRep return qb } -func (qb *adminMenuRepoQueryBuilder) WhereAdminIdNotIn(value []int32) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereAdminIdNotIn(value []int32) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -195,7 +195,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereAdminIdNotIn(value []int32) *adminMenu return qb } -func (qb *adminMenuRepoQueryBuilder) OrderByAdminId(asc bool) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) OrderByAdminId(asc bool) *adminMenuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -205,7 +205,7 @@ func (qb *adminMenuRepoQueryBuilder) OrderByAdminId(asc bool) *adminMenuRepoQuer return qb } -func (qb *adminMenuRepoQueryBuilder) WhereMenuId(p db_repo.Predicate, value int32) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereMenuId(p mysql.Predicate, value int32) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -216,7 +216,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereMenuId(p db_repo.Predicate, value int3 return qb } -func (qb *adminMenuRepoQueryBuilder) WhereMenuIdIn(value []int32) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereMenuIdIn(value []int32) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -227,7 +227,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereMenuIdIn(value []int32) *adminMenuRepo return qb } -func (qb *adminMenuRepoQueryBuilder) WhereMenuIdNotIn(value []int32) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereMenuIdNotIn(value []int32) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -238,7 +238,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereMenuIdNotIn(value []int32) *adminMenuR return qb } -func (qb *adminMenuRepoQueryBuilder) OrderByMenuId(asc bool) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) OrderByMenuId(asc bool) *adminMenuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -248,7 +248,7 @@ func (qb *adminMenuRepoQueryBuilder) OrderByMenuId(asc bool) *adminMenuRepoQuery return qb } -func (qb *adminMenuRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value time.Time) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereCreatedAt(p mysql.Predicate, value time.Time) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -259,7 +259,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value t return qb } -func (qb *adminMenuRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereCreatedAtIn(value []time.Time) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -270,7 +270,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *adminM return qb } -func (qb *adminMenuRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -281,7 +281,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *adm return qb } -func (qb *adminMenuRepoQueryBuilder) OrderByCreatedAt(asc bool) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) OrderByCreatedAt(asc bool) *adminMenuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -291,7 +291,7 @@ func (qb *adminMenuRepoQueryBuilder) OrderByCreatedAt(asc bool) *adminMenuRepoQu return qb } -func (qb *adminMenuRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value string) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereCreatedUser(p mysql.Predicate, value string) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -302,7 +302,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value return qb } -func (qb *adminMenuRepoQueryBuilder) WhereCreatedUserIn(value []string) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereCreatedUserIn(value []string) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -313,7 +313,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereCreatedUserIn(value []string) *adminMe return qb } -func (qb *adminMenuRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) WhereCreatedUserNotIn(value []string) *adminMenuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -324,7 +324,7 @@ func (qb *adminMenuRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *admi return qb } -func (qb *adminMenuRepoQueryBuilder) OrderByCreatedUser(asc bool) *adminMenuRepoQueryBuilder { +func (qb *adminMenuQueryBuilder) OrderByCreatedUser(asc bool) *adminMenuQueryBuilder { order := "DESC" if asc { order = "ASC" diff --git a/internal/api/repository/db_repo/admin_menu_repo/gen_model.go b/internal/repository/mysql/admin_menu/gen_model.go similarity index 93% rename from internal/api/repository/db_repo/admin_menu_repo/gen_model.go rename to internal/repository/mysql/admin_menu/gen_model.go index c829527..3209132 100755 --- a/internal/api/repository/db_repo/admin_menu_repo/gen_model.go +++ b/internal/repository/mysql/admin_menu/gen_model.go @@ -1,4 +1,4 @@ -package admin_menu_repo +package admin_menu import "time" diff --git a/internal/repository/mysql/admin_menu/gen_table.md b/internal/repository/mysql/admin_menu/gen_table.md new file mode 100755 index 0000000..d3a70d8 --- /dev/null +++ b/internal/repository/mysql/admin_menu/gen_table.md @@ -0,0 +1,10 @@ +#### go_gin_api.admin_menu +管理员菜单栏表 + +| 序号 | 名称 | 描述 | 类型 | 键 | 为空 | 额外 | 默认值 | +| :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: | +| 1 | id | 主键 | int unsigned | PRI | NO | auto_increment | | +| 2 | admin_id | 管理员ID | int unsigned | MUL | NO | | 0 | +| 3 | menu_id | 菜单栏ID | int unsigned | | NO | | 0 | +| 4 | created_at | 创建时间 | timestamp | | NO | DEFAULT_GENERATED | CURRENT_TIMESTAMP | +| 5 | created_user | 创建人 | varchar(60) | | NO | | | diff --git a/internal/api/repository/db_repo/authorized_repo/gen_authorized.go b/internal/repository/mysql/authorized/gen_authorized.go similarity index 59% rename from internal/api/repository/db_repo/authorized_repo/gen_authorized.go rename to internal/repository/mysql/authorized/gen_authorized.go index dc737af..0c5bf46 100755 --- a/internal/api/repository/db_repo/authorized_repo/gen_authorized.go +++ b/internal/repository/mysql/authorized/gen_authorized.go @@ -3,13 +3,13 @@ // ANY CHANGES DONE HERE WILL BE LOST // /////////////////////////////////////////////////////////// -package authorized_repo +package authorized import ( "fmt" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "github.com/pkg/errors" "gorm.io/gorm" @@ -19,8 +19,8 @@ func NewModel() *Authorized { return new(Authorized) } -func NewQueryBuilder() *authorizedRepoQueryBuilder { - return new(authorizedRepoQueryBuilder) +func NewQueryBuilder() *authorizedQueryBuilder { + return new(authorizedQueryBuilder) } func (t *Authorized) Create(db *gorm.DB) (id int32, err error) { @@ -30,7 +30,7 @@ func (t *Authorized) Create(db *gorm.DB) (id int32, err error) { return t.Id, nil } -type authorizedRepoQueryBuilder struct { +type authorizedQueryBuilder struct { order []string where []struct { prefix string @@ -40,7 +40,7 @@ type authorizedRepoQueryBuilder struct { offset int } -func (qb *authorizedRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { +func (qb *authorizedQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { ret := db for _, where := range qb.where { ret = ret.Where(where.prefix, where.value) @@ -52,7 +52,7 @@ func (qb *authorizedRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { return ret } -func (qb *authorizedRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { +func (qb *authorizedQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { db = db.Model(&Authorized{}) for _, where := range qb.where { @@ -65,7 +65,7 @@ func (qb *authorizedRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interfac return nil } -func (qb *authorizedRepoQueryBuilder) Delete(db *gorm.DB) (err error) { +func (qb *authorizedQueryBuilder) Delete(db *gorm.DB) (err error) { for _, where := range qb.where { db = db.Where(where.prefix, where.value) } @@ -76,7 +76,7 @@ func (qb *authorizedRepoQueryBuilder) Delete(db *gorm.DB) (err error) { return nil } -func (qb *authorizedRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { +func (qb *authorizedQueryBuilder) Count(db *gorm.DB) (int64, error) { var c int64 res := qb.buildQuery(db).Model(&Authorized{}).Count(&c) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -85,7 +85,7 @@ func (qb *authorizedRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { return c, res.Error } -func (qb *authorizedRepoQueryBuilder) First(db *gorm.DB) (*Authorized, error) { +func (qb *authorizedQueryBuilder) First(db *gorm.DB) (*Authorized, error) { ret := &Authorized{} res := qb.buildQuery(db).First(ret) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -94,7 +94,7 @@ func (qb *authorizedRepoQueryBuilder) First(db *gorm.DB) (*Authorized, error) { return ret, res.Error } -func (qb *authorizedRepoQueryBuilder) QueryOne(db *gorm.DB) (*Authorized, error) { +func (qb *authorizedQueryBuilder) QueryOne(db *gorm.DB) (*Authorized, error) { qb.limit = 1 ret, err := qb.QueryAll(db) if len(ret) > 0 { @@ -103,23 +103,23 @@ func (qb *authorizedRepoQueryBuilder) QueryOne(db *gorm.DB) (*Authorized, error) return nil, err } -func (qb *authorizedRepoQueryBuilder) QueryAll(db *gorm.DB) ([]*Authorized, error) { +func (qb *authorizedQueryBuilder) QueryAll(db *gorm.DB) ([]*Authorized, error) { var ret []*Authorized err := qb.buildQuery(db).Find(&ret).Error return ret, err } -func (qb *authorizedRepoQueryBuilder) Limit(limit int) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) Limit(limit int) *authorizedQueryBuilder { qb.limit = limit return qb } -func (qb *authorizedRepoQueryBuilder) Offset(offset int) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) Offset(offset int) *authorizedQueryBuilder { qb.offset = offset return qb } -func (qb *authorizedRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereId(p mysql.Predicate, value int32) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -130,7 +130,7 @@ func (qb *authorizedRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) return qb } -func (qb *authorizedRepoQueryBuilder) WhereIdIn(value []int32) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereIdIn(value []int32) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -141,7 +141,7 @@ func (qb *authorizedRepoQueryBuilder) WhereIdIn(value []int32) *authorizedRepoQu return qb } -func (qb *authorizedRepoQueryBuilder) WhereIdNotIn(value []int32) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereIdNotIn(value []int32) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -152,7 +152,7 @@ func (qb *authorizedRepoQueryBuilder) WhereIdNotIn(value []int32) *authorizedRep return qb } -func (qb *authorizedRepoQueryBuilder) OrderById(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderById(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -162,7 +162,7 @@ func (qb *authorizedRepoQueryBuilder) OrderById(asc bool) *authorizedRepoQueryBu return qb } -func (qb *authorizedRepoQueryBuilder) WhereBusinessKey(p db_repo.Predicate, value string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereBusinessKey(p mysql.Predicate, value string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -173,7 +173,7 @@ func (qb *authorizedRepoQueryBuilder) WhereBusinessKey(p db_repo.Predicate, valu return qb } -func (qb *authorizedRepoQueryBuilder) WhereBusinessKeyIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereBusinessKeyIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -184,7 +184,7 @@ func (qb *authorizedRepoQueryBuilder) WhereBusinessKeyIn(value []string) *author return qb } -func (qb *authorizedRepoQueryBuilder) WhereBusinessKeyNotIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereBusinessKeyNotIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -195,7 +195,7 @@ func (qb *authorizedRepoQueryBuilder) WhereBusinessKeyNotIn(value []string) *aut return qb } -func (qb *authorizedRepoQueryBuilder) OrderByBusinessKey(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByBusinessKey(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -205,7 +205,7 @@ func (qb *authorizedRepoQueryBuilder) OrderByBusinessKey(asc bool) *authorizedRe return qb } -func (qb *authorizedRepoQueryBuilder) WhereBusinessSecret(p db_repo.Predicate, value string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereBusinessSecret(p mysql.Predicate, value string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -216,7 +216,7 @@ func (qb *authorizedRepoQueryBuilder) WhereBusinessSecret(p db_repo.Predicate, v return qb } -func (qb *authorizedRepoQueryBuilder) WhereBusinessSecretIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereBusinessSecretIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -227,7 +227,7 @@ func (qb *authorizedRepoQueryBuilder) WhereBusinessSecretIn(value []string) *aut return qb } -func (qb *authorizedRepoQueryBuilder) WhereBusinessSecretNotIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereBusinessSecretNotIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -238,7 +238,7 @@ func (qb *authorizedRepoQueryBuilder) WhereBusinessSecretNotIn(value []string) * return qb } -func (qb *authorizedRepoQueryBuilder) OrderByBusinessSecret(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByBusinessSecret(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -248,7 +248,7 @@ func (qb *authorizedRepoQueryBuilder) OrderByBusinessSecret(asc bool) *authorize return qb } -func (qb *authorizedRepoQueryBuilder) WhereBusinessDeveloper(p db_repo.Predicate, value string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereBusinessDeveloper(p mysql.Predicate, value string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -259,7 +259,7 @@ func (qb *authorizedRepoQueryBuilder) WhereBusinessDeveloper(p db_repo.Predicate return qb } -func (qb *authorizedRepoQueryBuilder) WhereBusinessDeveloperIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereBusinessDeveloperIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -270,7 +270,7 @@ func (qb *authorizedRepoQueryBuilder) WhereBusinessDeveloperIn(value []string) * return qb } -func (qb *authorizedRepoQueryBuilder) WhereBusinessDeveloperNotIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereBusinessDeveloperNotIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -281,7 +281,7 @@ func (qb *authorizedRepoQueryBuilder) WhereBusinessDeveloperNotIn(value []string return qb } -func (qb *authorizedRepoQueryBuilder) OrderByBusinessDeveloper(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByBusinessDeveloper(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -291,7 +291,7 @@ func (qb *authorizedRepoQueryBuilder) OrderByBusinessDeveloper(asc bool) *author return qb } -func (qb *authorizedRepoQueryBuilder) WhereRemark(p db_repo.Predicate, value string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereRemark(p mysql.Predicate, value string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -302,7 +302,7 @@ func (qb *authorizedRepoQueryBuilder) WhereRemark(p db_repo.Predicate, value str return qb } -func (qb *authorizedRepoQueryBuilder) WhereRemarkIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereRemarkIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -313,7 +313,7 @@ func (qb *authorizedRepoQueryBuilder) WhereRemarkIn(value []string) *authorizedR return qb } -func (qb *authorizedRepoQueryBuilder) WhereRemarkNotIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereRemarkNotIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -324,7 +324,7 @@ func (qb *authorizedRepoQueryBuilder) WhereRemarkNotIn(value []string) *authoriz return qb } -func (qb *authorizedRepoQueryBuilder) OrderByRemark(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByRemark(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -334,7 +334,7 @@ func (qb *authorizedRepoQueryBuilder) OrderByRemark(asc bool) *authorizedRepoQue return qb } -func (qb *authorizedRepoQueryBuilder) WhereIsUsed(p db_repo.Predicate, value int32) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereIsUsed(p mysql.Predicate, value int32) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -345,7 +345,7 @@ func (qb *authorizedRepoQueryBuilder) WhereIsUsed(p db_repo.Predicate, value int return qb } -func (qb *authorizedRepoQueryBuilder) WhereIsUsedIn(value []int32) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereIsUsedIn(value []int32) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -356,7 +356,7 @@ func (qb *authorizedRepoQueryBuilder) WhereIsUsedIn(value []int32) *authorizedRe return qb } -func (qb *authorizedRepoQueryBuilder) WhereIsUsedNotIn(value []int32) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereIsUsedNotIn(value []int32) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -367,7 +367,7 @@ func (qb *authorizedRepoQueryBuilder) WhereIsUsedNotIn(value []int32) *authorize return qb } -func (qb *authorizedRepoQueryBuilder) OrderByIsUsed(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByIsUsed(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -377,7 +377,7 @@ func (qb *authorizedRepoQueryBuilder) OrderByIsUsed(asc bool) *authorizedRepoQue return qb } -func (qb *authorizedRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, value int32) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereIsDeleted(p mysql.Predicate, value int32) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -388,7 +388,7 @@ func (qb *authorizedRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, value return qb } -func (qb *authorizedRepoQueryBuilder) WhereIsDeletedIn(value []int32) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereIsDeletedIn(value []int32) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -399,7 +399,7 @@ func (qb *authorizedRepoQueryBuilder) WhereIsDeletedIn(value []int32) *authorize return qb } -func (qb *authorizedRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereIsDeletedNotIn(value []int32) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -410,7 +410,7 @@ func (qb *authorizedRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *author return qb } -func (qb *authorizedRepoQueryBuilder) OrderByIsDeleted(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByIsDeleted(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -420,7 +420,7 @@ func (qb *authorizedRepoQueryBuilder) OrderByIsDeleted(asc bool) *authorizedRepo return qb } -func (qb *authorizedRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value time.Time) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereCreatedAt(p mysql.Predicate, value time.Time) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -431,7 +431,7 @@ func (qb *authorizedRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value return qb } -func (qb *authorizedRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereCreatedAtIn(value []time.Time) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -442,7 +442,7 @@ func (qb *authorizedRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *autho return qb } -func (qb *authorizedRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -453,7 +453,7 @@ func (qb *authorizedRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *au return qb } -func (qb *authorizedRepoQueryBuilder) OrderByCreatedAt(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByCreatedAt(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -463,7 +463,7 @@ func (qb *authorizedRepoQueryBuilder) OrderByCreatedAt(asc bool) *authorizedRepo return qb } -func (qb *authorizedRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereCreatedUser(p mysql.Predicate, value string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -474,7 +474,7 @@ func (qb *authorizedRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, valu return qb } -func (qb *authorizedRepoQueryBuilder) WhereCreatedUserIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereCreatedUserIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -485,7 +485,7 @@ func (qb *authorizedRepoQueryBuilder) WhereCreatedUserIn(value []string) *author return qb } -func (qb *authorizedRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereCreatedUserNotIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -496,7 +496,7 @@ func (qb *authorizedRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *aut return qb } -func (qb *authorizedRepoQueryBuilder) OrderByCreatedUser(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByCreatedUser(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -506,7 +506,7 @@ func (qb *authorizedRepoQueryBuilder) OrderByCreatedUser(asc bool) *authorizedRe return qb } -func (qb *authorizedRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value time.Time) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereUpdatedAt(p mysql.Predicate, value time.Time) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -517,7 +517,7 @@ func (qb *authorizedRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value return qb } -func (qb *authorizedRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereUpdatedAtIn(value []time.Time) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -528,7 +528,7 @@ func (qb *authorizedRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *autho return qb } -func (qb *authorizedRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -539,7 +539,7 @@ func (qb *authorizedRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *au return qb } -func (qb *authorizedRepoQueryBuilder) OrderByUpdatedAt(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByUpdatedAt(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -549,7 +549,7 @@ func (qb *authorizedRepoQueryBuilder) OrderByUpdatedAt(asc bool) *authorizedRepo return qb } -func (qb *authorizedRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, value string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereUpdatedUser(p mysql.Predicate, value string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -560,7 +560,7 @@ func (qb *authorizedRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, valu return qb } -func (qb *authorizedRepoQueryBuilder) WhereUpdatedUserIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereUpdatedUserIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -571,7 +571,7 @@ func (qb *authorizedRepoQueryBuilder) WhereUpdatedUserIn(value []string) *author return qb } -func (qb *authorizedRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) WhereUpdatedUserNotIn(value []string) *authorizedQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -582,7 +582,7 @@ func (qb *authorizedRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *aut return qb } -func (qb *authorizedRepoQueryBuilder) OrderByUpdatedUser(asc bool) *authorizedRepoQueryBuilder { +func (qb *authorizedQueryBuilder) OrderByUpdatedUser(asc bool) *authorizedQueryBuilder { order := "DESC" if asc { order = "ASC" diff --git a/internal/api/repository/db_repo/authorized_repo/gen_model.go b/internal/repository/mysql/authorized/gen_model.go similarity index 96% rename from internal/api/repository/db_repo/authorized_repo/gen_model.go rename to internal/repository/mysql/authorized/gen_model.go index 670ac5b..3959e0f 100755 --- a/internal/api/repository/db_repo/authorized_repo/gen_model.go +++ b/internal/repository/mysql/authorized/gen_model.go @@ -1,4 +1,4 @@ -package authorized_repo +package authorized import "time" diff --git a/internal/api/repository/db_repo/authorized_repo/gen_table.md b/internal/repository/mysql/authorized/gen_table.md similarity index 64% rename from internal/api/repository/db_repo/authorized_repo/gen_table.md rename to internal/repository/mysql/authorized/gen_table.md index 4a7b212..3875e6a 100755 --- a/internal/api/repository/db_repo/authorized_repo/gen_table.md +++ b/internal/repository/mysql/authorized/gen_table.md @@ -3,14 +3,14 @@ | 序号 | 名称 | 描述 | 类型 | 键 | 为空 | 额外 | 默认值 | | :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: | -| 1 | id | 主键 | int(11) unsigned | PRI | NO | auto_increment | | -| 2 | business_key | 调用方key | varchar(32) | | NO | | | +| 1 | id | 主键 | int unsigned | PRI | NO | auto_increment | | +| 2 | business_key | 调用方key | varchar(32) | UNI | NO | | | | 3 | business_secret | 调用方secret | varchar(60) | | NO | | | | 4 | business_developer | 调用方对接人 | varchar(60) | | NO | | | | 5 | remark | 备注 | varchar(255) | | NO | | | -| 6 | is_used | 是否启用 1:是 -1:否 | tinyint(1) | | NO | | -1 | +| 6 | is_used | 是否启用 1:是 -1:否 | tinyint(1) | | NO | | 1 | | 7 | is_deleted | 是否删除 1:是 -1:否 | tinyint(1) | | NO | | -1 | -| 8 | created_at | 创建时间 | timestamp | | NO | | CURRENT_TIMESTAMP | +| 8 | created_at | 创建时间 | timestamp | | NO | DEFAULT_GENERATED | CURRENT_TIMESTAMP | | 9 | created_user | 创建人 | varchar(60) | | NO | | | -| 10 | updated_at | 更新时间 | timestamp | | NO | on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | +| 10 | updated_at | 更新时间 | timestamp | | NO | DEFAULT_GENERATED on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | | 11 | updated_user | 更新人 | varchar(60) | | NO | | | diff --git a/internal/api/repository/db_repo/authorized_api_repo/gen_authorized_api.go b/internal/repository/mysql/authorized_api/gen_authorized_api.go similarity index 58% rename from internal/api/repository/db_repo/authorized_api_repo/gen_authorized_api.go rename to internal/repository/mysql/authorized_api/gen_authorized_api.go index ae03b4f..7e78001 100755 --- a/internal/api/repository/db_repo/authorized_api_repo/gen_authorized_api.go +++ b/internal/repository/mysql/authorized_api/gen_authorized_api.go @@ -3,13 +3,13 @@ // ANY CHANGES DONE HERE WILL BE LOST // /////////////////////////////////////////////////////////// -package authorized_api_repo +package authorized_api import ( "fmt" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "github.com/pkg/errors" "gorm.io/gorm" @@ -19,8 +19,8 @@ func NewModel() *AuthorizedApi { return new(AuthorizedApi) } -func NewQueryBuilder() *authorizedApiRepoQueryBuilder { - return new(authorizedApiRepoQueryBuilder) +func NewQueryBuilder() *authorizedApiQueryBuilder { + return new(authorizedApiQueryBuilder) } func (t *AuthorizedApi) Create(db *gorm.DB) (id int32, err error) { @@ -30,7 +30,7 @@ func (t *AuthorizedApi) Create(db *gorm.DB) (id int32, err error) { return t.Id, nil } -type authorizedApiRepoQueryBuilder struct { +type authorizedApiQueryBuilder struct { order []string where []struct { prefix string @@ -40,7 +40,7 @@ type authorizedApiRepoQueryBuilder struct { offset int } -func (qb *authorizedApiRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { +func (qb *authorizedApiQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { ret := db for _, where := range qb.where { ret = ret.Where(where.prefix, where.value) @@ -52,7 +52,7 @@ func (qb *authorizedApiRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { return ret } -func (qb *authorizedApiRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { +func (qb *authorizedApiQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { db = db.Model(&AuthorizedApi{}) for _, where := range qb.where { @@ -65,7 +65,7 @@ func (qb *authorizedApiRepoQueryBuilder) Updates(db *gorm.DB, m map[string]inter return nil } -func (qb *authorizedApiRepoQueryBuilder) Delete(db *gorm.DB) (err error) { +func (qb *authorizedApiQueryBuilder) Delete(db *gorm.DB) (err error) { for _, where := range qb.where { db = db.Where(where.prefix, where.value) } @@ -76,7 +76,7 @@ func (qb *authorizedApiRepoQueryBuilder) Delete(db *gorm.DB) (err error) { return nil } -func (qb *authorizedApiRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { +func (qb *authorizedApiQueryBuilder) Count(db *gorm.DB) (int64, error) { var c int64 res := qb.buildQuery(db).Model(&AuthorizedApi{}).Count(&c) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -85,7 +85,7 @@ func (qb *authorizedApiRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { return c, res.Error } -func (qb *authorizedApiRepoQueryBuilder) First(db *gorm.DB) (*AuthorizedApi, error) { +func (qb *authorizedApiQueryBuilder) First(db *gorm.DB) (*AuthorizedApi, error) { ret := &AuthorizedApi{} res := qb.buildQuery(db).First(ret) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -94,7 +94,7 @@ func (qb *authorizedApiRepoQueryBuilder) First(db *gorm.DB) (*AuthorizedApi, err return ret, res.Error } -func (qb *authorizedApiRepoQueryBuilder) QueryOne(db *gorm.DB) (*AuthorizedApi, error) { +func (qb *authorizedApiQueryBuilder) QueryOne(db *gorm.DB) (*AuthorizedApi, error) { qb.limit = 1 ret, err := qb.QueryAll(db) if len(ret) > 0 { @@ -103,23 +103,23 @@ func (qb *authorizedApiRepoQueryBuilder) QueryOne(db *gorm.DB) (*AuthorizedApi, return nil, err } -func (qb *authorizedApiRepoQueryBuilder) QueryAll(db *gorm.DB) ([]*AuthorizedApi, error) { +func (qb *authorizedApiQueryBuilder) QueryAll(db *gorm.DB) ([]*AuthorizedApi, error) { var ret []*AuthorizedApi err := qb.buildQuery(db).Find(&ret).Error return ret, err } -func (qb *authorizedApiRepoQueryBuilder) Limit(limit int) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) Limit(limit int) *authorizedApiQueryBuilder { qb.limit = limit return qb } -func (qb *authorizedApiRepoQueryBuilder) Offset(offset int) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) Offset(offset int) *authorizedApiQueryBuilder { qb.offset = offset return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereId(p mysql.Predicate, value int32) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -130,7 +130,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereId(p db_repo.Predicate, value int3 return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereIdIn(value []int32) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereIdIn(value []int32) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -141,7 +141,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereIdIn(value []int32) *authorizedApi return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereIdNotIn(value []int32) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereIdNotIn(value []int32) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -152,7 +152,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereIdNotIn(value []int32) *authorized return qb } -func (qb *authorizedApiRepoQueryBuilder) OrderById(asc bool) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) OrderById(asc bool) *authorizedApiQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -162,7 +162,7 @@ func (qb *authorizedApiRepoQueryBuilder) OrderById(asc bool) *authorizedApiRepoQ return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereBusinessKey(p db_repo.Predicate, value string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereBusinessKey(p mysql.Predicate, value string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -173,7 +173,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereBusinessKey(p db_repo.Predicate, v return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereBusinessKeyIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereBusinessKeyIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -184,7 +184,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereBusinessKeyIn(value []string) *aut return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereBusinessKeyNotIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereBusinessKeyNotIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -195,7 +195,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereBusinessKeyNotIn(value []string) * return qb } -func (qb *authorizedApiRepoQueryBuilder) OrderByBusinessKey(asc bool) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) OrderByBusinessKey(asc bool) *authorizedApiQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -205,7 +205,7 @@ func (qb *authorizedApiRepoQueryBuilder) OrderByBusinessKey(asc bool) *authorize return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereMethod(p db_repo.Predicate, value string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereMethod(p mysql.Predicate, value string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -216,7 +216,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereMethod(p db_repo.Predicate, value return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereMethodIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereMethodIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -227,7 +227,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereMethodIn(value []string) *authoriz return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereMethodNotIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereMethodNotIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -238,7 +238,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereMethodNotIn(value []string) *autho return qb } -func (qb *authorizedApiRepoQueryBuilder) OrderByMethod(asc bool) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) OrderByMethod(asc bool) *authorizedApiQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -248,7 +248,7 @@ func (qb *authorizedApiRepoQueryBuilder) OrderByMethod(asc bool) *authorizedApiR return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereApi(p db_repo.Predicate, value string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereApi(p mysql.Predicate, value string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -259,7 +259,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereApi(p db_repo.Predicate, value str return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereApiIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereApiIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -270,7 +270,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereApiIn(value []string) *authorizedA return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereApiNotIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereApiNotIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -281,7 +281,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereApiNotIn(value []string) *authoriz return qb } -func (qb *authorizedApiRepoQueryBuilder) OrderByApi(asc bool) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) OrderByApi(asc bool) *authorizedApiQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -291,7 +291,7 @@ func (qb *authorizedApiRepoQueryBuilder) OrderByApi(asc bool) *authorizedApiRepo return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, value int32) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereIsDeleted(p mysql.Predicate, value int32) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -302,7 +302,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, val return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereIsDeletedIn(value []int32) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereIsDeletedIn(value []int32) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -313,7 +313,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereIsDeletedIn(value []int32) *author return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereIsDeletedNotIn(value []int32) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -324,7 +324,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *aut return qb } -func (qb *authorizedApiRepoQueryBuilder) OrderByIsDeleted(asc bool) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) OrderByIsDeleted(asc bool) *authorizedApiQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -334,7 +334,7 @@ func (qb *authorizedApiRepoQueryBuilder) OrderByIsDeleted(asc bool) *authorizedA return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value time.Time) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereCreatedAt(p mysql.Predicate, value time.Time) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -345,7 +345,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, val return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereCreatedAtIn(value []time.Time) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -356,7 +356,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *au return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -367,7 +367,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) return qb } -func (qb *authorizedApiRepoQueryBuilder) OrderByCreatedAt(asc bool) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) OrderByCreatedAt(asc bool) *authorizedApiQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -377,7 +377,7 @@ func (qb *authorizedApiRepoQueryBuilder) OrderByCreatedAt(asc bool) *authorizedA return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereCreatedUser(p mysql.Predicate, value string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -388,7 +388,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, v return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereCreatedUserIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereCreatedUserIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -399,7 +399,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereCreatedUserIn(value []string) *aut return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereCreatedUserNotIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -410,7 +410,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereCreatedUserNotIn(value []string) * return qb } -func (qb *authorizedApiRepoQueryBuilder) OrderByCreatedUser(asc bool) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) OrderByCreatedUser(asc bool) *authorizedApiQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -420,7 +420,7 @@ func (qb *authorizedApiRepoQueryBuilder) OrderByCreatedUser(asc bool) *authorize return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value time.Time) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereUpdatedAt(p mysql.Predicate, value time.Time) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -431,7 +431,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, val return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereUpdatedAtIn(value []time.Time) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -442,7 +442,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *au return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -453,7 +453,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) return qb } -func (qb *authorizedApiRepoQueryBuilder) OrderByUpdatedAt(asc bool) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) OrderByUpdatedAt(asc bool) *authorizedApiQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -463,7 +463,7 @@ func (qb *authorizedApiRepoQueryBuilder) OrderByUpdatedAt(asc bool) *authorizedA return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, value string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereUpdatedUser(p mysql.Predicate, value string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -474,7 +474,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, v return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedUserIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereUpdatedUserIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -485,7 +485,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedUserIn(value []string) *aut return qb } -func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) WhereUpdatedUserNotIn(value []string) *authorizedApiQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -496,7 +496,7 @@ func (qb *authorizedApiRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) * return qb } -func (qb *authorizedApiRepoQueryBuilder) OrderByUpdatedUser(asc bool) *authorizedApiRepoQueryBuilder { +func (qb *authorizedApiQueryBuilder) OrderByUpdatedUser(asc bool) *authorizedApiQueryBuilder { order := "DESC" if asc { order = "ASC" diff --git a/internal/api/repository/db_repo/authorized_api_repo/gen_model.go b/internal/repository/mysql/authorized_api/gen_model.go similarity index 87% rename from internal/api/repository/db_repo/authorized_api_repo/gen_model.go rename to internal/repository/mysql/authorized_api/gen_model.go index d788343..a93358d 100755 --- a/internal/api/repository/db_repo/authorized_api_repo/gen_model.go +++ b/internal/repository/mysql/authorized_api/gen_model.go @@ -1,8 +1,8 @@ -package authorized_api_repo +package authorized_api import "time" -// AuthorizedApi 已授权的调用方表 +// AuthorizedApi 已授权接口地址表 //go:generate gormgen -structs AuthorizedApi -input . type AuthorizedApi struct { Id int32 // 主键 diff --git a/internal/api/repository/db_repo/authorized_api_repo/gen_table.md b/internal/repository/mysql/authorized_api/gen_table.md similarity index 56% rename from internal/api/repository/db_repo/authorized_api_repo/gen_table.md rename to internal/repository/mysql/authorized_api/gen_table.md index 107b410..0ade228 100755 --- a/internal/api/repository/db_repo/authorized_api_repo/gen_table.md +++ b/internal/repository/mysql/authorized_api/gen_table.md @@ -1,14 +1,14 @@ #### go_gin_api.authorized_api -已授权的调用方表 +已授权接口地址表 | 序号 | 名称 | 描述 | 类型 | 键 | 为空 | 额外 | 默认值 | | :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: | -| 1 | id | 主键 | int(11) unsigned | PRI | NO | auto_increment | | -| 2 | business_key | 调用方key | varchar(30) | | NO | | | +| 1 | id | 主键 | int unsigned | PRI | NO | auto_increment | | +| 2 | business_key | 调用方key | varchar(32) | | NO | | | | 3 | method | 请求方式 | varchar(30) | | NO | | | | 4 | api | 请求地址 | varchar(100) | | NO | | | | 5 | is_deleted | 是否删除 1:是 -1:否 | tinyint(1) | | NO | | -1 | -| 6 | created_at | 创建时间 | timestamp | | NO | | CURRENT_TIMESTAMP | +| 6 | created_at | 创建时间 | timestamp | | NO | DEFAULT_GENERATED | CURRENT_TIMESTAMP | | 7 | created_user | 创建人 | varchar(60) | | NO | | | -| 8 | updated_at | 更新时间 | timestamp | | NO | on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | +| 8 | updated_at | 更新时间 | timestamp | | NO | DEFAULT_GENERATED on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | | 9 | updated_user | 更新人 | varchar(60) | | NO | | | diff --git a/internal/api/repository/db_repo/cron_task_repo/gen_cron_task.go b/internal/repository/mysql/cron_task/gen_cron_task.go similarity index 59% rename from internal/api/repository/db_repo/cron_task_repo/gen_cron_task.go rename to internal/repository/mysql/cron_task/gen_cron_task.go index f846da2..5bf2ff3 100755 --- a/internal/api/repository/db_repo/cron_task_repo/gen_cron_task.go +++ b/internal/repository/mysql/cron_task/gen_cron_task.go @@ -3,13 +3,13 @@ // ANY CHANGES DONE HERE WILL BE LOST // /////////////////////////////////////////////////////////// -package cron_task_repo +package cron_task import ( "fmt" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "github.com/pkg/errors" "gorm.io/gorm" @@ -19,8 +19,8 @@ func NewModel() *CronTask { return new(CronTask) } -func NewQueryBuilder() *cronTaskRepoQueryBuilder { - return new(cronTaskRepoQueryBuilder) +func NewQueryBuilder() *cronTaskQueryBuilder { + return new(cronTaskQueryBuilder) } func (t *CronTask) Create(db *gorm.DB) (id int32, err error) { @@ -30,7 +30,7 @@ func (t *CronTask) Create(db *gorm.DB) (id int32, err error) { return t.Id, nil } -type cronTaskRepoQueryBuilder struct { +type cronTaskQueryBuilder struct { order []string where []struct { prefix string @@ -40,7 +40,7 @@ type cronTaskRepoQueryBuilder struct { offset int } -func (qb *cronTaskRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { +func (qb *cronTaskQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { ret := db for _, where := range qb.where { ret = ret.Where(where.prefix, where.value) @@ -52,7 +52,7 @@ func (qb *cronTaskRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { return ret } -func (qb *cronTaskRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { +func (qb *cronTaskQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { db = db.Model(&CronTask{}) for _, where := range qb.where { @@ -65,7 +65,7 @@ func (qb *cronTaskRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{ return nil } -func (qb *cronTaskRepoQueryBuilder) Delete(db *gorm.DB) (err error) { +func (qb *cronTaskQueryBuilder) Delete(db *gorm.DB) (err error) { for _, where := range qb.where { db = db.Where(where.prefix, where.value) } @@ -76,7 +76,7 @@ func (qb *cronTaskRepoQueryBuilder) Delete(db *gorm.DB) (err error) { return nil } -func (qb *cronTaskRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { +func (qb *cronTaskQueryBuilder) Count(db *gorm.DB) (int64, error) { var c int64 res := qb.buildQuery(db).Model(&CronTask{}).Count(&c) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -85,7 +85,7 @@ func (qb *cronTaskRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { return c, res.Error } -func (qb *cronTaskRepoQueryBuilder) First(db *gorm.DB) (*CronTask, error) { +func (qb *cronTaskQueryBuilder) First(db *gorm.DB) (*CronTask, error) { ret := &CronTask{} res := qb.buildQuery(db).First(ret) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -94,7 +94,7 @@ func (qb *cronTaskRepoQueryBuilder) First(db *gorm.DB) (*CronTask, error) { return ret, res.Error } -func (qb *cronTaskRepoQueryBuilder) QueryOne(db *gorm.DB) (*CronTask, error) { +func (qb *cronTaskQueryBuilder) QueryOne(db *gorm.DB) (*CronTask, error) { qb.limit = 1 ret, err := qb.QueryAll(db) if len(ret) > 0 { @@ -103,23 +103,23 @@ func (qb *cronTaskRepoQueryBuilder) QueryOne(db *gorm.DB) (*CronTask, error) { return nil, err } -func (qb *cronTaskRepoQueryBuilder) QueryAll(db *gorm.DB) ([]*CronTask, error) { +func (qb *cronTaskQueryBuilder) QueryAll(db *gorm.DB) ([]*CronTask, error) { var ret []*CronTask err := qb.buildQuery(db).Find(&ret).Error return ret, err } -func (qb *cronTaskRepoQueryBuilder) Limit(limit int) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) Limit(limit int) *cronTaskQueryBuilder { qb.limit = limit return qb } -func (qb *cronTaskRepoQueryBuilder) Offset(offset int) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) Offset(offset int) *cronTaskQueryBuilder { qb.offset = offset return qb } -func (qb *cronTaskRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereId(p mysql.Predicate, value int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -130,7 +130,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *c return qb } -func (qb *cronTaskRepoQueryBuilder) WhereIdIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereIdIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -141,7 +141,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereIdIn(value []int32) *cronTaskRepoQueryB return qb } -func (qb *cronTaskRepoQueryBuilder) WhereIdNotIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereIdNotIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -152,7 +152,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereIdNotIn(value []int32) *cronTaskRepoQue return qb } -func (qb *cronTaskRepoQueryBuilder) OrderById(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderById(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -162,7 +162,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderById(asc bool) *cronTaskRepoQueryBuilde return qb } -func (qb *cronTaskRepoQueryBuilder) WhereName(p db_repo.Predicate, value string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereName(p mysql.Predicate, value string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -173,7 +173,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereName(p db_repo.Predicate, value string) return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNameIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNameIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -184,7 +184,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNameIn(value []string) *cronTaskRepoQue return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNameNotIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNameNotIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -195,7 +195,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNameNotIn(value []string) *cronTaskRepo return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByName(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByName(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -205,7 +205,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByName(asc bool) *cronTaskRepoQueryBuil return qb } -func (qb *cronTaskRepoQueryBuilder) WhereSpec(p db_repo.Predicate, value string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereSpec(p mysql.Predicate, value string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -216,7 +216,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereSpec(p db_repo.Predicate, value string) return qb } -func (qb *cronTaskRepoQueryBuilder) WhereSpecIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereSpecIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -227,7 +227,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereSpecIn(value []string) *cronTaskRepoQue return qb } -func (qb *cronTaskRepoQueryBuilder) WhereSpecNotIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereSpecNotIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -238,7 +238,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereSpecNotIn(value []string) *cronTaskRepo return qb } -func (qb *cronTaskRepoQueryBuilder) OrderBySpec(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderBySpec(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -248,7 +248,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderBySpec(asc bool) *cronTaskRepoQueryBuil return qb } -func (qb *cronTaskRepoQueryBuilder) WhereCommand(p db_repo.Predicate, value string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereCommand(p mysql.Predicate, value string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -259,7 +259,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereCommand(p db_repo.Predicate, value stri return qb } -func (qb *cronTaskRepoQueryBuilder) WhereCommandIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereCommandIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -270,7 +270,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereCommandIn(value []string) *cronTaskRepo return qb } -func (qb *cronTaskRepoQueryBuilder) WhereCommandNotIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereCommandNotIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -281,7 +281,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereCommandNotIn(value []string) *cronTaskR return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByCommand(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByCommand(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -291,7 +291,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByCommand(asc bool) *cronTaskRepoQueryB return qb } -func (qb *cronTaskRepoQueryBuilder) WhereProtocol(p db_repo.Predicate, value int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereProtocol(p mysql.Predicate, value int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -302,7 +302,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereProtocol(p db_repo.Predicate, value int return qb } -func (qb *cronTaskRepoQueryBuilder) WhereProtocolIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereProtocolIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -313,7 +313,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereProtocolIn(value []int32) *cronTaskRepo return qb } -func (qb *cronTaskRepoQueryBuilder) WhereProtocolNotIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereProtocolNotIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -324,7 +324,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereProtocolNotIn(value []int32) *cronTaskR return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByProtocol(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByProtocol(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -334,7 +334,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByProtocol(asc bool) *cronTaskRepoQuery return qb } -func (qb *cronTaskRepoQueryBuilder) WhereHttpMethod(p db_repo.Predicate, value int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereHttpMethod(p mysql.Predicate, value int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -345,7 +345,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereHttpMethod(p db_repo.Predicate, value i return qb } -func (qb *cronTaskRepoQueryBuilder) WhereHttpMethodIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereHttpMethodIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -356,7 +356,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereHttpMethodIn(value []int32) *cronTaskRe return qb } -func (qb *cronTaskRepoQueryBuilder) WhereHttpMethodNotIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereHttpMethodNotIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -367,7 +367,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereHttpMethodNotIn(value []int32) *cronTas return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByHttpMethod(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByHttpMethod(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -377,7 +377,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByHttpMethod(asc bool) *cronTaskRepoQue return qb } -func (qb *cronTaskRepoQueryBuilder) WhereTimeout(p db_repo.Predicate, value int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereTimeout(p mysql.Predicate, value int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -388,7 +388,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereTimeout(p db_repo.Predicate, value int3 return qb } -func (qb *cronTaskRepoQueryBuilder) WhereTimeoutIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereTimeoutIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -399,7 +399,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereTimeoutIn(value []int32) *cronTaskRepoQ return qb } -func (qb *cronTaskRepoQueryBuilder) WhereTimeoutNotIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereTimeoutNotIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -410,7 +410,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereTimeoutNotIn(value []int32) *cronTaskRe return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByTimeout(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByTimeout(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -420,7 +420,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByTimeout(asc bool) *cronTaskRepoQueryB return qb } -func (qb *cronTaskRepoQueryBuilder) WhereRetryTimes(p db_repo.Predicate, value int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereRetryTimes(p mysql.Predicate, value int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -431,7 +431,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereRetryTimes(p db_repo.Predicate, value i return qb } -func (qb *cronTaskRepoQueryBuilder) WhereRetryTimesIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereRetryTimesIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -442,7 +442,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereRetryTimesIn(value []int32) *cronTaskRe return qb } -func (qb *cronTaskRepoQueryBuilder) WhereRetryTimesNotIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereRetryTimesNotIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -453,7 +453,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereRetryTimesNotIn(value []int32) *cronTas return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByRetryTimes(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByRetryTimes(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -463,7 +463,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByRetryTimes(asc bool) *cronTaskRepoQue return qb } -func (qb *cronTaskRepoQueryBuilder) WhereRetryInterval(p db_repo.Predicate, value int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereRetryInterval(p mysql.Predicate, value int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -474,7 +474,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereRetryInterval(p db_repo.Predicate, valu return qb } -func (qb *cronTaskRepoQueryBuilder) WhereRetryIntervalIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereRetryIntervalIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -485,7 +485,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereRetryIntervalIn(value []int32) *cronTas return qb } -func (qb *cronTaskRepoQueryBuilder) WhereRetryIntervalNotIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereRetryIntervalNotIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -496,7 +496,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereRetryIntervalNotIn(value []int32) *cron return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByRetryInterval(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByRetryInterval(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -506,7 +506,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByRetryInterval(asc bool) *cronTaskRepo return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyStatus(p db_repo.Predicate, value int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyStatus(p mysql.Predicate, value int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -517,7 +517,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyStatus(p db_repo.Predicate, value return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyStatusIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyStatusIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -528,7 +528,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyStatusIn(value []int32) *cronTask return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyStatusNotIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyStatusNotIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -539,7 +539,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyStatusNotIn(value []int32) *cronT return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByNotifyStatus(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByNotifyStatus(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -549,7 +549,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByNotifyStatus(asc bool) *cronTaskRepoQ return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyType(p db_repo.Predicate, value int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyType(p mysql.Predicate, value int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -560,7 +560,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyType(p db_repo.Predicate, value i return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyTypeIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyTypeIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -571,7 +571,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyTypeIn(value []int32) *cronTaskRe return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyTypeNotIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyTypeNotIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -582,7 +582,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyTypeNotIn(value []int32) *cronTas return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByNotifyType(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByNotifyType(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -592,7 +592,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByNotifyType(asc bool) *cronTaskRepoQue return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyReceiverEmail(p db_repo.Predicate, value string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyReceiverEmail(p mysql.Predicate, value string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -603,7 +603,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyReceiverEmail(p db_repo.Predicate return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyReceiverEmailIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyReceiverEmailIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -614,7 +614,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyReceiverEmailIn(value []string) * return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyReceiverEmailNotIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyReceiverEmailNotIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -625,7 +625,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyReceiverEmailNotIn(value []string return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByNotifyReceiverEmail(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByNotifyReceiverEmail(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -635,7 +635,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByNotifyReceiverEmail(asc bool) *cronTa return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyKeyword(p db_repo.Predicate, value string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyKeyword(p mysql.Predicate, value string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -646,7 +646,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyKeyword(p db_repo.Predicate, valu return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyKeywordIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyKeywordIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -657,7 +657,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyKeywordIn(value []string) *cronTa return qb } -func (qb *cronTaskRepoQueryBuilder) WhereNotifyKeywordNotIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereNotifyKeywordNotIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -668,7 +668,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereNotifyKeywordNotIn(value []string) *cro return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByNotifyKeyword(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByNotifyKeyword(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -678,7 +678,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByNotifyKeyword(asc bool) *cronTaskRepo return qb } -func (qb *cronTaskRepoQueryBuilder) WhereRemark(p db_repo.Predicate, value string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereRemark(p mysql.Predicate, value string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -689,7 +689,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereRemark(p db_repo.Predicate, value strin return qb } -func (qb *cronTaskRepoQueryBuilder) WhereRemarkIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereRemarkIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -700,7 +700,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereRemarkIn(value []string) *cronTaskRepoQ return qb } -func (qb *cronTaskRepoQueryBuilder) WhereRemarkNotIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereRemarkNotIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -711,7 +711,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereRemarkNotIn(value []string) *cronTaskRe return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByRemark(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByRemark(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -721,7 +721,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByRemark(asc bool) *cronTaskRepoQueryBu return qb } -func (qb *cronTaskRepoQueryBuilder) WhereIsUsed(p db_repo.Predicate, value int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereIsUsed(p mysql.Predicate, value int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -732,7 +732,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereIsUsed(p db_repo.Predicate, value int32 return qb } -func (qb *cronTaskRepoQueryBuilder) WhereIsUsedIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereIsUsedIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -743,7 +743,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereIsUsedIn(value []int32) *cronTaskRepoQu return qb } -func (qb *cronTaskRepoQueryBuilder) WhereIsUsedNotIn(value []int32) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereIsUsedNotIn(value []int32) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -754,7 +754,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereIsUsedNotIn(value []int32) *cronTaskRep return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByIsUsed(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByIsUsed(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -764,7 +764,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByIsUsed(asc bool) *cronTaskRepoQueryBu return qb } -func (qb *cronTaskRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value time.Time) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereCreatedAt(p mysql.Predicate, value time.Time) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -775,7 +775,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value ti return qb } -func (qb *cronTaskRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereCreatedAtIn(value []time.Time) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -786,7 +786,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *cronTas return qb } -func (qb *cronTaskRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -797,7 +797,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *cron return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByCreatedAt(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByCreatedAt(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -807,7 +807,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByCreatedAt(asc bool) *cronTaskRepoQuer return qb } -func (qb *cronTaskRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereCreatedUser(p mysql.Predicate, value string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -818,7 +818,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value return qb } -func (qb *cronTaskRepoQueryBuilder) WhereCreatedUserIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereCreatedUserIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -829,7 +829,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereCreatedUserIn(value []string) *cronTask return qb } -func (qb *cronTaskRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereCreatedUserNotIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -840,7 +840,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *cronT return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByCreatedUser(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByCreatedUser(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -850,7 +850,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByCreatedUser(asc bool) *cronTaskRepoQu return qb } -func (qb *cronTaskRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value time.Time) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereUpdatedAt(p mysql.Predicate, value time.Time) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -861,7 +861,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value ti return qb } -func (qb *cronTaskRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereUpdatedAtIn(value []time.Time) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -872,7 +872,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *cronTas return qb } -func (qb *cronTaskRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -883,7 +883,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *cron return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByUpdatedAt(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByUpdatedAt(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -893,7 +893,7 @@ func (qb *cronTaskRepoQueryBuilder) OrderByUpdatedAt(asc bool) *cronTaskRepoQuer return qb } -func (qb *cronTaskRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, value string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereUpdatedUser(p mysql.Predicate, value string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -904,7 +904,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, value return qb } -func (qb *cronTaskRepoQueryBuilder) WhereUpdatedUserIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereUpdatedUserIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -915,7 +915,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereUpdatedUserIn(value []string) *cronTask return qb } -func (qb *cronTaskRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) WhereUpdatedUserNotIn(value []string) *cronTaskQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -926,7 +926,7 @@ func (qb *cronTaskRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *cronT return qb } -func (qb *cronTaskRepoQueryBuilder) OrderByUpdatedUser(asc bool) *cronTaskRepoQueryBuilder { +func (qb *cronTaskQueryBuilder) OrderByUpdatedUser(asc bool) *cronTaskQueryBuilder { order := "DESC" if asc { order = "ASC" diff --git a/internal/api/repository/db_repo/cron_task_repo/gen_model.go b/internal/repository/mysql/cron_task/gen_model.go similarity index 98% rename from internal/api/repository/db_repo/cron_task_repo/gen_model.go rename to internal/repository/mysql/cron_task/gen_model.go index d780b6c..22df0ff 100755 --- a/internal/api/repository/db_repo/cron_task_repo/gen_model.go +++ b/internal/repository/mysql/cron_task/gen_model.go @@ -1,4 +1,4 @@ -package cron_task_repo +package cron_task import "time" diff --git a/internal/api/repository/db_repo/cron_task_repo/gen_table.md b/internal/repository/mysql/cron_task/gen_table.md similarity index 100% rename from internal/api/repository/db_repo/cron_task_repo/gen_table.md rename to internal/repository/mysql/cron_task/gen_table.md diff --git a/internal/api/repository/db_repo/cron_task_repo/model.go b/internal/repository/mysql/cron_task/model.go similarity index 97% rename from internal/api/repository/db_repo/cron_task_repo/model.go rename to internal/repository/mysql/cron_task/model.go index 23db5c7..8e45f3b 100644 --- a/internal/api/repository/db_repo/cron_task_repo/model.go +++ b/internal/repository/mysql/cron_task/model.go @@ -1,4 +1,4 @@ -package cron_task_repo +package cron_task const ( ProtocolShell = 1 diff --git a/internal/api/repository/db_repo/menu_repo/gen_menu.go b/internal/repository/mysql/menu/gen_menu.go similarity index 62% rename from internal/api/repository/db_repo/menu_repo/gen_menu.go rename to internal/repository/mysql/menu/gen_menu.go index 2e67569..9891718 100755 --- a/internal/api/repository/db_repo/menu_repo/gen_menu.go +++ b/internal/repository/mysql/menu/gen_menu.go @@ -3,13 +3,13 @@ // ANY CHANGES DONE HERE WILL BE LOST // /////////////////////////////////////////////////////////// -package menu_repo +package menu import ( "fmt" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "github.com/pkg/errors" "gorm.io/gorm" @@ -19,8 +19,8 @@ func NewModel() *Menu { return new(Menu) } -func NewQueryBuilder() *menuRepoQueryBuilder { - return new(menuRepoQueryBuilder) +func NewQueryBuilder() *menuQueryBuilder { + return new(menuQueryBuilder) } func (t *Menu) Create(db *gorm.DB) (id int32, err error) { @@ -30,7 +30,7 @@ func (t *Menu) Create(db *gorm.DB) (id int32, err error) { return t.Id, nil } -type menuRepoQueryBuilder struct { +type menuQueryBuilder struct { order []string where []struct { prefix string @@ -40,7 +40,7 @@ type menuRepoQueryBuilder struct { offset int } -func (qb *menuRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { +func (qb *menuQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { ret := db for _, where := range qb.where { ret = ret.Where(where.prefix, where.value) @@ -52,7 +52,7 @@ func (qb *menuRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { return ret } -func (qb *menuRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { +func (qb *menuQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { db = db.Model(&Menu{}) for _, where := range qb.where { @@ -65,7 +65,7 @@ func (qb *menuRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) ( return nil } -func (qb *menuRepoQueryBuilder) Delete(db *gorm.DB) (err error) { +func (qb *menuQueryBuilder) Delete(db *gorm.DB) (err error) { for _, where := range qb.where { db = db.Where(where.prefix, where.value) } @@ -76,7 +76,7 @@ func (qb *menuRepoQueryBuilder) Delete(db *gorm.DB) (err error) { return nil } -func (qb *menuRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { +func (qb *menuQueryBuilder) Count(db *gorm.DB) (int64, error) { var c int64 res := qb.buildQuery(db).Model(&Menu{}).Count(&c) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -85,7 +85,7 @@ func (qb *menuRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { return c, res.Error } -func (qb *menuRepoQueryBuilder) First(db *gorm.DB) (*Menu, error) { +func (qb *menuQueryBuilder) First(db *gorm.DB) (*Menu, error) { ret := &Menu{} res := qb.buildQuery(db).First(ret) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -94,7 +94,7 @@ func (qb *menuRepoQueryBuilder) First(db *gorm.DB) (*Menu, error) { return ret, res.Error } -func (qb *menuRepoQueryBuilder) QueryOne(db *gorm.DB) (*Menu, error) { +func (qb *menuQueryBuilder) QueryOne(db *gorm.DB) (*Menu, error) { qb.limit = 1 ret, err := qb.QueryAll(db) if len(ret) > 0 { @@ -103,23 +103,23 @@ func (qb *menuRepoQueryBuilder) QueryOne(db *gorm.DB) (*Menu, error) { return nil, err } -func (qb *menuRepoQueryBuilder) QueryAll(db *gorm.DB) ([]*Menu, error) { +func (qb *menuQueryBuilder) QueryAll(db *gorm.DB) ([]*Menu, error) { var ret []*Menu err := qb.buildQuery(db).Find(&ret).Error return ret, err } -func (qb *menuRepoQueryBuilder) Limit(limit int) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) Limit(limit int) *menuQueryBuilder { qb.limit = limit return qb } -func (qb *menuRepoQueryBuilder) Offset(offset int) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) Offset(offset int) *menuQueryBuilder { qb.offset = offset return qb } -func (qb *menuRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereId(p mysql.Predicate, value int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -130,7 +130,7 @@ func (qb *menuRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *menuR return qb } -func (qb *menuRepoQueryBuilder) WhereIdIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIdIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -141,7 +141,7 @@ func (qb *menuRepoQueryBuilder) WhereIdIn(value []int32) *menuRepoQueryBuilder { return qb } -func (qb *menuRepoQueryBuilder) WhereIdNotIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIdNotIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -152,7 +152,7 @@ func (qb *menuRepoQueryBuilder) WhereIdNotIn(value []int32) *menuRepoQueryBuilde return qb } -func (qb *menuRepoQueryBuilder) OrderById(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderById(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -162,7 +162,7 @@ func (qb *menuRepoQueryBuilder) OrderById(asc bool) *menuRepoQueryBuilder { return qb } -func (qb *menuRepoQueryBuilder) WherePid(p db_repo.Predicate, value int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WherePid(p mysql.Predicate, value int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -173,7 +173,7 @@ func (qb *menuRepoQueryBuilder) WherePid(p db_repo.Predicate, value int32) *menu return qb } -func (qb *menuRepoQueryBuilder) WherePidIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WherePidIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -184,7 +184,7 @@ func (qb *menuRepoQueryBuilder) WherePidIn(value []int32) *menuRepoQueryBuilder return qb } -func (qb *menuRepoQueryBuilder) WherePidNotIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WherePidNotIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -195,7 +195,7 @@ func (qb *menuRepoQueryBuilder) WherePidNotIn(value []int32) *menuRepoQueryBuild return qb } -func (qb *menuRepoQueryBuilder) OrderByPid(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByPid(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -205,7 +205,7 @@ func (qb *menuRepoQueryBuilder) OrderByPid(asc bool) *menuRepoQueryBuilder { return qb } -func (qb *menuRepoQueryBuilder) WhereName(p db_repo.Predicate, value string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereName(p mysql.Predicate, value string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -216,7 +216,7 @@ func (qb *menuRepoQueryBuilder) WhereName(p db_repo.Predicate, value string) *me return qb } -func (qb *menuRepoQueryBuilder) WhereNameIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereNameIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -227,7 +227,7 @@ func (qb *menuRepoQueryBuilder) WhereNameIn(value []string) *menuRepoQueryBuilde return qb } -func (qb *menuRepoQueryBuilder) WhereNameNotIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereNameNotIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -238,7 +238,7 @@ func (qb *menuRepoQueryBuilder) WhereNameNotIn(value []string) *menuRepoQueryBui return qb } -func (qb *menuRepoQueryBuilder) OrderByName(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByName(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -248,7 +248,7 @@ func (qb *menuRepoQueryBuilder) OrderByName(asc bool) *menuRepoQueryBuilder { return qb } -func (qb *menuRepoQueryBuilder) WhereLink(p db_repo.Predicate, value string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereLink(p mysql.Predicate, value string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -259,7 +259,7 @@ func (qb *menuRepoQueryBuilder) WhereLink(p db_repo.Predicate, value string) *me return qb } -func (qb *menuRepoQueryBuilder) WhereLinkIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereLinkIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -270,7 +270,7 @@ func (qb *menuRepoQueryBuilder) WhereLinkIn(value []string) *menuRepoQueryBuilde return qb } -func (qb *menuRepoQueryBuilder) WhereLinkNotIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereLinkNotIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -281,7 +281,7 @@ func (qb *menuRepoQueryBuilder) WhereLinkNotIn(value []string) *menuRepoQueryBui return qb } -func (qb *menuRepoQueryBuilder) OrderByLink(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByLink(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -291,7 +291,7 @@ func (qb *menuRepoQueryBuilder) OrderByLink(asc bool) *menuRepoQueryBuilder { return qb } -func (qb *menuRepoQueryBuilder) WhereIcon(p db_repo.Predicate, value string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIcon(p mysql.Predicate, value string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -302,7 +302,7 @@ func (qb *menuRepoQueryBuilder) WhereIcon(p db_repo.Predicate, value string) *me return qb } -func (qb *menuRepoQueryBuilder) WhereIconIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIconIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -313,7 +313,7 @@ func (qb *menuRepoQueryBuilder) WhereIconIn(value []string) *menuRepoQueryBuilde return qb } -func (qb *menuRepoQueryBuilder) WhereIconNotIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIconNotIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -324,7 +324,7 @@ func (qb *menuRepoQueryBuilder) WhereIconNotIn(value []string) *menuRepoQueryBui return qb } -func (qb *menuRepoQueryBuilder) OrderByIcon(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByIcon(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -334,7 +334,7 @@ func (qb *menuRepoQueryBuilder) OrderByIcon(asc bool) *menuRepoQueryBuilder { return qb } -func (qb *menuRepoQueryBuilder) WhereLevel(p db_repo.Predicate, value int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereLevel(p mysql.Predicate, value int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -345,7 +345,7 @@ func (qb *menuRepoQueryBuilder) WhereLevel(p db_repo.Predicate, value int32) *me return qb } -func (qb *menuRepoQueryBuilder) WhereLevelIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereLevelIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -356,7 +356,7 @@ func (qb *menuRepoQueryBuilder) WhereLevelIn(value []int32) *menuRepoQueryBuilde return qb } -func (qb *menuRepoQueryBuilder) WhereLevelNotIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereLevelNotIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -367,7 +367,7 @@ func (qb *menuRepoQueryBuilder) WhereLevelNotIn(value []int32) *menuRepoQueryBui return qb } -func (qb *menuRepoQueryBuilder) OrderByLevel(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByLevel(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -377,7 +377,7 @@ func (qb *menuRepoQueryBuilder) OrderByLevel(asc bool) *menuRepoQueryBuilder { return qb } -func (qb *menuRepoQueryBuilder) WhereSort(p db_repo.Predicate, value int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereSort(p mysql.Predicate, value int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -388,7 +388,7 @@ func (qb *menuRepoQueryBuilder) WhereSort(p db_repo.Predicate, value int32) *men return qb } -func (qb *menuRepoQueryBuilder) WhereSortIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereSortIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -399,7 +399,7 @@ func (qb *menuRepoQueryBuilder) WhereSortIn(value []int32) *menuRepoQueryBuilder return qb } -func (qb *menuRepoQueryBuilder) WhereSortNotIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereSortNotIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -410,7 +410,7 @@ func (qb *menuRepoQueryBuilder) WhereSortNotIn(value []int32) *menuRepoQueryBuil return qb } -func (qb *menuRepoQueryBuilder) OrderBySort(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderBySort(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -420,7 +420,7 @@ func (qb *menuRepoQueryBuilder) OrderBySort(asc bool) *menuRepoQueryBuilder { return qb } -func (qb *menuRepoQueryBuilder) WhereIsUsed(p db_repo.Predicate, value int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIsUsed(p mysql.Predicate, value int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -431,7 +431,7 @@ func (qb *menuRepoQueryBuilder) WhereIsUsed(p db_repo.Predicate, value int32) *m return qb } -func (qb *menuRepoQueryBuilder) WhereIsUsedIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIsUsedIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -442,7 +442,7 @@ func (qb *menuRepoQueryBuilder) WhereIsUsedIn(value []int32) *menuRepoQueryBuild return qb } -func (qb *menuRepoQueryBuilder) WhereIsUsedNotIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIsUsedNotIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -453,7 +453,7 @@ func (qb *menuRepoQueryBuilder) WhereIsUsedNotIn(value []int32) *menuRepoQueryBu return qb } -func (qb *menuRepoQueryBuilder) OrderByIsUsed(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByIsUsed(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -463,7 +463,7 @@ func (qb *menuRepoQueryBuilder) OrderByIsUsed(asc bool) *menuRepoQueryBuilder { return qb } -func (qb *menuRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, value int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIsDeleted(p mysql.Predicate, value int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -474,7 +474,7 @@ func (qb *menuRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, value int32) return qb } -func (qb *menuRepoQueryBuilder) WhereIsDeletedIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIsDeletedIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -485,7 +485,7 @@ func (qb *menuRepoQueryBuilder) WhereIsDeletedIn(value []int32) *menuRepoQueryBu return qb } -func (qb *menuRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereIsDeletedNotIn(value []int32) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -496,7 +496,7 @@ func (qb *menuRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *menuRepoQuer return qb } -func (qb *menuRepoQueryBuilder) OrderByIsDeleted(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByIsDeleted(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -506,7 +506,7 @@ func (qb *menuRepoQueryBuilder) OrderByIsDeleted(asc bool) *menuRepoQueryBuilder return qb } -func (qb *menuRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value time.Time) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereCreatedAt(p mysql.Predicate, value time.Time) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -517,7 +517,7 @@ func (qb *menuRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value time.T return qb } -func (qb *menuRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereCreatedAtIn(value []time.Time) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -528,7 +528,7 @@ func (qb *menuRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *menuRepoQue return qb } -func (qb *menuRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -539,7 +539,7 @@ func (qb *menuRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *menuRepo return qb } -func (qb *menuRepoQueryBuilder) OrderByCreatedAt(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByCreatedAt(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -549,7 +549,7 @@ func (qb *menuRepoQueryBuilder) OrderByCreatedAt(asc bool) *menuRepoQueryBuilder return qb } -func (qb *menuRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereCreatedUser(p mysql.Predicate, value string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -560,7 +560,7 @@ func (qb *menuRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value stri return qb } -func (qb *menuRepoQueryBuilder) WhereCreatedUserIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereCreatedUserIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -571,7 +571,7 @@ func (qb *menuRepoQueryBuilder) WhereCreatedUserIn(value []string) *menuRepoQuer return qb } -func (qb *menuRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereCreatedUserNotIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -582,7 +582,7 @@ func (qb *menuRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *menuRepoQ return qb } -func (qb *menuRepoQueryBuilder) OrderByCreatedUser(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByCreatedUser(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -592,7 +592,7 @@ func (qb *menuRepoQueryBuilder) OrderByCreatedUser(asc bool) *menuRepoQueryBuild return qb } -func (qb *menuRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value time.Time) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereUpdatedAt(p mysql.Predicate, value time.Time) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -603,7 +603,7 @@ func (qb *menuRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value time.T return qb } -func (qb *menuRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereUpdatedAtIn(value []time.Time) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -614,7 +614,7 @@ func (qb *menuRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *menuRepoQue return qb } -func (qb *menuRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -625,7 +625,7 @@ func (qb *menuRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *menuRepo return qb } -func (qb *menuRepoQueryBuilder) OrderByUpdatedAt(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByUpdatedAt(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -635,7 +635,7 @@ func (qb *menuRepoQueryBuilder) OrderByUpdatedAt(asc bool) *menuRepoQueryBuilder return qb } -func (qb *menuRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, value string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereUpdatedUser(p mysql.Predicate, value string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -646,7 +646,7 @@ func (qb *menuRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, value stri return qb } -func (qb *menuRepoQueryBuilder) WhereUpdatedUserIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereUpdatedUserIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -657,7 +657,7 @@ func (qb *menuRepoQueryBuilder) WhereUpdatedUserIn(value []string) *menuRepoQuer return qb } -func (qb *menuRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) WhereUpdatedUserNotIn(value []string) *menuQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -668,7 +668,7 @@ func (qb *menuRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *menuRepoQ return qb } -func (qb *menuRepoQueryBuilder) OrderByUpdatedUser(asc bool) *menuRepoQueryBuilder { +func (qb *menuQueryBuilder) OrderByUpdatedUser(asc bool) *menuQueryBuilder { order := "DESC" if asc { order = "ASC" diff --git a/internal/api/repository/db_repo/menu_repo/gen_model.go b/internal/repository/mysql/menu/gen_model.go similarity index 89% rename from internal/api/repository/db_repo/menu_repo/gen_model.go rename to internal/repository/mysql/menu/gen_model.go index b895db2..ff38418 100755 --- a/internal/api/repository/db_repo/menu_repo/gen_model.go +++ b/internal/repository/mysql/menu/gen_model.go @@ -1,4 +1,4 @@ -package menu_repo +package menu import "time" @@ -13,7 +13,7 @@ type Menu struct { Level int32 // 菜单类型 1:一级菜单 2:二级菜单 Sort int32 // 排序 IsUsed int32 // 是否启用 1:是 -1:否 - IsDeleted int32 // 是否删除 1:是 -1:否 + IsDeleted int32 // 是否删除 1:是 -1:否 CreatedAt time.Time `gorm:"time"` // 创建时间 CreatedUser string // 创建人 UpdatedAt time.Time `gorm:"time"` // 更新时间 diff --git a/internal/api/repository/db_repo/menu_repo/gen_table.md b/internal/repository/mysql/menu/gen_table.md similarity index 61% rename from internal/api/repository/db_repo/menu_repo/gen_table.md rename to internal/repository/mysql/menu/gen_table.md index bb4d8e5..a681e83 100755 --- a/internal/api/repository/db_repo/menu_repo/gen_table.md +++ b/internal/repository/mysql/menu/gen_table.md @@ -3,16 +3,16 @@ | 序号 | 名称 | 描述 | 类型 | 键 | 为空 | 额外 | 默认值 | | :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: | -| 1 | id | 主键 | int(11) unsigned | PRI | NO | auto_increment | | -| 2 | pid | 父类ID | int(11) unsigned | | NO | | 0 | +| 1 | id | 主键 | int unsigned | PRI | NO | auto_increment | | +| 2 | pid | 父类ID | int unsigned | | NO | | 0 | | 3 | name | 菜单名称 | varchar(32) | | NO | | | | 4 | link | 链接地址 | varchar(100) | | NO | | | | 5 | icon | 图标 | varchar(60) | | NO | | | -| 6 | level | 菜单类型 1:一级菜单 2:二级菜单 | tinyint(1) unsigned | | NO | | 1 | -| 7 | sort | 排序 | int(11) unsigned | | NO | | 0 | +| 6 | level | 菜单类型 1:一级菜单 2:二级菜单 | tinyint unsigned | | NO | | 1 | +| 7 | sort | 排序 | int unsigned | | NO | | 0 | | 8 | is_used | 是否启用 1:是 -1:否 | tinyint(1) | | NO | | 1 | | 9 | is_deleted | 是否删除 1:是 -1:否 | tinyint(1) | | NO | | -1 | -| 10 | created_at | 创建时间 | timestamp | | NO | | CURRENT_TIMESTAMP | +| 10 | created_at | 创建时间 | timestamp | | NO | DEFAULT_GENERATED | CURRENT_TIMESTAMP | | 11 | created_user | 创建人 | varchar(60) | | NO | | | -| 12 | updated_at | 更新时间 | timestamp | | NO | on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | +| 12 | updated_at | 更新时间 | timestamp | | NO | DEFAULT_GENERATED on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | | 13 | updated_user | 更新人 | varchar(60) | | NO | | | diff --git a/internal/api/repository/db_repo/menu_action_repo/gen_menu_action.go b/internal/repository/mysql/menu_action/gen_menu_action.go similarity index 59% rename from internal/api/repository/db_repo/menu_action_repo/gen_menu_action.go rename to internal/repository/mysql/menu_action/gen_menu_action.go index 94a13d4..994a5c7 100755 --- a/internal/api/repository/db_repo/menu_action_repo/gen_menu_action.go +++ b/internal/repository/mysql/menu_action/gen_menu_action.go @@ -3,13 +3,13 @@ // ANY CHANGES DONE HERE WILL BE LOST // /////////////////////////////////////////////////////////// -package menu_action_repo +package menu_action import ( "fmt" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "github.com/pkg/errors" "gorm.io/gorm" @@ -19,8 +19,8 @@ func NewModel() *MenuAction { return new(MenuAction) } -func NewQueryBuilder() *menuActionRepoQueryBuilder { - return new(menuActionRepoQueryBuilder) +func NewQueryBuilder() *menuActionQueryBuilder { + return new(menuActionQueryBuilder) } func (t *MenuAction) Create(db *gorm.DB) (id int32, err error) { @@ -30,7 +30,7 @@ func (t *MenuAction) Create(db *gorm.DB) (id int32, err error) { return t.Id, nil } -type menuActionRepoQueryBuilder struct { +type menuActionQueryBuilder struct { order []string where []struct { prefix string @@ -40,7 +40,7 @@ type menuActionRepoQueryBuilder struct { offset int } -func (qb *menuActionRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { +func (qb *menuActionQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { ret := db for _, where := range qb.where { ret = ret.Where(where.prefix, where.value) @@ -52,7 +52,7 @@ func (qb *menuActionRepoQueryBuilder) buildQuery(db *gorm.DB) *gorm.DB { return ret } -func (qb *menuActionRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { +func (qb *menuActionQueryBuilder) Updates(db *gorm.DB, m map[string]interface{}) (err error) { db = db.Model(&MenuAction{}) for _, where := range qb.where { @@ -65,7 +65,7 @@ func (qb *menuActionRepoQueryBuilder) Updates(db *gorm.DB, m map[string]interfac return nil } -func (qb *menuActionRepoQueryBuilder) Delete(db *gorm.DB) (err error) { +func (qb *menuActionQueryBuilder) Delete(db *gorm.DB) (err error) { for _, where := range qb.where { db = db.Where(where.prefix, where.value) } @@ -76,7 +76,7 @@ func (qb *menuActionRepoQueryBuilder) Delete(db *gorm.DB) (err error) { return nil } -func (qb *menuActionRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { +func (qb *menuActionQueryBuilder) Count(db *gorm.DB) (int64, error) { var c int64 res := qb.buildQuery(db).Model(&MenuAction{}).Count(&c) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -85,7 +85,7 @@ func (qb *menuActionRepoQueryBuilder) Count(db *gorm.DB) (int64, error) { return c, res.Error } -func (qb *menuActionRepoQueryBuilder) First(db *gorm.DB) (*MenuAction, error) { +func (qb *menuActionQueryBuilder) First(db *gorm.DB) (*MenuAction, error) { ret := &MenuAction{} res := qb.buildQuery(db).First(ret) if res.Error != nil && res.Error == gorm.ErrRecordNotFound { @@ -94,7 +94,7 @@ func (qb *menuActionRepoQueryBuilder) First(db *gorm.DB) (*MenuAction, error) { return ret, res.Error } -func (qb *menuActionRepoQueryBuilder) QueryOne(db *gorm.DB) (*MenuAction, error) { +func (qb *menuActionQueryBuilder) QueryOne(db *gorm.DB) (*MenuAction, error) { qb.limit = 1 ret, err := qb.QueryAll(db) if len(ret) > 0 { @@ -103,23 +103,23 @@ func (qb *menuActionRepoQueryBuilder) QueryOne(db *gorm.DB) (*MenuAction, error) return nil, err } -func (qb *menuActionRepoQueryBuilder) QueryAll(db *gorm.DB) ([]*MenuAction, error) { +func (qb *menuActionQueryBuilder) QueryAll(db *gorm.DB) ([]*MenuAction, error) { var ret []*MenuAction err := qb.buildQuery(db).Find(&ret).Error return ret, err } -func (qb *menuActionRepoQueryBuilder) Limit(limit int) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) Limit(limit int) *menuActionQueryBuilder { qb.limit = limit return qb } -func (qb *menuActionRepoQueryBuilder) Offset(offset int) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) Offset(offset int) *menuActionQueryBuilder { qb.offset = offset return qb } -func (qb *menuActionRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereId(p mysql.Predicate, value int32) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -130,7 +130,7 @@ func (qb *menuActionRepoQueryBuilder) WhereId(p db_repo.Predicate, value int32) return qb } -func (qb *menuActionRepoQueryBuilder) WhereIdIn(value []int32) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereIdIn(value []int32) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -141,7 +141,7 @@ func (qb *menuActionRepoQueryBuilder) WhereIdIn(value []int32) *menuActionRepoQu return qb } -func (qb *menuActionRepoQueryBuilder) WhereIdNotIn(value []int32) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereIdNotIn(value []int32) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -152,7 +152,7 @@ func (qb *menuActionRepoQueryBuilder) WhereIdNotIn(value []int32) *menuActionRep return qb } -func (qb *menuActionRepoQueryBuilder) OrderById(asc bool) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) OrderById(asc bool) *menuActionQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -162,7 +162,7 @@ func (qb *menuActionRepoQueryBuilder) OrderById(asc bool) *menuActionRepoQueryBu return qb } -func (qb *menuActionRepoQueryBuilder) WhereMenuId(p db_repo.Predicate, value int32) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereMenuId(p mysql.Predicate, value int32) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -173,7 +173,7 @@ func (qb *menuActionRepoQueryBuilder) WhereMenuId(p db_repo.Predicate, value int return qb } -func (qb *menuActionRepoQueryBuilder) WhereMenuIdIn(value []int32) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereMenuIdIn(value []int32) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -184,7 +184,7 @@ func (qb *menuActionRepoQueryBuilder) WhereMenuIdIn(value []int32) *menuActionRe return qb } -func (qb *menuActionRepoQueryBuilder) WhereMenuIdNotIn(value []int32) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereMenuIdNotIn(value []int32) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -195,7 +195,7 @@ func (qb *menuActionRepoQueryBuilder) WhereMenuIdNotIn(value []int32) *menuActio return qb } -func (qb *menuActionRepoQueryBuilder) OrderByMenuId(asc bool) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) OrderByMenuId(asc bool) *menuActionQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -205,7 +205,7 @@ func (qb *menuActionRepoQueryBuilder) OrderByMenuId(asc bool) *menuActionRepoQue return qb } -func (qb *menuActionRepoQueryBuilder) WhereMethod(p db_repo.Predicate, value string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereMethod(p mysql.Predicate, value string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -216,7 +216,7 @@ func (qb *menuActionRepoQueryBuilder) WhereMethod(p db_repo.Predicate, value str return qb } -func (qb *menuActionRepoQueryBuilder) WhereMethodIn(value []string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereMethodIn(value []string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -227,7 +227,7 @@ func (qb *menuActionRepoQueryBuilder) WhereMethodIn(value []string) *menuActionR return qb } -func (qb *menuActionRepoQueryBuilder) WhereMethodNotIn(value []string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereMethodNotIn(value []string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -238,7 +238,7 @@ func (qb *menuActionRepoQueryBuilder) WhereMethodNotIn(value []string) *menuActi return qb } -func (qb *menuActionRepoQueryBuilder) OrderByMethod(asc bool) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) OrderByMethod(asc bool) *menuActionQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -248,7 +248,7 @@ func (qb *menuActionRepoQueryBuilder) OrderByMethod(asc bool) *menuActionRepoQue return qb } -func (qb *menuActionRepoQueryBuilder) WhereApi(p db_repo.Predicate, value string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereApi(p mysql.Predicate, value string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -259,7 +259,7 @@ func (qb *menuActionRepoQueryBuilder) WhereApi(p db_repo.Predicate, value string return qb } -func (qb *menuActionRepoQueryBuilder) WhereApiIn(value []string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereApiIn(value []string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -270,7 +270,7 @@ func (qb *menuActionRepoQueryBuilder) WhereApiIn(value []string) *menuActionRepo return qb } -func (qb *menuActionRepoQueryBuilder) WhereApiNotIn(value []string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereApiNotIn(value []string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -281,7 +281,7 @@ func (qb *menuActionRepoQueryBuilder) WhereApiNotIn(value []string) *menuActionR return qb } -func (qb *menuActionRepoQueryBuilder) OrderByApi(asc bool) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) OrderByApi(asc bool) *menuActionQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -291,7 +291,7 @@ func (qb *menuActionRepoQueryBuilder) OrderByApi(asc bool) *menuActionRepoQueryB return qb } -func (qb *menuActionRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, value int32) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereIsDeleted(p mysql.Predicate, value int32) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -302,7 +302,7 @@ func (qb *menuActionRepoQueryBuilder) WhereIsDeleted(p db_repo.Predicate, value return qb } -func (qb *menuActionRepoQueryBuilder) WhereIsDeletedIn(value []int32) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereIsDeletedIn(value []int32) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -313,7 +313,7 @@ func (qb *menuActionRepoQueryBuilder) WhereIsDeletedIn(value []int32) *menuActio return qb } -func (qb *menuActionRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereIsDeletedNotIn(value []int32) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -324,7 +324,7 @@ func (qb *menuActionRepoQueryBuilder) WhereIsDeletedNotIn(value []int32) *menuAc return qb } -func (qb *menuActionRepoQueryBuilder) OrderByIsDeleted(asc bool) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) OrderByIsDeleted(asc bool) *menuActionQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -334,7 +334,7 @@ func (qb *menuActionRepoQueryBuilder) OrderByIsDeleted(asc bool) *menuActionRepo return qb } -func (qb *menuActionRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value time.Time) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereCreatedAt(p mysql.Predicate, value time.Time) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -345,7 +345,7 @@ func (qb *menuActionRepoQueryBuilder) WhereCreatedAt(p db_repo.Predicate, value return qb } -func (qb *menuActionRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereCreatedAtIn(value []time.Time) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -356,7 +356,7 @@ func (qb *menuActionRepoQueryBuilder) WhereCreatedAtIn(value []time.Time) *menuA return qb } -func (qb *menuActionRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -367,7 +367,7 @@ func (qb *menuActionRepoQueryBuilder) WhereCreatedAtNotIn(value []time.Time) *me return qb } -func (qb *menuActionRepoQueryBuilder) OrderByCreatedAt(asc bool) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) OrderByCreatedAt(asc bool) *menuActionQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -377,7 +377,7 @@ func (qb *menuActionRepoQueryBuilder) OrderByCreatedAt(asc bool) *menuActionRepo return qb } -func (qb *menuActionRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, value string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereCreatedUser(p mysql.Predicate, value string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -388,7 +388,7 @@ func (qb *menuActionRepoQueryBuilder) WhereCreatedUser(p db_repo.Predicate, valu return qb } -func (qb *menuActionRepoQueryBuilder) WhereCreatedUserIn(value []string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereCreatedUserIn(value []string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -399,7 +399,7 @@ func (qb *menuActionRepoQueryBuilder) WhereCreatedUserIn(value []string) *menuAc return qb } -func (qb *menuActionRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereCreatedUserNotIn(value []string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -410,7 +410,7 @@ func (qb *menuActionRepoQueryBuilder) WhereCreatedUserNotIn(value []string) *men return qb } -func (qb *menuActionRepoQueryBuilder) OrderByCreatedUser(asc bool) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) OrderByCreatedUser(asc bool) *menuActionQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -420,7 +420,7 @@ func (qb *menuActionRepoQueryBuilder) OrderByCreatedUser(asc bool) *menuActionRe return qb } -func (qb *menuActionRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value time.Time) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereUpdatedAt(p mysql.Predicate, value time.Time) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -431,7 +431,7 @@ func (qb *menuActionRepoQueryBuilder) WhereUpdatedAt(p db_repo.Predicate, value return qb } -func (qb *menuActionRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereUpdatedAtIn(value []time.Time) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -442,7 +442,7 @@ func (qb *menuActionRepoQueryBuilder) WhereUpdatedAtIn(value []time.Time) *menuA return qb } -func (qb *menuActionRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -453,7 +453,7 @@ func (qb *menuActionRepoQueryBuilder) WhereUpdatedAtNotIn(value []time.Time) *me return qb } -func (qb *menuActionRepoQueryBuilder) OrderByUpdatedAt(asc bool) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) OrderByUpdatedAt(asc bool) *menuActionQueryBuilder { order := "DESC" if asc { order = "ASC" @@ -463,7 +463,7 @@ func (qb *menuActionRepoQueryBuilder) OrderByUpdatedAt(asc bool) *menuActionRepo return qb } -func (qb *menuActionRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, value string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereUpdatedUser(p mysql.Predicate, value string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -474,7 +474,7 @@ func (qb *menuActionRepoQueryBuilder) WhereUpdatedUser(p db_repo.Predicate, valu return qb } -func (qb *menuActionRepoQueryBuilder) WhereUpdatedUserIn(value []string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereUpdatedUserIn(value []string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -485,7 +485,7 @@ func (qb *menuActionRepoQueryBuilder) WhereUpdatedUserIn(value []string) *menuAc return qb } -func (qb *menuActionRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) WhereUpdatedUserNotIn(value []string) *menuActionQueryBuilder { qb.where = append(qb.where, struct { prefix string value interface{} @@ -496,7 +496,7 @@ func (qb *menuActionRepoQueryBuilder) WhereUpdatedUserNotIn(value []string) *men return qb } -func (qb *menuActionRepoQueryBuilder) OrderByUpdatedUser(asc bool) *menuActionRepoQueryBuilder { +func (qb *menuActionQueryBuilder) OrderByUpdatedUser(asc bool) *menuActionQueryBuilder { order := "DESC" if asc { order = "ASC" diff --git a/internal/api/repository/db_repo/menu_action_repo/gen_model.go b/internal/repository/mysql/menu_action/gen_model.go similarity index 95% rename from internal/api/repository/db_repo/menu_action_repo/gen_model.go rename to internal/repository/mysql/menu_action/gen_model.go index bdc9217..b09788d 100755 --- a/internal/api/repository/db_repo/menu_action_repo/gen_model.go +++ b/internal/repository/mysql/menu_action/gen_model.go @@ -1,4 +1,4 @@ -package menu_action_repo +package menu_action import "time" diff --git a/internal/api/repository/db_repo/menu_action_repo/gen_table.md b/internal/repository/mysql/menu_action/gen_table.md similarity index 58% rename from internal/api/repository/db_repo/menu_action_repo/gen_table.md rename to internal/repository/mysql/menu_action/gen_table.md index 543dc8e..7df558d 100755 --- a/internal/api/repository/db_repo/menu_action_repo/gen_table.md +++ b/internal/repository/mysql/menu_action/gen_table.md @@ -3,12 +3,12 @@ | 序号 | 名称 | 描述 | 类型 | 键 | 为空 | 额外 | 默认值 | | :--: | :--: | :--: | :--: | :--: | :--: | :--: | :--: | -| 1 | id | 主键 | int(11) unsigned | PRI | NO | auto_increment | | -| 2 | menu_id | 菜单栏ID | int(11) unsigned | MUL | NO | | 0 | +| 1 | id | 主键 | int unsigned | PRI | NO | auto_increment | | +| 2 | menu_id | 菜单栏ID | int unsigned | MUL | NO | | 0 | | 3 | method | 请求方式 | varchar(30) | | NO | | | | 4 | api | 请求地址 | varchar(100) | | NO | | | | 5 | is_deleted | 是否删除 1:是 -1:否 | tinyint(1) | | NO | | -1 | -| 6 | created_at | 创建时间 | timestamp | | NO | | CURRENT_TIMESTAMP | +| 6 | created_at | 创建时间 | timestamp | | NO | DEFAULT_GENERATED | CURRENT_TIMESTAMP | | 7 | created_user | 创建人 | varchar(60) | | NO | | | -| 8 | updated_at | 更新时间 | timestamp | | NO | on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | +| 8 | updated_at | 更新时间 | timestamp | | NO | DEFAULT_GENERATED on update CURRENT_TIMESTAMP | CURRENT_TIMESTAMP | | 9 | updated_user | 更新人 | varchar(60) | | NO | | | diff --git a/internal/pkg/db/mysql.go b/internal/repository/mysql/mysql.go similarity index 84% rename from internal/pkg/db/mysql.go rename to internal/repository/mysql/mysql.go index acfef78..7c735e1 100644 --- a/internal/pkg/db/mysql.go +++ b/internal/repository/mysql/mysql.go @@ -1,4 +1,4 @@ -package db +package mysql import ( "fmt" @@ -12,6 +12,19 @@ import ( "gorm.io/gorm/schema" ) +// Predicate is a string that acts as a condition in the where clause +type Predicate string + +var ( + EqualPredicate = Predicate("=") + NotEqualPredicate = Predicate("<>") + GreaterThanPredicate = Predicate(">") + GreaterThanOrEqualPredicate = Predicate(">=") + SmallerThanPredicate = Predicate("<") + SmallerThanOrEqualPredicate = Predicate("<=") + LikePredicate = Predicate("LIKE") +) + var _ Repo = (*dbRepo)(nil) type Repo interface { diff --git a/internal/pkg/db/plugin.go b/internal/repository/mysql/plugin.go similarity index 99% rename from internal/pkg/db/plugin.go rename to internal/repository/mysql/plugin.go index 6d94d33..2c0906a 100644 --- a/internal/pkg/db/plugin.go +++ b/internal/repository/mysql/plugin.go @@ -1,4 +1,4 @@ -package db +package mysql import ( "time" diff --git a/internal/api/repository/redis/redis.go b/internal/repository/redis/redis.go similarity index 100% rename from internal/api/repository/redis/redis.go rename to internal/repository/redis/redis.go diff --git a/internal/api/repository/socket/socket.go b/internal/repository/socket/socket.go similarity index 76% rename from internal/api/repository/socket/socket.go rename to internal/repository/socket/socket.go index a272d17..d2bd71b 100644 --- a/internal/api/repository/socket/socket.go +++ b/internal/repository/socket/socket.go @@ -1,11 +1,11 @@ package socket import ( + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" "net/http" "time" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errors" "github.com/gorilla/websocket" @@ -16,7 +16,7 @@ var _ Server = (*server)(nil) type server struct { logger *zap.Logger - db db.Repo + db mysql.Repo cache redis.Repo socket *websocket.Conn } @@ -41,7 +41,7 @@ var upGrader = websocket.Upgrader{ }, } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo, w http.ResponseWriter, r *http.Request, responseHeader http.Header) (Server, error) { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo, w http.ResponseWriter, r *http.Request, responseHeader http.Header) (Server, error) { if logger == nil { return nil, errors.New("logger required") } diff --git a/internal/api/repository/socket/socket_on_close.go b/internal/repository/socket/socket_on_close.go similarity index 100% rename from internal/api/repository/socket/socket_on_close.go rename to internal/repository/socket/socket_on_close.go diff --git a/internal/api/repository/socket/socket_on_message.go b/internal/repository/socket/socket_on_message.go similarity index 100% rename from internal/api/repository/socket/socket_on_message.go rename to internal/repository/socket/socket_on_message.go diff --git a/internal/api/repository/socket/socket_on_send.go b/internal/repository/socket/socket_on_send.go similarity index 100% rename from internal/api/repository/socket/socket_on_send.go rename to internal/repository/socket/socket_on_send.go diff --git a/internal/router/middleware/middle_rbac.go b/internal/router/middleware/middle_rbac.go index 8098c3c..71e7914 100644 --- a/internal/router/middleware/middle_rbac.go +++ b/internal/router/middleware/middle_rbac.go @@ -5,10 +5,10 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" + "github.com/xinliangnote/go-gin-api/internal/services/admin" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" "github.com/xinliangnote/go-gin-api/pkg/urltable" @@ -54,7 +54,7 @@ func (m *middleware) RBAC() core.HandlerFunc { return } - var actions []admin2.MyActionData + var actions []admin.MyActionData err = json.Unmarshal([]byte(actionData), &actions) if err != nil { c.AbortWithError(errno.NewError( diff --git a/internal/router/middleware/middle_token.go b/internal/router/middleware/middle_token.go index fc0f53d..fa6d670 100644 --- a/internal/router/middleware/middle_token.go +++ b/internal/router/middleware/middle_token.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" ) diff --git a/internal/router/middleware/middlerware.go b/internal/router/middleware/middlerware.go index e6c60be..7b0fcf1 100644 --- a/internal/router/middleware/middlerware.go +++ b/internal/router/middleware/middlerware.go @@ -1,11 +1,11 @@ package middleware import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" - admin2 "github.com/xinliangnote/go-gin-api/internal/services/admin" - authorized2 "github.com/xinliangnote/go-gin-api/internal/services/authorized" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" + "github.com/xinliangnote/go-gin-api/internal/services/admin" + "github.com/xinliangnote/go-gin-api/internal/services/authorized" "github.com/xinliangnote/go-gin-api/pkg/errno" "go.uber.org/zap" @@ -33,18 +33,18 @@ type Middleware interface { type middleware struct { logger *zap.Logger cache redis.Repo - db db.Repo - authorizedService authorized2.Service - adminService admin2.Service + db mysql.Repo + authorizedService authorized.Service + adminService admin.Service } -func New(logger *zap.Logger, cache redis.Repo, db db.Repo) Middleware { +func New(logger *zap.Logger, cache redis.Repo, db mysql.Repo) Middleware { return &middleware{ logger: logger, cache: cache, db: db, - authorizedService: authorized2.New(db, cache), - adminService: admin2.New(db, cache), + authorizedService: authorized.New(db, cache), + adminService: admin.New(db, cache), } } diff --git a/internal/router/router.go b/internal/router/router.go index 59ec7c4..e740bdc 100644 --- a/internal/router/router.go +++ b/internal/router/router.go @@ -2,12 +2,12 @@ package router import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/cron" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" "github.com/xinliangnote/go-gin-api/internal/pkg/metrics" "github.com/xinliangnote/go-gin-api/internal/pkg/notify" + "github.com/xinliangnote/go-gin-api/internal/repository/cron" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "github.com/xinliangnote/go-gin-api/internal/router/middleware" "github.com/xinliangnote/go-gin-api/pkg/errors" "github.com/xinliangnote/go-gin-api/pkg/file" @@ -18,7 +18,7 @@ import ( type resource struct { mux core.Mux logger *zap.Logger - db db.Repo + db mysql.Repo cache redis.Repo middles middleware.Middleware cronServer cron.Server @@ -26,7 +26,7 @@ type resource struct { type Server struct { Mux core.Mux - Db db.Repo + Db mysql.Repo Cache redis.Repo CronServer cron.Server } @@ -47,7 +47,7 @@ func NewHTTPServer(logger *zap.Logger, cronLogger *zap.Logger) (*Server, error) } else { // 已安装 // 初始化 DB - dbRepo, err := db.New() + dbRepo, err := mysql.New() if err != nil { logger.Fatal("new db err", zap.Error(err)) } diff --git a/internal/router/router_api.go b/internal/router/router_api.go index e645e5b..1163e45 100644 --- a/internal/router/router_api.go +++ b/internal/router/router_api.go @@ -1,19 +1,19 @@ package router import ( - "github.com/xinliangnote/go-gin-api/internal/api/controller/admin_handler" - "github.com/xinliangnote/go-gin-api/internal/api/controller/authorized_handler" - "github.com/xinliangnote/go-gin-api/internal/api/controller/config_handler" - "github.com/xinliangnote/go-gin-api/internal/api/controller/cron_handler" - "github.com/xinliangnote/go-gin-api/internal/api/controller/menu_handler" - "github.com/xinliangnote/go-gin-api/internal/api/controller/tool_handler" + "github.com/xinliangnote/go-gin-api/internal/api/admin" + "github.com/xinliangnote/go-gin-api/internal/api/authorized" + "github.com/xinliangnote/go-gin-api/internal/api/config" + "github.com/xinliangnote/go-gin-api/internal/api/cron" + "github.com/xinliangnote/go-gin-api/internal/api/menu" + "github.com/xinliangnote/go-gin-api/internal/api/tool" "github.com/xinliangnote/go-gin-api/internal/pkg/core" ) func setApiRouter(r *resource) { // admin - adminHandler := admin_handler.New(r.logger, r.db, r.cache) + adminHandler := admin.New(r.logger, r.db, r.cache) // 需要签名验证，无需登录验证，无需 RBAC 权限验证 login := r.mux.Group("/api", r.middles.Signature()) @@ -34,7 +34,7 @@ func setApiRouter(r *resource) { api := r.mux.Group("/api", core.WrapAuthHandler(r.middles.Token), r.middles.Signature(), r.middles.RBAC()) { // authorized - authorizedHandler := authorized_handler.New(r.logger, r.db, r.cache) + authorizedHandler := authorized.New(r.logger, r.db, r.cache) api.POST("/authorized", authorizedHandler.Create()) api.GET("/authorized", authorizedHandler.List()) api.PATCH("/authorized/used", authorizedHandler.UpdateUsed()) @@ -55,7 +55,7 @@ func setApiRouter(r *resource) { api.GET("/admin/menu/:id", core.AliasForRecordMetrics("/api/admin/menu"), adminHandler.ListAdminMenu()) // menu - menuHandler := menu_handler.New(r.logger, r.db, r.cache) + menuHandler := menu.New(r.logger, r.db, r.cache) api.POST("/menu", menuHandler.Create()) api.GET("/menu", menuHandler.List()) api.GET("/menu/:id", core.AliasForRecordMetrics("/api/menu"), menuHandler.Detail()) @@ -67,7 +67,7 @@ func setApiRouter(r *resource) { api.DELETE("/menu_action/:id", core.AliasForRecordMetrics("/api/menu_action"), menuHandler.DeleteAction()) // tool - toolHandler := tool_handler.New(r.logger, r.db, r.cache) + toolHandler := tool.New(r.logger, r.db, r.cache) api.GET("/tool/hashids/encode/:id", core.AliasForRecordMetrics("/api/tool/hashids/encode"), toolHandler.HashIdsEncode()) api.GET("/tool/hashids/decode/:id", core.AliasForRecordMetrics("/api/tool/hashids/decode"), toolHandler.HashIdsDecode()) api.POST("/tool/cache/search", toolHandler.SearchCache()) @@ -78,11 +78,11 @@ func setApiRouter(r *resource) { api.POST("/tool/send_message", toolHandler.SendMessage()) // config - configHandler := config_handler.New(r.logger, r.db, r.cache) + configHandler := config.New(r.logger, r.db, r.cache) api.PATCH("/config/email", configHandler.Email()) // cron - cronHandler := cron_handler.New(r.logger, r.db, r.cache, r.cronServer) + cronHandler := cron.New(r.logger, r.db, r.cache, r.cronServer) api.POST("/cron", cronHandler.Create()) api.GET("/cron", cronHandler.List()) api.GET("/cron/:id", core.AliasForRecordMetrics("/api/cron/detail"), cronHandler.Detail()) diff --git a/internal/services/admin/service.go b/internal/services/admin/service.go index b480ccd..c450e49 100644 --- a/internal/services/admin/service.go +++ b/internal/services/admin/service.go @@ -1,10 +1,10 @@ package admin import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) var _ Service = (*service)(nil) @@ -13,11 +13,11 @@ type Service interface { i() Create(ctx core.Context, adminData *CreateAdminData) (id int32, err error) - PageList(ctx core.Context, searchData *SearchData) (listData []*admin_repo.Admin, err error) + PageList(ctx core.Context, searchData *SearchData) (listData []*admin.Admin, err error) PageListCount(ctx core.Context, searchData *SearchData) (total int64, err error) UpdateUsed(ctx core.Context, id int32, used int32) (err error) Delete(ctx core.Context, id int32) (err error) - Detail(ctx core.Context, searchOneData *SearchOneData) (info *admin_repo.Admin, err error) + Detail(ctx core.Context, searchOneData *SearchOneData) (info *admin.Admin, err error) ResetPassword(ctx core.Context, id int32) (err error) ModifyPassword(ctx core.Context, id int32, newPassword string) (err error) ModifyPersonalInfo(ctx core.Context, id int32, modifyData *ModifyData) (err error) @@ -29,11 +29,11 @@ type Service interface { } type service struct { - db db.Repo + db mysql.Repo cache redis.Repo } -func New(db db.Repo, cache redis.Repo) Service { +func New(db mysql.Repo, cache redis.Repo) Service { return &service{ db: db, cache: cache, diff --git a/internal/services/admin/service_create.go b/internal/services/admin/service_create.go index 7c33121..7a71df5 100644 --- a/internal/services/admin/service_create.go +++ b/internal/services/admin/service_create.go @@ -1,9 +1,9 @@ package admin import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" ) type CreateAdminData struct { @@ -14,7 +14,7 @@ type CreateAdminData struct { } func (s *service) Create(ctx core.Context, adminData *CreateAdminData) (id int32, err error) { - model := admin_repo.NewModel() + model := admin.NewModel() model.Username = adminData.Username model.Password = password.GeneratePassword(adminData.Password) model.Nickname = adminData.Nickname diff --git a/internal/services/admin/service_createmenu.go b/internal/services/admin/service_createmenu.go index 2ab44bd..4210b99 100644 --- a/internal/services/admin/service_createmenu.go +++ b/internal/services/admin/service_createmenu.go @@ -3,9 +3,9 @@ package admin import ( "strings" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin_menu" "github.com/spf13/cast" ) @@ -16,15 +16,15 @@ type CreateMenuData struct { } func (s *service) CreateMenu(ctx core.Context, menuData *CreateMenuData) (err error) { - qb := admin_menu_repo.NewQueryBuilder() - qb.WhereAdminId(db_repo.EqualPredicate, menuData.AdminId) + qb := admin_menu.NewQueryBuilder() + qb.WhereAdminId(mysql.EqualPredicate, menuData.AdminId) if err = qb.Delete(s.db.GetDbW().WithContext(ctx.RequestContext())); err != nil { return } ActionArr := strings.Split(menuData.Actions, ",") for _, v := range ActionArr { - createModel := admin_menu_repo.NewModel() + createModel := admin_menu.NewModel() createModel.AdminId = menuData.AdminId createModel.MenuId = cast.ToInt32(v) createModel.CreatedUser = ctx.UserName() diff --git a/internal/services/admin/service_delete.go b/internal/services/admin/service_delete.go index 57b9186..0d3438b 100644 --- a/internal/services/admin/service_delete.go +++ b/internal/services/admin/service_delete.go @@ -2,11 +2,11 @@ package admin import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) func (s *service) Delete(ctx core.Context, id int32) (err error) { @@ -15,8 +15,8 @@ func (s *service) Delete(ctx core.Context, id int32) (err error) { "updated_user": ctx.UserName(), } - qb := admin_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := admin.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/admin/service_detail.go b/internal/services/admin/service_detail.go index b3f5aca..ab82092 100644 --- a/internal/services/admin/service_detail.go +++ b/internal/services/admin/service_detail.go @@ -1,9 +1,9 @@ package admin import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" ) type SearchOneData struct { @@ -15,33 +15,33 @@ type SearchOneData struct { IsUsed int32 // 是否启用 1:是 -1:否 } -func (s *service) Detail(ctx core.Context, searchOneData *SearchOneData) (info *admin_repo.Admin, err error) { +func (s *service) Detail(ctx core.Context, searchOneData *SearchOneData) (info *admin.Admin, err error) { - qb := admin_repo.NewQueryBuilder() - qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := admin.NewQueryBuilder() + qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchOneData.Id != 0 { - qb.WhereId(db_repo.EqualPredicate, searchOneData.Id) + qb.WhereId(mysql.EqualPredicate, searchOneData.Id) } if searchOneData.Username != "" { - qb.WhereUsername(db_repo.EqualPredicate, searchOneData.Username) + qb.WhereUsername(mysql.EqualPredicate, searchOneData.Username) } if searchOneData.Nickname != "" { - qb.WhereNickname(db_repo.EqualPredicate, searchOneData.Nickname) + qb.WhereNickname(mysql.EqualPredicate, searchOneData.Nickname) } if searchOneData.Mobile != "" { - qb.WhereMobile(db_repo.EqualPredicate, searchOneData.Mobile) + qb.WhereMobile(mysql.EqualPredicate, searchOneData.Mobile) } if searchOneData.Password != "" { - qb.WherePassword(db_repo.EqualPredicate, searchOneData.Password) + qb.WherePassword(mysql.EqualPredicate, searchOneData.Password) } if searchOneData.IsUsed != 0 { - qb.WhereIsUsed(db_repo.EqualPredicate, searchOneData.IsUsed) + qb.WhereIsUsed(mysql.EqualPredicate, searchOneData.IsUsed) } info, err = qb.QueryOne(s.db.GetDbR().WithContext(ctx.RequestContext())) diff --git a/internal/services/admin/service_listmenu.go b/internal/services/admin/service_listmenu.go index 89e9ce3..0ef52c2 100644 --- a/internal/services/admin/service_listmenu.go +++ b/internal/services/admin/service_listmenu.go @@ -1,10 +1,10 @@ package admin import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_menu_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin_menu" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" ) type SearchListMenuData struct { @@ -19,8 +19,8 @@ type ListMenuData struct { } func (s *service) ListMenu(ctx core.Context, searchData *SearchListMenuData) (menuData []ListMenuData, err error) { - menuQb := menu_repo.NewQueryBuilder() - menuQb.WhereIsDeleted(db_repo.EqualPredicate, -1) + menuQb := menu.NewQueryBuilder() + menuQb.WhereIsDeleted(mysql.EqualPredicate, -1) menuListData, err := menuQb. OrderBySort(true). QueryAll(s.db.GetDbR().WithContext(ctx.RequestContext())) @@ -44,9 +44,9 @@ func (s *service) ListMenu(ctx core.Context, searchData *SearchListMenuData) (me menuData[k] = data } - adminMenuQb := admin_menu_repo.NewQueryBuilder() + adminMenuQb := admin_menu.NewQueryBuilder() if searchData.AdminId != 0 { - adminMenuQb.WhereAdminId(db_repo.EqualPredicate, searchData.AdminId) + adminMenuQb.WhereAdminId(mysql.EqualPredicate, searchData.AdminId) } adminMenuListData, err := adminMenuQb. diff --git a/internal/services/admin/service_modifypassword.go b/internal/services/admin/service_modifypassword.go index 0ca83e1..6e3f473 100644 --- a/internal/services/admin/service_modifypassword.go +++ b/internal/services/admin/service_modifypassword.go @@ -2,11 +2,11 @@ package admin import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) func (s *service) ModifyPassword(ctx core.Context, id int32, newPassword string) (err error) { @@ -15,8 +15,8 @@ func (s *service) ModifyPassword(ctx core.Context, id int32, newPassword string) "updated_user": ctx.UserName(), } - qb := admin_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := admin.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/admin/service_modifypersonalinfo.go b/internal/services/admin/service_modifypersonalinfo.go index beae693..fe79e13 100644 --- a/internal/services/admin/service_modifypersonalinfo.go +++ b/internal/services/admin/service_modifypersonalinfo.go @@ -1,9 +1,9 @@ package admin import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" ) type ModifyData struct { @@ -18,8 +18,8 @@ func (s *service) ModifyPersonalInfo(ctx core.Context, id int32, modifyData *Mod "updated_user": ctx.UserName(), } - qb := admin_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := admin.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/admin/service_myaction.go b/internal/services/admin/service_myaction.go index 884a927..21339e3 100644 --- a/internal/services/admin/service_myaction.go +++ b/internal/services/admin/service_myaction.go @@ -1,10 +1,10 @@ package admin import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_menu_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_action_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin_menu" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu_action" ) type SearchMyActionData struct { @@ -19,9 +19,9 @@ type MyActionData struct { } func (s *service) MyAction(ctx core.Context, searchData *SearchMyActionData) (actionData []MyActionData, err error) { - adminMenuQb := admin_menu_repo.NewQueryBuilder() + adminMenuQb := admin_menu.NewQueryBuilder() if searchData.AdminId != 0 { - adminMenuQb.WhereAdminId(db_repo.EqualPredicate, searchData.AdminId) + adminMenuQb.WhereAdminId(mysql.EqualPredicate, searchData.AdminId) } adminMenuListData, err := adminMenuQb. @@ -40,8 +40,8 @@ func (s *service) MyAction(ctx core.Context, searchData *SearchMyActionData) (ac menuIds = append(menuIds, v.MenuId) } - actionQb := menu_action_repo.NewQueryBuilder() - actionQb.WhereIsDeleted(db_repo.EqualPredicate, -1) + actionQb := menu_action.NewQueryBuilder() + actionQb.WhereIsDeleted(mysql.EqualPredicate, -1) actionQb.WhereMenuIdIn(menuIds) actionListData, err := actionQb.QueryAll(s.db.GetDbR().WithContext(ctx.RequestContext())) if err != nil { diff --git a/internal/services/admin/service_mymenu.go b/internal/services/admin/service_mymenu.go index 0a522c7..be2e6eb 100644 --- a/internal/services/admin/service_mymenu.go +++ b/internal/services/admin/service_mymenu.go @@ -1,10 +1,10 @@ package admin import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_menu_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin_menu" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" ) type SearchMyMenuData struct { @@ -20,9 +20,9 @@ type ListMyMenuData struct { } func (s *service) MyMenu(ctx core.Context, searchData *SearchMyMenuData) (menuData []ListMyMenuData, err error) { - adminMenuQb := admin_menu_repo.NewQueryBuilder() + adminMenuQb := admin_menu.NewQueryBuilder() if searchData.AdminId != 0 { - adminMenuQb.WhereAdminId(db_repo.EqualPredicate, searchData.AdminId) + adminMenuQb.WhereAdminId(mysql.EqualPredicate, searchData.AdminId) } adminMenuListData, err := adminMenuQb. @@ -36,8 +36,8 @@ func (s *service) MyMenu(ctx core.Context, searchData *SearchMyMenuData) (menuDa return } - menuQb := menu_repo.NewQueryBuilder() - menuQb.WhereIsDeleted(db_repo.EqualPredicate, -1) + menuQb := menu.NewQueryBuilder() + menuQb.WhereIsDeleted(mysql.EqualPredicate, -1) menuListData, err := menuQb. OrderBySort(true). QueryAll(s.db.GetDbR().WithContext(ctx.RequestContext())) diff --git a/internal/services/admin/service_pagelist.go b/internal/services/admin/service_pagelist.go index 726d670..25e5bea 100644 --- a/internal/services/admin/service_pagelist.go +++ b/internal/services/admin/service_pagelist.go @@ -1,9 +1,9 @@ package admin import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" ) type SearchData struct { @@ -14,7 +14,7 @@ type SearchData struct { Mobile string // 手机号 } -func (s *service) PageList(ctx core.Context, searchData *SearchData) (listData []*admin_repo.Admin, err error) { +func (s *service) PageList(ctx core.Context, searchData *SearchData) (listData []*admin.Admin, err error) { page := searchData.Page if page == 0 { @@ -28,19 +28,19 @@ func (s *service) PageList(ctx core.Context, searchData *SearchData) (listData [ offset := (page - 1) * pageSize - qb := admin_repo.NewQueryBuilder() - qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := admin.NewQueryBuilder() + qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchData.Username != "" { - qb.WhereUsername(db_repo.EqualPredicate, searchData.Username) + qb.WhereUsername(mysql.EqualPredicate, searchData.Username) } if searchData.Nickname != "" { - qb.WhereNickname(db_repo.EqualPredicate, searchData.Nickname) + qb.WhereNickname(mysql.EqualPredicate, searchData.Nickname) } if searchData.Mobile != "" { - qb.WhereMobile(db_repo.EqualPredicate, searchData.Mobile) + qb.WhereMobile(mysql.EqualPredicate, searchData.Mobile) } listData, err = qb. diff --git a/internal/services/admin/service_pagelistcount.go b/internal/services/admin/service_pagelistcount.go index 5906668..f9d6ddf 100644 --- a/internal/services/admin/service_pagelistcount.go +++ b/internal/services/admin/service_pagelistcount.go @@ -1,25 +1,25 @@ package admin import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" ) func (s *service) PageListCount(ctx core.Context, searchData *SearchData) (total int64, err error) { - qb := admin_repo.NewQueryBuilder() - qb = qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := admin.NewQueryBuilder() + qb = qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchData.Username != "" { - qb.WhereUsername(db_repo.EqualPredicate, searchData.Username) + qb.WhereUsername(mysql.EqualPredicate, searchData.Username) } if searchData.Nickname != "" { - qb.WhereNickname(db_repo.EqualPredicate, searchData.Nickname) + qb.WhereNickname(mysql.EqualPredicate, searchData.Nickname) } if searchData.Mobile != "" { - qb.WhereMobile(db_repo.EqualPredicate, searchData.Mobile) + qb.WhereMobile(mysql.EqualPredicate, searchData.Mobile) } total, err = qb.Count(s.db.GetDbR().WithContext(ctx.RequestContext())) diff --git a/internal/services/admin/service_resetpassword.go b/internal/services/admin/service_resetpassword.go index 6deb2ea..0caa919 100644 --- a/internal/services/admin/service_resetpassword.go +++ b/internal/services/admin/service_resetpassword.go @@ -2,11 +2,11 @@ package admin import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) func (s *service) ResetPassword(ctx core.Context, id int32) (err error) { @@ -15,8 +15,8 @@ func (s *service) ResetPassword(ctx core.Context, id int32) (err error) { "updated_user": ctx.UserName(), } - qb := admin_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := admin.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/admin/service_updateused.go b/internal/services/admin/service_updateused.go index 66c504e..a4c4743 100644 --- a/internal/services/admin/service_updateused.go +++ b/internal/services/admin/service_updateused.go @@ -2,11 +2,11 @@ package admin import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/admin_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/admin" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) func (s *service) UpdateUsed(ctx core.Context, id int32, used int32) (err error) { @@ -15,8 +15,8 @@ func (s *service) UpdateUsed(ctx core.Context, id int32, used int32) (err error) "updated_user": ctx.UserName(), } - qb := admin_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := admin.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/authorized/service.go b/internal/services/authorized/service.go index b084498..ed404a1 100644 --- a/internal/services/authorized/service.go +++ b/internal/services/authorized/service.go @@ -1,11 +1,11 @@ package authorized import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_api_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized_api" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) var _ Service = (*service)(nil) @@ -14,25 +14,25 @@ type Service interface { i() Create(ctx core.Context, authorizedData *CreateAuthorizedData) (id int32, err error) - List(ctx core.Context, searchData *SearchData) (listData []*authorized_repo.Authorized, err error) - PageList(ctx core.Context, searchData *SearchData) (listData []*authorized_repo.Authorized, err error) + List(ctx core.Context, searchData *SearchData) (listData []*authorized.Authorized, err error) + PageList(ctx core.Context, searchData *SearchData) (listData []*authorized.Authorized, err error) PageListCount(ctx core.Context, searchData *SearchData) (total int64, err error) UpdateUsed(ctx core.Context, id int32, used int32) (err error) Delete(ctx core.Context, id int32) (err error) - Detail(ctx core.Context, id int32) (info *authorized_repo.Authorized, err error) + Detail(ctx core.Context, id int32) (info *authorized.Authorized, err error) DetailByKey(ctx core.Context, key string) (data *CacheAuthorizedData, err error) CreateAPI(ctx core.Context, authorizedAPIData *CreateAuthorizedAPIData) (id int32, err error) - ListAPI(ctx core.Context, searchAPIData *SearchAPIData) (listData []*authorized_api_repo.AuthorizedApi, err error) + ListAPI(ctx core.Context, searchAPIData *SearchAPIData) (listData []*authorized_api.AuthorizedApi, err error) DeleteAPI(ctx core.Context, id int32) (err error) } type service struct { - db db.Repo + db mysql.Repo cache redis.Repo } -func New(db db.Repo, cache redis.Repo) Service { +func New(db mysql.Repo, cache redis.Repo) Service { return &service{ db: db, cache: cache, diff --git a/internal/services/authorized/service_create.go b/internal/services/authorized/service_create.go index 4c632e4..6215ec6 100644 --- a/internal/services/authorized/service_create.go +++ b/internal/services/authorized/service_create.go @@ -5,8 +5,8 @@ import ( "encoding/hex" "io" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized" ) type CreateAuthorizedData struct { @@ -20,7 +20,7 @@ func (s *service) Create(ctx core.Context, authorizedData *CreateAuthorizedData) io.ReadFull(rand.Reader, buf) secret := hex.EncodeToString(buf) - model := authorized_repo.NewModel() + model := authorized.NewModel() model.BusinessKey = authorizedData.BusinessKey model.BusinessSecret = secret model.BusinessDeveloper = authorizedData.BusinessDeveloper diff --git a/internal/services/authorized/service_createapi.go b/internal/services/authorized/service_createapi.go index 2e02510..c6614f0 100644 --- a/internal/services/authorized/service_createapi.go +++ b/internal/services/authorized/service_createapi.go @@ -2,9 +2,9 @@ package authorized import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_api_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized_api" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) type CreateAuthorizedAPIData struct { @@ -14,7 +14,7 @@ type CreateAuthorizedAPIData struct { } func (s *service) CreateAPI(ctx core.Context, authorizedAPIData *CreateAuthorizedAPIData) (id int32, err error) { - model := authorized_api_repo.NewModel() + model := authorized_api.NewModel() model.BusinessKey = authorizedAPIData.BusinessKey model.Method = authorizedAPIData.Method model.Api = authorizedAPIData.API diff --git a/internal/services/authorized/service_delete.go b/internal/services/authorized/service_delete.go index 399a602..24385ae 100644 --- a/internal/services/authorized/service_delete.go +++ b/internal/services/authorized/service_delete.go @@ -2,19 +2,19 @@ package authorized import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "gorm.io/gorm" ) func (s *service) Delete(ctx core.Context, id int32) (err error) { // 先查询 id 是否存在 - authorizedInfo, err := authorized_repo.NewQueryBuilder(). - WhereIsDeleted(db_repo.EqualPredicate, -1). - WhereId(db_repo.EqualPredicate, id). + authorizedInfo, err := authorized.NewQueryBuilder(). + WhereIsDeleted(mysql.EqualPredicate, -1). + WhereId(mysql.EqualPredicate, id). First(s.db.GetDbR().WithContext(ctx.RequestContext())) if err == gorm.ErrRecordNotFound { @@ -26,8 +26,8 @@ func (s *service) Delete(ctx core.Context, id int32) (err error) { "updated_user": ctx.UserName(), } - qb := authorized_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := authorized.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/authorized/service_deleteapi.go b/internal/services/authorized/service_deleteapi.go index 48313c3..5b36aad 100644 --- a/internal/services/authorized/service_deleteapi.go +++ b/internal/services/authorized/service_deleteapi.go @@ -2,19 +2,19 @@ package authorized import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_api_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized_api" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "gorm.io/gorm" ) func (s *service) DeleteAPI(ctx core.Context, id int32) (err error) { // 先查询 id 是否存在 - authorizedApiInfo, err := authorized_api_repo.NewQueryBuilder(). - WhereIsDeleted(db_repo.EqualPredicate, -1). - WhereId(db_repo.EqualPredicate, id). + authorizedApiInfo, err := authorized_api.NewQueryBuilder(). + WhereIsDeleted(mysql.EqualPredicate, -1). + WhereId(mysql.EqualPredicate, id). First(s.db.GetDbR().WithContext(ctx.RequestContext())) if err == gorm.ErrRecordNotFound { @@ -26,8 +26,8 @@ func (s *service) DeleteAPI(ctx core.Context, id int32) (err error) { "updated_user": ctx.UserName(), } - qb := authorized_api_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := authorized_api.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/authorized/service_detail.go b/internal/services/authorized/service_detail.go index 531acad..cb2ac2c 100644 --- a/internal/services/authorized/service_detail.go +++ b/internal/services/authorized/service_detail.go @@ -1,15 +1,15 @@ package authorized import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized" ) -func (s *service) Detail(ctx core.Context, id int32) (info *authorized_repo.Authorized, err error) { - qb := authorized_repo.NewQueryBuilder() - qb.WhereIsDeleted(db_repo.EqualPredicate, -1) - qb.WhereId(db_repo.EqualPredicate, id) +func (s *service) Detail(ctx core.Context, id int32) (info *authorized.Authorized, err error) { + qb := authorized.NewQueryBuilder() + qb.WhereIsDeleted(mysql.EqualPredicate, -1) + qb.WhereId(mysql.EqualPredicate, id) info, err = qb.First(s.db.GetDbR().WithContext(ctx.RequestContext())) if err != nil { diff --git a/internal/services/authorized/service_detailbykey.go b/internal/services/authorized/service_detailbykey.go index f0aa6a4..672f161 100644 --- a/internal/services/authorized/service_detailbykey.go +++ b/internal/services/authorized/service_detailbykey.go @@ -5,11 +5,11 @@ import ( "time" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_api_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized_api" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) // CacheAuthorizedData 缓存结构 @@ -31,9 +31,9 @@ func (s *service) DetailByKey(ctx core.Context, key string) (cacheData *CacheAut if !s.cache.Exists(cacheKey) { // 查询调用方信息 - authorizedInfo, err := authorized_repo.NewQueryBuilder(). - WhereIsDeleted(db_repo.EqualPredicate, -1). - WhereBusinessKey(db_repo.EqualPredicate, key). + authorizedInfo, err := authorized.NewQueryBuilder(). + WhereIsDeleted(mysql.EqualPredicate, -1). + WhereBusinessKey(mysql.EqualPredicate, key). First(s.db.GetDbR().WithContext(ctx.RequestContext())) if err != nil { @@ -41,9 +41,9 @@ func (s *service) DetailByKey(ctx core.Context, key string) (cacheData *CacheAut } // 查询调用方授权 API 信息 - authorizedApiInfo, err := authorized_api_repo.NewQueryBuilder(). - WhereIsDeleted(db_repo.EqualPredicate, -1). - WhereBusinessKey(db_repo.EqualPredicate, key). + authorizedApiInfo, err := authorized_api.NewQueryBuilder(). + WhereIsDeleted(mysql.EqualPredicate, -1). + WhereBusinessKey(mysql.EqualPredicate, key). OrderById(false). QueryAll(s.db.GetDbR().WithContext(ctx.RequestContext())) diff --git a/internal/services/authorized/service_list.go b/internal/services/authorized/service_list.go index 990877d..8bd45e7 100644 --- a/internal/services/authorized/service_list.go +++ b/internal/services/authorized/service_list.go @@ -1,26 +1,26 @@ package authorized import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized" ) -func (s *service) List(ctx core.Context, searchData *SearchData) (listData []*authorized_repo.Authorized, err error) { +func (s *service) List(ctx core.Context, searchData *SearchData) (listData []*authorized.Authorized, err error) { - qb := authorized_repo.NewQueryBuilder() - qb = qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := authorized.NewQueryBuilder() + qb = qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchData.BusinessKey != "" { - qb.WhereBusinessKey(db_repo.EqualPredicate, searchData.BusinessKey) + qb.WhereBusinessKey(mysql.EqualPredicate, searchData.BusinessKey) } if searchData.BusinessSecret != "" { - qb.WhereBusinessSecret(db_repo.EqualPredicate, searchData.BusinessSecret) + qb.WhereBusinessSecret(mysql.EqualPredicate, searchData.BusinessSecret) } if searchData.BusinessDeveloper != "" { - qb.WhereBusinessDeveloper(db_repo.EqualPredicate, searchData.BusinessDeveloper) + qb.WhereBusinessDeveloper(mysql.EqualPredicate, searchData.BusinessDeveloper) } listData, err = qb. diff --git a/internal/services/authorized/service_listapi.go b/internal/services/authorized/service_listapi.go index 4aae4c8..cc2346d 100644 --- a/internal/services/authorized/service_listapi.go +++ b/internal/services/authorized/service_listapi.go @@ -1,22 +1,22 @@ package authorized import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_api_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized_api" ) type SearchAPIData struct { BusinessKey string `json:"business_key"` // 调用方key } -func (s *service) ListAPI(ctx core.Context, searchAPIData *SearchAPIData) (listData []*authorized_api_repo.AuthorizedApi, err error) { +func (s *service) ListAPI(ctx core.Context, searchAPIData *SearchAPIData) (listData []*authorized_api.AuthorizedApi, err error) { - qb := authorized_api_repo.NewQueryBuilder() - qb = qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := authorized_api.NewQueryBuilder() + qb = qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchAPIData.BusinessKey != "" { - qb.WhereBusinessKey(db_repo.EqualPredicate, searchAPIData.BusinessKey) + qb.WhereBusinessKey(mysql.EqualPredicate, searchAPIData.BusinessKey) } listData, err = qb. diff --git a/internal/services/authorized/service_pagelist.go b/internal/services/authorized/service_pagelist.go index f824688..4ccbb8c 100644 --- a/internal/services/authorized/service_pagelist.go +++ b/internal/services/authorized/service_pagelist.go @@ -1,9 +1,9 @@ package authorized import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized" ) type SearchData struct { @@ -15,7 +15,7 @@ type SearchData struct { Remark string `json:"remark"` // 备注 } -func (s *service) PageList(ctx core.Context, searchData *SearchData) (listData []*authorized_repo.Authorized, err error) { +func (s *service) PageList(ctx core.Context, searchData *SearchData) (listData []*authorized.Authorized, err error) { page := searchData.Page if page == 0 { @@ -29,19 +29,19 @@ func (s *service) PageList(ctx core.Context, searchData *SearchData) (listData [ offset := (page - 1) * pageSize - qb := authorized_repo.NewQueryBuilder() - qb = qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := authorized.NewQueryBuilder() + qb = qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchData.BusinessKey != "" { - qb.WhereBusinessKey(db_repo.EqualPredicate, searchData.BusinessKey) + qb.WhereBusinessKey(mysql.EqualPredicate, searchData.BusinessKey) } if searchData.BusinessSecret != "" { - qb.WhereBusinessSecret(db_repo.EqualPredicate, searchData.BusinessSecret) + qb.WhereBusinessSecret(mysql.EqualPredicate, searchData.BusinessSecret) } if searchData.BusinessDeveloper != "" { - qb.WhereBusinessDeveloper(db_repo.EqualPredicate, searchData.BusinessDeveloper) + qb.WhereBusinessDeveloper(mysql.EqualPredicate, searchData.BusinessDeveloper) } listData, err = qb. diff --git a/internal/services/authorized/service_pagelistcount.go b/internal/services/authorized/service_pagelistcount.go index 566afbe..943956b 100644 --- a/internal/services/authorized/service_pagelistcount.go +++ b/internal/services/authorized/service_pagelistcount.go @@ -1,25 +1,25 @@ package authorized import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized" ) func (s *service) PageListCount(ctx core.Context, searchData *SearchData) (total int64, err error) { - qb := authorized_repo.NewQueryBuilder() - qb = qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := authorized.NewQueryBuilder() + qb = qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchData.BusinessKey != "" { - qb.WhereBusinessKey(db_repo.EqualPredicate, searchData.BusinessKey) + qb.WhereBusinessKey(mysql.EqualPredicate, searchData.BusinessKey) } if searchData.BusinessSecret != "" { - qb.WhereBusinessSecret(db_repo.EqualPredicate, searchData.BusinessSecret) + qb.WhereBusinessSecret(mysql.EqualPredicate, searchData.BusinessSecret) } if searchData.BusinessDeveloper != "" { - qb.WhereBusinessDeveloper(db_repo.EqualPredicate, searchData.BusinessDeveloper) + qb.WhereBusinessDeveloper(mysql.EqualPredicate, searchData.BusinessDeveloper) } total, err = qb.Count(s.db.GetDbR().WithContext(ctx.RequestContext())) diff --git a/internal/services/authorized/service_updateused.go b/internal/services/authorized/service_updateused.go index c6d7ca9..ee60e37 100644 --- a/internal/services/authorized/service_updateused.go +++ b/internal/services/authorized/service_updateused.go @@ -2,18 +2,18 @@ package authorized import ( "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/authorized_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/authorized" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" "gorm.io/gorm" ) func (s *service) UpdateUsed(ctx core.Context, id int32, used int32) (err error) { - authorizedInfo, err := authorized_repo.NewQueryBuilder(). - WhereIsDeleted(db_repo.EqualPredicate, -1). - WhereId(db_repo.EqualPredicate, id). + authorizedInfo, err := authorized.NewQueryBuilder(). + WhereIsDeleted(mysql.EqualPredicate, -1). + WhereId(mysql.EqualPredicate, id). First(s.db.GetDbR().WithContext(ctx.RequestContext())) if err == gorm.ErrRecordNotFound { @@ -25,8 +25,8 @@ func (s *service) UpdateUsed(ctx core.Context, id int32, used int32) (err error) "updated_user": ctx.UserName(), } - qb := authorized_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := authorized.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/cron/service.go b/internal/services/cron/service.go index 7ffeae6..cdd8f42 100644 --- a/internal/services/cron/service.go +++ b/internal/services/cron/service.go @@ -1,11 +1,11 @@ package cron import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/cron" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/cron" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) var _ Service = (*service)(nil) @@ -15,20 +15,20 @@ type Service interface { Create(ctx core.Context, createData *CreateCronTaskData) (id int32, err error) Modify(ctx core.Context, id int32, modifyData *ModifyCronTaskData) (err error) - PageList(ctx core.Context, searchData *SearchData) (listData []*cron_task_repo.CronTask, err error) + PageList(ctx core.Context, searchData *SearchData) (listData []*cron_task.CronTask, err error) PageListCount(ctx core.Context, searchData *SearchData) (total int64, err error) UpdateUsed(ctx core.Context, id int32, used int32) (err error) Execute(ctx core.Context, id int32) (err error) - Detail(ctx core.Context, searchOneData *SearchOneData) (info *cron_task_repo.CronTask, err error) + Detail(ctx core.Context, searchOneData *SearchOneData) (info *cron_task.CronTask, err error) } type service struct { - db db.Repo + db mysql.Repo cache redis.Repo cronServer cron.Server } -func New(db db.Repo, cache redis.Repo, cron cron.Server) Service { +func New(db mysql.Repo, cache redis.Repo, cron cron.Server) Service { return &service{ db: db, cache: cache, diff --git a/internal/services/cron/service_create.go b/internal/services/cron/service_create.go index b8dd8c6..58a5503 100644 --- a/internal/services/cron/service_create.go +++ b/internal/services/cron/service_create.go @@ -1,8 +1,8 @@ package cron import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" ) type CreateCronTaskData struct { @@ -23,7 +23,7 @@ type CreateCronTaskData struct { } func (s *service) Create(ctx core.Context, createData *CreateCronTaskData) (id int32, err error) { - model := cron_task_repo.NewModel() + model := cron_task.NewModel() model.Name = createData.Name model.Spec = createData.Spec model.Command = createData.Command diff --git a/internal/services/cron/service_detail.go b/internal/services/cron/service_detail.go index 6aa0938..9574686 100644 --- a/internal/services/cron/service_detail.go +++ b/internal/services/cron/service_detail.go @@ -1,20 +1,20 @@ package cron import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" ) type SearchOneData struct { Id int32 // 任务ID } -func (s *service) Detail(ctx core.Context, searchOneData *SearchOneData) (info *cron_task_repo.CronTask, err error) { - qb := cron_task_repo.NewQueryBuilder() +func (s *service) Detail(ctx core.Context, searchOneData *SearchOneData) (info *cron_task.CronTask, err error) { + qb := cron_task.NewQueryBuilder() if searchOneData.Id != 0 { - qb.WhereId(db_repo.EqualPredicate, searchOneData.Id) + qb.WhereId(mysql.EqualPredicate, searchOneData.Id) } info, err = qb.QueryOne(s.db.GetDbR().WithContext(ctx.RequestContext())) diff --git a/internal/services/cron/service_execute.go b/internal/services/cron/service_execute.go index 7a602ab..ff644ac 100644 --- a/internal/services/cron/service_execute.go +++ b/internal/services/cron/service_execute.go @@ -1,14 +1,14 @@ package cron import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" ) func (s *service) Execute(ctx core.Context, id int32) (err error) { - qb := cron_task_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := cron_task.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) info, err := qb.QueryOne(s.db.GetDbR().WithContext(ctx.RequestContext())) if err != nil { return err diff --git a/internal/services/cron/service_modify.go b/internal/services/cron/service_modify.go index 19f8901..04e8726 100644 --- a/internal/services/cron/service_modify.go +++ b/internal/services/cron/service_modify.go @@ -1,9 +1,9 @@ package cron import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" "github.com/spf13/cast" ) @@ -44,19 +44,19 @@ func (s *service) Modify(ctx core.Context, id int32, modifyData *ModifyCronTaskD "updated_user": ctx.UserName(), } - qb := cron_task_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := cron_task.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err } // region 操作定时任务 避免主从同步延迟，在这需要查询主库 - if modifyData.IsUsed == cron_task_repo.IsUsedNo { + if modifyData.IsUsed == cron_task.IsUsedNo { s.cronServer.RemoveTask(cast.ToInt(id)) } else { - qb = cron_task_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb = cron_task.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) info, err := qb.QueryOne(s.db.GetDbW().WithContext(ctx.RequestContext())) if err != nil { return err diff --git a/internal/services/cron/service_pagelist.go b/internal/services/cron/service_pagelist.go index 184e64e..da5e616 100644 --- a/internal/services/cron/service_pagelist.go +++ b/internal/services/cron/service_pagelist.go @@ -1,9 +1,9 @@ package cron import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" ) type SearchData struct { @@ -14,7 +14,7 @@ type SearchData struct { IsUsed int32 // 是否启用 } -func (s *service) PageList(ctx core.Context, searchData *SearchData) (listData []*cron_task_repo.CronTask, err error) { +func (s *service) PageList(ctx core.Context, searchData *SearchData) (listData []*cron_task.CronTask, err error) { page := searchData.Page if page == 0 { page = 1 @@ -27,18 +27,18 @@ func (s *service) PageList(ctx core.Context, searchData *SearchData) (listData [ offset := (page - 1) * pageSize - qb := cron_task_repo.NewQueryBuilder() + qb := cron_task.NewQueryBuilder() if searchData.Name != "" { - qb.WhereName(db_repo.EqualPredicate, searchData.Name) + qb.WhereName(mysql.EqualPredicate, searchData.Name) } if searchData.Protocol != 0 { - qb.WhereProtocol(db_repo.EqualPredicate, searchData.Protocol) + qb.WhereProtocol(mysql.EqualPredicate, searchData.Protocol) } if searchData.IsUsed != 0 { - qb.WhereIsUsed(db_repo.EqualPredicate, searchData.IsUsed) + qb.WhereIsUsed(mysql.EqualPredicate, searchData.IsUsed) } listData, err = qb. diff --git a/internal/services/cron/service_pagelistcount.go b/internal/services/cron/service_pagelistcount.go index 9ccbe61..90be247 100644 --- a/internal/services/cron/service_pagelistcount.go +++ b/internal/services/cron/service_pagelistcount.go @@ -1,24 +1,24 @@ package cron import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" ) func (s *service) PageListCount(ctx core.Context, searchData *SearchData) (total int64, err error) { - qb := cron_task_repo.NewQueryBuilder() + qb := cron_task.NewQueryBuilder() if searchData.Name != "" { - qb.WhereName(db_repo.EqualPredicate, searchData.Name) + qb.WhereName(mysql.EqualPredicate, searchData.Name) } if searchData.Protocol != 0 { - qb.WhereProtocol(db_repo.EqualPredicate, searchData.Protocol) + qb.WhereProtocol(mysql.EqualPredicate, searchData.Protocol) } if searchData.IsUsed != 0 { - qb.WhereIsUsed(db_repo.EqualPredicate, searchData.IsUsed) + qb.WhereIsUsed(mysql.EqualPredicate, searchData.IsUsed) } total, err = qb.Count(s.db.GetDbR().WithContext(ctx.RequestContext())) diff --git a/internal/services/cron/service_updateused.go b/internal/services/cron/service_updateused.go index 4087d7d..7e3a521 100644 --- a/internal/services/cron/service_updateused.go +++ b/internal/services/cron/service_updateused.go @@ -1,9 +1,9 @@ package cron import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/cron_task_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/cron_task" "github.com/spf13/cast" ) @@ -14,19 +14,19 @@ func (s *service) UpdateUsed(ctx core.Context, id int32, used int32) (err error) "updated_user": ctx.UserName(), } - qb := cron_task_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := cron_task.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err } // region 操作定时任务 避免主从同步延迟，在这需要查询主库 - if used == cron_task_repo.IsUsedNo { + if used == cron_task.IsUsedNo { s.cronServer.RemoveTask(cast.ToInt(id)) } else { - qb = cron_task_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb = cron_task.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) info, err := qb.QueryOne(s.db.GetDbW().WithContext(ctx.RequestContext())) if err != nil { return err diff --git a/internal/services/menu/service.go b/internal/services/menu/service.go index 5d22f67..57e1d65 100644 --- a/internal/services/menu/service.go +++ b/internal/services/menu/service.go @@ -1,11 +1,11 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_action_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu_action" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" ) var _ Service = (*service)(nil) @@ -15,23 +15,23 @@ type Service interface { Create(ctx core.Context, menuData *CreateMenuData) (id int32, err error) Modify(ctx core.Context, id int32, menuData *UpdateMenuData) (err error) - List(ctx core.Context, searchData *SearchData) (listData []*menu_repo.Menu, err error) + List(ctx core.Context, searchData *SearchData) (listData []*menu.Menu, err error) UpdateUsed(ctx core.Context, id int32, used int32) (err error) UpdateSort(ctx core.Context, id int32, sort int32) (err error) Delete(ctx core.Context, id int32) (err error) - Detail(ctx core.Context, searchOneData *SearchOneData) (info *menu_repo.Menu, err error) + Detail(ctx core.Context, searchOneData *SearchOneData) (info *menu.Menu, err error) CreateAction(ctx core.Context, menuActionData *CreateMenuActionData) (id int32, err error) - ListAction(ctx core.Context, searchListActionData *SearchListActionData) (listData []*menu_action_repo.MenuAction, err error) + ListAction(ctx core.Context, searchListActionData *SearchListActionData) (listData []*menu_action.MenuAction, err error) DeleteAction(ctx core.Context, id int32) (err error) } type service struct { - db db.Repo + db mysql.Repo cache redis.Repo } -func New(db db.Repo, cache redis.Repo) Service { +func New(db mysql.Repo, cache redis.Repo) Service { return &service{ db: db, cache: cache, diff --git a/internal/services/menu/service_create.go b/internal/services/menu/service_create.go index fbea33b..21e4408 100644 --- a/internal/services/menu/service_create.go +++ b/internal/services/menu/service_create.go @@ -1,8 +1,8 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" ) type CreateMenuData struct { @@ -14,7 +14,7 @@ type CreateMenuData struct { } func (s *service) Create(ctx core.Context, menuData *CreateMenuData) (id int32, err error) { - model := menu_repo.NewModel() + model := menu.NewModel() model.Pid = menuData.Pid model.Name = menuData.Name model.Link = menuData.Link diff --git a/internal/services/menu/service_createaction.go b/internal/services/menu/service_createaction.go index a325537..18809a8 100644 --- a/internal/services/menu/service_createaction.go +++ b/internal/services/menu/service_createaction.go @@ -1,8 +1,8 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_action_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu_action" ) type CreateMenuActionData struct { @@ -12,7 +12,7 @@ type CreateMenuActionData struct { } func (s *service) CreateAction(ctx core.Context, menuActionData *CreateMenuActionData) (id int32, err error) { - model := menu_action_repo.NewModel() + model := menu_action.NewModel() model.MenuId = menuActionData.MenuId model.Method = menuActionData.Method model.Api = menuActionData.API diff --git a/internal/services/menu/service_delete.go b/internal/services/menu/service_delete.go index ae05c31..55d1eb8 100644 --- a/internal/services/menu/service_delete.go +++ b/internal/services/menu/service_delete.go @@ -1,9 +1,9 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" ) func (s *service) Delete(ctx core.Context, id int32) (err error) { @@ -12,8 +12,8 @@ func (s *service) Delete(ctx core.Context, id int32) (err error) { "updated_user": ctx.UserName(), } - qb := menu_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := menu.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/menu/service_deleteaction.go b/internal/services/menu/service_deleteaction.go index dfe7e79..1f430bb 100644 --- a/internal/services/menu/service_deleteaction.go +++ b/internal/services/menu/service_deleteaction.go @@ -1,18 +1,18 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_action_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu_action" "gorm.io/gorm" ) func (s *service) DeleteAction(ctx core.Context, id int32) (err error) { // 先查询 id 是否存在 - _, err = menu_action_repo.NewQueryBuilder(). - WhereIsDeleted(db_repo.EqualPredicate, -1). - WhereId(db_repo.EqualPredicate, id). + _, err = menu_action.NewQueryBuilder(). + WhereIsDeleted(mysql.EqualPredicate, -1). + WhereId(mysql.EqualPredicate, id). First(s.db.GetDbR().WithContext(ctx.RequestContext())) if err == gorm.ErrRecordNotFound { @@ -24,8 +24,8 @@ func (s *service) DeleteAction(ctx core.Context, id int32) (err error) { "updated_user": ctx.UserName(), } - qb := menu_action_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := menu_action.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/menu/service_detail.go b/internal/services/menu/service_detail.go index 5be6198..ce28a24 100644 --- a/internal/services/menu/service_detail.go +++ b/internal/services/menu/service_detail.go @@ -1,9 +1,9 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" ) type SearchOneData struct { @@ -11,17 +11,17 @@ type SearchOneData struct { IsUsed int32 // 是否启用 1:是 -1:否 } -func (s *service) Detail(ctx core.Context, searchOneData *SearchOneData) (info *menu_repo.Menu, err error) { +func (s *service) Detail(ctx core.Context, searchOneData *SearchOneData) (info *menu.Menu, err error) { - qb := menu_repo.NewQueryBuilder() - qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := menu.NewQueryBuilder() + qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchOneData.Id != 0 { - qb.WhereId(db_repo.EqualPredicate, searchOneData.Id) + qb.WhereId(mysql.EqualPredicate, searchOneData.Id) } if searchOneData.IsUsed != 0 { - qb.WhereIsUsed(db_repo.EqualPredicate, searchOneData.IsUsed) + qb.WhereIsUsed(mysql.EqualPredicate, searchOneData.IsUsed) } info, err = qb.QueryOne(s.db.GetDbR().WithContext(ctx.RequestContext())) diff --git a/internal/services/menu/service_list.go b/internal/services/menu/service_list.go index 450bdc7..ac14cbd 100644 --- a/internal/services/menu/service_list.go +++ b/internal/services/menu/service_list.go @@ -1,22 +1,22 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" ) type SearchData struct { Pid int32 // 父类ID } -func (s *service) List(ctx core.Context, searchData *SearchData) (listData []*menu_repo.Menu, err error) { +func (s *service) List(ctx core.Context, searchData *SearchData) (listData []*menu.Menu, err error) { - qb := menu_repo.NewQueryBuilder() - qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := menu.NewQueryBuilder() + qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchData.Pid != 0 { - qb.WherePid(db_repo.EqualPredicate, searchData.Pid) + qb.WherePid(mysql.EqualPredicate, searchData.Pid) } listData, err = qb. diff --git a/internal/services/menu/service_listaction.go b/internal/services/menu/service_listaction.go index 038619e..175c508 100644 --- a/internal/services/menu/service_listaction.go +++ b/internal/services/menu/service_listaction.go @@ -1,22 +1,22 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_action_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu_action" ) type SearchListActionData struct { MenuId int32 `json:"menu_id"` // 菜单栏ID } -func (s *service) ListAction(ctx core.Context, searchData *SearchListActionData) (listData []*menu_action_repo.MenuAction, err error) { +func (s *service) ListAction(ctx core.Context, searchData *SearchListActionData) (listData []*menu_action.MenuAction, err error) { - qb := menu_action_repo.NewQueryBuilder() - qb.WhereIsDeleted(db_repo.EqualPredicate, -1) + qb := menu_action.NewQueryBuilder() + qb.WhereIsDeleted(mysql.EqualPredicate, -1) if searchData.MenuId != 0 { - qb.WhereMenuId(db_repo.EqualPredicate, searchData.MenuId) + qb.WhereMenuId(mysql.EqualPredicate, searchData.MenuId) } listData, err = qb. diff --git a/internal/services/menu/service_modify.go b/internal/services/menu/service_modify.go index faabf11..f04afbe 100644 --- a/internal/services/menu/service_modify.go +++ b/internal/services/menu/service_modify.go @@ -1,9 +1,9 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" ) type UpdateMenuData struct { @@ -20,8 +20,8 @@ func (s *service) Modify(ctx core.Context, id int32, menuData *UpdateMenuData) ( "updated_user": ctx.UserName(), } - qb := menu_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := menu.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/menu/service_updatesort.go b/internal/services/menu/service_updatesort.go index 5e16276..dc2e414 100644 --- a/internal/services/menu/service_updatesort.go +++ b/internal/services/menu/service_updatesort.go @@ -1,9 +1,9 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" ) func (s *service) UpdateSort(ctx core.Context, id int32, sort int32) (err error) { @@ -12,8 +12,8 @@ func (s *service) UpdateSort(ctx core.Context, id int32, sort int32) (err error) "updated_user": ctx.UserName(), } - qb := menu_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := menu.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/services/menu/service_updateused.go b/internal/services/menu/service_updateused.go index f07dd31..a4a5948 100644 --- a/internal/services/menu/service_updateused.go +++ b/internal/services/menu/service_updateused.go @@ -1,9 +1,9 @@ package menu import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo" - "github.com/xinliangnote/go-gin-api/internal/api/repository/db_repo/menu_repo" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql/menu" ) func (s *service) UpdateUsed(ctx core.Context, id int32, used int32) (err error) { @@ -12,8 +12,8 @@ func (s *service) UpdateUsed(ctx core.Context, id int32, used int32) (err error) "updated_user": ctx.UserName(), } - qb := menu_repo.NewQueryBuilder() - qb.WhereId(db_repo.EqualPredicate, id) + qb := menu.NewQueryBuilder() + qb.WhereId(mysql.EqualPredicate, id) err = qb.Updates(s.db.GetDbW().WithContext(ctx.RequestContext()), data) if err != nil { return err diff --git a/internal/websocket/sysmessage/sysmessage.go b/internal/websocket/sysmessage/sysmessage.go index 59cd161..b24ee71 100644 --- a/internal/websocket/sysmessage/sysmessage.go +++ b/internal/websocket/sysmessage/sysmessage.go @@ -1,10 +1,10 @@ package sysmessage import ( - "github.com/xinliangnote/go-gin-api/internal/api/repository/redis" - "github.com/xinliangnote/go-gin-api/internal/api/repository/socket" "github.com/xinliangnote/go-gin-api/internal/pkg/core" - "github.com/xinliangnote/go-gin-api/internal/pkg/db" + "github.com/xinliangnote/go-gin-api/internal/repository/mysql" + "github.com/xinliangnote/go-gin-api/internal/repository/redis" + "github.com/xinliangnote/go-gin-api/internal/repository/socket" "github.com/xinliangnote/go-gin-api/pkg/errors" "go.uber.org/zap" @@ -18,10 +18,10 @@ var ( type handler struct { logger *zap.Logger cache redis.Repo - db db.Repo + db mysql.Repo } -func New(logger *zap.Logger, db db.Repo, cache redis.Repo) *handler { +func New(logger *zap.Logger, db mysql.Repo, cache redis.Repo) *handler { return &handler{ logger: logger, cache: cache,