From fec580093b2cf35cf0a8a51c06809d9b5839756f Mon Sep 17 00:00:00 2001
From: alex <reizero@live.com>
Date: Fri, 2 Dec 2022 09:45:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4GAEA=20APP=E5=8C=85=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/kotlin/com/synebula/zeus/app/Application.kt   | 2 +-
 .../kotlin/com/synebula/zeus/app/component/ZeusAspect.kt   | 5 ++++-
 .../main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt  | 5 -----
 .../com/synebula/zeus/app/controller/SignInOutApp.kt       | 6 +++---
 .../com/synebula/zeus/app/controller/rbac/AuthorityApp.kt  | 2 +-
 .../com/synebula/zeus/app/controller/rbac/GroupApp.kt      | 2 +-
 .../com/synebula/zeus/app/controller/rbac/RoleApp.kt       | 2 +-
 .../com/synebula/zeus/app/controller/rbac/UserApp.kt       | 2 +-
 .../zeus/app/controller/rbac/resource/InterfaceApp.kt      | 2 +-
 .../synebula/zeus/app/controller/rbac/resource/PageApp.kt  | 2 +-
 .../zeus/app/controller/rbac/resource/SystemApp.kt         | 2 +-
 .../com/synebula/zeus/domain/model/rbac/Authority.kt       | 2 +-
 .../kotlin/com/synebula/zeus/domain/model/rbac/Role.kt     | 2 ++
 .../zeus/domain/service/cmd/rbac/AuthorityBatchAddCmd.kt   | 2 +-
 .../synebula/zeus/domain/service/cmd/rbac/AuthorityCmd.kt  | 2 +-
 .../com/synebula/zeus/domain/service/cmd/rbac/RoleCmd.kt   | 2 ++
 .../src/main/kotlin/com/synebula/zeus/env/AuthorityType.kt | 7 -------
 .../src/main/kotlin/com/synebula/zeus/env/ResourceType.kt  | 3 +++
 .../com/synebula/zeus/query/contr/IAuthorityQuery.kt       | 2 +-
 .../synebula/zeus/query/contr/resouce/IInterfaceQuery.kt   | 2 +-
 .../com/synebula/zeus/query/contr/resouce/IPageQuery.kt    | 2 +-
 .../com/synebula/zeus/query/contr/resouce/ISystemQuery.kt  | 2 +-
 .../kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt  | 2 +-
 .../main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt  | 4 +++-
 .../com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt | 2 +-
 .../com/synebula/zeus/query/impl/resouce/PageQuery.kt      | 2 +-
 .../com/synebula/zeus/query/impl/resouce/SystemQuery.kt    | 2 +-
 .../kotlin/com/synebula/zeus/query/view/AuthorityView.kt   | 2 +-
 .../main/kotlin/com/synebula/zeus/query/view/RoleView.kt   | 2 ++
 .../kotlin/com/synebula/zeus/query/view/SignUserView.kt    | 3 +++
 30 files changed, 42 insertions(+), 37 deletions(-)
 delete mode 100644 src/zeus.env/src/main/kotlin/com/synebula/zeus/env/AuthorityType.kt

diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/Application.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/Application.kt
index 1daad0e..38a5110 100644
--- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/Application.kt
+++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/Application.kt
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 
 
 @SpringBootApplication
