From 649c0afc0734a250bec60d4dc48d0e9eed3d0818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=82=96?= <1340691923@qq.com> Date: Sun, 10 Apr 2022 23:22:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controller/manager_user_controller.go | 10 ++- controller/word_controller.go | 6 +- middleware/time.go | 7 ++- model/crud.go | 5 +- model/gm_operater_log.go | 5 +- model/gm_role.go | 8 ++- model/user_group.go | 5 +- platform-basic-libs/response/Response.go | 2 +- .../service/analysis/utils/user_group.go | 7 ++- .../service/app/app_service.go | 44 ++++++++++--- .../service/debug_data/debug_data.go | 5 +- .../service/gm_user/gm_user_service.go | 9 ++- platform-basic-libs/service/myapp/utils.go | 4 +- .../service/pannel/pannel_service.go | 61 ++++++++++++++----- .../service/realdata/real_data_service.go | 3 +- 15 files changed, 134 insertions(+), 47 deletions(-) diff --git a/controller/manager_user_controller.go b/controller/manager_user_controller.go index d0ba539..d576618 100644 --- a/controller/manager_user_controller.go +++ b/controller/manager_user_controller.go @@ -244,9 +244,13 @@ func (this ManagerUserController) UserBanAction(ctx *Ctx) error { return this.Error(ctx, errors.New("您无权操作该用户!")) } - _, err = db.SqlBuilder.Update("gm_user").SetMap(map[string]interface{}{ - "is_del": ban_typ, - }).Where(db.Eq{"id": id}).RunWith(db.Sqlx).Exec() + _, err = db. + SqlBuilder. + Update("gm_user"). + SetMap(map[string]interface{}{"is_del": ban_typ}). + Where(db.Eq{"id": id}). + RunWith(db.Sqlx). + Exec() if err != nil { return this.Error(ctx, err) diff --git a/controller/word_controller.go b/controller/word_controller.go index 1b2e071..5c6607f 100644 --- a/controller/word_controller.go +++ b/controller/word_controller.go @@ -173,15 +173,11 @@ func GetWordParse(ctx *fasthttp.RequestCtx) { Def string `json:"def"` Juzi string `json:"juzi"` TongYiCi string `json:"tong_yi_ci"` - }(struct { - Def string `json:"def"` - Juzi string `json:"juzi"` - TongYiCi string `json:"tong_yi_ci"` }{ Def: strings.ReplaceAll(selection.Find(".def").Text(), `"`, ""), Juzi: strings.ReplaceAll(selection.Find("p em").Text(), `"`, ""), TongYiCi: selection.Find(".gray a").Text(), - })) + }) } }) diff --git a/middleware/time.go b/middleware/time.go index ee1ee39..1f697b1 100644 --- a/middleware/time.go +++ b/middleware/time.go @@ -16,8 +16,11 @@ func Timer(ctx *fiber.Ctx) error { err := ctx.Next() // stop timer stop := time.Now() - - logs.Logger.Info("时间拦截器", zap.String("消耗时间：", stop.Sub(start).String())) + + logs.Logger.Info("时间拦截器", + zap.String("访问资源",ctx.Path()), + zap.Reflect("body",string(ctx.Body())), + zap.String("消耗时间：", stop.Sub(start).String())) return err } diff --git a/model/crud.go b/model/crud.go index ed5fa31..b84726f 100644 --- a/model/crud.go +++ b/model/crud.go @@ -12,7 +12,10 @@ type Curd interface { } func SearchList(curd Curd, page, limit int, columns string, list interface{}) (err error) { - sqlA := db.SqlBuilder.Select(columns).From(curd.TableName()) + sqlA := db. + SqlBuilder. + Select(columns). + From(curd.TableName()) sqlA = curd.ProcessSqlWhere(sqlA) sql, args, err := sqlA. Limit(uint64(limit)). diff --git a/model/gm_operater_log.go b/model/gm_operater_log.go index 631710f..b261ec4 100644 --- a/model/gm_operater_log.go +++ b/model/gm_operater_log.go @@ -52,7 +52,10 @@ func (this *GmOperaterLog) Insert() (err error) { if err != nil { return } - _, err = db.SqlBuilder.Insert(this.TableName()).SetMap(map[string]interface{}{ + _, err = db. + SqlBuilder. + Insert(this.TableName()). + SetMap(map[string]interface{}{ "operater_name": this.OperaterName, "operater_id": this.OperaterId, "operater_action": this.OperaterAction, diff --git a/model/gm_role.go b/model/gm_role.go index 3282148..477cb98 100644 --- a/model/gm_role.go +++ b/model/gm_role.go @@ -18,7 +18,9 @@ func (this *GmRoleModel) GetById(roleId int) (model GmRoleModel, err error) { // Update func (this *GmRoleModel) Update() (err error) { - _, err = db.Sqlx.Exec("update gm_role set role_name = ?,description=?,role_list=? where id = ?;", this.RoleName, this.Description, this.RoleList, this.ID) + _, err = db.Sqlx.Exec( + "update gm_role set role_name = ?,description=?,role_list=? where id = ?;", + this.RoleName, this.Description, this.RoleList, this.ID) return } @@ -30,7 +32,9 @@ func (this *GmRoleModel) Delete() (err error) { // Insert func (this *GmRoleModel) Insert() (id int64, err error) { - rlt, err := db.Sqlx.Exec("insert into gm_role (role_name,description,role_list) values (?,?,?);", this.RoleName, this.Description, this.RoleList) + rlt, err := db.Sqlx.Exec( + "insert into gm_role (role_name,description,role_list) values (?,?,?);", + this.RoleName, this.Description, this.RoleList) if err != nil { return } diff --git a/model/user_group.go b/model/user_group.go index 2596806..4016035 100644 --- a/model/user_group.go +++ b/model/user_group.go @@ -19,7 +19,10 @@ type UserGroup struct { } func (this *UserGroup) Insert(managerUid int32, appid int, userCount int, userList []byte) (err error) { - _, err = db.SqlBuilder.Insert("user_group").SetMap(map[string]interface{}{ + _, err = db. + SqlBuilder. + Insert("user_group"). + SetMap(map[string]interface{}{ "group_name": this.GroupName, "group_remark": this.GroupRemark, "create_by": managerUid, diff --git a/platform-basic-libs/response/Response.go b/platform-basic-libs/response/Response.go index b1f27c8..af0d54d 100644 --- a/platform-basic-libs/response/Response.go +++ b/platform-basic-libs/response/Response.go @@ -125,7 +125,7 @@ func (this *Response) Output(write io.Writer, data map[string]interface{}) error //得到trace信息 func (this *Response) getTrace(err error) []string { goEnv := os.Getenv("GO_ENV") - errorTrace := []string{} + var errorTrace []string if goEnv == "product" { errorTrace = this.DealErr(err) } diff --git a/platform-basic-libs/service/analysis/utils/user_group.go b/platform-basic-libs/service/analysis/utils/user_group.go index 73ca094..d41eca1 100644 --- a/platform-basic-libs/service/analysis/utils/user_group.go +++ b/platform-basic-libs/service/analysis/utils/user_group.go @@ -13,7 +13,12 @@ func GetUserGroupSqlAndArgs(ids []int, appid int) (SQL string, Args []interface{ return " and ( 1 = 1 ) ", nil, err } - sql, args, err := db.SqlBuilder.Select("user_list").From("user_group").Where(db.Eq{"appid": appid, "id": ids}).ToSql() + sql, args, err := db. + SqlBuilder. + Select("user_list"). + From("user_group"). + Where(db.Eq{"appid": appid, "id": ids}). + ToSql() var userGroupList []model.UserGroup diff --git a/platform-basic-libs/service/app/app_service.go b/platform-basic-libs/service/app/app_service.go index a9ca628..20204f0 100644 --- a/platform-basic-libs/service/app/app_service.go +++ b/platform-basic-libs/service/app/app_service.go @@ -15,10 +15,14 @@ type AppService struct { } func (this *AppService) UpdateManager(app model.App, managerUid int32) (err error) { - _, err = db.SqlBuilder.Update("app").SetMap(map[string]interface{}{ + _, err = db. + SqlBuilder. + Update("app"). + SetMap(map[string]interface{}{ "app_manager": app.AppManager, - "update_by": managerUid, - }).Where(db.Eq{"app_id": app.AppId}).RunWith(db.Sqlx).Exec() + "update_by": managerUid}). + Where(db.Eq{"app_id": app.AppId}). + RunWith(db.Sqlx).Exec() if err != nil { return } @@ -27,7 +31,11 @@ func (this *AppService) UpdateManager(app model.App, managerUid int32) (err erro func (this *AppService) Create(app model.App, managerUid int32) (err error) { roolbackFn := func(id int64) { - db.SqlBuilder.Delete("app").Where(db.Eq{"id": id}).RunWith(db.Sqlx).Exec() + db.SqlBuilder. + Delete("app"). + Where(db.Eq{"id": id}). + RunWith(db.Sqlx). + Exec() } app.AppId = util.GetUUid() @@ -36,7 +44,10 @@ func (this *AppService) Create(app model.App, managerUid int32) (err error) { app.SaveMonth = 1 } - rows, err := db.SqlBuilder.Insert("app").SetMap(map[string]interface{}{ + rows, err := db. + SqlBuilder. + Insert("app"). + SetMap(map[string]interface{}{ "app_name": app.AppName, "descibe": app.Descibe, "app_id": app.AppId, @@ -127,7 +138,9 @@ func (this AppService) ChangeStatus(app model.App, managerUid int32) (err error) if !util.InArr([]int{1, 0}, *app.IsClose) { return errors.New("无效操作") } - _, err = db.SqlBuilder.Update("app"). + _, err = db. + SqlBuilder. + Update("app"). SetMap(map[string]interface{}{ "is_close": *app.IsClose, "update_by": managerUid}). @@ -153,8 +166,14 @@ func (this AppService) ChangeStatus(app model.App, managerUid int32) (err error) func (this *AppService) List(managerUid int32, app model.App) (list []model.App, count int, err error) { - selectBuilder := db.SqlBuilder.Select("*").From("app") - selectBuilder2 := db.SqlBuilder.Select("count(*)").From("app") + selectBuilder := db. + SqlBuilder. + Select("*"). + From("app") + selectBuilder2 := db. + SqlBuilder. + Select("count(*)"). + From("app") if managerUid != 1 { selectBuilder = selectBuilder.Where(db.Eq{"create_by": managerUid}) @@ -176,7 +195,9 @@ func (this *AppService) List(managerUid int32, app model.App) (list []model.App, return } - err = db.Sqlx.Select(&list, sql, args...) + err = db. + Sqlx. + Select(&list, sql, args...) if err != nil { return } @@ -194,7 +215,10 @@ func (this *AppService) ResetAppkey(managerUid int32, app model.App) (err error) app.AppKey = util.MD5HexHash(util.Str2bytes(util.GetUUid())) - _, err = db.SqlBuilder.Update("app").SetMap(map[string]interface{}{ + _, err = db. + SqlBuilder. + Update("app"). + SetMap(map[string]interface{}{ "app_key": app.AppKey, "update_by": managerUid, }).Where(db.Eq{"app_id": app.AppId}).RunWith(db.Sqlx).Exec() diff --git a/platform-basic-libs/service/debug_data/debug_data.go b/platform-basic-libs/service/debug_data/debug_data.go index d95632f..9dc3dde 100644 --- a/platform-basic-libs/service/debug_data/debug_data.go +++ b/platform-basic-libs/service/debug_data/debug_data.go @@ -10,7 +10,10 @@ type DebugData struct { func (this *DebugData) AddDebugDeviceID(appid, deviceID, remark string, managerUid int32) (err error) { - _, err = db.SqlBuilder.Insert("debug_device").SetMap(map[string]interface{}{ + _, err = db. + SqlBuilder. + Insert("debug_device"). + SetMap(map[string]interface{}{ "remark": remark, "device_id": deviceID, "appid": appid, diff --git a/platform-basic-libs/service/gm_user/gm_user_service.go b/platform-basic-libs/service/gm_user/gm_user_service.go index 163cb98..00b0602 100644 --- a/platform-basic-libs/service/gm_user/gm_user_service.go +++ b/platform-basic-libs/service/gm_user/gm_user_service.go @@ -33,9 +33,12 @@ func (this GmUserService) CheckLogin(username, password string) (token string, e return } - db.SqlBuilder.Update("gm_user").SetMap(map[string]interface{}{ - "last_login_time": time.Now().Format(util.TimeFormat), - }).Where(db.Eq{"id": gmUser.ID}).RunWith(db.Sqlx).Exec() + db.SqlBuilder. + Update("gm_user"). + SetMap(map[string]interface{}{"last_login_time": time.Now().Format(util.TimeFormat)}). + Where(db.Eq{"id": gmUser.ID}). + RunWith(db.Sqlx). + Exec() token, err = jwt.GenerateToken(gmUser) if err != nil { diff --git a/platform-basic-libs/service/myapp/utils.go b/platform-basic-libs/service/myapp/utils.go index fd79f48..9b9afb7 100644 --- a/platform-basic-libs/service/myapp/utils.go +++ b/platform-basic-libs/service/myapp/utils.go @@ -10,7 +10,9 @@ import ( func GetAppidsByToken(token string) (list []model.App, err error) { c, _ := jwt.ParseToken(token) - selectBuilder := db.SqlBuilder.Select("id,app_name").From("app") + selectBuilder := db.SqlBuilder. + Select("id,app_name"). + From("app") if c.UserID != 1 { selectBuilder = selectBuilder.Where(fmt.Sprintf("FIND_IN_SET(%v,app_manager)", c.UserID)).Where(db.Eq{"is_close": 0}) diff --git a/platform-basic-libs/service/pannel/pannel_service.go b/platform-basic-libs/service/pannel/pannel_service.go index f658d9a..4c1597c 100644 --- a/platform-basic-libs/service/pannel/pannel_service.go +++ b/platform-basic-libs/service/pannel/pannel_service.go @@ -14,9 +14,13 @@ type PannelService struct { } func (this *PannelService) UpdatePannelManager(managers string, id int, managerUid int32) (err error) { - _, err = db.SqlBuilder.Update("pannel").SetMap(map[string]interface{}{ - "managers": managers, - }).Where(db.Eq{"id": id, "create_by": managerUid}).RunWith(db.Sqlx).Exec() + _, err = db. + SqlBuilder. + Update("pannel"). + SetMap(map[string]interface{}{"managers": managers}). + Where(db.Eq{"id": id, "create_by": managerUid}). + RunWith(db.Sqlx). + Exec() return } @@ -24,7 +28,12 @@ func (this *PannelService) RtListByAppid(appid int) (res map[int]model.ReportTab res = map[int]model.ReportTable{} - sql, args, err := db.SqlBuilder.Select("id,name,rt_type,data").From("report_table").Where(db.Eq{"appid": appid}).ToSql() + sql, args, err := db. + SqlBuilder. + Select("id,name,rt_type,data"). + From("report_table"). + Where(db.Eq{"appid": appid}). + ToSql() if err != nil { return nil, err @@ -64,13 +73,17 @@ func (this *PannelService) UpdatePannelRt(reportTables string, id int, managerUi } func (this *PannelService) CopyPannel(data model.Pannel, managerUid int32) (err error) { - _, err = db.Sqlx.Exec(`insert into pannel(folder_id,pannel_name,create_by,report_tables) values (?,?,?,?)`, - data.FolderId, data.PannelName, managerUid, data.ReportTables) + _, err = db. + Sqlx. + Exec(`insert into pannel(folder_id,pannel_name,create_by,report_tables) values (?,?,?,?)`, + data.FolderId, data.PannelName, managerUid, data.ReportTables, + ) return } func (this *PannelService) DeleteDir(data model.PannelFolder) (err error) { - _, err = db.Sqlx.Exec(` + _, err = db.Sqlx. + Exec(` DELETE p1,p2 FROM pannel_folder p1 LEFT JOIN pannel p2 ON p1.id = p2.folder_id where p1.id = ? and p1.appid = ? and p1.create_by = ?`, data.Id, data.Appid, data.CreateBy) @@ -107,12 +120,16 @@ func (this *PannelService) Rename(pannelName string, id int, managerUid int32) ( } func (this *PannelService) AddDir(data request.NewDir) (err error) { - _, err = db.SqlBuilder.Insert("pannel_folder"). + _, err = db. + SqlBuilder. + Insert("pannel_folder"). SetMap(map[string]interface{}{ "appid": data.Appid, "create_by": data.CreateBy, "folder_name": data.FolderName, - }).RunWith(db.Sqlx).Exec() + }). + RunWith(db.Sqlx). + Exec() return } @@ -123,7 +140,9 @@ func (this *PannelService) AddPannel(data request.NewPannel, managerUid int32) ( "folder_id": data.FolderId, "pannel_name": data.PannelName, "create_by": managerUid, - }).RunWith(db.Sqlx).Exec() + }). + RunWith(db.Sqlx). + Exec() return } @@ -153,7 +172,9 @@ FROM WHERE (p1.create_by = ? OR FIND_IN_SET(?,p2.managers) ) and appid= ?` - err = db.Sqlx.Select(&res, sql, managerUid, managerUid, managerUid, appid) + err = db. + Sqlx. + Select(&res, sql, managerUid, managerUid, managerUid, appid) if err != nil { return @@ -219,11 +240,17 @@ func (this *PannelService) FindNameCount(data request.FindNameCount, managerUid } func (this *PannelService) DeleteReportTableByID(data model.ReportTable, managerUid int32) (err error) { - if _, err := db.SqlBuilder.Delete("report_table").Where(db.Eq{"id": data.Id, "user_id": managerUid}).RunWith(db.Sqlx).Exec(); err != nil { + if _, err := db. + SqlBuilder. + Delete("report_table"). + Where(db.Eq{"id": data.Id, "user_id": managerUid}). + RunWith(db.Sqlx).Exec();err != nil{ return err } - if _, err := db.Sqlx.Exec(`UPDATE pannel SET report_tables = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', report_tables, ','), concat(',',?,','), ',')) + if _, err := db. + Sqlx. + Exec(`UPDATE pannel SET report_tables = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', report_tables, ','), concat(',',?,','), ',')) WHERE FIND_IN_SET(?, report_tables) and create_by = ?`, data.Id, data.Id, managerUid); err != nil { return err } @@ -242,7 +269,13 @@ func (this *PannelService) ReportTableList(appid int, rtType int8, managerUid in where["rt_type"] = rtType } - sql, args, err := db.SqlBuilder.Select("*").From("report_table").Where(where).OrderBy("rt_type").ToSql() + sql, args, err := db. + SqlBuilder. + Select("*"). + From("report_table"). + Where(where). + OrderBy("rt_type"). + ToSql() if err != nil { return nil, err diff --git a/platform-basic-libs/service/realdata/real_data_service.go b/platform-basic-libs/service/realdata/real_data_service.go index f0f8394..d03d557 100644 --- a/platform-basic-libs/service/realdata/real_data_service.go +++ b/platform-basic-libs/service/realdata/real_data_service.go @@ -56,7 +56,8 @@ func (this RealDataService) ReportCount(appid string, startTime string, endTime var failCountArr []count var succCountArr []count var showNameTmpArr []ShowNameTmp - mysqlErr := db.Sqlx.Select(&showNameTmpArr, "select event_name,show_name from meta_event where appid = ?", appid) + mysqlErr := db.Sqlx. + Select(&showNameTmpArr, "select event_name,show_name from meta_event where appid = ?", appid) if util.FilterMysqlNilErr(mysqlErr) { return nil, mysqlErr }