diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Group.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Group.kt index 81ef59c..f0476f2 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Group.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Group.kt @@ -2,6 +2,6 @@ package com.synebula.zeus.domain.model.rbac import com.synebula.gaea.domain.model.AggregateRoot -class Group(override var id: String?) : AggregateRoot() { +class Group(override var id: String? = null) : AggregateRoot() { var name = "" } \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Page.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Page.kt new file mode 100644 index 0000000..ea60f1d --- /dev/null +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Page.kt @@ -0,0 +1,15 @@ +package com.synebula.zeus.domain.model.rbac.resource + +class Page { + // 上级页面 + val supPage = 0 + + // 页面图标 + val icon: String? = null + + // 附加参数 + val params: String? = null + + // 所属系统 + val system = 0 +} \ No newline at end of file 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 new file mode 100644 index 0000000..e3b1d88 --- /dev/null +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Resource.kt @@ -0,0 +1,11 @@ +package com.synebula.zeus.domain.model.rbac.resource + +import com.synebula.gaea.domain.model.Entity + +open class Resource(override var id: String? = null) : Entity() { + var name = "" + var signature = "" + val uri: String? = null + var order = 0 + var desc = "" +} \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Service.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Service.kt new file mode 100644 index 0000000..514ec72 --- /dev/null +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Service.kt @@ -0,0 +1,4 @@ +package com.synebula.zeus.domain.model.rbac.resource + +class Service { +} \ No newline at end of file diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/System.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/System.kt new file mode 100644 index 0000000..4d072f3 --- /dev/null +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/System.kt @@ -0,0 +1,5 @@ +package com.synebula.zeus.domain.model.rbac.resource + +class System : Resource() { + fun dispose() {} +} \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/GroupView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/GroupView.kt index 7c02dcf..a8f3e9c 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/GroupView.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/GroupView.kt @@ -1,9 +1,13 @@ package com.synebula.zeus.query.view import com.synebula.gaea.query.annotation.Table +import com.synebula.gaea.query.annotation.Where +import com.synebula.gaea.query.type.Operator @Table("group") class GroupView { var id: String? = null + + @Where(Operator.like) var name = "" }