权限部份提交

eolinker · Dot-Liu · Aug 12, 2024 · Jul 24, 2024 · Jul 24, 2024 · Jul 29, 2024
commit 73e1fd718ed1bbebbce6d38301dd7968c81397aa
diff --git a/controller/permit_system/iml.go b/controller/permit_system/iml.go
@@ -0,0 +1,24 @@
+package permit_system
+
+import (
+	"github.com/eolinker/apipark/module/permit/system"
+	"github.com/eolinker/go-common/autowire"
+	"github.com/gin-gonic/gin"
+)
+
+var (
+	_ ISystemPermitController = (*imlSystemPermitController)(nil)
+	_ autowire.Complete       = (*imlSystemPermitController)(nil)
+)
+
+type imlSystemPermitController struct {
+	systemPermitModule system.ISystemPermitModule `autowired:""`
+}
+
+func (c *imlSystemPermitController) Permissions(ctx *gin.Context) ([]string, error) {
+	return c.systemPermitModule.Permissions(ctx)
+}
+
+func (c *imlSystemPermitController) OnComplete() {
+
+}
diff --git a/controller/permit_system/permit.go b/controller/permit_system/permit.go
@@ -0,0 +1,18 @@
+package permit_system
+
+import (
+	"reflect"
+
+	"github.com/eolinker/go-common/autowire"
+	"github.com/gin-gonic/gin"
+)
+
+type ISystemPermitController interface {
+	Permissions(ctx *gin.Context) ([]string, error)
+}
+
+func init() {
+	autowire.Auto[ISystemPermitController](func() reflect.Value {
+		return reflect.ValueOf(new(imlSystemPermitController))
+	})
+}
diff --git a/controller/permit_team/iml.go b/controller/permit_team/iml.go
@@ -0,0 +1,18 @@
+package permit_team
+
+import (
+	"github.com/eolinker/apipark/module/permit/team"
+	"github.com/gin-gonic/gin"
+)
+
+var (
+	_ ITeamPermitController = (*imlTeamPermitController)(nil)
+)
+
+type imlTeamPermitController struct {
+	teamPermitModule team.ITeamPermitModule `autowired:""`
+}
+
+func (c *imlTeamPermitController) Permissions(ctx *gin.Context, team string) ([]string, error) {
+	return c.teamPermitModule.Permissions(ctx, team)
+}
diff --git a/controller/permit_team/permit.go b/controller/permit_team/permit.go
@@ -0,0 +1,18 @@
+package permit_team
+
+import (
+	"reflect"
+
+	"github.com/eolinker/go-common/autowire"
+	"github.com/gin-gonic/gin"
+)
+
+type ITeamPermitController interface {
+	Permissions(ctx *gin.Context, team string) ([]string, error)
+}
+
+func init() {
+	autowire.Auto[ITeamPermitController](func() reflect.Value {
+		return reflect.ValueOf(new(imlTeamPermitController))
+	})
+}
diff --git a/middleware/permit/permit.go b/middleware/permit/permit.go
@@ -2,6 +2,9 @@ package permit_middleware
 
 import (
 	"errors"
+	"net/http"
+	"reflect"
+
 	permit_identity "github.com/eolinker/apipark/middleware/permit/identity"
 	permit_type "github.com/eolinker/apipark/service/permit-type"
 	"github.com/eolinker/eosc/log"
@@ -11,8 +14,6 @@ import (
 	"github.com/eolinker/go-common/utils"
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
-	"net/http"
-	"reflect"
 )
 
 var (
@@ -57,10 +58,10 @@ func (p *PermitMiddleware) Check(method string, path string) (bool, []gin.Handle
 				ginCtx.Abort()
 				return
 			}
-			if userId == "admin" {
-				// 超级管理员不校验
-				return
-			}
+			//if userId == "admin" {
+			//	// 超级管理员不校验
+			//	return
+			//}
 
 			for _, group := range checkSort {
 				accessList, has := accessRules[group]

diff --git a/module/my-team/iml.go b/module/my-team/iml.go
@@ -98,11 +98,11 @@ func (m *imlTeamModule) Search(ctx context.Context, keyword string) ([]*team_dto
 	if err != nil {
 		return nil, err
 	}
-	serviceNumMap, err := m.serviceService.ServiceCountByTeam(ctx, keyword)
+	serviceNumMap, err := m.serviceService.ServiceCountByTeam(ctx, teamIDs...)
 	if err != nil {
 		return nil, err
 	}
-	appNumMap, err := m.serviceService.AppCountByTeam(ctx, keyword)
+	appNumMap, err := m.serviceService.AppCountByTeam(ctx, teamIDs...)
 	if err != nil {
 		return nil, err
 	}