From fd5b74d91760d050aa6d78515cad7271cd36adcb Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 20 Nov 2020 16:56:14 +0800 Subject: [PATCH] modify permission type, default means not config it, null means not exist --- build.gradle | 2 +- .../src/main/kotlin/com/synebula/zeus/env/PermissionType.kt | 3 ++- .../synebula/zeus/query/contr/resouce/IPermissionQuery.kt | 4 ++-- .../com/synebula/zeus/query/impl/resouce/PermissionQuery.kt | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 46f25b9..500c393 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { subprojects { ext { - version '0.5.1' + version '0.5.2' gaea_version = '0.6.0' spring_version = "2.3.0.RELEASE" } diff --git a/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/PermissionType.kt b/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/PermissionType.kt index 1df9a95..845023d 100644 --- a/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/PermissionType.kt +++ b/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/PermissionType.kt @@ -1,6 +1,7 @@ package com.synebula.zeus.env enum class PermissionType { + Default, Deny, Allow -} \ No newline at end of file +} diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPermissionQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPermissionQuery.kt index 2b3d781..3e66d9a 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPermissionQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPermissionQuery.kt @@ -9,5 +9,5 @@ interface IPermissionQuery : IQuery { fun resourcePermissions(resourceType: ResourceType, role: String): List - fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType? -} \ No newline at end of file + fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType +} diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt index 520a5d3..24f176b 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt @@ -21,13 +21,13 @@ class PermissionQuery(template: MongoTemplate) : MongoQuery(template), IPermissi ), this.clazz, this.collection) } - override fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType? { + override fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType { val permission = this.template.findOne( Query.query( Criteria.where("type").`is`(resourceType) .and("resource").`is`(resource) .and("role").`is`(role) ), this.clazz, this.collection) - return permission?.authority + return permission?.authority ?: PermissionType.Default } -} \ No newline at end of file +}