Explorar o código

casbin整合,登录成功获取用户菜单

yxh %!s(int64=4) %!d(string=hai) anos
pai
achega
62f945c015
Modificáronse 4 ficheiros con 9 adicións e 6 borrados
  1. 1 1
      api/v1/system/user.go
  2. 3 1
      go.mod
  3. 3 2
      go.sum
  4. 2 2
      internal/app/system/model/sys_auth_rule.go

+ 1 - 1
api/v1/system/user.go

@@ -13,7 +13,7 @@ type UserLoginReq struct {
 	VerifyKey  string `p:"verifyKey"`
 }
 type UserLoginRes struct {
-	g.Meta   `mime:"text/html" example:""`
+	g.Meta   `mime:"application/json" example:""`
 	UserInfo *model.LoginUserRes `json:"userInfo"`
 	Token    string              `json:"token"`
 	MenuList []*model.UserMenus  `json:"menuList"`

+ 3 - 1
go.mod

@@ -3,10 +3,12 @@ module github.com/tiger1103/gfast/v3
 go 1.15
 
 require (
-	github.com/casbin/casbin/v2 v2.42.0 // indirect
+	github.com/casbin/casbin/v2 v2.42.0
 	github.com/gogf/gf/v2 v2.0.3
 	github.com/mojocn/base64Captcha v1.3.5
 	github.com/mssola/user_agent v0.5.3
 	github.com/tiger1103/gfast-cache v0.0.6
 	github.com/tiger1103/gfast-token v0.0.4
 )
+
+replace github.com/gogf/gf/v2 v2.0.3 => github.com/tiger1103/gf/v2 v2.0.4

+ 3 - 2
go.sum

@@ -26,12 +26,11 @@ github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gogf/gf/v2 v2.0.0-rc.0.20220117131058-9345eb5e946f/go.mod h1:apktt6TleWtCIwpz63vBqUnw8MX8gWKoZyxgDpXFtgM=
 github.com/gogf/gf/v2 v2.0.0-rc3/go.mod h1:apktt6TleWtCIwpz63vBqUnw8MX8gWKoZyxgDpXFtgM=
-github.com/gogf/gf/v2 v2.0.3 h1:T/PSaaE+N/czwC3/fYGv6bvbJZsK6Em2DsNNLbyqQ4w=
-github.com/gogf/gf/v2 v2.0.3/go.mod h1:apktt6TleWtCIwpz63vBqUnw8MX8gWKoZyxgDpXFtgM=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
@@ -84,6 +83,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tiger1103/gf/v2 v2.0.4 h1:RQmqPGIhRi6Y3ZLvMz/0OVZHiKXFuf+Ly3d1bEPDaTg=
+github.com/tiger1103/gf/v2 v2.0.4/go.mod h1:apktt6TleWtCIwpz63vBqUnw8MX8gWKoZyxgDpXFtgM=
 github.com/tiger1103/gfast-cache v0.0.6 h1:H40Txv6co5bjaRlFQ/ixcMfpgsihhPpNftvCHm7hLpI=
 github.com/tiger1103/gfast-cache v0.0.6/go.mod h1:s6cRWyr87wz6IJNGKRV6Ahq9hcuVz8h2PAtGrO66JO8=
 github.com/tiger1103/gfast-token v0.0.4 h1:h59pbFd/VyORNunsDdzIdqJkZIHYHsYCzdmPbcqGkZs=

+ 2 - 2
internal/app/system/model/sys_auth_rule.go

@@ -43,6 +43,6 @@ type UserMenu struct {
 }
 
 type UserMenus struct {
-	*UserMenu
-	Children []*UserMenus `json:"children"`
+	*UserMenu `json:""`
+	Children  []*UserMenus `json:"children"`
 }