apps/x_admin
1
0
Fork 0
mirror of https://gitee.com/xiangheng/x_admin.git synced 2025-10-10 02:20:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix:修改用户信息密码不用必传

Browse Source
This commit is contained in:
xiangheng
2023-11-29 11:38:31 +08:00
parent 1ae107ab83
commit d1ababfe51
3 changed files with 77 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
server/util/verify.go
View File

@@ -2,14 +2,56 @@ package util
import (
"encoding/json"
"fmt"
"io"
"mime/multipart"
"x_admin/core/response"
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"github.com/go-playground/locales/en"
"github.com/go-playground/locales/zh"
ut "github.com/go-playground/universal-translator"
"github.com/go-playground/validator/v10"
enTranslations "github.com/go-playground/validator/v10/translations/en"
chTranslations "github.com/go-playground/validator/v10/translations/zh"
)
var trans ut.Translator
// loca 通常取决于 http 请求头的 'Accept-Language'
func transInit(local string) (err error) {
if v, ok := binding.Validator.Engine().(*validator.Validate); ok {
zhT := zh.New() //chinese
enT := en.New() //english
uni := ut.New(enT, zhT, enT)
var o bool
trans, o = uni.GetTranslator(local)
if !o {
return fmt.Errorf("uni.GetTranslator(%s) failed", local)
}
//register translate
// 注册翻译器
switch local {
case "en":
err = enTranslations.RegisterDefaultTranslations(v, trans)
case "zh":
err = chTranslations.RegisterDefaultTranslations(v, trans)
default:
err = enTranslations.RegisterDefaultTranslations(v, trans)
}
return
}
return
}
func init() {
if err := transInit("zh"); err != nil {
fmt.Printf("init trans failed, err:%v\n", err)
return
}
}
var VerifyUtil = verifyUtil{}
// verifyUtil 参数验证工具类
@@ -17,7 +59,12 @@ type verifyUtil struct{}
func (vu verifyUtil) VerifyJSON(c *gin.Context, obj any) (e error) {
if err := c.ShouldBindBodyWith(obj, binding.JSON); err != nil {
e = response.ParamsValidError.MakeData(err.Error())
errs, ok := err.(validator.ValidationErrors)
if !ok {
e = response.ParamsValidError.MakeData(err.Error())
return
}
e = response.ParamsValidError.MakeData(errs.Translate(trans))
return
}
return
@@ -39,7 +86,12 @@ func (vu verifyUtil) VerifyJSONArray(c *gin.Context, obj any) (e error) {
func (vu verifyUtil) VerifyBody(c *gin.Context, obj any) (e error) {
if err := c.ShouldBind(obj); err != nil {
e = response.ParamsValidError.MakeData(err.Error())
errs, ok := err.(validator.ValidationErrors)
if !ok {
e = response.ParamsValidError.MakeData(err.Error())
return
}
e = response.ParamsValidError.MakeData(errs.Translate(trans))
return
}
return
@@ -47,7 +99,12 @@ func (vu verifyUtil) VerifyBody(c *gin.Context, obj any) (e error) {
func (vu verifyUtil) VerifyHeader(c *gin.Context, obj any) (e error) {
if err := c.ShouldBindHeader(obj); err != nil {
e = response.ParamsValidError.MakeData(err.Error())
errs, ok := err.(validator.ValidationErrors)
if !ok {
e = response.ParamsValidError.MakeData(err.Error())
return
}
e = response.ParamsValidError.MakeData(errs.Translate(trans))
return
}
return
@@ -55,7 +112,12 @@ func (vu verifyUtil) VerifyHeader(c *gin.Context, obj any) (e error) {
func (vu verifyUtil) VerifyQuery(c *gin.Context, obj any) (e error) {
if err := c.ShouldBindQuery(obj); err != nil {
e = response.ParamsValidError.MakeData(err.Error())
errs, ok := err.(validator.ValidationErrors)
if !ok {
e = response.ParamsValidError.MakeData(err.Error())
return
}
e = response.ParamsValidError.MakeData(errs.Translate(trans))
return
}
return
@@ -64,7 +126,12 @@ func (vu verifyUtil) VerifyQuery(c *gin.Context, obj any) (e error) {
func (vu verifyUtil) VerifyFile(c *gin.Context, name string) (file *multipart.FileHeader, e error) {
file, err := c.FormFile(name)
if err != nil {
e = response.ParamsValidError.MakeData(err.Error())
errs, ok := err.(validator.ValidationErrors)
if !ok {
e = response.ParamsValidError.MakeData(err.Error())
return
}
e = response.ParamsValidError.MakeData(errs.Translate(trans))
return
}
return