调整GAEA APP包配置信息

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)

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() {
     }
 }

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)
     }

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.controller.IApplication
-import com.synebula.gaea.app.component.security.session.UserSession
+import com.synebula.gaea.app.security.session.UserSession
-import com.synebula.gaea.app.component.security.session.UserSessionManager
+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

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

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

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

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

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

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

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

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>() {

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
 }

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() {

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() {

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
 }

src/zeus.env/src/main/kotlin/com/synebula/zeus/env/AuthorityType.kt

@@ -1,7 +0,0 @@
-package com.synebula.zeus.env
-
-enum class AuthorityType {
-    Default,
-    Deny,
-    Allow
-}

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,

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
 

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>  {

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>  {

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>  {

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

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

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

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

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

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() {

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
 }

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 = ""
 )