From 25d7323ed1beb806494d4a2315e2d89dbf9de1a5 Mon Sep 17 00:00:00 2001 From: G-Akiraka <45746659+G-Akiraka@users.noreply.github.com> Date: Fri, 2 Jul 2021 09:05:25 +0800 Subject: [PATCH 01/10] Update settings.yml --- config/settings.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/settings.yml b/config/settings.yml index 3035d57..2f32d36 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -52,7 +52,8 @@ settings: # addr: 127.0.0.1:6379 # password: xxxxxx # db: 2 - memory: '' key存在即可 + # key存在即可 + memory: '' queue: memory: poolSize: 100 @@ -69,4 +70,4 @@ settings: # blockingTimeout: 5 # reclaimInterval: 1 locker: - redis: \ No newline at end of file + redis: From f2ae95d932408ccf85e0342136db8ca99d4423b5 Mon Sep 17 00:00:00 2001 From: G-Akiraka <45746659+G-Akiraka@users.noreply.github.com> Date: Fri, 2 Jul 2021 09:09:20 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E7=BF=BB=E8=AF=91=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E7=AE=A1=E7=90=86=E5=91=98=E7=AE=A1=E7=90=86=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E6=98=AF=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/db.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/db.sql b/config/db.sql index f491072..a4a5421 100644 --- a/config/db.sql +++ b/config/db.sql @@ -199,7 +199,7 @@ COMMIT; BEGIN; INSERT INTO `sys_menu` VALUES (2, 'Admin', '系统管理', 'api-server', '/admin', '/0/2', 'M', '无', '', 0, 1, '', 'Layout', 10, '0', '1', 0, 1, '2021-05-20 21:58:45.679', '2021-06-17 11:48:40.703', NULL); -INSERT INTO `sys_menu` VALUES (3, 'SysUserManage', '管理员管理', 'user', '/admin/sys-user', '/0/2/3', 'C', '无', 'admin:sysUser:list', 2, 0, '', '/admin/sys-user/index', 10, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL); +INSERT INTO `sys_menu` VALUES (3, 'SysUserManage', '用户管理', 'user', '/admin/sys-user', '/0/2/3', 'C', '无', 'admin:sysUser:list', 2, 0, '', '/admin/sys-user/index', 10, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL); INSERT INTO `sys_menu` VALUES (43, '', '新增管理员1', 'app-group-fill', '', '/0/2/3/43', 'F', 'POST', 'admin:sysUser:add', 3, 0, '', '', 10, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL); INSERT INTO `sys_menu` VALUES (44, '', '查询管理员', 'app-group-fill', '', '/0/2/3/44', 'F', 'GET', 'admin:sysUser:query', 3, 0, '', '', 40, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL); INSERT INTO `sys_menu` VALUES (45, '', '修改管理员', 'app-group-fill', '', '/0/2/3/45', 'F', 'PUT', 'admin:sysUser:edit', 3, 0, '', '', 30, '0', '1', 0, 1, '2021-05-20 22:08:44.526', '2021-06-17 20:31:14.305', NULL); @@ -363,4 +363,4 @@ COMMIT; SET FOREIGN_KEY_CHECKS = 1; --- 数据完成 ; \ No newline at end of file +-- 数据完成 ; From 007807e776066b8923e4268b894831d75571cd07 Mon Sep 17 00:00:00 2001 From: G-Akiraka <45746659+G-Akiraka@users.noreply.github.com> Date: Fri, 2 Jul 2021 10:06:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A3=81=E7=9B=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=BB=E6=9C=BA=E5=90=8D=E7=A7=B0=E4=B8=8E?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 上一个pr提交作废 --- app/other/apis/sys_server_monitor.go | 39 ++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/app/other/apis/sys_server_monitor.go b/app/other/apis/sys_server_monitor.go index 4841e7e..a805405 100644 --- a/app/other/apis/sys_server_monitor.go +++ b/app/other/apis/sys_server_monitor.go @@ -1,7 +1,11 @@ package apis import ( + "fmt" + "github.com/shirou/gopsutil/host" "runtime" + "strconv" + "time" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" @@ -23,6 +27,20 @@ type ServerMonitor struct { api.Api } +//获取相差时间 +func GetHourDiffer(startTime, endTime string) int64 { + var hour int64 + t1, err := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local) + t2, err := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local) + if err == nil && t1.Before(t2) { + diff := t2.Unix() - t1.Unix() // + hour = diff / 3600 + return hour + } else { + return hour + } +} + // ServerInfo 获取系统信息 // @Summary 系统信息 // @Description 获取JSON @@ -33,6 +51,7 @@ type ServerMonitor struct { func (e ServerMonitor) ServerInfo(c *gin.Context) { e.Context = c + sysInfo, err := host.Info() osDic := make(map[string]interface{}, 0) osDic["goOs"] = runtime.GOOS osDic["arch"] = runtime.GOARCH @@ -42,6 +61,8 @@ func (e ServerMonitor) ServerInfo(c *gin.Context) { osDic["numGoroutine"] = runtime.NumGoroutine() osDic["ip"] = pkg.GetLocaHonst() osDic["projectDir"] = pkg.GetCurrentPath() + osDic["hostName"] = sysInfo.Hostname + osDic["time"] = time.Now().Format("2006-01-02 15:04:05") dis, _ := disk.Usage("/") diskTotalGB := int(dis.Total) / GB @@ -67,11 +88,29 @@ func (e ServerMonitor) ServerInfo(c *gin.Context) { cpuDic["Percent"] = pkg.Round(percent[0], 2) cpuDic["cpuNum"], _ = cpu.Counts(false) + //服务器磁盘信息 + disklist := make([]disk.UsageStat, 0) + //所有分区 + diskInfo, err := disk.Partitions(true) + if err == nil { + for _, p := range diskInfo { + diskDetail, err := disk.Usage(p.Mountpoint) + if err == nil { + diskDetail.UsedPercent, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", diskDetail.UsedPercent), 64) + diskDetail.Total = diskDetail.Total / 1024 / 1024 + diskDetail.Used = diskDetail.Used / 1024 / 1024 + diskDetail.Free = diskDetail.Free / 1024 / 1024 + disklist = append(disklist, *diskDetail) + } + } + } + e.Custom(gin.H{ "code": 200, "os": osDic, "mem": memDic, "cpu": cpuDic, "disk": diskDic, + "diskList": disklist, }) } From 37d318b4d9bbc0f144f27e6ba570d95dee154f58 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 4 Jul 2021 05:46:20 +0800 Subject: [PATCH 04/10] =?UTF-8?q?feat=E2=9C=A8:=20vue-cli@3=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=B8=BA=20vue-cli@4=E3=80=81Change=20Node=20Sass=20t?= =?UTF-8?q?o=20Dart=20Sass=E3=80=81=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. vue-cli@3 升级为 vue-cli@4 2. Change Node Sass to Dart Sass 3. 代码生成工具 --- app/admin/apis/sys_api.go | 4 +- app/other/apis/tools/gen.go | 102 +++------------------ app/other/apis/tools/sys_tables.go | 22 +++-- app/other/models/tools/sys_columns.go | 90 +++++++++--------- app/other/models/tools/sys_tables.go | 6 +- template/v4/dto.go.template | 78 ++++++++++++---- template/v4/js.go.template | 10 +- template/v4/no_actions/apis.go.template | 27 +++--- template/v4/no_actions/service.go.template | 11 +-- template/v4/vue.go.template | 6 +- 10 files changed, 168 insertions(+), 188 deletions(-) diff --git a/app/admin/apis/sys_api.go b/app/admin/apis/sys_api.go index 8e6cab2..c2d3474 100644 --- a/app/admin/apis/sys_api.go +++ b/app/admin/apis/sys_api.go @@ -92,7 +92,7 @@ func (e SysApi) Get(c *gin.Context) { // @Tags 接口管理 // @Accept application/json // @Product application/json -// @Param data body dto.SysApiControl true "body" +// @Param data body dto.SysApiUpdateReq true "body" // @Success 200 {object} response.Response "{"code": 200, "message": "修改成功"}" // @Router /api/v1/sys-api/{id} [put] // @Security Bearer @@ -122,7 +122,7 @@ func (e SysApi) Update(c *gin.Context) { // @Summary 删除接口管理 // @Description 删除接口管理 // @Tags 接口管理 -// @Param ids body []int false "ids" +// @Param data body dto.SysApiDeleteReq true "body" // @Success 200 {object} response.Response "{"code": 200, "message": "删除成功"}" // @Router /api/v1/sys-api [delete] // @Security Bearer diff --git a/app/other/apis/tools/gen.go b/app/other/apis/tools/gen.go index 7760ad3..6d0afcc 100644 --- a/app/other/apis/tools/gen.go +++ b/app/other/apis/tools/gen.go @@ -83,7 +83,7 @@ func (e Gen) Preview(c *gin.Context) { return } - tab, _ := table.Get(db) + tab, _ := table.Get(db,false) var b1 bytes.Buffer err = t1.Execute(&b1, tab) var b2 bytes.Buffer @@ -129,13 +129,9 @@ func (e Gen) GenCode(c *gin.Context) { } table.TableId = id - tab, _ := table.Get(db) + tab, _ := table.Get(db,false) - if tab.IsActions == 1 { - e.ActionsGen(c, tab) - } else { - e.NOActionsGen(c, tab) - } + e.NOActionsGen(c, tab) e.OK("", "Code generated successfully!") } @@ -159,7 +155,7 @@ func (e Gen) GenApiToFile(c *gin.Context) { } table.TableId = id - tab, _ := table.Get(db) + tab, _ := table.Get(db,false) e.genApiToFile(c, tab) e.OK("", "Code generated successfully!") @@ -224,8 +220,8 @@ func (e Gen) NOActionsGen(c *gin.Context, tab tools.SysTables) { _ = pkg.PathCreate("./app/" + tab.PackageName + "/models/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/router/") _ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/") - _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/" + tab.PackageName+ "/") - err = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.PackageName + "/" + tab.MLTBName+ "/") + _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/" + tab.PackageName + "/") + err = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.PackageName + "/" + tab.MLTBName + "/") if err != nil { log.Error(err) e.Error(500, err, fmt.Sprintf("views目录创建失败!错误详情:%s", err.Error())) @@ -285,78 +281,6 @@ func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) { } -func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) { - err := e.MakeContext(c). - MakeOrm(). - Errors - if err != nil { - e.Logger.Error(err) - e.Error(500, err, err.Error()) - return - } - - basePath := "template/v4/" - routerFile := basePath + "actions/router_check_role.go.template" - - if tab.IsAuth == 2 { - routerFile = basePath + "actions/router_no_check_role.go.template" - } - - t1, err := template.ParseFiles(basePath + "model.go.template") - if err != nil { - e.Logger.Error(err) - e.Error(500, err, fmt.Sprintf("model模版解析失败!错误详情:%s", err.Error())) - return - } - t3, err := template.ParseFiles(routerFile) - if err != nil { - e.Logger.Error(err) - e.Error(500, err, fmt.Sprintf("路由模版解析失败!错误详情:%s", err.Error())) - return - } - t4, err := template.ParseFiles(basePath + "js.go.template") - if err != nil { - e.Logger.Error(err) - e.Error(500, err, fmt.Sprintf("js模版解析失败!错误详情:%s", err.Error())) - return - } - t5, err := template.ParseFiles(basePath + "vue.go.template") - if err != nil { - e.Logger.Error(err) - e.Error(500, err, fmt.Sprintf("vue模版解析失败!错误详情:%s", err.Error())) - return - } - t6, err := template.ParseFiles(basePath + "dto.go.template") - if err != nil { - e.Logger.Error(err) - e.Error(500, err, fmt.Sprintf("dto模版解析失败!错误详情:%s", err.Error())) - return - } - - _ = pkg.PathCreate("./app/" + tab.PackageName + "/models/") - _ = pkg.PathCreate("./app/" + tab.PackageName + "/router/") - _ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/") - _ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/") - _ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.ModuleFrontName) - - var b1 bytes.Buffer - err = t1.Execute(&b1, tab) - var b3 bytes.Buffer - err = t3.Execute(&b3, tab) - var b4 bytes.Buffer - err = t4.Execute(&b4, tab) - var b5 bytes.Buffer - err = t5.Execute(&b5, tab) - var b6 bytes.Buffer - err = t6.Execute(&b6, tab) - - pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.ModuleName+".go") - pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.ModuleName+".go") - pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.ModuleFrontName+".js") - pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.ModuleFrontName+"/index.vue") - pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.ModuleName+".go") -} - func (e Gen) GenMenuAndApi(c *gin.Context) { s := service.SysMenu{} err := e.MakeContext(c). @@ -378,13 +302,13 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { } table.TableId = id - tab, _ := table.Get(e.Orm) + tab, _ := table.Get(e.Orm,true) tab.MLTBName = strings.Replace(tab.TBName, "_", "-", -1) Mmenu := dto.SysMenuControl{} Mmenu.Title = tab.TableComment Mmenu.Icon = "pass" - Mmenu.Path = "/" +tab.MLTBName + Mmenu.Path = "/" + tab.MLTBName Mmenu.MenuType = "M" Mmenu.Action = "无" Mmenu.ParentId = 0 @@ -403,7 +327,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { Cmenu.Path = "/" + tab.PackageName + "/" + tab.MLTBName Cmenu.MenuType = "C" Cmenu.Action = "无" - Cmenu.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":list" + Cmenu.Permission = tab.PackageName + ":" + tab.BusinessName + ":list" Cmenu.ParentId = Mmenu.MenuId Cmenu.NoCache = false Cmenu.Component = "/" + tab.PackageName + "/" + tab.MLTBName + "/index" @@ -421,7 +345,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { MList.Path = tab.TBName MList.MenuType = "F" MList.Action = "无" - MList.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":query" + MList.Permission = tab.PackageName + ":" + tab.BusinessName + ":query" MList.ParentId = Cmenu.MenuId MList.NoCache = false MList.Sort = 0 @@ -438,7 +362,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { MCreate.Path = tab.TBName MCreate.MenuType = "F" MCreate.Action = "无" - MCreate.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":add" + MCreate.Permission = tab.PackageName + ":" + tab.BusinessName + ":add" MCreate.ParentId = Cmenu.MenuId MCreate.NoCache = false MCreate.Sort = 0 @@ -455,7 +379,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { MUpdate.Path = tab.TBName MUpdate.MenuType = "F" MUpdate.Action = "无" - MUpdate.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":edit" + MUpdate.Permission = tab.PackageName + ":" + tab.BusinessName + ":edit" MUpdate.ParentId = Cmenu.MenuId MUpdate.NoCache = false MUpdate.Sort = 0 @@ -472,7 +396,7 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { MDelete.Path = tab.TBName MDelete.MenuType = "F" MDelete.Action = "无" - MDelete.Permission = tab.PackageName + ":" + tab.ModuleFrontName + ":remove" + MDelete.Permission = tab.PackageName + ":" + tab.BusinessName + ":remove" MDelete.ParentId = Cmenu.MenuId MDelete.NoCache = false MDelete.Sort = 0 diff --git a/app/other/apis/tools/sys_tables.go b/app/other/apis/tools/sys_tables.go index 03a5d95..ea7dee7 100644 --- a/app/other/apis/tools/sys_tables.go +++ b/app/other/apis/tools/sys_tables.go @@ -79,7 +79,7 @@ func (e SysTable) Get(c *gin.Context) { var data tools.SysTables data.TableId, _ = pkg.StringToInt(c.Param("tableId")) - result, err := data.Get(db) + result, err := data.Get(db,true) if err != nil { log.Errorf("Get error, %s", err.Error()) e.Error(500, err, "") @@ -106,7 +106,7 @@ func (e SysTable) GetSysTablesInfo(c *gin.Context) { if c.Request.FormValue("tableName") != "" { data.TBName = c.Request.FormValue("tableName") } - result, err := data.Get(db) + result, err := data.Get(db,true) if err != nil { log.Errorf("Get error, %s", err.Error()) e.Error(500, err, "抱歉未找到相关信息") @@ -202,15 +202,23 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool for i := 0; i < len(tablenamelist); i++ { strStart := string([]byte(tablenamelist[i])[:1]) strend := string([]byte(tablenamelist[i])[1:]) + // 大驼峰表名 结构体使用 data.ClassName += strings.ToUpper(strStart) + strend + // 小驼峰表名 js函数名和权限标识使用 + if i == 0 { + data.BusinessName += strings.ToLower(strStart) + strend + } else { + data.BusinessName += strings.ToUpper(strStart) + strend + } //data.PackageName += strings.ToLower(strStart) + strings.ToLower(strend) - data.ModuleName += strings.ToLower(strStart) + strings.ToLower(strend) + //data.ModuleName += strings.ToLower(strStart) + strings.ToLower(strend) } - data.ModuleFrontName = strings.ReplaceAll(data.ModuleName, "_", "-") + //data.ModuleFrontName = strings.ReplaceAll(data.ModuleName, "_", "-") data.PackageName = "admin" data.TplCategory = "crud" data.Crud = true - + // 中横线表名称,接口路径、前端文件夹名称和js名称使用 + data.ModuleName = strings.Replace(data.TBName, "_", "-", -1) dbcolumn, err := dbColumn.GetList(tx) data.CreateBy = 0 data.TableComment = dbtable.TableComment @@ -219,7 +227,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool } data.FunctionName = data.TableComment - data.BusinessName = data.ModuleName + //data.BusinessName = data.ModuleName data.IsLogicalDelete = "1" data.LogicalDelete = true data.LogicalDeleteColumn = "is_del" @@ -350,4 +358,4 @@ func (e SysTable) Delete(c *gin.Context) { return } e.OK(nil, "删除成功") -} \ No newline at end of file +} diff --git a/app/other/models/tools/sys_columns.go b/app/other/models/tools/sys_columns.go index 13ebf17..34fe27c 100644 --- a/app/other/models/tools/sys_columns.go +++ b/app/other/models/tools/sys_columns.go @@ -6,43 +6,43 @@ import ( ) type SysColumns struct { - ColumnId int `gorm:"primaryKey;autoIncrement" json:"columnId"` - TableId int `gorm:"" json:"tableId"` - ColumnName string `gorm:"size:128;" json:"columnName"` - ColumnComment string `gorm:"column:column_comment;size:128;" json:"columnComment"` - ColumnType string `gorm:"column:column_type;size:128;" json:"columnType"` - GoType string `gorm:"column:go_type;size:128;" json:"goType"` - GoField string `gorm:"column:go_field;size:128;" json:"goField"` - JsonField string `gorm:"column:json_field;size:128;" json:"jsonField"` - IsPk string `gorm:"column:is_pk;size:4;" json:"isPk"` - IsIncrement string `gorm:"column:is_increment;size:4;" json:"isIncrement"` - IsRequired string `gorm:"column:is_required;size:4;" json:"isRequired"` - IsInsert string `gorm:"column:is_insert;size:4;" json:"isInsert"` - IsEdit string `gorm:"column:is_edit;size:4;" json:"isEdit"` - IsList string `gorm:"column:is_list;size:4;" json:"isList"` - IsQuery string `gorm:"column:is_query;size:4;" json:"isQuery"` - QueryType string `gorm:"column:query_type;size:128;" json:"queryType"` - HtmlType string `gorm:"column:html_type;size:128;" json:"htmlType"` - DictType string `gorm:"column:dict_type;size:128;" json:"dictType"` - Sort int `gorm:"column:sort;" json:"sort"` - List string `gorm:"column:list;size:1;" json:"list"` - Pk bool `gorm:"column:pk;size:1;" json:"pk"` - Required bool `gorm:"column:required;size:1;" json:"required"` - SuperColumn bool `gorm:"column:super_column;size:1;" json:"superColumn"` - UsableColumn bool `gorm:"column:usable_column;size:1;" json:"usableColumn"` - Increment bool `gorm:"column:increment;size:1;" json:"increment"` - Insert bool `gorm:"column:insert;size:1;" json:"insert"` - Edit bool `gorm:"column:edit;size:1;" json:"edit"` - Query bool `gorm:"column:query;size:1;" json:"query"` - Remark string `gorm:"column:remark;size:255;" json:"remark"` - FkTableName string `gorm:"" json:"fkTableName"` - FkTableNameClass string `gorm:"" json:"fkTableNameClass"` - FkTableNamePackage string `gorm:"" json:"fkTableNamePackage"` - FkCol []SysColumns `gorm:"-" json:"fkCol"` - FkLabelId string `gorm:"" json:"fkLabelId"` - FkLabelName string `gorm:"size:255;" json:"fkLabelName"` - CreateBy int `gorm:"column:create_by;size:20;" json:"createBy"` - UpdateBy int `gorm:"column:update_By;size:20;" json:"updateBy"` + ColumnId int `gorm:"primaryKey;autoIncrement" json:"columnId"` + TableId int `gorm:"" json:"tableId"` + ColumnName string `gorm:"size:128;" json:"columnName"` + ColumnComment string `gorm:"column:column_comment;size:128;" json:"columnComment"` + ColumnType string `gorm:"column:column_type;size:128;" json:"columnType"` + GoType string `gorm:"column:go_type;size:128;" json:"goType"` + GoField string `gorm:"column:go_field;size:128;" json:"goField"` + JsonField string `gorm:"column:json_field;size:128;" json:"jsonField"` + IsPk string `gorm:"column:is_pk;size:4;" json:"isPk"` + IsIncrement string `gorm:"column:is_increment;size:4;" json:"isIncrement"` + IsRequired string `gorm:"column:is_required;size:4;" json:"isRequired"` + IsInsert string `gorm:"column:is_insert;size:4;" json:"isInsert"` + IsEdit string `gorm:"column:is_edit;size:4;" json:"isEdit"` + IsList string `gorm:"column:is_list;size:4;" json:"isList"` + IsQuery string `gorm:"column:is_query;size:4;" json:"isQuery"` + QueryType string `gorm:"column:query_type;size:128;" json:"queryType"` + HtmlType string `gorm:"column:html_type;size:128;" json:"htmlType"` + DictType string `gorm:"column:dict_type;size:128;" json:"dictType"` + Sort int `gorm:"column:sort;" json:"sort"` + List string `gorm:"column:list;size:1;" json:"list"` + Pk bool `gorm:"column:pk;size:1;" json:"pk"` + Required bool `gorm:"column:required;size:1;" json:"required"` + SuperColumn bool `gorm:"column:super_column;size:1;" json:"superColumn"` + UsableColumn bool `gorm:"column:usable_column;size:1;" json:"usableColumn"` + Increment bool `gorm:"column:increment;size:1;" json:"increment"` + Insert bool `gorm:"column:insert;size:1;" json:"insert"` + Edit bool `gorm:"column:edit;size:1;" json:"edit"` + Query bool `gorm:"column:query;size:1;" json:"query"` + Remark string `gorm:"column:remark;size:255;" json:"remark"` + FkTableName string `gorm:"" json:"fkTableName"` + FkTableNameClass string `gorm:"" json:"fkTableNameClass"` + FkTableNamePackage string `gorm:"" json:"fkTableNamePackage"` + FkCol []SysColumns `gorm:"-" json:"fkCol"` + FkLabelId string `gorm:"" json:"fkLabelId"` + FkLabelName string `gorm:"size:255;" json:"fkLabelName"` + CreateBy int `gorm:"column:create_by;size:20;" json:"createBy"` + UpdateBy int `gorm:"column:update_By;size:20;" json:"updateBy"` models.BaseModel } @@ -51,12 +51,20 @@ func (SysColumns) TableName() string { return "sys_columns" } -func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) { +func (e *SysColumns) GetList(tx *gorm.DB, exclude bool) ([]SysColumns, error) { var doc []SysColumns - table := tx.Table("sys_columns") - - table = table.Where("table_id = ?", e.TableId) + table = table.Where("table_id = ? ", e.TableId) + if exclude { + notIn := make([]string, 6) + notIn = append(notIn, "id") + notIn = append(notIn, "create_by") + notIn = append(notIn, "update_by") + notIn = append(notIn, "created_at") + notIn = append(notIn, "updated_at") + notIn = append(notIn, "deleted_at") + table = table.Where(" column_name not in(?)", notIn) + } if err := table.Find(&doc).Error; err != nil { return nil, err diff --git a/app/other/models/tools/sys_tables.go b/app/other/models/tools/sys_tables.go index fa808bb..4267402 100644 --- a/app/other/models/tools/sys_tables.go +++ b/app/other/models/tools/sys_tables.go @@ -78,7 +78,7 @@ func (e *SysTables) GetPage(tx *gorm.DB, pageSize int, pageIndex int) ([]SysTabl return doc, int(count), nil } -func (e *SysTables) Get(tx *gorm.DB) (SysTables, error) { +func (e *SysTables) Get(tx *gorm.DB, exclude bool) (SysTables, error) { var doc SysTables var err error table := tx.Table("sys_tables") @@ -98,7 +98,7 @@ func (e *SysTables) Get(tx *gorm.DB) (SysTables, error) { } var col SysColumns col.TableId = doc.TableId - if doc.Columns, err = col.GetList(tx); err != nil { + if doc.Columns, err = col.GetList(tx, exclude); err != nil { return doc, err } @@ -127,7 +127,7 @@ func (e *SysTables) GetTree(tx *gorm.DB) ([]SysTables, error) { var col SysColumns //col.FkCol = append(col.FkCol, SysColumns{ColumnId: 0, ColumnName: "请选择"}) col.TableId = doc[i].TableId - if doc[i].Columns, err = col.GetList(tx); err != nil { + if doc[i].Columns, err = col.GetList(tx, false); err != nil { return doc, err } diff --git a/template/v4/dto.go.template b/template/v4/dto.go.template index 93e52b2..1aa5bfe 100644 --- a/template/v4/dto.go.template +++ b/template/v4/dto.go.template @@ -20,7 +20,7 @@ import ( {{- end }} ) -type {{.ClassName}}Search struct { +type {{.ClassName}}GetPageReq struct { dto.Pagination `search:"-"` {{- $tablename := .TBName -}} {{- range .Columns -}} @@ -39,15 +39,15 @@ type {{.ClassName}}Order struct { {{ end }} } -func (m *{{.ClassName}}Search) GetNeedSearch() interface{} { +func (m *{{.ClassName}}GetPageReq) GetNeedSearch() interface{} { return *m } -type {{.ClassName}}Control struct { +type {{.ClassName}}InsertReq struct { {{- range .Columns -}} {{$x := .Pk}} {{- if ($x) }} - {{.GoField}} {{.GoType}} `uri:"{{.JsonField}}" comment:"{{.ColumnComment}}"` // {{.ColumnComment}} + {{.GoField}} {{.GoType}} `json:"-" comment:"{{.ColumnComment}}"` // {{.ColumnComment}} {{- else if eq .GoField "CreatedAt" -}} {{- else if eq .GoField "UpdatedAt" -}} {{- else if eq .GoField "DeletedAt" -}} @@ -60,7 +60,7 @@ type {{.ClassName}}Control struct { common.ControlBy } -func (s *{{.ClassName}}Control) Generate(model *models.{{.ClassName}}) { +func (s *{{.ClassName}}InsertReq) Generate(model *models.{{.ClassName}}) { {{- range .Columns -}} {{$x := .Pk}} {{- if ($x) }} @@ -78,25 +78,67 @@ func (s *{{.ClassName}}Control) Generate(model *models.{{.ClassName}}) { {{- end }} } -func (s *{{.ClassName}}Control) GetId() interface{} { +func (s *{{.ClassName}}InsertReq) GetId() interface{} { return s.{{.PkGoField}} } -type {{.ClassName}}ById struct { - Id int `uri:"id"` - Ids []int `json:"ids"` +type {{.ClassName}}UpdateReq struct { + {{- range .Columns -}} + {{$x := .Pk}} + {{- if ($x) }} + {{.GoField}} {{.GoType}} `uri:"{{.JsonField}}" comment:"{{.ColumnComment}}"` // {{.ColumnComment}} + {{- else if eq .GoField "CreatedAt" -}} + {{- else if eq .GoField "UpdatedAt" -}} + {{- else if eq .GoField "DeletedAt" -}} + {{- else if eq .GoField "CreateBy" -}} + {{- else if eq .GoField "UpdateBy" -}} + {{- else }} + {{.GoField}} {{.GoType}} `json:"{{.JsonField}}" comment:"{{.ColumnComment}}"` + {{- end -}} + {{- end }} common.ControlBy } -func (s *{{.ClassName}}ById) GetId() interface{} { - if len(s.Ids) > 0 { - s.Ids = append(s.Ids, s.Id) - return s.Ids - } - return s.Id +func (s *{{.ClassName}}UpdateReq) Generate(model *models.{{.ClassName}}) { + {{- range .Columns -}} + {{$x := .Pk}} + {{- if ($x) }} + if s.{{.GoField}} == 0 { + model.Model = common.Model{ {{.GoField}}: s.{{.GoField}} } + } + {{- else if eq .GoField "CreatedAt" -}} + {{- else if eq .GoField "UpdatedAt" -}} + {{- else if eq .GoField "DeletedAt" -}} + {{- else if eq .GoField "CreateBy" -}} + {{- else if eq .GoField "UpdateBy" -}} + {{- else }} + model.{{.GoField}} = s.{{.GoField}} + {{- end -}} + {{- end }} } -func (s *{{.ClassName}}ById) Generate() *{{.ClassName}}ById { - o := *s - return &o +func (s *{{.ClassName}}UpdateReq) GetId() interface{} { + return s.{{.PkGoField}} +} + +// {{.ClassName}}GetReq 功能获取请求参数 +type {{.ClassName}}GetReq struct { + {{- range .Columns -}} + {{$x := .Pk}} + {{- if ($x) }} + {{.GoField}} {{.GoType}} `uri:"{{.JsonField}}"` + {{- end }} + {{- end }} +} +func (s *{{.ClassName}}GetReq) GetId() interface{} { + return s.{{.PkGoField}} +} + +// {{.ClassName}}DeleteReq 功能删除请求参数 +type {{.ClassName}}DeleteReq struct { + Ids []int `json:"ids"` +} + +func (s *{{.ClassName}}DeleteReq) GetId() interface{} { + return s.Ids } \ No newline at end of file diff --git a/template/v4/js.go.template b/template/v4/js.go.template index ff980fc..db3d4a2 100644 --- a/template/v4/js.go.template +++ b/template/v4/js.go.template @@ -3,7 +3,7 @@ import request from '@/utils/request' // 查询{{.ClassName}}列表 export function list{{.ClassName}}(query) { return request({ - url: '/api/v1/{{.MLTBName}}', + url: '/api/v1/{{.ModuleName}}', method: 'get', params: query }) @@ -12,7 +12,7 @@ export function list{{.ClassName}}(query) { // 查询{{.ClassName}}详细 export function get{{.ClassName}} ({{.PkJsonField}}) { return request({ - url: '/api/v1/{{.MLTBName}}/' + {{.PkJsonField}}, + url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}}, method: 'get' }) } @@ -21,7 +21,7 @@ export function get{{.ClassName}} ({{.PkJsonField}}) { // 新增{{.ClassName}} export function add{{.ClassName}}(data) { return request({ - url: '/api/v1/{{.MLTBName}}', + url: '/api/v1/{{.ModuleName}}', method: 'post', data: data }) @@ -30,7 +30,7 @@ export function add{{.ClassName}}(data) { // 修改{{.ClassName}} export function update{{.ClassName}}(data) { return request({ - url: '/api/v1/{{.MLTBName}}/'+data.{{.PkJsonField}}, + url: '/api/v1/{{.ModuleName}}/'+data.{{.PkJsonField}}, method: 'put', data: data }) @@ -39,7 +39,7 @@ export function update{{.ClassName}}(data) { // 删除{{.ClassName}} export function del{{.ClassName}}(data) { return request({ - url: '/api/v1/{{.MLTBName}}', + url: '/api/v1/{{.ModuleName}}', method: 'delete', data: data }) diff --git a/template/v4/no_actions/apis.go.template b/template/v4/no_actions/apis.go.template index 1bfdcf9..08c0926 100644 --- a/template/v4/no_actions/apis.go.template +++ b/template/v4/no_actions/apis.go.template @@ -3,7 +3,6 @@ package apis import ( "fmt" - "github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" @@ -36,11 +35,11 @@ type {{.ClassName}} struct { // @Router /api/v1/{{.ModuleName}} [get] // @Security Bearer func (e {{.ClassName}}) GetPage(c *gin.Context) { - req := dto.{{.ClassName}}Search{} + req := dto.{{.ClassName}}GetPageReq{} s := service.{{.ClassName}}{} err := e.MakeContext(c). MakeOrm(). - Bind(&req, binding.Form). + Bind(&req). MakeService(&s.Service). Errors if err != nil { @@ -71,11 +70,11 @@ func (e {{.ClassName}}) GetPage(c *gin.Context) { // @Router /api/v1/{{.ModuleName}}/{id} [get] // @Security Bearer func (e {{.ClassName}}) Get(c *gin.Context) { - req := dto.{{.ClassName}}ById{} + req := dto.{{.ClassName}}GetReq{} s := service.{{.ClassName}}{} err := e.MakeContext(c). MakeOrm(). - Bind(&req, nil). + Bind(&req). MakeService(&s.Service). Errors if err != nil { @@ -101,16 +100,16 @@ func (e {{.ClassName}}) Get(c *gin.Context) { // @Tags {{.TableComment}} // @Accept application/json // @Product application/json -// @Param data body dto.{{.ClassName}}Control true "data" +// @Param data body dto.{{.ClassName}}InsertReq true "data" // @Success 200 {object} response.Response "{"code": 200, "message": "添加成功"}" // @Router /api/v1/{{.ModuleName}} [post] // @Security Bearer func (e {{.ClassName}}) Insert(c *gin.Context) { - req := dto.{{.ClassName}}Control{} + req := dto.{{.ClassName}}InsertReq{} s := service.{{.ClassName}}{} err := e.MakeContext(c). MakeOrm(). - Bind(&req, binding.JSON). + Bind(&req). MakeService(&s.Service). Errors if err != nil { @@ -136,16 +135,16 @@ func (e {{.ClassName}}) Insert(c *gin.Context) { // @Tags {{.TableComment}} // @Accept application/json // @Product application/json -// @Param data body dto.{{.ClassName}}Control true "body" +// @Param data body dto.{{.ClassName}}UpdateReq true "body" // @Success 200 {object} response.Response "{"code": 200, "message": "修改成功"}" // @Router /api/v1/{{.ModuleName}}/{id} [put] // @Security Bearer func (e {{.ClassName}}) Update(c *gin.Context) { - req := dto.{{.ClassName}}Control{} + req := dto.{{.ClassName}}UpdateReq{} s := service.{{.ClassName}}{} err := e.MakeContext(c). MakeOrm(). - Bind(&req, binding.JSON, nil). + Bind(&req). MakeService(&s.Service). Errors if err != nil { @@ -174,10 +173,10 @@ func (e {{.ClassName}}) Update(c *gin.Context) { // @Security Bearer func (e {{.ClassName}}) Delete(c *gin.Context) { s := service.{{.ClassName}}{} - req := dto.{{.ClassName}}ById{} + req := dto.{{.ClassName}}DeleteReq{} err := e.MakeContext(c). MakeOrm(). - Bind(&req, binding.JSON). + Bind(&req). MakeService(&s.Service). Errors if err != nil { @@ -186,7 +185,7 @@ func (e {{.ClassName}}) Delete(c *gin.Context) { return } - req.SetUpdateBy(user.GetUserId(c)) + // req.SetUpdateBy(user.GetUserId(c)) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) diff --git a/template/v4/no_actions/service.go.template b/template/v4/no_actions/service.go.template index 1aff47a..8ab3ef6 100644 --- a/template/v4/no_actions/service.go.template +++ b/template/v4/no_actions/service.go.template @@ -17,7 +17,7 @@ type {{.ClassName}} struct { } // GetPage 获取{{.ClassName}}列表 -func (e *{{.ClassName}}) GetPage(c *dto.{{.ClassName}}Search, p *actions.DataPermission, list *[]models.{{.ClassName}}, count *int64) error { +func (e *{{.ClassName}}) GetPage(c *dto.{{.ClassName}}GetPageReq, p *actions.DataPermission, list *[]models.{{.ClassName}}, count *int64) error { var err error var data models.{{.ClassName}} @@ -37,7 +37,7 @@ func (e *{{.ClassName}}) GetPage(c *dto.{{.ClassName}}Search, p *actions.DataPer } // Get 获取{{.ClassName}}对象 -func (e *{{.ClassName}}) Get(d *dto.{{.ClassName}}ById, p *actions.DataPermission, model *models.{{.ClassName}}) error { +func (e *{{.ClassName}}) Get(d *dto.{{.ClassName}}GetReq, p *actions.DataPermission, model *models.{{.ClassName}}) error { var data models.{{.ClassName}} err := e.Orm.Model(&data). @@ -58,7 +58,7 @@ func (e *{{.ClassName}}) Get(d *dto.{{.ClassName}}ById, p *actions.DataPermissio } // Insert 创建{{.ClassName}}对象 -func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}Control) error { +func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}InsertReq) error { var err error var data models.{{.ClassName}} c.Generate(&data) @@ -71,7 +71,7 @@ func (e *{{.ClassName}}) Insert(c *dto.{{.ClassName}}Control) error { } // Update 修改{{.ClassName}}对象 -func (e *{{.ClassName}}) Update(c *dto.{{.ClassName}}Control, p *actions.DataPermission) error { +func (e *{{.ClassName}}) Update(c *dto.{{.ClassName}}UpdateReq, p *actions.DataPermission) error { var err error var data = models.{{.ClassName}}{} e.Orm.Scopes( @@ -86,13 +86,12 @@ func (e *{{.ClassName}}) Update(c *dto.{{.ClassName}}Control, p *actions.DataPer } if db.RowsAffected == 0 { return errors.New("无权更新该数据") - } return nil } // Remove 删除{{.ClassName}} -func (e *{{.ClassName}}) Remove(d *dto.{{.ClassName}}ById, p *actions.DataPermission) error { +func (e *{{.ClassName}}) Remove(d *dto.{{.ClassName}}DeleteReq, p *actions.DataPermission) error { var data models.{{.ClassName}} db := e.Orm.Model(&data). diff --git a/template/v4/vue.go.template b/template/v4/vue.go.template index be1a68d..3db9bfc 100644 --- a/template/v4/vue.go.template +++ b/template/v4/vue.go.template @@ -78,7 +78,7 @@ - + {{- range .Columns -}} {{- $x := .IsList -}} @@ -260,7 +260,7 @@ isEdit: false, // 类型数据字典 typeOptions: [], - {{.ModuleName}}List: [], + {{.BusinessName}}List: [], {{range .Columns}} {{- if ne .DictType "" -}} {{.JsonField}}Options: [], @@ -314,7 +314,7 @@ getList() { this.loading = true list{{.ClassName}}(this.addDateRange(this.queryParams, this.dateRange)).then(response => { - this.{{.ModuleName}}List = response.data.list + this.{{.BusinessName}}List = response.data.list this.total = response.data.count this.loading = false } From b9b3cbee93162ca64fd7bb94aec33f294eb7194f Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 4 Jul 2021 13:43:11 +0800 Subject: [PATCH 05/10] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E7=99=BB=E9=99=86=E6=97=A5=E5=BF=97=E5=92=8Capi?= =?UTF-8?q?=E5=92=8C=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.Zh-cn.md | 8 ++++---- app/admin/apis/sys_login_log.go | 8 +++----- app/admin/service/dto/sys_api.go | 14 ++++++++++++-- app/admin/service/dto/sys_login_log.go | 18 ++++++++---------- app/admin/service/dto/sys_opera_log.go | 18 +++++++++--------- app/admin/service/sys_login_log.go | 6 +++--- app/admin/service/sys_opera_log.go | 4 ++-- 7 files changed, 41 insertions(+), 35 deletions(-) diff --git a/README.Zh-cn.md b/README.Zh-cn.md index 36aac13..57f5679 100644 --- a/README.Zh-cn.md +++ b/README.Zh-cn.md @@ -234,13 +234,13 @@ npm run dev - - + + - - + +
微信此群已满go-admin技术交流乙号go-admin技术交流丁号🆕go-admin技术交流柄号🆕
diff --git a/app/admin/apis/sys_login_log.go b/app/admin/apis/sys_login_log.go index a90de72..7477e2f 100644 --- a/app/admin/apis/sys_login_log.go +++ b/app/admin/apis/sys_login_log.go @@ -4,7 +4,6 @@ import ( "github.com/gin-gonic/gin" "github.com/gin-gonic/gin/binding" "github.com/go-admin-team/go-admin-core/sdk/api" - "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" "go-admin/app/admin/models" "go-admin/app/admin/service" @@ -61,10 +60,10 @@ func (e SysLoginLog) GetPage(c *gin.Context) { // @Security Bearer func (e SysLoginLog) Get(c *gin.Context) { s := service.SysLoginLog{} - req := dto.SysLoginLogById{} + req := dto.SysLoginLogGetReq{} err := e.MakeContext(c). MakeOrm(). - Bind(&req, binding.JSON, nil). + Bind(&req). MakeService(&s.Service). Errors if err != nil { @@ -91,7 +90,7 @@ func (e SysLoginLog) Get(c *gin.Context) { // @Security Bearer func (e SysLoginLog) Delete(c *gin.Context) { s := service.SysLoginLog{} - req := dto.SysLoginLogById{} + req := dto.SysLoginLogDeleteReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON, nil). @@ -102,7 +101,6 @@ func (e SysLoginLog) Delete(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) err = s.Remove(&req) if err != nil { e.Error(500, err, "删除失败") diff --git a/app/admin/service/dto/sys_api.go b/app/admin/service/dto/sys_api.go index 1ea88bb..5e53d07 100644 --- a/app/admin/service/dto/sys_api.go +++ b/app/admin/service/dto/sys_api.go @@ -77,10 +77,20 @@ func (s *SysApiUpdateReq) GetId() interface{} { // SysApiGetReq 功能获取请求参数 type SysApiGetReq struct { - dto.ObjectGetReq + Id int `uri:"id"` } +func (s *SysApiGetReq) GetId() interface{} { + return s.Id +} + + // SysApiDeleteReq 功能删除请求参数 type SysApiDeleteReq struct { - dto.ObjectDeleteReq + Ids []int `json:"ids"` } + +func (s *SysApiDeleteReq) GetId() interface{} { + return s.Ids +} + diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index c1061df..79c98a7 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -61,21 +61,19 @@ func (s *SysLoginLogControl) GetId() interface{} { return s.ID } -type SysLoginLogById struct { - Id int `uri:"id"` - Ids []int `json:"ids"` - common.ControlBy +type SysLoginLogGetReq struct { + Id int `uri:"id"` } -func (s *SysLoginLogById) GetId() interface{} { +func (s *SysLoginLogGetReq) GetId() interface{} { return s.Id } -func (s *SysLoginLogById) Generate() *SysLoginLogById { - cp := *s - return &cp +// SysLoginLogDeleteReq 功能删除请求参数 +type SysLoginLogDeleteReq struct { + Ids []int `json:"ids"` } -func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) { - return &models.SysLoginLog{}, nil +func (s *SysLoginLogDeleteReq) GetId() interface{} { + return s.Ids } \ No newline at end of file diff --git a/app/admin/service/dto/sys_opera_log.go b/app/admin/service/dto/sys_opera_log.go index 72bc6ae..f83f606 100644 --- a/app/admin/service/dto/sys_opera_log.go +++ b/app/admin/service/dto/sys_opera_log.go @@ -79,19 +79,19 @@ func (s *SysOperaLogControl) GetId() interface{} { return s.ID } -type SysOperaLogById struct { - Id int `uri:"id"` - Ids []int `json:"ids"` +type SysOperaLogGetReq struct { + Id int `uri:"id"` } -func (s *SysOperaLogById) GetId() interface{} { - if len(s.Ids) > 0 { - s.Ids = append(s.Ids, s.Id) - return s.Ids - } +func (s *SysOperaLogGetReq) GetId() interface{} { return s.Id } -func (s *SysOperaLogById) SetUpdateBy(id int) { +// SysOperaLogDeleteReq 功能删除请求参数 +type SysOperaLogDeleteReq struct { + Ids []int `json:"ids"` +} +func (s *SysOperaLogDeleteReq) GetId() interface{} { + return s.Ids } diff --git a/app/admin/service/sys_login_log.go b/app/admin/service/sys_login_log.go index cb077b8..8bc5123 100644 --- a/app/admin/service/sys_login_log.go +++ b/app/admin/service/sys_login_log.go @@ -34,8 +34,8 @@ func (e *SysLoginLog) GetPage(c *dto.SysLoginLogSearch, list *[]models.SysLoginL return nil } -// GetSysLoginLog 获取SysLoginLog对象 -func (e *SysLoginLog) Get(d *dto.SysLoginLogById, model *models.SysLoginLog) error { +// Get 获取SysLoginLog对象 +func (e *SysLoginLog) Get(d *dto.SysLoginLogGetReq, model *models.SysLoginLog) error { var err error db := e.Orm.First(model, d.GetId()) err = db.Error @@ -52,7 +52,7 @@ func (e *SysLoginLog) Get(d *dto.SysLoginLogById, model *models.SysLoginLog) err } // Remove 删除SysLoginLog -func (e *SysLoginLog) Remove(c *dto.SysLoginLogById) error { +func (e *SysLoginLog) Remove(c *dto.SysLoginLogDeleteReq) error { var err error var data models.SysLoginLog diff --git a/app/admin/service/sys_opera_log.go b/app/admin/service/sys_opera_log.go index a531350..c94b82c 100644 --- a/app/admin/service/sys_opera_log.go +++ b/app/admin/service/sys_opera_log.go @@ -35,7 +35,7 @@ func (e *SysOperaLog) GetPage(c *dto.SysOperaLogGetPageReq, list *[]models.SysOp } // Get 获取SysOperaLog对象 -func (e *SysOperaLog) Get(d *dto.SysOperaLogById, model *models.SysOperaLog) error { +func (e *SysOperaLog) Get(d *dto.SysOperaLogGetReq, model *models.SysOperaLog) error { var data models.SysOperaLog err := e.Orm.Model(&data). @@ -67,7 +67,7 @@ func (e *SysOperaLog) Insert(model *models.SysOperaLog) error { } // Remove 删除SysOperaLog -func (e *SysOperaLog) Remove(d *dto.SysOperaLogById) error { +func (e *SysOperaLog) Remove(d *dto.SysOperaLogDeleteReq) error { var err error var data models.SysOperaLog From b6be297a1e75758723377977b0c2dd7151ed89bd Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 4 Jul 2021 13:43:32 +0800 Subject: [PATCH 06/10] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4demo=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/migrate/migration/models/tb_demo.go | 12 ++++++++++++ .../migration/version/1599190683659_tables.go | 1 + 2 files changed, 13 insertions(+) create mode 100644 cmd/migrate/migration/models/tb_demo.go diff --git a/cmd/migrate/migration/models/tb_demo.go b/cmd/migrate/migration/models/tb_demo.go new file mode 100644 index 0000000..7d30541 --- /dev/null +++ b/cmd/migrate/migration/models/tb_demo.go @@ -0,0 +1,12 @@ +package models + +type TbDemo struct { + Model + Name string `json:"name" gorm:"type:varchar(128);comment:名称"` + ModelTime + ControlBy +} + +func (TbDemo) TableName() string { + return "tb_demo" +} diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index 91e86a1..ef3076d 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -35,6 +35,7 @@ func _1599190683659Tables(db *gorm.DB, version string) error { new(models.SysJob), new(models.SysConfig), new(models.SysApi), + new(models.TbDemo), ) if err != nil { return err From 0d1cb2ee33ea6a29266beda3d25569a0c367a64f Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 4 Jul 2021 23:11:58 +0800 Subject: [PATCH 07/10] =?UTF-8?q?docs=F0=9F=93=9D:=20=E5=8D=87=E7=BA=A7qq?= =?UTF-8?q?=E7=BE=A4=E8=87=B32000=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.Zh-cn.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.Zh-cn.md b/README.Zh-cn.md index 57f5679..1d4cc32 100644 --- a/README.Zh-cn.md +++ b/README.Zh-cn.md @@ -232,15 +232,15 @@ npm run dev ## 📨 互动 - + - - + + - - + +
微信go-admin技术交流丁号🆕go-admin技术交流柄号🆕go-admin技术交流甲号go-admin技术交流乙号
From c1347fbb5d230b0b0718a36433b0ad0b72dea924 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 4 Jul 2021 23:12:21 +0800 Subject: [PATCH 08/10] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 7c276c9..fafe8ce 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/bytedance/go-tagexpr/v2 v2.7.12 github.com/casbin/casbin/v2 v2.25.1 github.com/gin-gonic/gin v1.7.1 - github.com/go-admin-team/go-admin-core v1.3.5-rc.6.0.20210701142131-afcbe40a6a3b - github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.6.0.20210701142131-afcbe40a6a3b + github.com/go-admin-team/go-admin-core v1.3.6 + github.com/go-admin-team/go-admin-core/sdk v1.3.6 github.com/google/uuid v1.2.0 github.com/mssola/user_agent v0.5.2 github.com/opentracing/opentracing-go v1.1.0 From 3f9060558955b8f9a041f47a1a861c1cbd3a2660 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 4 Jul 2021 23:13:14 +0800 Subject: [PATCH 09/10] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E6=93=8D?= =?UTF-8?q?=E4=BD=9Clog=E6=B7=BB=E5=8A=A0=E5=AD=97=E7=AC=A6=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/models/sys_opera_log.go | 4 ++++ common/ip.go | 1 - common/middleware/logger.go | 19 ++++++++++--------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/admin/models/sys_opera_log.go b/app/admin/models/sys_opera_log.go index 823d945..31fb635 100644 --- a/app/admin/models/sys_opera_log.go +++ b/app/admin/models/sys_opera_log.go @@ -74,6 +74,10 @@ func SaveOperaLog(message storage.Messager) (err error) { // Log writing to the database ignores error return nil } + // 超出100个字符返回值截断 + if len(l.JsonResult) > 100 { + l.JsonResult = l.JsonResult[:100] + } err = db.Create(&l).Error if err != nil { log.Errorf("db create error, %s", err.Error()) diff --git a/common/ip.go b/common/ip.go index e06b9bb..ab34148 100644 --- a/common/ip.go +++ b/common/ip.go @@ -23,6 +23,5 @@ func GetClientIP(c *gin.Context) string { if ClientIP != "127.0.0.1" { ip = ClientIP } - //fmt.Println("ip:", ip) return ip } diff --git a/common/middleware/logger.go b/common/middleware/logger.go index a69ca62..e449916 100644 --- a/common/middleware/logger.go +++ b/common/middleware/logger.go @@ -3,6 +3,7 @@ package middleware import ( "bufio" "bytes" + "encoding/json" "fmt" "go-admin/common" gaConfig "go-admin/config" @@ -56,16 +57,16 @@ func LoggerToFile() gin.HandlerFunc { return } - //rt, bl := c.Get("result") + rt, bl := c.Get("result") var result = "" - //if bl { - // rb, err := json.Marshal(rt) - // if err != nil { - // log.Warnf("json Marshal result error, %s", err.Error()) - // } else { - // result = string(rb) - // } - //} + if bl { + rb, err := json.Marshal(rt) + if err != nil { + log.Warnf("json Marshal result error, %s", err.Error()) + } else { + result = string(rb) + } + } st, bl := c.Get("status") var statusBus = 0 From 1c41b0ec7234fc4a3861cd97931d3a8a3f47f3ab Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 4 Jul 2021 23:26:43 +0800 Subject: [PATCH 10/10] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=E6=93=8D?= =?UTF-8?q?=E4=BD=9Clog=20dto=E6=A8=A1=E5=9E=8B=E5=90=8D=E7=A7=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_opera_log.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/admin/apis/sys_opera_log.go b/app/admin/apis/sys_opera_log.go index 9f6b204..44c60f8 100644 --- a/app/admin/apis/sys_opera_log.go +++ b/app/admin/apis/sys_opera_log.go @@ -65,7 +65,7 @@ func (e SysOperaLog) GetPage(c *gin.Context) { // @Security Bearer func (e SysOperaLog) Get(c *gin.Context) { s := new(service.SysOperaLog) - req := dto.SysOperaLogById{} + req := dto.SysOperaLogGetReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, nil). @@ -96,7 +96,7 @@ func (e SysOperaLog) Get(c *gin.Context) { // @Security Bearer func (e SysOperaLog) Delete(c *gin.Context) { s := new(service.SysOperaLog) - req := dto.SysOperaLogById{} + req := dto.SysOperaLogDeleteReq{} err := e.MakeContext(c). MakeOrm(). Bind(&req, binding.JSON).