From a54d4ba0c1aa9181d122a3ebad6d7c4e778784c6 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Mon, 31 May 2021 18:10:23 +0800 Subject: [PATCH] =?UTF-8?q?format=F0=9F=A5=9A=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_api.go | 6 +-- app/admin/apis/sys_config.go | 2 +- app/admin/apis/sys_dept.go | 2 +- app/admin/apis/sys_dict_data.go | 2 +- app/admin/apis/sys_dict_type.go | 2 +- app/admin/apis/sys_login_log.go | 2 +- app/admin/apis/sys_menu.go | 2 +- app/admin/apis/sys_opera_log.go | 2 +- app/admin/apis/sys_post.go | 2 +- app/admin/apis/tools/gen.go | 2 +- app/admin/apis/tools/systables.go | 2 +- app/admin/models/casbin_rule.go | 2 +- app/admin/models/datascope.go | 2 +- app/admin/models/menu.go | 48 +++++++++---------- app/admin/models/role.go | 2 +- app/admin/models/role_dept.go | 2 +- app/admin/models/role_menu.go | 2 +- app/admin/models/sys_config.go | 2 +- app/admin/models/sys_dept.go | 2 +- app/admin/models/sys_dict_data.go | 2 +- app/admin/models/sys_dict_type.go | 2 +- app/admin/models/sys_login_log.go | 2 +- app/admin/models/sys_menu.go | 2 +- app/admin/models/sys_opera_log.go | 2 +- app/admin/models/sys_post.go | 2 +- app/admin/models/sys_role.go | 2 +- app/admin/models/sys_user.go | 2 +- app/admin/router/sys_api.go | 2 +- app/admin/router/sys_login_log.go | 2 +- app/admin/router/sys_opera_log.go | 2 +- app/admin/service/dto/sys_api.go | 8 ++-- app/admin/service/dto/sys_config.go | 5 +- app/admin/service/dto/sys_dept.go | 3 +- app/admin/service/dto/sys_dict_data.go | 2 +- app/admin/service/dto/sys_dict_type.go | 2 +- app/admin/service/dto/sys_login_log.go | 2 +- app/admin/service/dto/sys_menu.go | 4 +- app/admin/service/dto/sys_opera_log.go | 2 +- app/admin/service/dto/sys_role.go | 4 +- app/admin/service/dto/sys_setting.go | 2 +- app/admin/service/dto/sys_user.go | 4 +- app/admin/service/sys_api.go | 2 +- app/admin/service/sys_config.go | 8 ++-- app/admin/service/sys_dept.go | 2 +- app/admin/service/sys_dict_data.go | 2 +- app/admin/service/sys_dict_type.go | 2 +- app/admin/service/sys_opera_log.go | 4 +- app/admin/service/sys_post.go | 2 +- app/admin/service/sys_role.go | 2 +- app/admin/service/sys_role_menu.go | 2 +- app/admin/service/sys_setting.go | 2 +- app/admin/service/sys_user.go | 2 +- app/cms/models/sys_content.go | 2 +- app/cms/router/init_router.go | 2 +- app/cms/router/sys_content.go | 2 +- app/cms/service/dto/sys_content.go | 2 +- app/jobs/apis/sys_job.go | 2 +- app/jobs/router/int_router.go | 2 +- app/jobs/router/router.go | 3 +- app/jobs/router/sys_job.go | 2 +- app/jobs/service/sys_job.go | 2 +- app/other/apis/file.go | 2 +- app/other/apis/sys_china_area_data.go | 2 +- app/other/apis/sys_file_dir.go | 2 +- app/other/apis/sys_file_info.go | 2 +- app/other/apis/sys_server_monitor.go | 2 +- app/other/models/sys_china_area_data.go | 6 +-- app/other/models/sys_file_info.go | 12 ++--- app/other/router/file.go | 2 +- app/other/router/init_router.go | 2 +- app/other/router/monitor.go | 2 +- app/other/router/router.go | 2 +- app/other/router/sys_server_monitor.go | 2 +- app/other/service/dto/sys_china_area_data.go | 8 ++-- app/other/service/sys_china_area_data.go | 2 +- app/other/service/sys_file_dir.go | 2 +- app/other/service/sys_file_info.go | 2 +- cmd/api/cms.go | 2 +- cmd/api/jobs.go | 2 +- cmd/api/other.go | 2 +- cmd/cobra.go | 2 +- cmd/migrate/migration/models/sys_api.go | 2 +- cmd/migrate/migration/models/sys_menu.go | 2 +- cmd/migrate/migration/models/systables.go | 2 +- .../version-local/1614270163879_migrate.go | 6 +-- .../migration/version/1599190683659_tables.go | 2 +- common/actions/create.go | 2 +- common/database/initialize.go | 2 +- common/dto/auto_form.go | 2 +- common/file_store/oss.go | 2 +- common/global/adm.go | 2 +- common/global/topic.go | 2 +- common/middleware/handler/auth.go | 2 +- common/middleware/logger.go | 5 +- common/middleware/permission.go | 2 +- config/extend.go | 2 +- 96 files changed, 143 insertions(+), 151 deletions(-) diff --git a/app/admin/apis/sys_api.go b/app/admin/apis/sys_api.go index c86204fe..b81e889f 100644 --- a/app/admin/apis/sys_api.go +++ b/app/admin/apis/sys_api.go @@ -37,7 +37,7 @@ func (e SysApi) GetSysApiList(c *gin.Context) { d := new(dto.SysApiSearch) err := e.MakeContext(c). MakeOrm(). - Bind(d,binding.Form). + Bind(d, binding.Form). MakeService(&s.Service). Errors if err != nil { @@ -71,7 +71,7 @@ func (e SysApi) GetSysApi(c *gin.Context) { s := new(service.SysApi) err := e.MakeContext(c). MakeOrm(). - Bind(control,nil). + Bind(control, nil). MakeService(&s.Service). Errors if err != nil { @@ -166,4 +166,4 @@ func (e SysApi) DeleteSysApi(c *gin.Context) { return } e.OK(control.GetId(), "删除成功") -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_config.go b/app/admin/apis/sys_config.go index 9a46a432..35bbc5bb 100644 --- a/app/admin/apis/sys_config.go +++ b/app/admin/apis/sys_config.go @@ -291,4 +291,4 @@ func (e SysConfig) GetSysConfigByKEYForService(c *gin.Context) { return } e.OK(control, s.Msg) -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_dept.go b/app/admin/apis/sys_dept.go index c5e5f899..28dbc168 100644 --- a/app/admin/apis/sys_dept.go +++ b/app/admin/apis/sys_dept.go @@ -247,4 +247,4 @@ func (e SysDept) GetDeptTreeRoleSelect(c *gin.Context) { "depts": result, "checkedKeys": menuIds, }, "") -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_dict_data.go b/app/admin/apis/sys_dict_data.go index 0a9f9f66..dd31667d 100644 --- a/app/admin/apis/sys_dict_data.go +++ b/app/admin/apis/sys_dict_data.go @@ -212,7 +212,7 @@ func (e SysDictData) GetSysDictDataAll(c *gin.Context) { d := &dto.SysDictDataSearch{} err := e.MakeContext(c). MakeOrm(). - Bind(d,binding.Form). + Bind(d, binding.Form). MakeService(&s.Service). Errors if err != nil { diff --git a/app/admin/apis/sys_dict_type.go b/app/admin/apis/sys_dict_type.go index e09181e0..5a8e07c9 100644 --- a/app/admin/apis/sys_dict_type.go +++ b/app/admin/apis/sys_dict_type.go @@ -222,4 +222,4 @@ func (e SysDictType) GetSysDictTypeAll(c *gin.Context) { } e.OK(list, "查询成功") -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_login_log.go b/app/admin/apis/sys_login_log.go index 02bd92df..7b5c883e 100644 --- a/app/admin/apis/sys_login_log.go +++ b/app/admin/apis/sys_login_log.go @@ -90,4 +90,4 @@ func (e SysLoginLog) DeleteSysLoginLog(c *gin.Context) { return } e.OK(control.GetId(), "删除成功") -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_menu.go b/app/admin/apis/sys_menu.go index 052ea769..bde8b6cf 100644 --- a/app/admin/apis/sys_menu.go +++ b/app/admin/apis/sys_menu.go @@ -292,4 +292,4 @@ func (e SysMenu) GetMenuTreeSelect(c *gin.Context) { "menus": result, "checkedKeys": menuIds, }, "获取成功") -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_opera_log.go b/app/admin/apis/sys_opera_log.go index e22a7575..13c3ec33 100644 --- a/app/admin/apis/sys_opera_log.go +++ b/app/admin/apis/sys_opera_log.go @@ -89,4 +89,4 @@ func (e SysOperaLog) DeleteSysOperaLog(c *gin.Context) { return } e.OK(req.GetId(), "删除成功") -} \ No newline at end of file +} diff --git a/app/admin/apis/sys_post.go b/app/admin/apis/sys_post.go index b7fac3f3..ea4a4053 100644 --- a/app/admin/apis/sys_post.go +++ b/app/admin/apis/sys_post.go @@ -188,4 +188,4 @@ func (e SysPost) DeleteSysPost(c *gin.Context) { return } e.OK(req.GetId(), "删除成功") -} \ No newline at end of file +} diff --git a/app/admin/apis/tools/gen.go b/app/admin/apis/tools/gen.go index 586de11b..970fab49 100644 --- a/app/admin/apis/tools/gen.go +++ b/app/admin/apis/tools/gen.go @@ -555,4 +555,4 @@ func (e Gen) GenMenuAndApi(c *gin.Context) { //ADelete.Id, err = ADelete.Create(db) e.OK("", "数据生成成功！") -} \ No newline at end of file +} diff --git a/app/admin/apis/tools/systables.go b/app/admin/apis/tools/systables.go index 1956d49a..2056a7cd 100644 --- a/app/admin/apis/tools/systables.go +++ b/app/admin/apis/tools/systables.go @@ -348,4 +348,4 @@ func (e *SysTable) DeleteSysTables(c *gin.Context) { return } e.OK(nil, "删除成功") -} \ No newline at end of file +} diff --git a/app/admin/models/casbin_rule.go b/app/admin/models/casbin_rule.go index f4ef8268..014e2fd1 100644 --- a/app/admin/models/casbin_rule.go +++ b/app/admin/models/casbin_rule.go @@ -13,4 +13,4 @@ type CasbinRule struct { func (CasbinRule) TableName() string { return "sys_casbin_rule" -} \ No newline at end of file +} diff --git a/app/admin/models/datascope.go b/app/admin/models/datascope.go index 3c384c80..c33ffd64 100644 --- a/app/admin/models/datascope.go +++ b/app/admin/models/datascope.go @@ -78,4 +78,4 @@ func DataScopes(tableName string, userId int) func(db *gorm.DB) *gorm.DB { } return db } -} \ No newline at end of file +} diff --git a/app/admin/models/menu.go b/app/admin/models/menu.go index cbd8658a..9007f1e7 100644 --- a/app/admin/models/menu.go +++ b/app/admin/models/menu.go @@ -9,29 +9,29 @@ import ( ) type Menu struct { - MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` - MenuName string `json:"menuName" gorm:"size:128;"` - Title string `json:"title" gorm:"size:128;"` - Icon string `json:"icon" gorm:"size:128;"` - Path string `json:"path" gorm:"size:128;"` - Paths string `json:"paths" gorm:"size:128;"` - MenuType string `json:"menuType" gorm:"size:1;"` - Action string `json:"action" gorm:"size:16;"` - Permission string `json:"permission" gorm:"size:255;"` - ParentId int `json:"parentId" gorm:"size:11;"` - NoCache bool `json:"noCache" gorm:"size:8;"` - Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` - Component string `json:"component" gorm:"size:255;"` - Sort int `json:"sort" gorm:"size:4;"` - Visible string `json:"visible" gorm:"size:1;"` - CreateBy string `json:"createBy" gorm:"size:128;"` - UpdateBy string `json:"updateBy" gorm:"size:128;"` - IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` - DataScope string `json:"dataScope" gorm:"-"` - Params string `json:"params" gorm:"-"` - RoleId int `gorm:"-"` - Children []Menu `json:"children" gorm:"-"` - IsSelect bool `json:"is_select" gorm:"-"` + MenuId int `json:"menuId" gorm:"primaryKey;autoIncrement"` + MenuName string `json:"menuName" gorm:"size:128;"` + Title string `json:"title" gorm:"size:128;"` + Icon string `json:"icon" gorm:"size:128;"` + Path string `json:"path" gorm:"size:128;"` + Paths string `json:"paths" gorm:"size:128;"` + MenuType string `json:"menuType" gorm:"size:1;"` + Action string `json:"action" gorm:"size:16;"` + Permission string `json:"permission" gorm:"size:255;"` + ParentId int `json:"parentId" gorm:"size:11;"` + NoCache bool `json:"noCache" gorm:"size:8;"` + Breadcrumb string `json:"breadcrumb" gorm:"size:255;"` + Component string `json:"component" gorm:"size:255;"` + Sort int `json:"sort" gorm:"size:4;"` + Visible string `json:"visible" gorm:"size:1;"` + CreateBy string `json:"createBy" gorm:"size:128;"` + UpdateBy string `json:"updateBy" gorm:"size:128;"` + IsFrame string `json:"isFrame" gorm:"size:1;DEFAULT:0;"` + DataScope string `json:"dataScope" gorm:"-"` + Params string `json:"params" gorm:"-"` + RoleId int `gorm:"-"` + Children []Menu `json:"children" gorm:"-"` + IsSelect bool `json:"is_select" gorm:"-"` models.ModelTime } @@ -159,4 +159,4 @@ func InitPaths(tx *gorm.DB, menu *Menu) (err error) { } tx.Table("sys_menu").Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths) return -} \ No newline at end of file +} diff --git a/app/admin/models/role.go b/app/admin/models/role.go index ac0990f2..861d0206 100644 --- a/app/admin/models/role.go +++ b/app/admin/models/role.go @@ -238,4 +238,4 @@ type MenuIdList struct { // } // // return true, nil -//} \ No newline at end of file +//} diff --git a/app/admin/models/role_dept.go b/app/admin/models/role_dept.go index 3ac8ebaf..0a794e00 100644 --- a/app/admin/models/role_dept.go +++ b/app/admin/models/role_dept.go @@ -8,4 +8,4 @@ type SysRoleDept struct { func (SysRoleDept) TableName() string { return "sys_role_dept" -} \ No newline at end of file +} diff --git a/app/admin/models/role_menu.go b/app/admin/models/role_menu.go index 82d4d9a0..414d6e81 100644 --- a/app/admin/models/role_menu.go +++ b/app/admin/models/role_menu.go @@ -168,4 +168,4 @@ func (rm *RoleMenu) Delete(tx *gorm.DB, RoleId string, MenuID string) (bool, err } return true, nil -} \ No newline at end of file +} diff --git a/app/admin/models/sys_config.go b/app/admin/models/sys_config.go index 6e7e3a55..1e65e742 100644 --- a/app/admin/models/sys_config.go +++ b/app/admin/models/sys_config.go @@ -27,4 +27,4 @@ func (e *SysConfig) Generate() models.ActiveRecord { func (e *SysConfig) GetId() interface{} { return e.Id -} \ No newline at end of file +} diff --git a/app/admin/models/sys_dept.go b/app/admin/models/sys_dept.go index 7084be32..4de08b2d 100644 --- a/app/admin/models/sys_dept.go +++ b/app/admin/models/sys_dept.go @@ -30,4 +30,4 @@ func (e *SysDept) Generate() models.ActiveRecord { func (e *SysDept) GetId() interface{} { return e.DeptId -} \ No newline at end of file +} diff --git a/app/admin/models/sys_dict_data.go b/app/admin/models/sys_dict_data.go index 70f50bba..b0be60aa 100644 --- a/app/admin/models/sys_dict_data.go +++ b/app/admin/models/sys_dict_data.go @@ -32,4 +32,4 @@ func (e *SysDictData) Generate() models.ActiveRecord { func (e *SysDictData) GetId() interface{} { return e.DictCode -} \ No newline at end of file +} diff --git a/app/admin/models/sys_dict_type.go b/app/admin/models/sys_dict_type.go index 9aaf3e4a..1cb3ce7a 100644 --- a/app/admin/models/sys_dict_type.go +++ b/app/admin/models/sys_dict_type.go @@ -26,4 +26,4 @@ func (e *SysDictType) Generate() models.ActiveRecord { func (e *SysDictType) GetId() interface{} { return e.ID -} \ No newline at end of file +} diff --git a/app/admin/models/sys_login_log.go b/app/admin/models/sys_login_log.go index 84154c1c..bad12e47 100644 --- a/app/admin/models/sys_login_log.go +++ b/app/admin/models/sys_login_log.go @@ -69,4 +69,4 @@ func SaveLoginLog(message storage.Messager) (err error) { return err } return nil -} \ No newline at end of file +} diff --git a/app/admin/models/sys_menu.go b/app/admin/models/sys_menu.go index 08fc642f..1ba83b70 100644 --- a/app/admin/models/sys_menu.go +++ b/app/admin/models/sys_menu.go @@ -63,4 +63,4 @@ func (e *SysMenu) Generate() models.ActiveRecord { func (e *SysMenu) GetId() interface{} { return e.MenuId -} \ No newline at end of file +} diff --git a/app/admin/models/sys_opera_log.go b/app/admin/models/sys_opera_log.go index 40c8aa5a..16a65c98 100644 --- a/app/admin/models/sys_opera_log.go +++ b/app/admin/models/sys_opera_log.go @@ -82,4 +82,4 @@ func SaveOperaLog(message storage.Messager) (err error) { return err } return nil -} \ No newline at end of file +} diff --git a/app/admin/models/sys_post.go b/app/admin/models/sys_post.go index 7f1ccaa2..f38783d1 100644 --- a/app/admin/models/sys_post.go +++ b/app/admin/models/sys_post.go @@ -27,4 +27,4 @@ func (e *SysPost) Generate() models.ActiveRecord { func (e *SysPost) GetId() interface{} { return e.PostId -} \ No newline at end of file +} diff --git a/app/admin/models/sys_role.go b/app/admin/models/sys_role.go index f77d440d..1dcbc5ef 100644 --- a/app/admin/models/sys_role.go +++ b/app/admin/models/sys_role.go @@ -31,4 +31,4 @@ func (e *SysRole) Generate() models.ActiveRecord { func (e *SysRole) GetId() interface{} { return e.RoleId -} \ No newline at end of file +} diff --git a/app/admin/models/sys_user.go b/app/admin/models/sys_user.go index dde75764..3b45628a 100644 --- a/app/admin/models/sys_user.go +++ b/app/admin/models/sys_user.go @@ -74,4 +74,4 @@ func (e *SysUser) AfterFind(_ *gorm.DB) error { e.PostIds = []int{e.PostId} e.RoleIds = []int{e.RoleId} return nil -} \ No newline at end of file +} diff --git a/app/admin/router/sys_api.go b/app/admin/router/sys_api.go index eb60522c..d63723ca 100644 --- a/app/admin/router/sys_api.go +++ b/app/admin/router/sys_api.go @@ -21,4 +21,4 @@ func registerSysApiRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlew r.GET("/:id", api.GetSysApi) r.PUT("/:id", api.UpdateSysApi) } -} \ No newline at end of file +} diff --git a/app/admin/router/sys_login_log.go b/app/admin/router/sys_login_log.go index dfa68e3c..91ff7162 100644 --- a/app/admin/router/sys_login_log.go +++ b/app/admin/router/sys_login_log.go @@ -21,4 +21,4 @@ func registerSysLoginLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi r.GET("/:id", api.GetSysLoginLog) r.DELETE("", api.DeleteSysLoginLog) } -} \ No newline at end of file +} diff --git a/app/admin/router/sys_opera_log.go b/app/admin/router/sys_opera_log.go index 6900a1a4..0d20ea63 100644 --- a/app/admin/router/sys_opera_log.go +++ b/app/admin/router/sys_opera_log.go @@ -20,4 +20,4 @@ func registerSysOperaLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi r.GET("/:id", api.GetSysOperaLog) r.DELETE("", api.DeleteSysOperaLog) } -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_api.go b/app/admin/service/dto/sys_api.go index e6e8d38e..7539b3b7 100644 --- a/app/admin/service/dto/sys_api.go +++ b/app/admin/service/dto/sys_api.go @@ -16,8 +16,8 @@ type SysApiSearch struct { } type SysApiOrder struct { - TitleOrder string `search:"type:order;column:title;table:sys_api" form:"titleOrder"` - PathOrder string `search:"type:order;column:path;table:sys_api" form:"pathOrder"` + TitleOrder string `search:"type:order;column:title;table:sys_api" form:"titleOrder"` + PathOrder string `search:"type:order;column:path;table:sys_api" form:"pathOrder"` CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAtOrder"` } @@ -25,7 +25,6 @@ func (m *SysApiSearch) GetNeedSearch() interface{} { return *m } - type SysApiControl struct { Id int `uri:"id" comment:"编码"` // 编码 Handle string `json:"handle" comment:"handle"` @@ -64,7 +63,6 @@ func (s *SysApiById) GetId() interface{} { return s.Id } - func (s *SysApiById) Generate() dto.Control { o := *s return &o @@ -72,4 +70,4 @@ func (s *SysApiById) Generate() dto.Control { func (s *SysApiById) GenerateM() (common.ActiveRecord, error) { return &models.SysApi{}, nil -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index c9e2facb..da2ec3fe 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -61,7 +61,7 @@ func (s *SysConfigControl) GetId() interface{} { // GetSetSysConfigReq 增、改使用的结构体 type GetSetSysConfigReq struct { - ConfigKey string `json:"configKey" comment:""` + ConfigKey string `json:"configKey" comment:""` ConfigValue string `json:"configValue" comment:""` } @@ -69,6 +69,7 @@ type GetSetSysConfigReq struct { func (s *GetSetSysConfigReq) Generate(model *models.SysConfig) { model.ConfigValue = s.ConfigValue } + type UpdateSetSysConfigReq map[string]string // SysConfigByKeyReq 根据Key获取配置 @@ -98,4 +99,4 @@ func (s *SysConfigById) GetId() interface{} { return s.Ids } return s.Id -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_dept.go b/app/admin/service/dto/sys_dept.go index 08c787f0..edc4afb3 100644 --- a/app/admin/service/dto/sys_dept.go +++ b/app/admin/service/dto/sys_dept.go @@ -99,7 +99,6 @@ func (s *SysDeptById) GetId() interface{} { return s.Id } - func (s *SysDeptById) GenerateM() (*models.SysDept, error) { return &models.SysDept{}, nil } @@ -108,4 +107,4 @@ type DeptLabel struct { Id int `gorm:"-" json:"id"` Label string `gorm:"-" json:"label"` Children []DeptLabel `gorm:"-" json:"children"` -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_dict_data.go b/app/admin/service/dto/sys_dict_data.go index 262385ea..575555a9 100644 --- a/app/admin/service/dto/sys_dict_data.go +++ b/app/admin/service/dto/sys_dict_data.go @@ -106,4 +106,4 @@ func (s *SysDictDataById) Generate() dto.Control { func (s *SysDictDataById) GenerateM() (common.ActiveRecord, error) { return &models.SysDictData{}, nil -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index c0fcb0b2..65dbcb53 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/app/admin/service/dto/sys_dict_type.go @@ -83,4 +83,4 @@ func (s *SysDictTypeById) GetId() interface{} { func (s *SysDictTypeById) GenerateM() (common.ActiveRecord, error) { return &models.SysDictType{}, nil -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index 37085b41..ffa5b59b 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -115,4 +115,4 @@ func (s *SysLoginLogById) Generate() *SysLoginLogById { func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) { return &models.SysLoginLog{}, nil -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_menu.go b/app/admin/service/dto/sys_menu.go index 389fcc7e..3b623a13 100644 --- a/app/admin/service/dto/sys_menu.go +++ b/app/admin/service/dto/sys_menu.go @@ -24,7 +24,6 @@ func (m *SysMenuSearch) GetNeedSearch() interface{} { return *m } - // SysMenuControl 增、改使用的结构体 type SysMenuControl struct { MenuId int `uri:"id" comment:"编码"` // 编码 @@ -97,7 +96,6 @@ type SysMenuById struct { common.ControlBy } - func (s *SysMenuById) Generate() *SysMenuById { cp := *s return &cp @@ -128,4 +126,4 @@ type MenuRole struct { type SelectRole struct { RoleId int `uri:"roleId"` -} \ 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 a55b3ff8..a2d351ad 100644 --- a/app/admin/service/dto/sys_opera_log.go +++ b/app/admin/service/dto/sys_opera_log.go @@ -120,4 +120,4 @@ func (s *SysOperaLogById) Bind(ctx *gin.Context) error { func (s *SysOperaLogById) SetUpdateBy(id int) { -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_role.go b/app/admin/service/dto/sys_role.go index e3294662..c33995b9 100644 --- a/app/admin/service/dto/sys_role.go +++ b/app/admin/service/dto/sys_role.go @@ -31,7 +31,7 @@ type SysRoleOrder struct { RoleIdOrder string `search:"type:order;column:role_id;table:sys_role" form:"roleIdOrder"` RoleNameOrder string `search:"type:order;column:role_name;table:sys_role" form:"roleNameOrder"` RoleSortOrder string `search:"type:order;column:role_sort;table:sys_role" form:"usernameOrder"` - StatusOrder string `search:"type:order;column:status;table:sys_role" form:"statusOrder"` + StatusOrder string `search:"type:order;column:status;table:sys_role" form:"statusOrder"` CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAtOrder"` } @@ -147,4 +147,4 @@ type RoleDataScopeReq struct { type DeptIdList struct { DeptId int `json:"DeptId"` -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_setting.go b/app/admin/service/dto/sys_setting.go index face3588..5ccf0f07 100644 --- a/app/admin/service/dto/sys_setting.go +++ b/app/admin/service/dto/sys_setting.go @@ -89,4 +89,4 @@ func (s *SysSettingById) Bind(ctx *gin.Context) error { func (s *SysSettingById) GenerateM() (*models.SysSetting, error) { return &models.SysSetting{}, nil -} \ No newline at end of file +} diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index d445c380..506cd222 100644 --- a/app/admin/service/dto/sys_user.go +++ b/app/admin/service/dto/sys_user.go @@ -25,7 +25,7 @@ type SysUserSearch struct { type SysUserOrder struct { UserIdOrder string `search:"type:order;column:user_id;table:sys_user" form:"userIdOrder"` UsernameOrder string `search:"type:order;column:username;table:sys_user" form:"usernameOrder"` - StatusOrder string `search:"type:order;column:status;table:sys_user" form:"statusOrder"` + StatusOrder string `search:"type:order;column:status;table:sys_user" form:"statusOrder"` CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAtOrder"` } @@ -93,4 +93,4 @@ func (s *SysUserById) GenerateM() (common.ActiveRecord, error) { type PassWord struct { NewPassword string `json:"newPassword" binding:"required"` OldPassword string `json:"oldPassword" binding:"required"` -} \ No newline at end of file +} diff --git a/app/admin/service/sys_api.go b/app/admin/service/sys_api.go index 805f9258..db45874b 100644 --- a/app/admin/service/sys_api.go +++ b/app/admin/service/sys_api.go @@ -107,4 +107,4 @@ func (e *SysApi) RemoveSysApi(d *dto.SysApiById, p *actions.DataPermission) erro return errors.New("无权删除该数据") } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index 0deb49a5..f25d61fe 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -138,16 +138,14 @@ func (e *SysConfig) UpdateSetSysConfig(c *[]dto.GetSetSysConfigReq) error { for _, req := range m { var data models.SysConfig if err := e.Orm.Where("config_key = ?", req.ConfigKey). - First(&data).Error; - err != nil { + First(&data).Error; err != nil { e.Log.Errorf("Service GetSysConfigPage error:%s", err) return err } if data.ConfigValue != req.ConfigValue { data.ConfigValue = req.ConfigValue - if err := e.Orm.Save(&data).Error; - err != nil { + if err := e.Orm.Save(&data).Error; err != nil { e.Log.Errorf("Service GetSysConfigPage error:%s", err) return err } @@ -188,4 +186,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigByKeyReq) error { } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go index b36ed823..5d371e35 100644 --- a/app/admin/service/sys_dept.go +++ b/app/admin/service/sys_dept.go @@ -282,4 +282,4 @@ func digitDeptLabel(deptList *[]models.SysDept, dept dto.DeptLabel) dto.DeptLabe } dept.Children = min return dept -} \ No newline at end of file +} diff --git a/app/admin/service/sys_dict_data.go b/app/admin/service/sys_dict_data.go index 3c82f942..31c22df7 100644 --- a/app/admin/service/sys_dict_data.go +++ b/app/admin/service/sys_dict_data.go @@ -118,4 +118,4 @@ func (e *SysDictData) GetAll(c *dto.SysDictDataSearch, list *[]models.SysDictDat return err } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_dict_type.go b/app/admin/service/sys_dict_type.go index 656682b2..6afbea65 100644 --- a/app/admin/service/sys_dict_type.go +++ b/app/admin/service/sys_dict_type.go @@ -116,4 +116,4 @@ func (e *SysDictType) GetAll(c *dto.SysDictTypeSearch, list *[]models.SysDictTyp return err } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_opera_log.go b/app/admin/service/sys_opera_log.go index a7d1d785..faaf597f 100644 --- a/app/admin/service/sys_opera_log.go +++ b/app/admin/service/sys_opera_log.go @@ -2,7 +2,7 @@ package service import ( "errors" - + "go-admin/app/admin/models" "go-admin/app/admin/service/dto" cDto "go-admin/common/dto" @@ -97,4 +97,4 @@ func (e *SysOperaLog) RemoveSysOperaLog(d *dto.SysOperaLogById) error { return errors.New("无权删除该数据") } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_post.go b/app/admin/service/sys_post.go index abb4af2b..b6ed2870 100644 --- a/app/admin/service/sys_post.go +++ b/app/admin/service/sys_post.go @@ -103,4 +103,4 @@ func (e *SysPost) RemoveSysPost(d *dto.SysPostById) error { return err } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index ab3c4fcf..a094ef5d 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -224,4 +224,4 @@ func (e *SysRole) UpdateDataScope(c *models.SysRole) (err error) { } } return err -} \ No newline at end of file +} diff --git a/app/admin/service/sys_role_menu.go b/app/admin/service/sys_role_menu.go index 2753a37e..c6cbc9a5 100644 --- a/app/admin/service/sys_role_menu.go +++ b/app/admin/service/sys_role_menu.go @@ -110,4 +110,4 @@ func (e *SysRoleMenu) GetIDS(tx *gorm.DB, roleName string) ([]models.MenuPath, e return nil, err } return r, nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_setting.go b/app/admin/service/sys_setting.go index cfb81662..f6714e9a 100644 --- a/app/admin/service/sys_setting.go +++ b/app/admin/service/sys_setting.go @@ -49,4 +49,4 @@ func (e *SysSetting) UpdateSysSetting(c *models.SysSetting) error { } return nil -} \ No newline at end of file +} diff --git a/app/admin/service/sys_user.go b/app/admin/service/sys_user.go index f02e8b56..e08c124f 100644 --- a/app/admin/service/sys_user.go +++ b/app/admin/service/sys_user.go @@ -176,4 +176,4 @@ func (e *SysUser) GetSysUserProfile(c *dto.SysUserById, user *models.SysUser, ro } return nil -} \ No newline at end of file +} diff --git a/app/cms/models/sys_content.go b/app/cms/models/sys_content.go index 093d2ba1..cb00ca66 100644 --- a/app/cms/models/sys_content.go +++ b/app/cms/models/sys_content.go @@ -30,4 +30,4 @@ func (e *SysContent) Generate() models.ActiveRecord { func (e *SysContent) GetId() interface{} { return e.Id -} \ No newline at end of file +} diff --git a/app/cms/router/init_router.go b/app/cms/router/init_router.go index d74f81f5..2f544cd0 100644 --- a/app/cms/router/init_router.go +++ b/app/cms/router/init_router.go @@ -37,4 +37,4 @@ func InitRouter() { // 注册业务路由 // TODO: 这里可存放业务路由，里边并无实际路由只有演示代码 initRouter(r, authMiddleware) -} \ No newline at end of file +} diff --git a/app/cms/router/sys_content.go b/app/cms/router/sys_content.go index 82cb2eec..aac6da29 100644 --- a/app/cms/router/sys_content.go +++ b/app/cms/router/sys_content.go @@ -28,4 +28,4 @@ func registerSysContentRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMid r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysContentControl))) r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysContentById))) } -} \ No newline at end of file +} diff --git a/app/cms/service/dto/sys_content.go b/app/cms/service/dto/sys_content.go index 43f986a1..576b1354 100644 --- a/app/cms/service/dto/sys_content.go +++ b/app/cms/service/dto/sys_content.go @@ -91,4 +91,4 @@ func (s *SysContentById) Generate() dto.Control { func (s *SysContentById) GenerateM() (common.ActiveRecord, error) { return &models.SysContent{}, nil -} \ No newline at end of file +} diff --git a/app/jobs/apis/sys_job.go b/app/jobs/apis/sys_job.go index bf7bc0ed..c8c6f176 100644 --- a/app/jobs/apis/sys_job.go +++ b/app/jobs/apis/sys_job.go @@ -71,4 +71,4 @@ func (e SysJob) StartJobForService(c *gin.Context) { return } e.OK(nil, s.Msg) -} \ No newline at end of file +} diff --git a/app/jobs/router/int_router.go b/app/jobs/router/int_router.go index d74f81f5..2f544cd0 100644 --- a/app/jobs/router/int_router.go +++ b/app/jobs/router/int_router.go @@ -37,4 +37,4 @@ func InitRouter() { // 注册业务路由 // TODO: 这里可存放业务路由，里边并无实际路由只有演示代码 initRouter(r, authMiddleware) -} \ No newline at end of file +} diff --git a/app/jobs/router/router.go b/app/jobs/router/router.go index a99da845..8c893a27 100644 --- a/app/jobs/router/router.go +++ b/app/jobs/router/router.go @@ -1,6 +1,5 @@ package router - import ( "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" @@ -40,4 +39,4 @@ func checkRoleRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) { for _, f := range routerCheckRole { f(v1, authMiddleware) } -} \ No newline at end of file +} diff --git a/app/jobs/router/sys_job.go b/app/jobs/router/sys_job.go index 1cab08f7..89723d47 100644 --- a/app/jobs/router/sys_job.go +++ b/app/jobs/router/sys_job.go @@ -35,4 +35,4 @@ func registerSysJobRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlew v1.GET("/job/remove/:id", sysJob.RemoveJobForService) v1.GET("/job/start/:id", sysJob.StartJobForService) -} \ No newline at end of file +} diff --git a/app/jobs/service/sys_job.go b/app/jobs/service/sys_job.go index 37ea9ef1..45ebafa3 100644 --- a/app/jobs/service/sys_job.go +++ b/app/jobs/service/sys_job.go @@ -84,4 +84,4 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error { e.Log.Errorf("db error: %s", err) } return err -} \ No newline at end of file +} diff --git a/app/other/apis/file.go b/app/other/apis/file.go index 187dc953..9f47d301 100644 --- a/app/other/apis/file.go +++ b/app/other/apis/file.go @@ -200,4 +200,4 @@ func ossUpload(name string, path string) error { func qiniuUpload(name string, path string) error { oss := file_store.ALiYunOSS{} return oss.UpLoad(name, path) -} \ No newline at end of file +} diff --git a/app/other/apis/sys_china_area_data.go b/app/other/apis/sys_china_area_data.go index ba64522e..c3d3c714 100644 --- a/app/other/apis/sys_china_area_data.go +++ b/app/other/apis/sys_china_area_data.go @@ -192,4 +192,4 @@ func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) { return } e.OK(control.GetId(), "删除成功") -} \ No newline at end of file +} diff --git a/app/other/apis/sys_file_dir.go b/app/other/apis/sys_file_dir.go index 3dfac8f0..994f0b06 100644 --- a/app/other/apis/sys_file_dir.go +++ b/app/other/apis/sys_file_dir.go @@ -195,4 +195,4 @@ func (e SysFileDir) DeleteSysFileDir(c *gin.Context) { return } e.OK(control.Id, "删除成功") -} \ No newline at end of file +} diff --git a/app/other/apis/sys_file_info.go b/app/other/apis/sys_file_info.go index 4c8965a9..625a7313 100644 --- a/app/other/apis/sys_file_info.go +++ b/app/other/apis/sys_file_info.go @@ -206,4 +206,4 @@ func (e SysFileInfo) DeleteSysFileInfo(c *gin.Context) { return } e.OK(control.Id, "删除成功") -} \ No newline at end of file +} diff --git a/app/other/apis/sys_server_monitor.go b/app/other/apis/sys_server_monitor.go index 037970bc..c821ffe4 100644 --- a/app/other/apis/sys_server_monitor.go +++ b/app/other/apis/sys_server_monitor.go @@ -73,4 +73,4 @@ func (e ServerMonitor) ServerInfo(c *gin.Context) { "cpu": cpuDic, "disk": diskDic, }) -} \ No newline at end of file +} diff --git a/app/other/models/sys_china_area_data.go b/app/other/models/sys_china_area_data.go index e9bf7658..7e329420 100644 --- a/app/other/models/sys_china_area_data.go +++ b/app/other/models/sys_china_area_data.go @@ -6,8 +6,8 @@ import ( type SysChinaAreaData struct { models.Model - PId string `json:"p_id" gorm:"size:11;comment:上级编码"` - Name string `json:"name" gorm:"size:128;comment:名称"` + PId string `json:"p_id" gorm:"size:11;comment:上级编码"` + Name string `json:"name" gorm:"size:128;comment:名称"` models.ControlBy models.ModelTime } @@ -23,4 +23,4 @@ func (e *SysChinaAreaData) Generate() models.ActiveRecord { func (e *SysChinaAreaData) GetId() interface{} { return e.Id -} \ No newline at end of file +} diff --git a/app/other/models/sys_file_info.go b/app/other/models/sys_file_info.go index be9ed7a1..c3cceccb 100644 --- a/app/other/models/sys_file_info.go +++ b/app/other/models/sys_file_info.go @@ -6,12 +6,12 @@ import ( type SysFileInfo struct { models.Model - Type string `json:"type" gorm:"size:255;comment:类型"` // - Name string `json:"name" gorm:"size:255;comment:名称"` // - Size string `json:"size" gorm:"size:11;comment:大小"` // - PId int `json:"p_id" gorm:"size:11;comment:目录"` // - Source string `json:"source" gorm:"size:255;comment:来源"` // - Url string `json:"url" gorm:"size:255;comment:地址"` // + Type string `json:"type" gorm:"size:255;comment:类型"` // + Name string `json:"name" gorm:"size:255;comment:名称"` // + Size string `json:"size" gorm:"size:11;comment:大小"` // + PId int `json:"p_id" gorm:"size:11;comment:目录"` // + Source string `json:"source" gorm:"size:255;comment:来源"` // + Url string `json:"url" gorm:"size:255;comment:地址"` // FullUrl string `json:"full_url" gorm:"size:255;comment:全地址"` // models.ControlBy models.ModelTime diff --git a/app/other/router/file.go b/app/other/router/file.go index e1bca04e..395d95fa 100644 --- a/app/other/router/file.go +++ b/app/other/router/file.go @@ -13,4 +13,4 @@ func init() { func registerFileRouter(v1 *gin.RouterGroup) { var api = apis.File{} v1.POST("/public/uploadFile", api.UploadFile) -} \ No newline at end of file +} diff --git a/app/other/router/init_router.go b/app/other/router/init_router.go index 3954ab79..ee98c1ee 100644 --- a/app/other/router/init_router.go +++ b/app/other/router/init_router.go @@ -37,4 +37,4 @@ func InitRouter() { // 注册业务路由 // TODO: 这里可存放业务路由，里边并无实际路由只有演示代码 initRouter(r, authMiddleware) -} \ No newline at end of file +} diff --git a/app/other/router/monitor.go b/app/other/router/monitor.go index 0ce1ed10..29a20593 100644 --- a/app/other/router/monitor.go +++ b/app/other/router/monitor.go @@ -22,4 +22,4 @@ func registerMonitorRouter(v1 *gin.RouterGroup) { c.Status(http.StatusOK) }) } -} \ No newline at end of file +} diff --git a/app/other/router/router.go b/app/other/router/router.go index e43e435b..8c893a27 100644 --- a/app/other/router/router.go +++ b/app/other/router/router.go @@ -39,4 +39,4 @@ func checkRoleRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) { for _, f := range routerCheckRole { f(v1, authMiddleware) } -} \ No newline at end of file +} diff --git a/app/other/router/sys_server_monitor.go b/app/other/router/sys_server_monitor.go index 1287a476..ffa91a1d 100644 --- a/app/other/router/sys_server_monitor.go +++ b/app/other/router/sys_server_monitor.go @@ -18,4 +18,4 @@ func registerSysServerMonitorRouter(v1 *gin.RouterGroup, authMiddleware *jwt.Gin { r.GET("", api.ServerInfo) } -} \ No newline at end of file +} diff --git a/app/other/service/dto/sys_china_area_data.go b/app/other/service/dto/sys_china_area_data.go index 63ab10ba..192c62e9 100644 --- a/app/other/service/dto/sys_china_area_data.go +++ b/app/other/service/dto/sys_china_area_data.go @@ -55,9 +55,9 @@ func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error { func (s *SysChinaAreaDataControl) Generate() (*models2.SysChinaAreaData, error) { return &models2.SysChinaAreaData{ - Model: common.Model{Id: s.Id}, - PId: s.PId, - Name: s.Name, + Model: common.Model{Id: s.Id}, + PId: s.PId, + Name: s.Name, }, nil } @@ -94,4 +94,4 @@ func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error { func (s *SysChinaAreaDataById) SetUpdateBy(id int) { -} \ No newline at end of file +} diff --git a/app/other/service/sys_china_area_data.go b/app/other/service/sys_china_area_data.go index b3158dde..6bc45145 100644 --- a/app/other/service/sys_china_area_data.go +++ b/app/other/service/sys_china_area_data.go @@ -103,4 +103,4 @@ func (e *SysChinaAreaData) RemoveSysChinaAreaData(d *dto.SysChinaAreaDataById, p return errors.New("无权删除该数据") } return nil -} \ No newline at end of file +} diff --git a/app/other/service/sys_file_dir.go b/app/other/service/sys_file_dir.go index 5c5e6e3b..dece2eca 100644 --- a/app/other/service/sys_file_dir.go +++ b/app/other/service/sys_file_dir.go @@ -165,4 +165,4 @@ func SysFileDirCall(list *[]models.SysFileDir, m models.SysFileDir) models.SysFi } return m -} \ No newline at end of file +} diff --git a/app/other/service/sys_file_info.go b/app/other/service/sys_file_info.go index 461fd4d2..9b014c3c 100644 --- a/app/other/service/sys_file_info.go +++ b/app/other/service/sys_file_info.go @@ -123,4 +123,4 @@ func (e *SysFileInfo) RemoveSysFileInfo(d *dto.SysFileInfoById, p *actions.DataP return err } return nil -} \ No newline at end of file +} diff --git a/cmd/api/cms.go b/cmd/api/cms.go index 563565c6..417de8a9 100644 --- a/cmd/api/cms.go +++ b/cmd/api/cms.go @@ -5,4 +5,4 @@ import "go-admin/app/cms/router" func init() { //注册路由 fixme 其他应用的路由，在本目录新建文件放在init方法 AppRouters = append(AppRouters, router.InitRouter) -} \ No newline at end of file +} diff --git a/cmd/api/jobs.go b/cmd/api/jobs.go index 37de4ee5..e95caf89 100644 --- a/cmd/api/jobs.go +++ b/cmd/api/jobs.go @@ -5,4 +5,4 @@ import "go-admin/app/jobs/router" func init() { //注册路由 fixme 其他应用的路由，在本目录新建文件放在init方法 AppRouters = append(AppRouters, router.InitRouter) -} \ No newline at end of file +} diff --git a/cmd/api/other.go b/cmd/api/other.go index f9c990f5..4c291bed 100644 --- a/cmd/api/other.go +++ b/cmd/api/other.go @@ -5,4 +5,4 @@ import "go-admin/app/other/router" func init() { //注册路由 fixme 其他应用的路由，在本目录新建文件放在init方法 AppRouters = append(AppRouters, router.InitRouter) -} \ No newline at end of file +} diff --git a/cmd/cobra.go b/cmd/cobra.go index 454ea76c..dedb0736 100644 --- a/cmd/cobra.go +++ b/cmd/cobra.go @@ -52,4 +52,4 @@ func Execute() { if err := rootCmd.Execute(); err != nil { os.Exit(-1) } -} \ No newline at end of file +} diff --git a/cmd/migrate/migration/models/sys_api.go b/cmd/migrate/migration/models/sys_api.go index aef97eb6..0d9732e4 100644 --- a/cmd/migrate/migration/models/sys_api.go +++ b/cmd/migrate/migration/models/sys_api.go @@ -27,4 +27,4 @@ func (e *SysApi) Generate() models.ActiveRecord { func (e *SysApi) GetId() interface{} { return e.Id -} \ No newline at end of file +} diff --git a/cmd/migrate/migration/models/sys_menu.go b/cmd/migrate/migration/models/sys_menu.go index 501ba3d8..feb78b57 100644 --- a/cmd/migrate/migration/models/sys_menu.go +++ b/cmd/migrate/migration/models/sys_menu.go @@ -26,4 +26,4 @@ type SysMenu struct { func (SysMenu) TableName() string { return "sys_menu" -} \ No newline at end of file +} diff --git a/cmd/migrate/migration/models/systables.go b/cmd/migrate/migration/models/systables.go index df2add3a..0e53032b 100644 --- a/cmd/migrate/migration/models/systables.go +++ b/cmd/migrate/migration/models/systables.go @@ -34,4 +34,4 @@ type SysTables struct { func (SysTables) TableName() string { return "sys_tables" -} \ No newline at end of file +} diff --git a/cmd/migrate/migration/version-local/1614270163879_migrate.go b/cmd/migrate/migration/version-local/1614270163879_migrate.go index 89e297d4..e17441f5 100644 --- a/cmd/migrate/migration/version-local/1614270163879_migrate.go +++ b/cmd/migrate/migration/version-local/1614270163879_migrate.go @@ -4595,7 +4595,7 @@ func _1614270163879Test(db *gorm.DB, version string) error { "820007": "路氹填海區", "820008": "聖方濟各堂區" } -}` ) +}`) return db.Transaction(func(tx *gorm.DB) error { err := tx.Migrator().AutoMigrate(models.SysChinaAreaData{}) @@ -4617,7 +4617,7 @@ func _1614270163879Test(db *gorm.DB, version string) error { fmt.Println(k, k1, v1) var id = 0 id, _ = pkg.StringToInt(k1) - list = append(list, models.SysChinaAreaData{PId: k, Model: common.Model{Id: id}, Name: v1.(string),ModelTime:common.ModelTime{CreatedAt: time.Now(),UpdatedAt: time.Now()}}) + list = append(list, models.SysChinaAreaData{PId: k, Model: common.Model{Id: id}, Name: v1.(string), ModelTime: common.ModelTime{CreatedAt: time.Now(), UpdatedAt: time.Now()}}) } } err = tx.Create(list).Error @@ -4629,4 +4629,4 @@ func _1614270163879Test(db *gorm.DB, version string) error { Version: version, }).Error }) -} \ No newline at end of file +} diff --git a/cmd/migrate/migration/version/1599190683659_tables.go b/cmd/migrate/migration/version/1599190683659_tables.go index 1d19daec..bd6a35d7 100644 --- a/cmd/migrate/migration/version/1599190683659_tables.go +++ b/cmd/migrate/migration/version/1599190683659_tables.go @@ -47,4 +47,4 @@ func _1599190683659Tables(db *gorm.DB, version string) error { return db.Create(&common.Migration{ Version: version, }).Error -} \ No newline at end of file +} diff --git a/common/actions/create.go b/common/actions/create.go index 4de722d9..82d08b83 100644 --- a/common/actions/create.go +++ b/common/actions/create.go @@ -46,4 +46,4 @@ func CreateAction(control dto.Control) gin.HandlerFunc { response.OK(c, object.GetId(), "创建成功") c.Next() } -} \ No newline at end of file +} diff --git a/common/database/initialize.go b/common/database/initialize.go index abf32525..501f523b 100644 --- a/common/database/initialize.go +++ b/common/database/initialize.go @@ -62,4 +62,4 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) { sdk.Runtime.SetDb(host, db) sdk.Runtime.SetCasbin(host, e) -} \ No newline at end of file +} diff --git a/common/dto/auto_form.go b/common/dto/auto_form.go index eec2ead0..c99976ab 100644 --- a/common/dto/auto_form.go +++ b/common/dto/auto_form.go @@ -71,4 +71,4 @@ type Field struct { type Style struct { Width string `json:"width"` -} \ No newline at end of file +} diff --git a/common/file_store/oss.go b/common/file_store/oss.go index d72832e7..fb7a2a45 100644 --- a/common/file_store/oss.go +++ b/common/file_store/oss.go @@ -52,4 +52,4 @@ func (e *ALiYunOSS) UpLoad(yourObjectName string, localFile string) error { return err } return nil -} \ No newline at end of file +} diff --git a/common/global/adm.go b/common/global/adm.go index 1e9d1f9c..82c24333 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -9,4 +9,4 @@ var ( Source string Driver string DBName string -) \ No newline at end of file +) diff --git a/common/global/topic.go b/common/global/topic.go index 827c9d75..60e1d34b 100644 --- a/common/global/topic.go +++ b/common/global/topic.go @@ -4,4 +4,4 @@ const ( LoginLog = "login_log_queue" OperateLog = "operate_log_queue" ApiCheck = "api_check_queue" -) \ No newline at end of file +) diff --git a/common/middleware/handler/auth.go b/common/middleware/handler/auth.go index eabbbc8f..bca0ff3c 100644 --- a/common/middleware/handler/auth.go +++ b/common/middleware/handler/auth.go @@ -177,4 +177,4 @@ func Unauthorized(c *gin.Context, code int, message string) { "code": code, "msg": message, }) -} \ No newline at end of file +} diff --git a/common/middleware/logger.go b/common/middleware/logger.go index 4d66060d..1f31b2f4 100644 --- a/common/middleware/logger.go +++ b/common/middleware/logger.go @@ -39,7 +39,7 @@ func LoggerToFile() gin.HandlerFunc { } rb, _ := ioutil.ReadAll(bf) c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(rb)) - body =string(rb) + body = string(rb) } c.Next() @@ -53,7 +53,6 @@ func LoggerToFile() gin.HandlerFunc { if c.Request.Method == http.MethodOptions { return } - rt, bl := c.Get("result") var result = "" @@ -129,4 +128,4 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string log.Errorf("Append message error, %s", err.Error()) } } -} \ No newline at end of file +} diff --git a/common/middleware/permission.go b/common/middleware/permission.go index 109f97ba..3c8dd6cd 100644 --- a/common/middleware/permission.go +++ b/common/middleware/permission.go @@ -10,7 +10,7 @@ import ( "github.com/go-admin-team/go-admin-core/sdk/pkg/response" ) -//权限检查中间件 +// AuthCheckRole 权限检查中间件 func AuthCheckRole() gin.HandlerFunc { return func(c *gin.Context) { log := api.GetRequestLogger(c) diff --git a/config/extend.go b/config/extend.go index 0d4c9622..b21ef9b6 100644 --- a/config/extend.go +++ b/config/extend.go @@ -13,4 +13,4 @@ type Extend struct { type Demo struct { Name string -} \ No newline at end of file +}