diff --git a/go.mod b/go.mod index 6d2e295..5d794d0 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,9 @@ require ( github.com/gin-gonic/gin v1.6.3 github.com/go-ole/go-ole v1.2.5 // indirect github.com/go-openapi/spec v0.20.0 // indirect + github.com/go-playground/locales v0.13.0 + github.com/go-playground/universal-translator v0.17.0 + github.com/go-playground/validator/v10 v10.2.0 github.com/go-redis/redis/v7 v7.4.0 github.com/golang/protobuf v1.5.2 github.com/jinzhu/gorm v1.9.16 diff --git a/internal/api/controller/admin_handler/func_create.go b/internal/api/controller/admin_handler/func_create.go index cbd518d..8eea0d0 100755 --- a/internal/api/controller/admin_handler/func_create.go +++ b/internal/api/controller/admin_handler/func_create.go @@ -3,17 +3,18 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/admin_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" + "github.com/xinliangnote/go-gin-api/internal/pkg/validation" "github.com/xinliangnote/go-gin-api/pkg/errno" ) type createRequest struct { - Username string `form:"username"` // 用户名 - Nickname string `form:"nickname"` // 昵称 - Mobile string `form:"mobile"` // 手机号 - Password string `form:"password"` // 密码 + Username string `form:"username" binding:"required"` // 用户名 + Nickname string `form:"nickname" binding:"required"` // 昵称 + Mobile string `form:"mobile" binding:"required"` // 手机号 + Password string `form:"password" binding:"required"` // 密码 } type createResponse struct { @@ -41,7 +42,7 @@ func (h *handler) Create() core.HandlerFunc { c.AbortWithError(errno.NewError( http.StatusBadRequest, code.ParamBindError, - code.Text(code.ParamBindError)).WithErr(err), + validation.Error(err)).WithErr(err), ) return } diff --git a/internal/api/controller/admin_handler/func_createadminmenu.go b/internal/api/controller/admin_handler/func_createadminmenu.go index bf735d6..fc12778 100755 --- a/internal/api/controller/admin_handler/func_createadminmenu.go +++ b/internal/api/controller/admin_handler/func_createadminmenu.go @@ -3,8 +3,8 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/admin_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/admin_handler/func_delete.go b/internal/api/controller/admin_handler/func_delete.go index a07d131..e075870 100755 --- a/internal/api/controller/admin_handler/func_delete.go +++ b/internal/api/controller/admin_handler/func_delete.go @@ -3,7 +3,7 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/admin_handler/func_detail.go b/internal/api/controller/admin_handler/func_detail.go index c4fa056..3433145 100644 --- a/internal/api/controller/admin_handler/func_detail.go +++ b/internal/api/controller/admin_handler/func_detail.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/admin_service" "github.com/xinliangnote/go-gin-api/internal/pkg/cache" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/admin_handler/func_list.go b/internal/api/controller/admin_handler/func_list.go index 752edb8..a5845d6 100755 --- a/internal/api/controller/admin_handler/func_list.go +++ b/internal/api/controller/admin_handler/func_list.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/admin_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/admin_handler/func_listadminmenu.go b/internal/api/controller/admin_handler/func_listadminmenu.go index 5581978..8bf9d43 100755 --- a/internal/api/controller/admin_handler/func_listadminmenu.go +++ b/internal/api/controller/admin_handler/func_listadminmenu.go @@ -3,8 +3,8 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/admin_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/admin_handler/func_login.go b/internal/api/controller/admin_handler/func_login.go index 17ddbf9..01a6544 100644 --- a/internal/api/controller/admin_handler/func_login.go +++ b/internal/api/controller/admin_handler/func_login.go @@ -6,9 +6,9 @@ import ( "time" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/admin_service" "github.com/xinliangnote/go-gin-api/internal/pkg/cache" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/admin_handler/func_logout.go b/internal/api/controller/admin_handler/func_logout.go index e117127..a1d0abe 100644 --- a/internal/api/controller/admin_handler/func_logout.go +++ b/internal/api/controller/admin_handler/func_logout.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/pkg/cache" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" diff --git a/internal/api/controller/admin_handler/func_modifypassword.go b/internal/api/controller/admin_handler/func_modifypassword.go index 6acb6cd..f274cd9 100644 --- a/internal/api/controller/admin_handler/func_modifypassword.go +++ b/internal/api/controller/admin_handler/func_modifypassword.go @@ -3,8 +3,8 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/admin_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/admin_handler/func_modifypersonalinfo.go b/internal/api/controller/admin_handler/func_modifypersonalinfo.go index 05ac8ee..baa381c 100644 --- a/internal/api/controller/admin_handler/func_modifypersonalinfo.go +++ b/internal/api/controller/admin_handler/func_modifypersonalinfo.go @@ -3,8 +3,8 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/admin_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/admin_handler/func_offline.go b/internal/api/controller/admin_handler/func_offline.go index 85e8d4b..e2fe150 100755 --- a/internal/api/controller/admin_handler/func_offline.go +++ b/internal/api/controller/admin_handler/func_offline.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/pkg/cache" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/password" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/admin_handler/func_resetpassword.go b/internal/api/controller/admin_handler/func_resetpassword.go index edc4f0e..c1ae519 100755 --- a/internal/api/controller/admin_handler/func_resetpassword.go +++ b/internal/api/controller/admin_handler/func_resetpassword.go @@ -3,7 +3,7 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/admin_handler/func_updateused.go b/internal/api/controller/admin_handler/func_updateused.go index f1cb823..67c64ce 100755 --- a/internal/api/controller/admin_handler/func_updateused.go +++ b/internal/api/controller/admin_handler/func_updateused.go @@ -3,7 +3,7 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/authorized_handler/func_create.go b/internal/api/controller/authorized_handler/func_create.go index 1932096..db0e7ee 100755 --- a/internal/api/controller/authorized_handler/func_create.go +++ b/internal/api/controller/authorized_handler/func_create.go @@ -3,8 +3,8 @@ package authorized_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/authorized_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/authorized_handler/func_createapi.go b/internal/api/controller/authorized_handler/func_createapi.go index fe463f0..5236e0c 100755 --- a/internal/api/controller/authorized_handler/func_createapi.go +++ b/internal/api/controller/authorized_handler/func_createapi.go @@ -3,8 +3,8 @@ package authorized_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/authorized_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/authorized_handler/func_delete.go b/internal/api/controller/authorized_handler/func_delete.go index 502a37b..098d8cd 100755 --- a/internal/api/controller/authorized_handler/func_delete.go +++ b/internal/api/controller/authorized_handler/func_delete.go @@ -3,7 +3,7 @@ package authorized_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/authorized_handler/func_deleteapi.go b/internal/api/controller/authorized_handler/func_deleteapi.go index a7c56d0..324ae50 100755 --- a/internal/api/controller/authorized_handler/func_deleteapi.go +++ b/internal/api/controller/authorized_handler/func_deleteapi.go @@ -3,7 +3,7 @@ package authorized_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/authorized_handler/func_list.go b/internal/api/controller/authorized_handler/func_list.go index 04607b3..a5c37e5 100755 --- a/internal/api/controller/authorized_handler/func_list.go +++ b/internal/api/controller/authorized_handler/func_list.go @@ -3,8 +3,8 @@ package authorized_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/authorized_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/time_parse" diff --git a/internal/api/controller/authorized_handler/func_listapi.go b/internal/api/controller/authorized_handler/func_listapi.go index 4079c5d..89efc9c 100755 --- a/internal/api/controller/authorized_handler/func_listapi.go +++ b/internal/api/controller/authorized_handler/func_listapi.go @@ -3,8 +3,8 @@ package authorized_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/authorized_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/authorized_handler/func_updateused.go b/internal/api/controller/authorized_handler/func_updateused.go index 4e5c2bc..854edd5 100755 --- a/internal/api/controller/authorized_handler/func_updateused.go +++ b/internal/api/controller/authorized_handler/func_updateused.go @@ -3,7 +3,7 @@ package authorized_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/config_handler/func_email.go b/internal/api/controller/config_handler/func_email.go index 36759aa..99e3ac8 100755 --- a/internal/api/controller/config_handler/func_email.go +++ b/internal/api/controller/config_handler/func_email.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/env" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/menu_handler/func_create.go b/internal/api/controller/menu_handler/func_create.go index 3cee256..3679a97 100755 --- a/internal/api/controller/menu_handler/func_create.go +++ b/internal/api/controller/menu_handler/func_create.go @@ -3,8 +3,8 @@ package menu_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/menu_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/menu_handler/func_createaction.go b/internal/api/controller/menu_handler/func_createaction.go index 8225fb2..c1807d3 100755 --- a/internal/api/controller/menu_handler/func_createaction.go +++ b/internal/api/controller/menu_handler/func_createaction.go @@ -3,8 +3,8 @@ package menu_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/menu_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/menu_handler/func_delete.go b/internal/api/controller/menu_handler/func_delete.go index 2f798c8..73aeaa5 100755 --- a/internal/api/controller/menu_handler/func_delete.go +++ b/internal/api/controller/menu_handler/func_delete.go @@ -3,7 +3,7 @@ package menu_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/menu_handler/func_deleteaction.go b/internal/api/controller/menu_handler/func_deleteaction.go index 909f952..2c9eed8 100755 --- a/internal/api/controller/menu_handler/func_deleteaction.go +++ b/internal/api/controller/menu_handler/func_deleteaction.go @@ -3,7 +3,7 @@ package menu_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/menu_handler/func_detail.go b/internal/api/controller/menu_handler/func_detail.go index f548af8..36b0732 100755 --- a/internal/api/controller/menu_handler/func_detail.go +++ b/internal/api/controller/menu_handler/func_detail.go @@ -3,8 +3,8 @@ package menu_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/menu_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/menu_handler/func_list.go b/internal/api/controller/menu_handler/func_list.go index 9f2b359..795b971 100755 --- a/internal/api/controller/menu_handler/func_list.go +++ b/internal/api/controller/menu_handler/func_list.go @@ -3,8 +3,8 @@ package menu_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/menu_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/menu_handler/func_listaction.go b/internal/api/controller/menu_handler/func_listaction.go index 8c01538..277c565 100755 --- a/internal/api/controller/menu_handler/func_listaction.go +++ b/internal/api/controller/menu_handler/func_listaction.go @@ -3,8 +3,8 @@ package menu_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/menu_service" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/menu_handler/func_updatesort.go b/internal/api/controller/menu_handler/func_updatesort.go index ece2a77..cf14b11 100755 --- a/internal/api/controller/menu_handler/func_updatesort.go +++ b/internal/api/controller/menu_handler/func_updatesort.go @@ -3,7 +3,7 @@ package menu_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/menu_handler/func_updateused.go b/internal/api/controller/menu_handler/func_updateused.go index 5aba603..ceffaee 100755 --- a/internal/api/controller/menu_handler/func_updateused.go +++ b/internal/api/controller/menu_handler/func_updateused.go @@ -3,7 +3,7 @@ package menu_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/tool_handler/func_clearcache.go b/internal/api/controller/tool_handler/func_clearcache.go index 1986d6d..504a1f0 100644 --- a/internal/api/controller/tool_handler/func_clearcache.go +++ b/internal/api/controller/tool_handler/func_clearcache.go @@ -3,8 +3,8 @@ package tool_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/pkg/cache" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/tool_handler/func_hashidsdecode.go b/internal/api/controller/tool_handler/func_hashidsdecode.go index 061e00b..d5c233b 100755 --- a/internal/api/controller/tool_handler/func_hashidsdecode.go +++ b/internal/api/controller/tool_handler/func_hashidsdecode.go @@ -3,7 +3,7 @@ package tool_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/tool_handler/func_hashidsencode.go b/internal/api/controller/tool_handler/func_hashidsencode.go index 773c6f6..f146622 100755 --- a/internal/api/controller/tool_handler/func_hashidsencode.go +++ b/internal/api/controller/tool_handler/func_hashidsencode.go @@ -3,7 +3,7 @@ package tool_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/tool_handler/func_searchcache.go b/internal/api/controller/tool_handler/func_searchcache.go index f579072..9b68053 100644 --- a/internal/api/controller/tool_handler/func_searchcache.go +++ b/internal/api/controller/tool_handler/func_searchcache.go @@ -3,8 +3,8 @@ package tool_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/pkg/cache" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/controller/tool_handler/func_searchmysql.go b/internal/api/controller/tool_handler/func_searchmysql.go index ff272e0..932ab8e 100644 --- a/internal/api/controller/tool_handler/func_searchmysql.go +++ b/internal/api/controller/tool_handler/func_searchmysql.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/api/controller/tool_handler/func_tables.go b/internal/api/controller/tool_handler/func_tables.go index 52f481e..e8be5bc 100644 --- a/internal/api/controller/tool_handler/func_tables.go +++ b/internal/api/controller/tool_handler/func_tables.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/api/code/README.md b/internal/pkg/code/README.md similarity index 100% rename from internal/api/code/README.md rename to internal/pkg/code/README.md diff --git a/internal/api/code/code.go b/internal/pkg/code/code.go similarity index 100% rename from internal/api/code/code.go rename to internal/pkg/code/code.go diff --git a/internal/api/code/en-us.go b/internal/pkg/code/en-us.go similarity index 100% rename from internal/api/code/en-us.go rename to internal/pkg/code/en-us.go diff --git a/internal/api/code/zh-cn.go b/internal/pkg/code/zh-cn.go similarity index 100% rename from internal/api/code/zh-cn.go rename to internal/pkg/code/zh-cn.go diff --git a/internal/pkg/core/core.go b/internal/pkg/core/core.go index a7bf9dc..3c90d7d 100644 --- a/internal/pkg/core/core.go +++ b/internal/pkg/core/core.go @@ -9,7 +9,7 @@ import ( "github.com/xinliangnote/go-gin-api/configs" _ "github.com/xinliangnote/go-gin-api/docs" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/pkg/browser" "github.com/xinliangnote/go-gin-api/pkg/color" "github.com/xinliangnote/go-gin-api/pkg/env" @@ -246,7 +246,7 @@ func New(logger *zap.Logger, options ...Option) (Mux, error) { } gin.SetMode(gin.ReleaseMode) - gin.DisableBindValidation() + //gin.DisableBindValidation() mux := &mux{ engine: gin.New(), } diff --git a/internal/pkg/grpc/interceptor.go b/internal/pkg/grpc/interceptor.go index f24f600..d7f1ed3 100644 --- a/internal/pkg/grpc/interceptor.go +++ b/internal/pkg/grpc/interceptor.go @@ -7,7 +7,7 @@ import ( "runtime/debug" "time" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/pkg/notify" "github.com/xinliangnote/go-gin-api/pkg/errno" diff --git a/internal/pkg/validation/validation.go b/internal/pkg/validation/validation.go new file mode 100644 index 0000000..bbd7d3a --- /dev/null +++ b/internal/pkg/validation/validation.go @@ -0,0 +1,46 @@ +package validation + +import ( + "fmt" + + "github.com/xinliangnote/go-gin-api/configs" + + "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" + enTranslation "github.com/go-playground/validator/v10/translations/en" + zhTranslation "github.com/go-playground/validator/v10/translations/zh" +) + +var trans ut.Translator + +func init() { + lang := configs.Get().Language.Local + + if lang == configs.ZhCN { + trans, _ = ut.New(zh.New()).GetTranslator("zh") + if err := zhTranslation.RegisterDefaultTranslations(binding.Validator.Engine().(*validator.Validate), trans); err != nil { + fmt.Println("validator zh translation error", err) + } + } + + if lang == configs.EnUS { + trans, _ = ut.New(en.New()).GetTranslator("en") + if err := enTranslation.RegisterDefaultTranslations(binding.Validator.Engine().(*validator.Validate), trans); err != nil { + fmt.Println("validator en translation error", err) + } + } +} + +func Error(err error) (message string) { + if validationErrors, ok := err.(validator.ValidationErrors); !ok { + return err.Error() + } else { + for _, e := range validationErrors { + message += e.Translate(trans) + ";" + } + } + return message +} diff --git a/internal/router/middleware/middle_jwt.go b/internal/router/middleware/middle_jwt.go index 7c6e8d8..c9464dd 100644 --- a/internal/router/middleware/middle_jwt.go +++ b/internal/router/middleware/middle_jwt.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" diff --git a/internal/router/middleware/middle_rbac.go b/internal/router/middleware/middle_rbac.go index d4f84b2..d23a8a8 100644 --- a/internal/router/middleware/middle_rbac.go +++ b/internal/router/middleware/middle_rbac.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/api/service/admin_service" "github.com/xinliangnote/go-gin-api/internal/pkg/cache" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" diff --git a/internal/router/middleware/middle_resubmit.go b/internal/router/middleware/middle_resubmit.go index aa08ecf..fb97fc1 100644 --- a/internal/router/middleware/middle_resubmit.go +++ b/internal/router/middleware/middle_resubmit.go @@ -5,8 +5,8 @@ import ( "time" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/pkg/cache" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" diff --git a/internal/router/middleware/middle_signature.go b/internal/router/middleware/middle_signature.go index 67321f7..3f8ca10 100644 --- a/internal/router/middleware/middle_signature.go +++ b/internal/router/middleware/middle_signature.go @@ -6,7 +6,7 @@ import ( "time" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" diff --git a/internal/router/middleware/middle_token.go b/internal/router/middleware/middle_token.go index ca9664d..17f8b84 100644 --- a/internal/router/middleware/middle_token.go +++ b/internal/router/middleware/middle_token.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" "github.com/xinliangnote/go-gin-api/internal/pkg/cache" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" "github.com/xinliangnote/go-gin-api/pkg/errors" diff --git a/internal/web/controller/admin_handler/func_adminmenuview.go b/internal/web/controller/admin_handler/func_adminmenuview.go index fe69138..62d0b05 100644 --- a/internal/web/controller/admin_handler/func_adminmenuview.go +++ b/internal/web/controller/admin_handler/func_adminmenuview.go @@ -3,7 +3,7 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/web/controller/admin_handler/func_menuactionview.go b/internal/web/controller/admin_handler/func_menuactionview.go index 738da82..8b70d02 100644 --- a/internal/web/controller/admin_handler/func_menuactionview.go +++ b/internal/web/controller/admin_handler/func_menuactionview.go @@ -3,7 +3,7 @@ package admin_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/web/controller/authorized_handler/func_apiview.go b/internal/web/controller/authorized_handler/func_apiview.go index 4cab5af..6d4075a 100644 --- a/internal/web/controller/authorized_handler/func_apiview.go +++ b/internal/web/controller/authorized_handler/func_apiview.go @@ -3,7 +3,7 @@ package authorized_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/pkg/errno" ) diff --git a/internal/web/controller/config_handler/func_codeview.go b/internal/web/controller/config_handler/func_codeview.go index 6dd30ae..bde0178 100644 --- a/internal/web/controller/config_handler/func_codeview.go +++ b/internal/web/controller/config_handler/func_codeview.go @@ -4,7 +4,7 @@ import ( "go/token" "log" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/dave/dst" @@ -23,7 +23,7 @@ type codeViewResponse struct { } const ( - codeFile = "./internal/api/code/code.go" + codeFile = "./internal/pkg/code/code.go" minBusinessCode = 20000 ) diff --git a/internal/web/controller/install_handler/func_execute.go b/internal/web/controller/install_handler/func_execute.go index b160066..1ee3897 100644 --- a/internal/web/controller/install_handler/func_execute.go +++ b/internal/web/controller/install_handler/func_execute.go @@ -7,7 +7,7 @@ import ( "runtime" "github.com/xinliangnote/go-gin-api/configs" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/web/controller/install_handler/mysql_table" "github.com/xinliangnote/go-gin-api/pkg/env" diff --git a/internal/web/controller/upgrade_handler/func_upgradeexecute.go b/internal/web/controller/upgrade_handler/func_upgradeexecute.go index e1892fa..18596ed 100644 --- a/internal/web/controller/upgrade_handler/func_upgradeexecute.go +++ b/internal/web/controller/upgrade_handler/func_upgradeexecute.go @@ -3,7 +3,7 @@ package upgrade_handler import ( "net/http" - "github.com/xinliangnote/go-gin-api/internal/api/code" + "github.com/xinliangnote/go-gin-api/internal/pkg/code" "github.com/xinliangnote/go-gin-api/internal/pkg/core" "github.com/xinliangnote/go-gin-api/internal/web/controller/install_handler/mysql_table" "github.com/xinliangnote/go-gin-api/pkg/errno"