From 7e4c9b4a30c187ffc4a0d716c6f20820c9c427ef Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Mon, 12 Jun 2023 09:47:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E7=BB=93=E6=9E=84=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/controller/base.go | 1 + api/controller/basic.go | 12 ++++++------ api/controller/role.go | 10 ++++++++++ api/requests/basic.go | 8 ++++---- .../{basic.go => basicResponse/basicResponse.go} | 2 +- api/router/router.go | 8 +++++--- api/service/basic.go | 16 ++++++++-------- 7 files changed, 35 insertions(+), 22 deletions(-) create mode 100644 api/controller/role.go rename api/responses/{basic.go => basicResponse/basicResponse.go} (95%) diff --git a/api/controller/base.go b/api/controller/base.go index fd01701..b6caa9d 100644 --- a/api/controller/base.go +++ b/api/controller/base.go @@ -3,4 +3,5 @@ package controller // Api api接口 type Api struct { Basic // 基础数据 + Role // 角色数据 } diff --git a/api/controller/basic.go b/api/controller/basic.go index 2bde8f5..1de5bde 100644 --- a/api/controller/basic.go +++ b/api/controller/basic.go @@ -40,12 +40,12 @@ func (b *Basic) Login(c *gin.Context) { } // 验证验证码 - // isValid := utils.VerifyCaptcha(login) - // if !isValid { - // // 验证码错误 - // responses.FailWithMessage("验证码错误", c) - // return - // } + isValid := utils.VerifyCaptcha(login) + if !isValid { + // 验证码错误 + responses.FailWithMessage("验证码错误", c) + return + } // 登陆 Basic := service.Basic{} diff --git a/api/controller/role.go b/api/controller/role.go new file mode 100644 index 0000000..a44288a --- /dev/null +++ b/api/controller/role.go @@ -0,0 +1,10 @@ +package controller + +import "github.com/gin-gonic/gin" + +type Role struct{} + +// GetRoleMenuList 获取角色菜单列表 +func (r *Role) GetRoleMenuList(c *gin.Context) { + +} diff --git a/api/requests/basic.go b/api/requests/basic.go index 12a6ba6..c3ba7a3 100644 --- a/api/requests/basic.go +++ b/api/requests/basic.go @@ -6,8 +6,8 @@ type Basic struct { // Login 登陆 type Login struct { - Access string `json:"access" form:"access" validate:"required" label:"用户名"` // 用户名 - Password string `json:"password" form:"password" validate:"required"` // 密码 - Captcha string `json:"captcha" form:"captcha" validate:"required"` // 验证码 - CaptchaId string `json:"captchaId" form:"captchaId" validate:"required"` // 验证码ID + Access string `json:"access" form:"access" validate:"required" label:"用户名"` // 用户名 + Password string `json:"password" form:"password" validate:"required" label:"密码"` // 密码 + Captcha string `json:"captcha" form:"captcha" validate:"required" label:"验证码"` // 验证码 + CaptchaId string `json:"captchaId" form:"captchaId" validate:"required"` // 验证码ID } diff --git a/api/responses/basic.go b/api/responses/basicResponse/basicResponse.go similarity index 95% rename from api/responses/basic.go rename to api/responses/basicResponse/basicResponse.go index 4525c14..ba97240 100644 --- a/api/responses/basic.go +++ b/api/responses/basicResponse/basicResponse.go @@ -1,4 +1,4 @@ -package responses +package basicResponse import "hospital-admin-api/config" diff --git a/api/router/router.go b/api/router/router.go index 0eeeeb2..39cada2 100644 --- a/api/router/router.go +++ b/api/router/router.go @@ -68,9 +68,11 @@ func publicRouter(r *gin.Engine, api controller.Api) { // privateRouter 私有路由 func privateRouter(r *gin.Engine, api controller.Api) { adminGroup := r.Group("/admin") - base1Group := adminGroup.Group("/basic") + + // 角色 + base1Group := adminGroup.Group("/role") { - // 验证码 - base1Group.GET("captcha-test/:id", api.Basic.GetCaptchaTest) + // 获取角色菜单列表 + base1Group.GET("menu", api.Role.GetRoleMenuList) } } diff --git a/api/service/basic.go b/api/service/basic.go index 4128a26..9137d75 100644 --- a/api/service/basic.go +++ b/api/service/basic.go @@ -6,19 +6,19 @@ import ( "errors" "hospital-admin-api/api/dao" "hospital-admin-api/api/requests" - "hospital-admin-api/api/responses" + "hospital-admin-api/api/responses/basicResponse" "hospital-admin-api/utils" ) type Basic struct{} // Login 登陆 -func (b *Basic) Login(login requests.Login) (responses.Login, error) { +func (b *Basic) Login(login requests.Login) (basicResponse.Login, error) { // 获取用户信息 AdminUserDao := dao.AdminUser{} adminUser, err := AdminUserDao.GetAdminUserFirstByAccess(login.Access) if err != nil || adminUser.UserID == 0 { - return responses.Login{}, errors.New("用户名或密码错误") + return basicResponse.Login{}, errors.New("用户名或密码错误") } // 检测用户密码 @@ -27,16 +27,16 @@ func (b *Basic) Login(login requests.Login) (responses.Login, error) { passwordString := hex.EncodeToString(password[:]) if passwordString != adminUser.Password { - return responses.Login{}, errors.New("用户名或密码错误") + return basicResponse.Login{}, errors.New("用户名或密码错误") } // 检测用户状态 if adminUser.IsDeleted == 1 { - return responses.Login{}, errors.New("非法用户") + return basicResponse.Login{}, errors.New("非法用户") } if adminUser.IsDisabled == 1 { - return responses.Login{}, errors.New("您的账号已被禁用，请联系管理员处理") + return basicResponse.Login{}, errors.New("您的账号已被禁用，请联系管理员处理") } token := &utils.Token{ @@ -48,11 +48,11 @@ func (b *Basic) Login(login requests.Login) (responses.Login, error) { jwt, err := token.NewJWT() if err != nil { - return responses.Login{}, errors.New("登陆失败") + return basicResponse.Login{}, errors.New("登陆失败") } // 生成jwt - result := responses.Login{ + result := basicResponse.Login{ UserId: adminUser.UserID, NickName: adminUser.NickName, Avatar: adminUser.Avatar,