feat:注释不用的代码
This commit is contained in:
@ -1,9 +1,9 @@
|
||||
package router
|
||||
|
||||
import (
|
||||
"SciencesServer/app/logic"
|
||||
"SciencesServer/app/service"
|
||||
"SciencesServer/config"
|
||||
"SciencesServer/serve/cache"
|
||||
"SciencesServer/utils"
|
||||
"github.com/gin-gonic/gin"
|
||||
"net/http"
|
||||
@ -24,7 +24,7 @@ func AddSkipperURL(url ...string) SkipperURL {
|
||||
}
|
||||
|
||||
// NeedLogin 需要登录
|
||||
func NeedLogin(skipperURL ...SkipperURL) gin.HandlerFunc {
|
||||
func NeedLogin(session logic.ISession, skipperURL ...SkipperURL) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
if len(skipperURL) > 0 && skipperURL[0](c) {
|
||||
c.Next()
|
||||
@ -37,7 +37,7 @@ func NeedLogin(skipperURL ...SkipperURL) gin.HandlerFunc {
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
session, err := service.NewAuthToken(token).Auth()
|
||||
err := service.NewAuthToken(token).Auth(session)
|
||||
|
||||
if err != nil {
|
||||
c.JSON(http.StatusUnauthorized, gin.H{"message": err.Error()})
|
||||
@ -62,11 +62,11 @@ func NeedPermission(skipperURL ...SkipperURL) PermissionHandle {
|
||||
|
||||
if !_session.IsAdmin {
|
||||
if _session.TenantID > 0 {
|
||||
if isExist, _ := cache.Cache.SIsMember(config.RedisKeyForTenant, _session.TenantKey); !isExist {
|
||||
c.JSON(http.StatusForbidden, gin.H{"message": "租户/公司信息协议已到期或已被禁用,无权限访问!"})
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
//if isExist, _ := cache.Cache.SIsMember(config.RedisKeyForTenant, _session.TenantKey); !isExist {
|
||||
// c.JSON(http.StatusForbidden, gin.H{"message": "租户/公司信息协议已到期或已被禁用,无权限访问!"})
|
||||
// c.Abort()
|
||||
// return
|
||||
//}
|
||||
}
|
||||
//if pass, _ := service.NewPermission(nil, &service.AuthRequest{
|
||||
// Url: key,
|
||||
|
Reference in New Issue
Block a user