From e5358f67bdf0e8c03d6ad6cd513b90700609da31 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 29 Oct 2020 17:02:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86=E8=B5=84=E6=BA=90=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../synebula/zeus/app/controller/rbac/GroupApp.kt | 2 +- .../synebula/zeus/app/controller/rbac/RoleApp.kt | 2 +- .../synebula/zeus/app/controller/rbac/UserApp.kt | 2 +- .../zeus/domain/model/rbac/resource/Resource.kt | 2 +- .../{contr => ctr}/component/IUserNotifier.kt | 2 +- .../service/{contr => ctr}/rbac/IGroupService.kt | 2 +- .../service/{contr => ctr}/rbac/IRoleService.kt | 2 +- .../service/{contr => ctr}/rbac/IUserService.kt | 2 +- .../service/ctr/rbac/resource/IPageService.kt | 7 +++++++ .../service/ctr/rbac/resource/IServiceService.kt | 7 +++++++ .../service/ctr/rbac/resource/ISystemService.kt | 7 +++++++ .../zeus/domain/service/impl/rbac/GroupService.kt | 3 +-- .../zeus/domain/service/impl/rbac/RoleService.kt | 2 +- .../zeus/domain/service/impl/rbac/UserService.kt | 8 ++++---- .../service/impl/rbac/resource/SystemService.kt | 13 +++++++++++++ 15 files changed, 48 insertions(+), 15 deletions(-) rename src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/{contr => ctr}/component/IUserNotifier.kt (71%) rename src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/{contr => ctr}/rbac/IGroupService.kt (65%) rename src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/{contr => ctr}/rbac/IRoleService.kt (65%) rename src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/{contr => ctr}/rbac/IUserService.kt (94%) create mode 100644 src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IPageService.kt create mode 100644 src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IServiceService.kt create mode 100644 src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/ISystemService.kt create mode 100644 src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/SystemService.kt diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/GroupApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/GroupApp.kt index 4e84b27..a7b9d46 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/GroupApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/GroupApp.kt @@ -4,7 +4,7 @@ import com.synebula.gaea.app.Application import com.synebula.gaea.log.ILogger import com.synebula.gaea.query.IQuery import com.synebula.zeus.domain.service.cmd.rbac.GroupCmd -import com.synebula.zeus.domain.service.contr.rbac.IGroupService +import com.synebula.zeus.domain.service.ctr.rbac.IGroupService import com.synebula.zeus.query.view.GroupView import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/RoleApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/RoleApp.kt index 6354c7d..ea2e9fe 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/RoleApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/RoleApp.kt @@ -4,7 +4,7 @@ import com.synebula.gaea.app.Application import com.synebula.gaea.log.ILogger import com.synebula.gaea.query.IQuery import com.synebula.zeus.domain.service.cmd.rbac.RoleCmd -import com.synebula.zeus.domain.service.contr.rbac.IRoleService +import com.synebula.zeus.domain.service.ctr.rbac.IRoleService import com.synebula.zeus.query.view.RoleView import org.springframework.web.bind.annotation.RequestMapping import org.springframework.web.bind.annotation.RestController diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt index f32e4b5..c52516e 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt @@ -7,7 +7,7 @@ import com.synebula.gaea.data.serialization.json.IJsonSerializer import com.synebula.gaea.log.ILogger import com.synebula.gaea.query.IQuery import com.synebula.zeus.domain.service.cmd.rbac.UserCmd -import com.synebula.zeus.domain.service.contr.rbac.IUserService +import com.synebula.zeus.domain.service.ctr.rbac.IUserService import com.synebula.zeus.query.view.UserView import org.springframework.beans.factory.annotation.Autowired import org.springframework.web.bind.annotation.* diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Resource.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Resource.kt index e3b1d88..93641d3 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Resource.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Resource.kt @@ -2,7 +2,7 @@ package com.synebula.zeus.domain.model.rbac.resource import com.synebula.gaea.domain.model.Entity -open class Resource(override var id: String? = null) : Entity() { +abstract class Resource(override var id: String? = null) : Entity() { var name = "" var signature = "" val uri: String? = null diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/component/IUserNotifier.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/component/IUserNotifier.kt similarity index 71% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/component/IUserNotifier.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/component/IUserNotifier.kt index 3138d19..cea485a 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/component/IUserNotifier.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/component/IUserNotifier.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.contr.component +package com.synebula.zeus.domain.service.ctr.component interface IUserNotifier { fun added(id: String, name: String, token: String) diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IGroupService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IGroupService.kt similarity index 65% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IGroupService.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IGroupService.kt index 1d112cb..b37f710 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IGroupService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IGroupService.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.contr.rbac +package com.synebula.zeus.domain.service.ctr.rbac import com.synebula.gaea.domain.service.IService diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IRoleService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IRoleService.kt similarity index 65% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IRoleService.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IRoleService.kt index f4ad941..4c7b2fe 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IRoleService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IRoleService.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.contr.rbac +package com.synebula.zeus.domain.service.ctr.rbac import com.synebula.gaea.domain.service.IService diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IUserService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IUserService.kt similarity index 94% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IUserService.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IUserService.kt index d840fbf..7a0844d 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IUserService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IUserService.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.contr.rbac +package com.synebula.zeus.domain.service.ctr.rbac import com.synebula.gaea.data.message.Message import com.synebula.gaea.domain.service.IService diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IPageService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IPageService.kt new file mode 100644 index 0000000..61674dc --- /dev/null +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IPageService.kt @@ -0,0 +1,7 @@ +package com.synebula.zeus.domain.service.ctr.rbac.resource + +import com.synebula.gaea.domain.service.IService + +interface IPageService : IService { + +} \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IServiceService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IServiceService.kt new file mode 100644 index 0000000..9679267 --- /dev/null +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IServiceService.kt @@ -0,0 +1,7 @@ +package com.synebula.zeus.domain.service.ctr.rbac.resource + +import com.synebula.gaea.domain.service.IService + +interface IServiceService : IService { + +} \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/ISystemService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/ISystemService.kt new file mode 100644 index 0000000..0e9667f --- /dev/null +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/ISystemService.kt @@ -0,0 +1,7 @@ +package com.synebula.zeus.domain.service.ctr.rbac.resource + +import com.synebula.gaea.domain.service.IService + +interface ISystemService : IService { + +} \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/GroupService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/GroupService.kt index 7e9805a..2ddfffd 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/GroupService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/GroupService.kt @@ -5,8 +5,7 @@ import com.synebula.gaea.domain.repository.IRepository import com.synebula.gaea.domain.service.Service import com.synebula.gaea.log.ILogger import com.synebula.zeus.domain.model.rbac.Group -import com.synebula.zeus.domain.service.contr.rbac.IGroupService -import com.synebula.zeus.domain.service.contr.rbac.IRoleService +import com.synebula.zeus.domain.service.ctr.rbac.IGroupService class GroupService( repository: IRepository, diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/RoleService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/RoleService.kt index fcfb274..1ccaf43 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/RoleService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/RoleService.kt @@ -5,7 +5,7 @@ import com.synebula.gaea.domain.repository.IRepository import com.synebula.gaea.domain.service.Service import com.synebula.gaea.log.ILogger import com.synebula.zeus.domain.model.rbac.Role -import com.synebula.zeus.domain.service.contr.rbac.IRoleService +import com.synebula.zeus.domain.service.ctr.rbac.IRoleService class RoleService( repository: IRepository, diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt index 9aa1c71..4892062 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt @@ -9,10 +9,10 @@ import com.synebula.gaea.domain.service.Service import com.synebula.gaea.extension.toMd5 import com.synebula.gaea.log.ILogger import com.synebula.zeus.domain.model.rbac.User -import com.synebula.zeus.domain.service.contr.component.IUserNotifier -import com.synebula.zeus.domain.service.contr.rbac.IGroupService -import com.synebula.zeus.domain.service.contr.rbac.IRoleService -import com.synebula.zeus.domain.service.contr.rbac.IUserService +import com.synebula.zeus.domain.service.ctr.component.IUserNotifier +import com.synebula.zeus.domain.service.ctr.rbac.IGroupService +import com.synebula.zeus.domain.service.ctr.rbac.IRoleService +import com.synebula.zeus.domain.service.ctr.rbac.IUserService import java.util.* class UserService( diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/SystemService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/SystemService.kt new file mode 100644 index 0000000..1be12c7 --- /dev/null +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/SystemService.kt @@ -0,0 +1,13 @@ +package com.synebula.zeus.domain.service.impl.rbac.resource + +import com.synebula.gaea.data.IObjectConverter +import com.synebula.gaea.domain.repository.IRepository +import com.synebula.gaea.domain.service.Service +import com.synebula.gaea.log.ILogger +import com.synebula.zeus.domain.model.rbac.Group +import com.synebula.zeus.domain.service.ctr.rbac.IGroupService + +class SystemService( + repository: IRepository, + converter: IObjectConverter, logger: ILogger +) : Service(Group::class.java, repository, converter, logger), IGroupService \ No newline at end of file