From 29e3df81323b052a50d9672b1e6724680a472bf0 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Wed, 30 Aug 2023 15:37:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E7=94=A8logger=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=94=B9log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- features/sys_menu/service/repo_sys_menu.go | 22 ++++++++++---------- features/sys_role_menu/repo_sys_role_menu.go | 10 ++++----- features/sys_user_role/repo_sys_user_role.go | 10 ++++----- lib/core/datasource/datasource.go | 6 +++--- lib/core/utils/date/date.go | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/features/sys_menu/service/repo_sys_menu.go b/features/sys_menu/service/repo_sys_menu.go index abfc93d6..72a36c33 100644 --- a/features/sys_menu/service/repo_sys_menu.go +++ b/features/sys_menu/service/repo_sys_menu.go @@ -9,7 +9,7 @@ import ( "ems.agt/features/sys_menu/model" "ems.agt/lib/core/datasource" "ems.agt/lib/core/utils/parse" - "github.com/go-admin-team/go-admin-core/logger" + "ems.agt/lib/log" ) // 实例化数据层 RepoSysMenu 结构体 @@ -111,7 +111,7 @@ func (r *RepoSysMenu) SelectMenuList(sysMenu model.SysMenu, userId string) []mod querySql := fromSql + whereSql + orderSql results, err := datasource.RawDB("", querySql, params) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return []model.SysMenu{} } @@ -130,7 +130,7 @@ func (r *RepoSysMenu) SelectMenuPermsByUserId(userId string) []string { // 查询结果 results, err := datasource.RawDB("", querySql, []any{userId}) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return []string{} } @@ -168,7 +168,7 @@ func (r *RepoSysMenu) SelectMenuTreeByUserId(userId string) []model.SysMenu { // 查询结果 results, err := datasource.RawDB("", querySql, params) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return []model.SysMenu{} } @@ -194,7 +194,7 @@ func (r *RepoSysMenu) SelectMenuListByRoleId(roleId string, menuCheckStrictly bo // 查询结果 results, err := datasource.RawDB("", querySql, params) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return []string{} } @@ -215,7 +215,7 @@ func (r *RepoSysMenu) SelectMenuByIds(menuIds []string) []model.SysMenu { parameters := datasource.ConvertIdsSlice(menuIds) results, err := datasource.RawDB("", querySql, parameters) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return []model.SysMenu{} } // 转换实体 @@ -227,7 +227,7 @@ func (r *RepoSysMenu) HasChildByMenuId(menuId string) int64 { querySql := "select count(1) as 'total' from sys_menu where parent_id = ?" results, err := datasource.RawDB("", querySql, []any{menuId}) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return 0 } if len(results) > 0 { @@ -311,7 +311,7 @@ func (r *RepoSysMenu) InsertMenu(sysMenu model.SysMenu) string { // 执行插入 rows, err := datasource.ExecDB("", sql, values) if err != nil { - logger.Errorf("insert row : %v", err.Error()) + log.Errorf("insert row : %v", err.Error()) return "" } @@ -394,7 +394,7 @@ func (r *RepoSysMenu) UpdateMenu(sysMenu model.SysMenu) int64 { values = append(values, sysMenu.MenuID) rows, err := datasource.ExecDB("", sql, values) if err != nil { - logger.Errorf("update row : %v", err.Error()) + log.Errorf("update row : %v", err.Error()) return 0 } return rows @@ -405,7 +405,7 @@ func (r *RepoSysMenu) DeleteMenuById(menuId string) int64 { sql := "delete from sys_menu where menu_id = ?" results, err := datasource.ExecDB("", sql, []any{menuId}) if err != nil { - logger.Errorf("delete err => %v", err) + log.Errorf("delete err => %v", err) return 0 } return results @@ -442,7 +442,7 @@ func (r *RepoSysMenu) CheckUniqueMenu(sysMenu model.SysMenu) string { querySql := "select menu_id as 'str' from sys_menu " + whereSql + " limit 1" results, err := datasource.RawDB("", querySql, params) if err != nil { - logger.Errorf("query err %v", err) + log.Errorf("query err %v", err) return "" } if len(results) > 0 { diff --git a/features/sys_role_menu/repo_sys_role_menu.go b/features/sys_role_menu/repo_sys_role_menu.go index 0f36eef7..24d96f2f 100644 --- a/features/sys_role_menu/repo_sys_role_menu.go +++ b/features/sys_role_menu/repo_sys_role_menu.go @@ -6,7 +6,7 @@ import ( "ems.agt/lib/core/datasource" "ems.agt/lib/core/utils/parse" - "github.com/go-admin-team/go-admin-core/logger" + "ems.agt/lib/log" ) // 实例化数据层 RepoSysRoleMenu 结构体 @@ -20,7 +20,7 @@ func (r *RepoSysRoleMenu) CheckMenuExistRole(menuId string) int64 { querySql := "select count(1) as 'total' from sys_role_menu where menu_id = ?" results, err := datasource.RawDB("", querySql, []any{menuId}) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return 0 } if len(results) > 0 { @@ -36,7 +36,7 @@ func (r *RepoSysRoleMenu) DeleteRoleMenu(roleIds []string) int64 { parameters := datasource.ConvertIdsSlice(roleIds) results, err := datasource.ExecDB("", sql, parameters) if err != nil { - logger.Errorf("delete err => %v", err) + log.Errorf("delete err => %v", err) return 0 } return results @@ -49,7 +49,7 @@ func (r *RepoSysRoleMenu) DeleteMenuRole(menuIds []string) int64 { parameters := datasource.ConvertIdsSlice(menuIds) results, err := datasource.ExecDB("", sql, parameters) if err != nil { - logger.Errorf("delete err => %v", err) + log.Errorf("delete err => %v", err) return 0 } return results @@ -64,7 +64,7 @@ func (r *RepoSysRoleMenu) BatchRoleMenu(sysRoleMenus []SysRoleMenu) int64 { sql := "insert into sys_role_menu(role_id, menu_id) values " + strings.Join(keyValues, ",") results, err := datasource.ExecDB("", sql, nil) if err != nil { - logger.Errorf("delete err => %v", err) + log.Errorf("delete err => %v", err) return 0 } return results diff --git a/features/sys_user_role/repo_sys_user_role.go b/features/sys_user_role/repo_sys_user_role.go index 1c63c294..c7237646 100644 --- a/features/sys_user_role/repo_sys_user_role.go +++ b/features/sys_user_role/repo_sys_user_role.go @@ -6,7 +6,7 @@ import ( "ems.agt/lib/core/datasource" "ems.agt/lib/core/utils/parse" - "github.com/go-admin-team/go-admin-core/logger" + "ems.agt/lib/log" ) // 实例化数据层 RepoSysUserRole 结构体 @@ -20,7 +20,7 @@ func (r *RepoSysUserRole) CountUserRoleByRoleId(roleId string) int64 { querySql := "select count(1) as total from sys_user_role where role_id = ?" results, err := datasource.RawDB("", querySql, []any{roleId}) if err != nil { - logger.Errorf("query err => %v", err) + log.Errorf("query err => %v", err) return 0 } if len(results) > 0 { @@ -38,7 +38,7 @@ func (r *RepoSysUserRole) BatchUserRole(sysUserRoles []SysUserRole) int64 { sql := "insert into sys_user_role(user_id, role_id) values " + strings.Join(keyValues, ",") results, err := datasource.ExecDB("", sql, nil) if err != nil { - logger.Errorf("delete err => %v", err) + log.Errorf("delete err => %v", err) return 0 } return results @@ -51,7 +51,7 @@ func (r *RepoSysUserRole) DeleteUserRole(userIds []string) int64 { parameters := datasource.ConvertIdsSlice(userIds) results, err := datasource.ExecDB("", sql, parameters) if err != nil { - logger.Errorf("delete err => %v", err) + log.Errorf("delete err => %v", err) return 0 } return results @@ -65,7 +65,7 @@ func (r *RepoSysUserRole) DeleteUserRoleByRoleId(roleId string, userIds []string parameters = append([]any{roleId}, parameters...) results, err := datasource.ExecDB("", sql, parameters) if err != nil { - logger.Errorf("delete err => %v", err) + log.Errorf("delete err => %v", err) return 0 } return results diff --git a/lib/core/datasource/datasource.go b/lib/core/datasource/datasource.go index 013a1ab1..a36e2ba1 100644 --- a/lib/core/datasource/datasource.go +++ b/lib/core/datasource/datasource.go @@ -20,8 +20,8 @@ func RawDB(source string, sql string, parameters []any) ([]map[string]any, error // 使用正则表达式替换连续的空白字符为单个空格 fmtSql := regexp.MustCompile(`\s+`).ReplaceAllString(sql, " ") - // logger.Infof("sql=> %v", fmtSql) - // logger.Infof("parameters=> %v", parameters) + // log.Infof("sql=> %v", fmtSql) + // log.Infof("parameters=> %v", parameters) // 查询结果 var rows []map[string]any @@ -40,7 +40,7 @@ func ExecDB(source string, sql string, parameters []any) (int64, error) { // 使用正则表达式替换连续的空白字符为单个空格 fmtSql := regexp.MustCompile(`\s+`).ReplaceAllString(sql, " ") // 执行结果 - res, err := db.Exec(fmtSql, parameters) + res, err := db.Exec(append([]any{fmtSql}, parameters...)...) if err != nil { return 0, err } diff --git a/lib/core/utils/date/date.go b/lib/core/utils/date/date.go index d2b0c23a..e0893fb8 100644 --- a/lib/core/utils/date/date.go +++ b/lib/core/utils/date/date.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/go-admin-team/go-admin-core/logger" + "ems.agt/lib/log" ) const ( @@ -28,7 +28,7 @@ const ( func ParseStrToDate(dateStr, formatStr string) time.Time { t, err := time.Parse(formatStr, dateStr) if err != nil { - logger.Infof("utils ParseStrToDate err %v", err) + log.Infof("utils ParseStrToDate err %v", err) return time.Time{} } return t