-open class Application
+class Application
 
 fun main(args: Array<String>) {
     SpringApplication.run(Application::class.java, *args)
diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/component/ZeusAspect.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/component/ZeusAspect.kt
index bd24aff..c06d2af 100644
--- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/component/ZeusAspect.kt
+++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/component/ZeusAspect.kt
@@ -9,7 +9,10 @@ import org.springframework.stereotype.Component
 @Component
 class ZeusAspect : AppAspect() {
 
-    @Pointcut("target(com.synebula.gaea.app.IApplication)")
+    /**
+     * 切片执行所有继承[com.synebula.gaea.app.controller.IApplication]接口的类
+     */
+    @Pointcut("target(com.synebula.gaea.app.controller.IApplication)")
     override fun func() {
     }
 }
\ No newline at end of file
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 f63bbf3..bd2d54e 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
@@ -8,16 +8,11 @@ import com.synebula.gaea.mongodb.query.MongodbQueryFactory
 import com.synebula.gaea.mongodb.repository.MongodbRepositoryFactory
 import com.synebula.gaea.query.IQueryFactory
 import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration
 import org.springframework.data.mongodb.core.MongoTemplate
 
-
 @Configuration
-@ComponentScan(basePackages = ["com.synebula.gaea.app.component"])
 class ZeusBeans {
-
-    @Bean
     fun repoFactory(template: MongoTemplate): IRepositoryFactory {
         return MongodbRepositoryFactory(template)
     }
diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/SignInOutApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/SignInOutApp.kt
index c9d9231..0956b65 100644
--- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/SignInOutApp.kt
+++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/SignInOutApp.kt
@@ -1,8 +1,8 @@
 package com.synebula.zeus.app.controller
 
-import com.synebula.gaea.app.IApplication
-import com.synebula.gaea.app.component.security.session.UserSession
-import com.synebula.gaea.app.component.security.session.UserSessionManager
+import com.synebula.gaea.app.controller.IApplication
+import com.synebula.gaea.app.security.session.UserSession
+import com.synebula.gaea.app.security.session.UserSessionManager
 import com.synebula.gaea.data.message.HttpMessage
 import com.synebula.gaea.data.message.HttpMessageFactory
 import com.synebula.gaea.data.message.Status
diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/AuthorityApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/AuthorityApp.kt
index 60ec0a0..09b087f 100644
--- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/AuthorityApp.kt
+++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/AuthorityApp.kt
@@ -1,6 +1,6 @@
 package com.synebula.zeus.app.controller.rbac
 
-import com.synebula.gaea.app.Application
+import com.synebula.gaea.app.controller.Application
 import com.synebula.gaea.data.message.HttpMessage
 import com.synebula.gaea.log.ILogger
 import com.synebula.gaea.spring.aop.annotation.Method
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 d965d48..effdfd6 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
@@ -1,6 +1,6 @@
 package com.synebula.zeus.app.controller.rbac
 
-import com.synebula.gaea.app.Application
+import com.synebula.gaea.app.controller.Application
 import com.synebula.gaea.log.ILogger
 import com.synebula.gaea.query.IQueryFactory
 import com.synebula.zeus.domain.service.cmd.rbac.GroupCmd
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 4198431..2953e06 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
@@ -1,6 +1,6 @@
 package com.synebula.zeus.app.controller.rbac
 
-import com.synebula.gaea.app.Application
+import com.synebula.gaea.app.controller.Application
 import com.synebula.gaea.log.ILogger
 import com.synebula.gaea.query.IQueryFactory
 import com.synebula.zeus.domain.service.cmd.rbac.RoleCmd
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 159e7d2..29c42a4 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
@@ -1,6 +1,6 @@
 package com.synebula.zeus.app.controller.rbac
 
-import com.synebula.gaea.app.Application
+import com.synebula.gaea.app.controller.Application
 import com.synebula.gaea.data.message.HttpMessage
 import com.synebula.gaea.data.message.Status
 import com.synebula.gaea.data.serialization.json.IJsonSerializer
diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/InterfaceApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/InterfaceApp.kt
index 10507d2..1696090 100644
--- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/InterfaceApp.kt
+++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/InterfaceApp.kt
@@ -1,6 +1,6 @@
 package com.synebula.zeus.app.controller.rbac.resource
 
-import com.synebula.gaea.app.Application
+import com.synebula.gaea.app.controller.Application
 import com.synebula.gaea.data.message.HttpMessage
 import com.synebula.gaea.log.ILogger
 import com.synebula.gaea.spring.aop.annotation.Method
diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PageApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PageApp.kt
index 8a73313..ebe085d 100644
--- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PageApp.kt
+++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PageApp.kt
@@ -1,6 +1,6 @@
 package com.synebula.zeus.app.controller.rbac.resource
 
-import com.synebula.gaea.app.Application
+import com.synebula.gaea.app.controller.Application
 import com.synebula.gaea.data.message.HttpMessage
 import com.synebula.gaea.log.ILogger
 import com.synebula.gaea.spring.aop.annotation.Method
diff --git a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/SystemApp.kt b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/SystemApp.kt
index 40e6082..f90f687 100644
--- a/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/SystemApp.kt
+++ b/src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/SystemApp.kt
@@ -1,6 +1,6 @@
 package com.synebula.zeus.app.controller.rbac.resource
 
-import com.synebula.gaea.app.Application
+import com.synebula.gaea.app.controller.Application
 import com.synebula.gaea.data.message.HttpMessage
 import com.synebula.gaea.log.ILogger
 import com.synebula.gaea.spring.aop.annotation.Method
diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Authority.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Authority.kt
index 24947d6..39b0d2a 100644
--- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Authority.kt
+++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Authority.kt
@@ -1,7 +1,7 @@
 package com.synebula.zeus.domain.model.rbac
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.domain.model.AggregateRoot
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.env.ResourceType
 
 class Authority(override var id: String? = null) : AggregateRoot<String>() {
diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Role.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Role.kt
index 841096e..2b54650 100644
--- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Role.kt
+++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Role.kt
@@ -1,8 +1,10 @@
 package com.synebula.zeus.domain.model.rbac
 
+import com.synebula.gaea.data.permission.PermissionType
 import com.synebula.gaea.domain.model.AggregateRoot
 
 class Role(override var id: String? = null) : AggregateRoot<String>() {
     var name = ""
     var desc = ""
+    var permissionType = PermissionType.Minimum
 }
\ No newline at end of file
diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityBatchAddCmd.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityBatchAddCmd.kt
index e3ed7f6..e9a6560 100644
--- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityBatchAddCmd.kt
+++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityBatchAddCmd.kt
@@ -1,7 +1,7 @@
 package com.synebula.zeus.domain.service.cmd.rbac
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.domain.service.Command
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.env.ResourceType
 
 class AuthorityBatchAddCmd : Command() {
diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityCmd.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityCmd.kt
index 36cd3dc..0b9b1f0 100644
--- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityCmd.kt
+++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityCmd.kt
@@ -1,7 +1,7 @@
 package com.synebula.zeus.domain.service.cmd.rbac
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.domain.service.Command
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.env.ResourceType
 
 class AuthorityCmd : Command() {
diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/RoleCmd.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/RoleCmd.kt
index b041a82..0b6bc99 100644
--- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/RoleCmd.kt
+++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/RoleCmd.kt
@@ -1,9 +1,11 @@
 package com.synebula.zeus.domain.service.cmd.rbac
 
+import com.synebula.gaea.data.permission.PermissionType
 import com.synebula.gaea.domain.service.Command
 
 class RoleCmd : Command() {
     var id: String? = null
     var name = ""
     var desc = ""
+    var permissionType = PermissionType.Minimum
 }
\ No newline at end of file
diff --git a/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/AuthorityType.kt b/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/AuthorityType.kt
deleted file mode 100644
index c080c85..0000000
--- a/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/AuthorityType.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.synebula.zeus.env
-
-enum class AuthorityType {
-    Default,
-    Deny,
-    Allow
-}
diff --git a/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/ResourceType.kt b/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/ResourceType.kt
index d52a359..ecf2a02 100644
--- a/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/ResourceType.kt
+++ b/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/ResourceType.kt
@@ -1,5 +1,8 @@
 package com.synebula.zeus.env
 
+/**
+ * 资源类型
+ */
 enum class ResourceType {
     System,
     Page,
diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IAuthorityQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IAuthorityQuery.kt
index cebfbf8..4d673af 100644
--- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IAuthorityQuery.kt
+++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IAuthorityQuery.kt
@@ -1,7 +1,7 @@
 package com.synebula.zeus.query.contr
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.query.IQuery
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.env.ResourceType
 import com.synebula.zeus.query.view.AuthorityView
 
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 43c69d8..6fccb5f 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
@@ -1,7 +1,7 @@
 package com.synebula.zeus.query.contr.resouce
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.query.IQuery
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.query.view.resource.InterfaceView
 
 interface IInterfaceQuery : IQuery<InterfaceView, String>  {
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 af1d25b..c389e3c 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
@@ -1,7 +1,7 @@
 package com.synebula.zeus.query.contr.resouce
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.query.IQuery
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.query.view.resource.PageView
 
 interface IPageQuery : IQuery<PageView, String>  {
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 e467978..a65b9be 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
@@ -1,7 +1,7 @@
 package com.synebula.zeus.query.contr.resouce
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.query.IQuery
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.query.view.resource.SystemView
 
 interface ISystemQuery : IQuery<SystemView, String>  {
diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt
index 93f79ef..ef19895 100644
--- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt
+++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt
@@ -1,7 +1,7 @@
 package com.synebula.zeus.query.impl
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.mongodb.query.MongodbQuery
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.env.ResourceType
 import com.synebula.zeus.query.contr.IAuthorityQuery
 import com.synebula.zeus.query.view.AuthorityView
diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt
index 6a18d0b..2fa99a8 100644
--- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt
+++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt
@@ -2,6 +2,7 @@ package com.synebula.zeus.query.impl
 
 import com.synebula.gaea.data.message.DataMessage
 import com.synebula.gaea.data.message.Status
+import com.synebula.gaea.data.permission.PermissionType
 import com.synebula.gaea.ext.toMd5
 import com.synebula.gaea.mongodb.query.MongodbQuery
 import com.synebula.gaea.mongodb.whereId
@@ -32,7 +33,8 @@ class UserQuery(template: MongoTemplate) :
                 SignUserView(
                     user.id, user.realName ?: "",
                     user.role ?: "", role?.name ?: "",
-                    user.group ?: "", group?.name ?: ""
+                    user.group ?: "", group?.name ?: "",
+                    role?.permissionType ?: PermissionType.None
                 )
             )
         } else
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 a251713..319a586 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
@@ -1,7 +1,7 @@
 package com.synebula.zeus.query.impl.resouce
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.mongodb.query.MongodbQuery
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.env.ResourceType
 import com.synebula.zeus.query.contr.IAuthorityQuery
 import com.synebula.zeus.query.contr.resouce.IInterfaceQuery
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 d9b9436..28bdabb 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
@@ -1,7 +1,7 @@
 package com.synebula.zeus.query.impl.resouce
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.mongodb.query.MongodbQuery
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.env.ResourceType
 import com.synebula.zeus.query.contr.IAuthorityQuery
 import com.synebula.zeus.query.contr.resouce.IPageQuery
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 783e1ad..da5630e 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
@@ -1,7 +1,7 @@
 package com.synebula.zeus.query.impl.resouce
 
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.gaea.mongodb.query.MongodbQuery
-import com.synebula.zeus.env.AuthorityType
 import com.synebula.zeus.env.ResourceType
 import com.synebula.zeus.query.contr.IAuthorityQuery
 import com.synebula.zeus.query.contr.resouce.ISystemQuery
diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/AuthorityView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/AuthorityView.kt
index 1613030..c6e3592 100644
--- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/AuthorityView.kt
+++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/AuthorityView.kt
@@ -1,6 +1,6 @@
 package com.synebula.zeus.query.view
 
-import com.synebula.zeus.env.AuthorityType
+import com.synebula.gaea.data.permission.AuthorityType
 import com.synebula.zeus.env.ResourceType
 
 class AuthorityView() {
diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/RoleView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/RoleView.kt
index 0894ae2..2ce2f3c 100644
--- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/RoleView.kt
+++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/RoleView.kt
@@ -1,5 +1,6 @@
 package com.synebula.zeus.query.view
 
+import com.synebula.gaea.data.permission.PermissionType
 import com.synebula.gaea.query.Table
 
 @Table("role")
@@ -7,4 +8,5 @@ class RoleView {
     var id: String? = null
     var name = ""
     var desc = ""
+    var permissionType = PermissionType.Minimum
 }
\ No newline at end of file
diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt
index cb534ac..81aaaf3 100644
--- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt
+++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt
@@ -1,5 +1,7 @@
 package com.synebula.zeus.query.view
 
+import com.synebula.gaea.data.permission.PermissionType
+
 class SignUserView(
     /**
      * 用户id
@@ -30,6 +32,7 @@ class SignUserView(
      * 组名称
      */
     var gname: String = "",
+    var permissionType: PermissionType = PermissionType.Minimum,
     var remember: Boolean = false,
     var token: String = ""
 )
\ No newline at end of file