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 a7b9d46..4e84b27 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.ctr.rbac.IGroupService +import com.synebula.zeus.domain.service.contr.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 ea2e9fe..6354c7d 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.ctr.rbac.IRoleService +import com.synebula.zeus.domain.service.contr.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 c52516e..f32e4b5 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.ctr.rbac.IUserService +import com.synebula.zeus.domain.service.contr.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/service/ctr/component/IUserNotifier.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/component/IUserNotifier.kt similarity index 71% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/component/IUserNotifier.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/component/IUserNotifier.kt index cea485a..3138d19 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/component/IUserNotifier.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/component/IUserNotifier.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.ctr.component +package com.synebula.zeus.domain.service.contr.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/ctr/rbac/IGroupService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IGroupService.kt similarity index 65% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IGroupService.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IGroupService.kt index b37f710..1d112cb 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IGroupService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IGroupService.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.ctr.rbac +package com.synebula.zeus.domain.service.contr.rbac import com.synebula.gaea.domain.service.IService diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IRoleService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IRoleService.kt similarity index 65% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IRoleService.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IRoleService.kt index 4c7b2fe..f4ad941 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IRoleService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IRoleService.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.ctr.rbac +package com.synebula.zeus.domain.service.contr.rbac import com.synebula.gaea.domain.service.IService diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IUserService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IUserService.kt similarity index 94% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IUserService.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IUserService.kt index 5806025..9ff7af8 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/IUserService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IUserService.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.ctr.rbac +package com.synebula.zeus.domain.service.contr.rbac import com.synebula.gaea.data.message.DataMessage import com.synebula.gaea.domain.service.IService diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IInterfaceService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/resource/IInterfaceService.kt similarity index 62% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IInterfaceService.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/resource/IInterfaceService.kt index ea8562c..d54c875 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IInterfaceService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/resource/IInterfaceService.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.ctr.rbac.resource +package com.synebula.zeus.domain.service.contr.rbac.resource 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/contr/rbac/resource/IPageService.kt similarity index 61% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/IPageService.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/resource/IPageService.kt index 61674dc..d072b77 100644 --- 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/contr/rbac/resource/IPageService.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.ctr.rbac.resource +package com.synebula.zeus.domain.service.contr.rbac.resource import com.synebula.gaea.domain.service.IService 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/contr/rbac/resource/ISystemService.kt similarity index 61% rename from src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/ctr/rbac/resource/ISystemService.kt rename to src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/resource/ISystemService.kt index 0e9667f..3ed21d8 100644 --- 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/contr/rbac/resource/ISystemService.kt @@ -1,4 +1,4 @@ -package com.synebula.zeus.domain.service.ctr.rbac.resource +package com.synebula.zeus.domain.service.contr.rbac.resource import com.synebula.gaea.domain.service.IService 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 2ddfffd..d462d17 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,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.Group -import com.synebula.zeus.domain.service.ctr.rbac.IGroupService +import com.synebula.zeus.domain.service.contr.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 1ccaf43..fcfb274 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.ctr.rbac.IRoleService +import com.synebula.zeus.domain.service.contr.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 899ef4a..101dc0b 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 @@ -10,10 +10,10 @@ import com.synebula.gaea.domain.service.Service import com.synebula.gaea.ext.toMd5 import com.synebula.gaea.log.ILogger import com.synebula.zeus.domain.model.rbac.User -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 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 java.util.* class UserService( diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/InterfaceService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/InterfaceService.kt index 363c365..3036f71 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/InterfaceService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/InterfaceService.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.resource.Interface -import com.synebula.zeus.domain.service.ctr.rbac.resource.IInterfaceService +import com.synebula.zeus.domain.service.contr.rbac.resource.IInterfaceService class InterfaceService( repository: IRepository, diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/PageService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/PageService.kt index 714598e..e2746f5 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/PageService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/PageService.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.resource.Page -import com.synebula.zeus.domain.service.ctr.rbac.resource.IPageService +import com.synebula.zeus.domain.service.contr.rbac.resource.IPageService class PageService( repository: IRepository, 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 index 1b87580..7dac050 100644 --- 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 @@ -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.resource.System -import com.synebula.zeus.domain.service.ctr.rbac.resource.ISystemService +import com.synebula.zeus.domain.service.contr.rbac.resource.ISystemService class SystemService( repository: IRepository,