From 8d664a327ce375461962566895536b911bfb7bbf Mon Sep 17 00:00:00 2001 From: xiangheng <11675084@qq.com> Date: Sun, 16 Jun 2024 14:40:41 +0800 Subject: [PATCH] =?UTF-8?q?MakeData=E6=94=B9=E4=B8=BASetData=EF=BC=8CMake?= =?UTF-8?q?=E6=94=B9=E4=B8=BASetMessage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/admin/common/album/service.go | 6 ++--- server/admin/generator/gen/service.go | 10 ++++---- server/admin/setting/dict_data/service.go | 4 ++-- server/admin/setting/dict_type/service.go | 8 +++---- server/admin/system/admin/service.go | 26 ++++++++++----------- server/admin/system/dept/service.go | 12 +++++----- server/admin/system/menu/service.go | 2 +- server/admin/system/post/service.go | 6 ++--- server/admin/system/role/service.go | 6 ++--- server/core/response/response.go | 18 +++++++-------- server/plugin/storage.go | 20 ++++++++-------- server/util/verify.go | 28 +++++++++++------------ 12 files changed, 73 insertions(+), 73 deletions(-) diff --git a/server/admin/common/album/service.go b/server/admin/common/album/service.go index b72d9a9..9c26325 100644 --- a/server/admin/common/album/service.go +++ b/server/admin/common/album/service.go @@ -110,7 +110,7 @@ func (albSrv albumService) AlbumMove(ids []uint, cid int) (e error) { return } if len(albums) == 0 { - return response.AssertArgumentError.Make("文件丢失！") + return response.AssertArgumentError.SetMessage("文件丢失！") } if cid > 0 { err = albSrv.db.Where("id = ? AND is_delete = ?", cid, 0).Limit(1).First(&common_model.AlbumCate{}).Error @@ -150,7 +150,7 @@ func (albSrv albumService) AlbumDel(ids []uint) (e error) { return } if len(albums) == 0 { - return response.AssertArgumentError.Make("文件丢失！") + return response.AssertArgumentError.SetMessage("文件丢失！") } err = albSrv.db.Model(&common_model.Album{}).Where("id in ?", ids).Updates( common_model.Album{IsDelete: 1, DeleteTime: core.NowTime()}).Error @@ -218,7 +218,7 @@ func (albSrv albumService) CateDel(id uint) (e error) { return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("当前分类正被使用中,不能删除！") + return response.AssertArgumentError.SetMessage("当前分类正被使用中,不能删除！") } cate.IsDelete = 1 cate.DeleteTime = core.NowTime() diff --git a/server/admin/generator/gen/service.go b/server/admin/generator/gen/service.go index 0f452e3..d7cd84e 100644 --- a/server/admin/generator/gen/service.go +++ b/server/admin/generator/gen/service.go @@ -145,7 +145,7 @@ func (genSrv generateService) ImportTable(tableNames []string) (e error) { var tables []gen_model.GenTable response.Copy(&tables, dbTbs) if len(tables) == 0 { - e = response.AssertArgumentError.Make("表不存在!") + e = response.AssertArgumentError.SetMessage("表不存在!") return } err = genSrv.db.Transaction(func(tx *gorm.DB) error { @@ -193,7 +193,7 @@ func (genSrv generateService) SyncTable(id uint) (e error) { return } if len(genTableCols) <= 0 { - e = response.AssertArgumentError.Make("旧数据异常！") + e = response.AssertArgumentError.SetMessage("旧数据异常！") return } prevColMap := make(map[string]gen_model.GenTableColumn) @@ -207,7 +207,7 @@ func (genSrv generateService) SyncTable(id uint) (e error) { return } if len(columns) <= 0 { - e = response.AssertArgumentError.Make("同步结构失败,原表结构不存在！") + e = response.AssertArgumentError.SetMessage("同步结构失败,原表结构不存在！") return } //事务处理 @@ -263,11 +263,11 @@ func (genSrv generateService) SyncTable(id uint) (e error) { func (genSrv generateService) EditTable(editReq EditTableReq) (e error) { if editReq.GenTpl == tpl_utils.GenConstants.TplTree { if editReq.TreePrimary == "" { - e = response.AssertArgumentError.Make("树主ID不能为空！") + e = response.AssertArgumentError.SetMessage("树主ID不能为空！") return } if editReq.TreeParent == "" { - e = response.AssertArgumentError.Make("树父ID不能为空！") + e = response.AssertArgumentError.SetMessage("树父ID不能为空！") return } } diff --git a/server/admin/setting/dict_data/service.go b/server/admin/setting/dict_data/service.go index 264406e..d59ab9c 100644 --- a/server/admin/setting/dict_data/service.go +++ b/server/admin/setting/dict_data/service.go @@ -120,7 +120,7 @@ func (ddSrv settingDictDataService) Detail(id uint) (res SettingDictDataResp, e // Add 字典数据新增 func (ddSrv settingDictDataService) Add(addReq SettingDictDataAddReq) (e error) { if r := ddSrv.db.Where("name = ? AND is_delete = ?", addReq.Name, 0).Limit(1).First(&setting_model.DictData{}); r.RowsAffected > 0 { - return response.AssertArgumentError.Make("字典数据已存在！") + return response.AssertArgumentError.SetMessage("字典数据已存在！") } var dd setting_model.DictData response.Copy(&dd, addReq) @@ -139,7 +139,7 @@ func (ddSrv settingDictDataService) Edit(editReq SettingDictDataEditReq) (e erro return } if r := ddSrv.db.Where("id != ? AND name = ? AND is_delete = ?", editReq.ID, editReq.Name, 0).Limit(1).First(&setting_model.DictData{}); r.RowsAffected > 0 { - return response.AssertArgumentError.Make("字典数据已存在！") + return response.AssertArgumentError.SetMessage("字典数据已存在！") } var dd setting_model.DictData response.Copy(&dd, editReq) diff --git a/server/admin/setting/dict_type/service.go b/server/admin/setting/dict_type/service.go index df0a0c8..402f52a 100644 --- a/server/admin/setting/dict_type/service.go +++ b/server/admin/setting/dict_type/service.go @@ -94,10 +94,10 @@ func (dtSrv settingDictTypeService) Detail(id uint) (res SettingDictTypeResp, e // Add 字典类型新增 func (dtSrv settingDictTypeService) Add(addReq SettingDictTypeAddReq) (e error) { if r := dtSrv.db.Where("dict_name = ? AND is_delete = ?", addReq.DictName, 0).Limit(1).First(&setting_model.DictType{}); r.RowsAffected > 0 { - return response.AssertArgumentError.Make("字典名称已存在！") + return response.AssertArgumentError.SetMessage("字典名称已存在！") } if r := dtSrv.db.Where("dict_type = ? AND is_delete = ?", addReq.DictType, 0).Limit(1).First(&setting_model.DictType{}); r.RowsAffected > 0 { - return response.AssertArgumentError.Make("字典类型已存在！") + return response.AssertArgumentError.SetMessage("字典类型已存在！") } var dt setting_model.DictType response.Copy(&dt, addReq) @@ -116,10 +116,10 @@ func (dtSrv settingDictTypeService) Edit(editReq SettingDictTypeEditReq) (e erro return } if r := dtSrv.db.Where("id != ? AND dict_name = ? AND is_delete = ?", editReq.ID, editReq.DictName, 0).Limit(1).First(&setting_model.DictType{}); r.RowsAffected > 0 { - return response.AssertArgumentError.Make("字典名称已存在！") + return response.AssertArgumentError.SetMessage("字典名称已存在！") } if r := dtSrv.db.Where("id != ? AND dict_type = ? AND is_delete = ?", editReq.ID, editReq.DictType, 0).Limit(1).First(&setting_model.DictType{}); r.RowsAffected > 0 { - return response.AssertArgumentError.Make("字典类型已存在！") + return response.AssertArgumentError.SetMessage("字典类型已存在！") } var dt setting_model.DictType response.Copy(&dt, editReq) diff --git a/server/admin/system/admin/service.go b/server/admin/system/admin/service.go index 3904f90..74deeff 100644 --- a/server/admin/system/admin/service.go +++ b/server/admin/system/admin/service.go @@ -231,7 +231,7 @@ func (adminSrv systemAuthAdminService) Add(addReq SystemAuthAdminAddReq) (e erro return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("账号已存在换一个吧！") + return response.AssertArgumentError.SetMessage("账号已存在换一个吧！") } // 检查nickname r = adminSrv.db.Where("nickname = ? AND is_delete = ?", addReq.Nickname, 0).Limit(1).Find(&sysAdmin) @@ -240,18 +240,18 @@ func (adminSrv systemAuthAdminService) Add(addReq SystemAuthAdminAddReq) (e erro return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("昵称已存在换一个吧！") + return response.AssertArgumentError.SetMessage("昵称已存在换一个吧！") } var roleResp role.SystemAuthRoleResp if roleResp, e = role.Service.Detail(addReq.Role); e != nil { return } if roleResp.IsDisable > 0 { - return response.AssertArgumentError.Make("当前角色已被禁用!") + return response.AssertArgumentError.SetMessage("当前角色已被禁用!") } passwdLen := len(addReq.Password) if !(passwdLen >= 6 && passwdLen <= 20) { - return response.Failed.Make("密码必须在6~20位") + return response.Failed.SetMessage("密码必须在6~20位") } salt := util.ToolsUtil.RandomString(5) response.Copy(&sysAdmin, addReq) @@ -285,7 +285,7 @@ func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAd return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("账号已存在换一个吧！") + return response.AssertArgumentError.SetMessage("账号已存在换一个吧！") } // 检查nickname r = adminSrv.db.Where("nickname = ? AND is_delete = ? AND id != ?", editReq.Nickname, 0, editReq.ID).Find(&admin) @@ -294,7 +294,7 @@ func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAd return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("昵称已存在换一个吧！") + return response.AssertArgumentError.SetMessage("昵称已存在换一个吧！") } // 检查role if editReq.Role > 0 && editReq.ID != 1 { @@ -317,7 +317,7 @@ func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq SystemAuthAd if editReq.Password != "" { passwdLen := len(editReq.Password) if passwdLen != 32 { - return response.Failed.Make("密码格式不正确") + return response.Failed.SetMessage("密码格式不正确") } salt := util.ToolsUtil.RandomString(5) adminMap["Salt"] = salt @@ -373,11 +373,11 @@ func (adminSrv systemAuthAdminService) Update(c *gin.Context, updateReq SystemAu if updateReq.Password != "" { currPass := util.ToolsUtil.MakeMd5(updateReq.CurrPassword + admin.Salt) if currPass != admin.Password { - return response.Failed.Make("当前密码不正确!") + return response.Failed.SetMessage("当前密码不正确!") } passwdLen := len(updateReq.Password) if passwdLen != 32 { - return response.Failed.Make("新密码格式不正确") + return response.Failed.SetMessage("新密码格式不正确") } salt := util.ToolsUtil.RandomString(5) adminMap["Salt"] = salt @@ -420,10 +420,10 @@ func (adminSrv systemAuthAdminService) Del(c *gin.Context, id uint) (e error) { return } if id == 1 { - return response.AssertArgumentError.Make("系统管理员不允许删除!") + return response.AssertArgumentError.SetMessage("系统管理员不允许删除!") } if id == config.AdminConfig.GetAdminId(c) { - return response.AssertArgumentError.Make("不能删除自己!") + return response.AssertArgumentError.SetMessage("不能删除自己!") } err = adminSrv.db.Model(&admin).Updates(system_model.SystemAuthAdmin{IsDelete: 1, DeleteTime: core.TsTime(time.Now())}).Error e = response.CheckErr(err, "Del Updates err") @@ -438,10 +438,10 @@ func (adminSrv systemAuthAdminService) Disable(c *gin.Context, id uint) (e error return } if admin.ID == 0 { - return response.AssertArgumentError.Make("账号已不存在!") + return response.AssertArgumentError.SetMessage("账号已不存在!") } if id == config.AdminConfig.GetAdminId(c) { - return response.AssertArgumentError.Make("不能禁用自己!") + return response.AssertArgumentError.SetMessage("不能禁用自己!") } var isDisable uint8 if admin.IsDisable == 0 { diff --git a/server/admin/system/dept/service.go b/server/admin/system/dept/service.go index b16250c..0783326 100644 --- a/server/admin/system/dept/service.go +++ b/server/admin/system/dept/service.go @@ -85,7 +85,7 @@ func (service systemAuthDeptService) Add(addReq SystemAuthDeptAddReq) (e error) return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("顶级部门只允许有一个!") + return response.AssertArgumentError.SetMessage("顶级部门只允许有一个!") } } var dept system_model.SystemAuthDept @@ -107,10 +107,10 @@ func (service systemAuthDeptService) Edit(editReq SystemAuthDeptEditReq) (e erro return } if dept.Pid == 0 && editReq.Pid > 0 { - return response.AssertArgumentError.Make("顶级部门不能修改上级!") + return response.AssertArgumentError.SetMessage("顶级部门不能修改上级!") } if editReq.ID == editReq.Pid { - return response.AssertArgumentError.Make("上级部门不能是自己!") + return response.AssertArgumentError.SetMessage("上级部门不能是自己!") } // 更新 response.Copy(&dept, editReq) @@ -131,21 +131,21 @@ func (service systemAuthDeptService) Del(id uint) (e error) { return } if dept.Pid == 0 { - return response.AssertArgumentError.Make("顶级部门不能删除!") + return response.AssertArgumentError.SetMessage("顶级部门不能删除!") } r := service.db.Where("pid = ? AND is_delete = ?", id, 0).Limit(1).Find(&system_model.SystemAuthDept{}) if e = response.CheckErr(r.Error, "Del Find dept err"); e != nil { return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("请先删除子级部门!") + return response.AssertArgumentError.SetMessage("请先删除子级部门!") } r = service.db.Where("dept_id = ? AND is_delete = ?", id, 0).Limit(1).Find(&system_model.SystemAuthAdmin{}) if e = response.CheckErr(r.Error, "Del Find admin err"); e != nil { return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("该部门已被管理员使用,请先移除!") + return response.AssertArgumentError.SetMessage("该部门已被管理员使用,请先移除!") } // dept.IsDelete = 1 // err = service.db.Save(&dept).Error diff --git a/server/admin/system/menu/service.go b/server/admin/system/menu/service.go index 9950ead..c2c5673 100644 --- a/server/admin/system/menu/service.go +++ b/server/admin/system/menu/service.go @@ -136,7 +136,7 @@ func (menuSrv systemAuthMenuService) Del(id uint) (e error) { return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("请先删除子菜单再操作！") + return response.AssertArgumentError.SetMessage("请先删除子菜单再操作！") } err = menuSrv.db.Delete(&menu).Error e = response.CheckErr(err, "Delete Delete err") diff --git a/server/admin/system/post/service.go b/server/admin/system/post/service.go index 4eb16f7..ae88068 100644 --- a/server/admin/system/post/service.go +++ b/server/admin/system/post/service.go @@ -102,7 +102,7 @@ func (service systemAuthPostService) Add(addReq SystemAuthPostAddReq) (e error) return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("该岗位已存在!") + return response.AssertArgumentError.SetMessage("该岗位已存在!") } var post system_model.SystemAuthPost response.Copy(&post, addReq) @@ -127,7 +127,7 @@ func (service systemAuthPostService) Edit(editReq SystemAuthPostEditReq) (e erro return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("该岗位已存在!") + return response.AssertArgumentError.SetMessage("该岗位已存在!") } // 更新 response.Copy(&post, editReq) @@ -152,7 +152,7 @@ func (service systemAuthPostService) Del(id uint) (e error) { return } if r.RowsAffected > 0 { - return response.AssertArgumentError.Make("该岗位存在管理员,请先移除!") + return response.AssertArgumentError.SetMessage("该岗位存在管理员,请先移除!") } err = service.db.Delete(&post).Error diff --git a/server/admin/system/role/service.go b/server/admin/system/role/service.go index 16267f2..074e12d 100644 --- a/server/admin/system/role/service.go +++ b/server/admin/system/role/service.go @@ -103,7 +103,7 @@ func (roleSrv systemAuthRoleService) getMemberCnt(roleId uint) (count int64) { func (roleSrv systemAuthRoleService) Add(addReq SystemAuthRoleAddReq) (e error) { var role system_model.SystemAuthRole if r := roleSrv.db.Where("name = ?", strings.Trim(addReq.Name, " ")).Limit(1).First(&role); r.RowsAffected > 0 { - return response.AssertArgumentError.Make("角色名称已存在!") + return response.AssertArgumentError.SetMessage("角色名称已存在!") } response.Copy(&role, addReq) role.Name = strings.Trim(addReq.Name, " ") @@ -132,7 +132,7 @@ func (roleSrv systemAuthRoleService) Edit(editReq SystemAuthRoleEditReq) (e erro } var role system_model.SystemAuthRole if r := roleSrv.db.Where("id != ? AND name = ?", editReq.ID, strings.Trim(editReq.Name, " ")).Limit(1).First(&role); r.RowsAffected > 0 { - return response.AssertArgumentError.Make("角色名称已存在!") + return response.AssertArgumentError.SetMessage("角色名称已存在!") } role.ID = editReq.ID roleMap := structs.Map(editReq) @@ -169,7 +169,7 @@ func (roleSrv systemAuthRoleService) Del(id uint) (e error) { return } if r := roleSrv.db.Where("role = ? AND is_delete = ?", id, 0).Limit(1).Find(&system_model.SystemAuthAdmin{}); r.RowsAffected > 0 { - return response.AssertArgumentError.Make("角色已被管理员使用,请先移除!") + return response.AssertArgumentError.SetMessage("角色已被管理员使用,请先移除!") } // 事务 err = roleSrv.db.Transaction(func(tx *gorm.DB) error { diff --git a/server/core/response/response.go b/server/core/response/response.go index dd12cbf..8f3213a 100644 --- a/server/core/response/response.go +++ b/server/core/response/response.go @@ -53,14 +53,14 @@ func (rt RespType) Error() string { return strconv.Itoa(rt.code) + ":" + rt.message } -// Make 以响应类型生成信息 -func (rt RespType) Make(message string) RespType { +// SetMessage 以响应类型生成信息 +func (rt RespType) SetMessage(message string) RespType { rt.message = message return rt } -// MakeData 以响应类型生成数据 -func (rt RespType) MakeData(data interface{}) RespType { +// SetData 以响应类型生成数据 +func (rt RespType) SetData(data interface{}) RespType { rt.data = data return rt } @@ -164,7 +164,7 @@ func IsFailWithResp(c *gin.Context, err error) bool { FailWithData(c, v, data) // 其他类型 default: - Fail(c, SystemError.Make(err.Error())) + Fail(c, SystemError.SetMessage(err.Error())) } return true } @@ -194,7 +194,7 @@ func CheckErr(err error, template string, args ...interface{}) (e error) { args = append(args, err) if err != nil { core.Logger.WithOptions(zap.AddCallerSkip(1)).Errorf(template+prefix+"err=[%+v]", args...) - return SystemError.Make(template) + return SystemError.SetMessage(template) } return } @@ -205,10 +205,10 @@ func CheckMysqlErr(err error) (e error) { switch mysqlErr.Number { case 404: core.Logger.WithOptions(zap.AddCallerSkip(1)).Errorf("record not found: err=[%+v]", err) - return SystemError.Make("数据不存在") + return SystemError.SetMessage("数据不存在") case 1062: // MySQL中表示重复条目的代码 core.Logger.WithOptions(zap.AddCallerSkip(1)).Infof("数据已存在: err=[%+v]", err) - return SystemError.Make("数据已存在") + return SystemError.SetMessage("数据已存在") default: // 处理其他错误 core.Logger.WithOptions(zap.AddCallerSkip(1)).Errorf("未知错误: err=[%+v]", err) @@ -221,7 +221,7 @@ func CheckMysqlErr(err error) (e error) { func CheckErrDBNotRecord(err error, message string) (e error) { if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { core.Logger.WithOptions(zap.AddCallerSkip(1)).Infof("记录不存在: err=[%+v]", err) - return SystemError.Make(message) + return SystemError.SetMessage(message) } return } diff --git a/server/plugin/storage.go b/server/plugin/storage.go index ef6685b..b9b1452 100644 --- a/server/plugin/storage.go +++ b/server/plugin/storage.go @@ -44,7 +44,7 @@ func (sd storageDriver) Upload(file *multipart.FileHeader, folder string, fileTy } } else { core.Logger.Errorf("storageDriver.Upload engine err: err=[unsupported engine]") - return nil, response.Failed.Make(fmt.Sprintf("engine:%s 暂时不支持", engine)) + return nil, response.Failed.SetMessage(fmt.Sprintf("engine:%s 暂时不支持", engine)) } fileRelPath := path.Join(folder, key) return &UploadFile{ @@ -66,7 +66,7 @@ func (sd storageDriver) localUpload(file *multipart.FileHeader, key string, fold src, err := file.Open() if err != nil { core.Logger.Errorf("storageDriver.localUpload Open err: err=[%+v]", err) - return response.Failed.Make("打开文件失败!") + return response.Failed.SetMessage("打开文件失败!") } defer src.Close() // 文件信息 @@ -77,14 +77,14 @@ func (sd storageDriver) localUpload(file *multipart.FileHeader, key string, fold if err != nil && !os.IsExist(err) { core.Logger.Errorf( "storageDriver.localUpload MkdirAll err: path=[%s], err=[%+v]", savePath, err) - return response.Failed.Make("创建上传目录失败!") + return response.Failed.SetMessage("创建上传目录失败!") } // 创建目标文件 out, err := os.Create(saveFilePath) if err != nil { core.Logger.Errorf( "storageDriver.localUpload Create err: file=[%s], err=[%+v]", saveFilePath, err) - return response.Failed.Make("创建文件失败!") + return response.Failed.SetMessage("创建文件失败!") } defer out.Close() // 写入目标文件 @@ -92,7 +92,7 @@ func (sd storageDriver) localUpload(file *multipart.FileHeader, key string, fold if err != nil { core.Logger.Errorf( "storageDriver.localUpload Copy err: file=[%s], err=[%+v]", saveFilePath, err) - return response.Failed.Make("上传文件失败: " + err.Error()) + return response.Failed.SetMessage("上传文件失败: " + err.Error()) } return nil } @@ -113,22 +113,22 @@ func (sd storageDriver) checkFile(file *multipart.FileHeader, fileType int) (e e if fileType == 10 { // 图片文件 if !util.ToolsUtil.Contains(config.Config.UploadImageExt, fileExt) { - return response.Failed.Make("不被支持的图片扩展: " + fileExt) + return response.Failed.SetMessage("不被支持的图片扩展: " + fileExt) } if fileSize > config.Config.UploadImageSize { - return response.Failed.Make("上传图片不能超出限制: " + strconv.FormatInt(config.Config.UploadImageSize/1024/1024, 10) + "M") + return response.Failed.SetMessage("上传图片不能超出限制: " + strconv.FormatInt(config.Config.UploadImageSize/1024/1024, 10) + "M") } } else if fileType == 20 { // 视频文件 if !util.ToolsUtil.Contains(config.Config.UploadVideoExt, fileExt) { - return response.Failed.Make("不被支持的视频扩展: " + fileExt) + return response.Failed.SetMessage("不被支持的视频扩展: " + fileExt) } if fileSize > config.Config.UploadVideoSize { - return response.Failed.Make("上传视频不能超出限制: " + strconv.FormatInt(config.Config.UploadVideoSize/1024/1024, 10) + "M") + return response.Failed.SetMessage("上传视频不能超出限制: " + strconv.FormatInt(config.Config.UploadVideoSize/1024/1024, 10) + "M") } } else { core.Logger.Errorf("storageDriver.checkFile fileType err: err=[unsupported fileType]") - return response.Failed.Make("上传文件类型错误") + return response.Failed.SetMessage("上传文件类型错误") } return nil } diff --git a/server/util/verify.go b/server/util/verify.go index 7d2881e..fd2c331 100644 --- a/server/util/verify.go +++ b/server/util/verify.go @@ -62,10 +62,10 @@ func (vu verifyUtil) VerifyJSON(c *gin.Context, obj any) (e error) { if err := c.ShouldBindBodyWith(&obj, binding.JSON); err != nil { errs, ok := err.(validator.ValidationErrors) if !ok { - e = response.ParamsValidError.MakeData(err.Error()) + e = response.ParamsValidError.SetData(err.Error()) return } - e = response.ParamsValidError.MakeData(errs.Translate(trans)) + e = response.ParamsValidError.SetData(errs.Translate(trans)) return } // response.Copy(obj, reqInfo) @@ -74,10 +74,10 @@ func (vu verifyUtil) VerifyJSON(c *gin.Context, obj any) (e error) { // if err := c.ShouldBindBodyWith(obj, binding.JSON); err != nil { // errs, ok := err.(validator.ValidationErrors) // if !ok { - // e = response.ParamsValidError.MakeData(err.Error()) + // e = response.ParamsValidError.SetData(err.Error()) // return // } - // e = response.ParamsValidError.MakeData(errs.Translate(trans)) + // e = response.ParamsValidError.SetData(errs.Translate(trans)) // return // } // return @@ -86,12 +86,12 @@ func (vu verifyUtil) VerifyJSON(c *gin.Context, obj any) (e error) { func (vu verifyUtil) VerifyJSONArray(c *gin.Context, obj any) (e error) { body, err := io.ReadAll(c.Request.Body) if err != nil { - e = response.ParamsValidError.MakeData(err.Error()) + e = response.ParamsValidError.SetData(err.Error()) return } err = json.Unmarshal(body, &obj) if err != nil { - e = response.ParamsValidError.MakeData(err.Error()) + e = response.ParamsValidError.SetData(err.Error()) return } return @@ -101,10 +101,10 @@ func (vu verifyUtil) VerifyBody(c *gin.Context, obj any) (e error) { if err := c.ShouldBind(obj); err != nil { errs, ok := err.(validator.ValidationErrors) if !ok { - e = response.ParamsValidError.MakeData(err.Error()) + e = response.ParamsValidError.SetData(err.Error()) return } - e = response.ParamsValidError.MakeData(errs.Translate(trans)) + e = response.ParamsValidError.SetData(errs.Translate(trans)) return } return @@ -114,10 +114,10 @@ func (vu verifyUtil) VerifyHeader(c *gin.Context, obj any) (e error) { if err := c.ShouldBindHeader(obj); err != nil { errs, ok := err.(validator.ValidationErrors) if !ok { - e = response.ParamsValidError.MakeData(err.Error()) + e = response.ParamsValidError.SetData(err.Error()) return } - e = response.ParamsValidError.MakeData(errs.Translate(trans)) + e = response.ParamsValidError.SetData(errs.Translate(trans)) return } return @@ -127,10 +127,10 @@ func (vu verifyUtil) VerifyQuery(c *gin.Context, obj any) (e error) { if err := c.ShouldBindQuery(obj); err != nil { errs, ok := err.(validator.ValidationErrors) if !ok { - e = response.ParamsValidError.MakeData(err.Error()) + e = response.ParamsValidError.SetData(err.Error()) return } - e = response.ParamsValidError.MakeData(errs.Translate(trans)) + e = response.ParamsValidError.SetData(errs.Translate(trans)) return } return @@ -141,10 +141,10 @@ func (vu verifyUtil) VerifyFile(c *gin.Context, name string) (file *multipart.Fi if err != nil { errs, ok := err.(validator.ValidationErrors) if !ok { - e = response.ParamsValidError.MakeData(err.Error()) + e = response.ParamsValidError.SetData(err.Error()) return } - e = response.ParamsValidError.MakeData(errs.Translate(trans)) + e = response.ParamsValidError.SetData(errs.Translate(trans)) return } return