feat:注释不用的代码

This commit is contained in:
henry
2021-11-24 11:12:46 +08:00
parent 0862142ef0
commit 5475320171
19 changed files with 74 additions and 71 deletions

View File

@ -4,16 +4,22 @@ import (
api2 "SciencesServer/app/api/enterprise/api"
"SciencesServer/app/api/manage/api"
api3 "SciencesServer/app/basic/api"
"SciencesServer/app/session"
"github.com/gin-gonic/gin"
)
// registerAPI 注册API
func registerAPI(app *gin.Engine) {
apiPrefix := "/api"
}
// registerManageAPI 注册API
func registerManageAPI(app *gin.Engine) {
apiPrefix := "/manage"
g := app.Group(apiPrefix)
// 登录验证
g.Use(NeedLogin(AddSkipperURL([]string{
g.Use(NeedLogin(session.NewManage(), AddSkipperURL([]string{
apiPrefix + "/captcha",
apiPrefix + "/account/login",
apiPrefix + "/account/logout",

View File

@ -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,

View File

@ -57,6 +57,7 @@ func (this *Router) Init() *gin.Engine {
app.StaticFS("/upload", http.Dir("./upload"))
// 注册路由
registerAPI(app)
registerManageAPI(app)
registerEnterpriseAPI(app)
app.MaxMultipartMemory = 4 << 20