From b9bb63ea212024fe1110f8c1be2ef15d8e91e175 Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 2 Nov 2020 23:52:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=EF=BC=9B=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?bean=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/synebula/zeus/app/config/ZeusBeans.kt | 13 ------------- .../zeus/query/contr/resouce/IInterfaceQuery.kt | 2 +- .../synebula/zeus/query/contr/resouce/IPageQuery.kt | 2 +- .../zeus/query/contr/resouce/IPermissionQuery.kt | 2 +- .../zeus/query/contr/resouce/ISystemQuery.kt | 2 +- .../zeus/query/impl/resouce/InterfaceQuery.kt | 2 +- .../synebula/zeus/query/impl/resouce/PageQuery.kt | 2 +- .../zeus/query/impl/resouce/PermissionQuery.kt | 6 +++--- .../synebula/zeus/query/impl/resouce/SystemQuery.kt | 2 +- 9 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt index 87d8557..c49368c 100644 --- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt +++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt @@ -30,19 +30,6 @@ open class ZeusBeans { @Bean open fun gson(): Gson = Gson() - @Bean - open fun userNotifier(): IUserNotifier { - return object : IUserNotifier { - override fun added(id: String, name: String, token: String) { - - } - - override fun forgot(id: String, name: String, token: String) { - } - - } - } - @Bean open fun serializer(gson: Gson): IJsonSerializer { return object : IJsonSerializer { diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IInterfaceQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IInterfaceQuery.kt index 4e37bb8..8380b4f 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IInterfaceQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IInterfaceQuery.kt @@ -10,5 +10,5 @@ interface IInterfaceQuery : IQuery { fun withPermission(role: String, system: String?): List - fun authentication(resource: String, role: String): PermissionType + fun authentication(resource: String, role: String): PermissionType? } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPageQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPageQuery.kt index 2866df8..2ea2fd9 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPageQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPageQuery.kt @@ -10,5 +10,5 @@ interface IPageQuery : IQuery { fun withPermission(role: String, system: String? ): List - fun authentication(resource: String, role: String): PermissionType + fun authentication(resource: String, role: String): PermissionType? } \ 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 c3285d7..2b3d781 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 + fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType? } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/ISystemQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/ISystemQuery.kt index cb2f205..6b3c130 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/ISystemQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/ISystemQuery.kt @@ -8,5 +8,5 @@ interface ISystemQuery : IQuery { fun withPermission(role: String): List - fun authentication(resource: String, role: String): PermissionType + fun authentication(resource: String, role: String): PermissionType? } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt index 6b692ed..20efd67 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt @@ -36,7 +36,7 @@ class InterfaceQuery(template: MongoTemplate, var permissionQuery: IPermissionQu } } - override fun authentication(resource: String, role: String): PermissionType { + override fun authentication(resource: String, role: String): PermissionType? { return this.permissionQuery.authentication(ResourceType.Interface, resource, role) } } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt index 1ea68a2..fafd785 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt @@ -33,7 +33,7 @@ class PageQuery(template: MongoTemplate, var permissionQuery: IPermissionQuery, } } - override fun authentication(resource: String, role: String): PermissionType { + override fun authentication(resource: String, role: String): PermissionType? { return this.permissionQuery.authentication(ResourceType.Page, resource, role) } } \ No newline at end of file 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 b50d040..93597d4 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("resourceType").`is`(resourceType) + Criteria.where("type").`is`(resourceType) .and("resource").`is`(resource) .and("role").`is`(role) ), this.clazz, this.collection) - return permission?.authorization ?: PermissionType.Allow + return permission?.authorization } } \ No newline at end of file diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt index 6e3e4b7..154dc4e 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt @@ -16,7 +16,7 @@ class SystemQuery(template: MongoTemplate, var permissionQuery: PermissionQuery) return systems.filter { i -> permissions.find { p -> i.id == p.resource }?.authorization == PermissionType.Allow } } - override fun authentication(resource: String, role: String): PermissionType { + override fun authentication(resource: String, role: String): PermissionType? { return this.permissionQuery.authentication(ResourceType.System, resource, role) } } \ No newline at end of file