init

pkg/app/controller/app_controller.go

@@ -18,6 +18,7 @@ func (c *AppController) BeforeActivation(b mvc.BeforeActivation) {
 	b.Handle("POST", "/add", "Create")
 	b.Handle("PUT", "/update", "Update")
 	b.Handle("DELETE", "/{appId:int64}", "DeleteByID")
+	b.Handle("GET", "/user/permit", "GetPermit")
 }
 
 func (c *AppController) GetList() *JsonResult {
@@ -95,3 +96,14 @@ func (c *AppController) DeleteByID(appId int64) *JsonResult {
 		return ResultOk("删除成功", nil)
 	}
 }
+
+func (c *AppController) GetPermit() *JsonResult {
+	roleId := c.GetCurUserRoleId()
+	appKey := c.GetAppKey()
+	data, err := c.Service.GetPermit(roleId, appKey)
+	if err != nil {
+		return ResultErr(err.Error(), nil)
+	} else {
+		return ResultOk("获取成功", data)
+	}
+}

pkg/app/controller/app_permit_controller.go

@@ -12,7 +12,6 @@ type AppPermitController struct {
 }
 
 func (c *AppPermitController) BeforeActivation(b mvc.BeforeActivation) {
-	b.Handle("GET", "/user/permit", "GetPermit")
 	b.Handle("GET", "", "GetList")
 	b.Handle("GET", "/{appId:int64}/{roleId:int64}/{permitId:int64}", "GetById")
 	b.Handle("GET", "/{appId:int64}/{roleId:int64}", "GetListById")
@@ -35,17 +34,6 @@ func (c *AppPermitController) GetList() *JsonResult {
 	}
 }
 
-func (c *AppPermitController) GetPermit() *JsonResult {
-	roleId := c.GetCurUserRoleId()
-	appKey := c.GetAppKey()
-	data, err := c.Service.GetPermit(roleId, appKey)
-	if err != nil {
-		return ResultErr(err.Error(), nil)
-	} else {
-		return ResultOk("获取成功", data)
-	}
-}
-
 func (c *AppPermitController) GetById(appId, roleId, permitId int64) *JsonResult {
 	data, err := c.Service.GetById(appId, roleId, permitId)
 	if err != nil {

pkg/app/service/app_permit_service.go

@@ -15,7 +15,6 @@ type AppPermitService interface {
 	Create(permit *datamodel.AppPermit) error
 	Update(permit *datamodel.AppPermit) error
 	Delete(m map[string]interface{}) error
-	GetPermit(roleId int64, appKey string) ([]viewmodel.AppPermitInfo, error)
 }
 
 type appPermitService struct {
@@ -70,10 +69,3 @@ func (s *appPermitService) Delete(m map[string]interface{}) error {
 	permitId := m["permitId"].(int64)
 	return s.repo.Delete(appId, roleId, permitId)
 }
-
-func (s *appPermitService) GetPermit(roleId int64, appKey string) ([]viewmodel.AppPermitInfo, error) {
-	m := make(map[string]interface{}, 0)
-	m["appKey"] = appKey
-	m["roleId"] = roleId
-	return s.repo.GetList(m)
-}

pkg/app/service/app_service.go

@@ -15,39 +15,49 @@ type AppService interface {
 	Create(d *datamodel.App) error
 	Update(d *datamodel.App) error
 	Delete(m map[string]interface{}) error
+	GetPermit(roleId int64, appKey string) ([]viewmodel.AppPermitInfo, error)
 }
 
 type appService struct {
-	repo *repository.AppRepo
+	appRepo       *repository.AppRepo
+	appPermitRepo *repository.AppPermitRepo
 }
 
 func NewAppService() AppService {
 	return &appService{
-		repo: repository.NewAppRepo(datasource.InstanceMaster()),
+		appRepo:       repository.NewAppRepo(datasource.InstanceMaster()),
+		appPermitRepo: repository.NewAppPermitRepo(datasource.InstanceMaster()),
 	}
 }
 
 func (s *appService) GetList(m map[string]interface{}) ([]viewmodel.AppInfo, error) {
-	return s.repo.GetList(m)
+	return s.appRepo.GetList(m)
 }
 
 func (s *appService) GetPage(m map[string]interface{}) (*base.PageResult, error) {
-	return s.repo.GetPage(m)
+	return s.appRepo.GetPage(m)
 }
 
 func (s *appService) GetById(appId int64) (*viewmodel.AppInfo, error) {
-	return s.repo.GetById(appId)
+	return s.appRepo.GetById(appId)
 }
 
 func (s *appService) Create(App *datamodel.App) error {
 	App.AppId = NewID()
-	return s.repo.Create(App)
+	return s.appRepo.Create(App)
 }
 
 func (s *appService) Update(App *datamodel.App) error {
-	return s.repo.Update(App)
+	return s.appRepo.Update(App)
 }
 
 func (s *appService) Delete(m map[string]interface{}) error {
-	return s.repo.Delete(m)
+	return s.appRepo.Delete(m)
+}
+
+func (s *appService) GetPermit(roleId int64, appKey string) ([]viewmodel.AppPermitInfo, error) {
+	m := make(map[string]interface{}, 0)
+	m["appKey"] = appKey
+	m["roleId"] = roleId
+	return s.appPermitRepo.GetList(m)
 }