alex/Zeus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from synebula-myths/dev

Browse Source 
Dev
This commit is contained in:
synebula
2022-08-26 10:47:38 +08:00
committed by GitHub
parent 72cb8cf5ca cbe75da254
commit 6f520513a2
66 changed files with 618 additions and 455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
build.gradle
View File

@@ -1,11 +1,11 @@
buildscript {
ext {
kotlin_version = '1.3.72'
kotlin_version = '1.6.10'
}
repositories {
mavenLocal()
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
mavenCentral()
}
@@ -14,42 +14,39 @@ buildscript {
}
}
allprojects {
subprojects {
group 'com.synebula'
version version
}
subprojects {
ext {
version '0.5.2'
gaea_version = '0.6.1'
spring_version = "2.3.0.RELEASE"
version '0.9.0'
gaea_version = '1.4.0'
spring_version = "2.7.0"
}
buildscript {
repositories {
mavenLocal()
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
mavenCentral()
}
}
repositories {
mavenLocal()
maven { url 'http://maven.aliyun.com/nexus/content/groups/public/' }
maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
mavenCentral()
}
apply plugin: 'idea'
apply plugin: 'java'
apply plugin: 'kotlin'
apply plugin: 'maven'
apply plugin: 'maven-publish'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testCompile group: 'junit', name: 'junit', version: '4.12'
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
testApi group: 'junit', name: 'junit', version: '4.12'
}
sourceCompatibility = 1.8

2
settings.gradle
View File

@@ -4,3 +4,5 @@ include 'src:zeus.app'
include 'src:zeus.domain'
include 'src:zeus.query'
include 'src:zeus.env'
include 'src:zeus.repository'

13
src/zeus.app/build.gradle
View File

@@ -1,20 +1,23 @@
buildscript {
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:$spring_version")
classpath("org.jetbrains.kotlin:kotlin-allopen:$kotlin_version")
}
}
apply plugin: 'org.springframework.boot'
apply plugin: 'kotlin-spring'
jar.enabled = true //jar SKIPPED问题,不设置可能会无法打jar
dependencies {
compile project(":src:zeus.domain")
compile project(":src:zeus.query")
compile "com.synebula:gaea.app:$gaea_version"
compile "com.synebula:gaea.mongo:$gaea_version"
api project(":src:zeus.domain")
api project(":src:zeus.query")
api project(":src:zeus.repository")
api "com.synebula:gaea.app:$gaea_version"
api "com.synebula:gaea.spring:$gaea_version"
api "com.synebula:gaea.mongodb:$gaea_version"
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
}
publishing {

15
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/component/ZeusAspect.kt Normal file
View File

@@ -0,0 +1,15 @@
package com.synebula.zeus.app.component
import com.synebula.gaea.spring.aop.AppAspect
import org.aspectj.lang.annotation.Aspect
import org.aspectj.lang.annotation.Pointcut
import org.springframework.stereotype.Component
@Aspect
@Component
class ZeusAspect : AppAspect() {
@Pointcut("target(com.synebula.gaea.app.IApplication)")
override fun func() {
}
}

41
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusBeans.kt
View File

@@ -1,37 +1,42 @@
package com.synebula.zeus.app.config
import com.google.gson.Gson
import com.synebula.gaea.app.component.security.WebSecurity
import com.synebula.gaea.data.serialization.json.IJsonSerializer
import com.synebula.gaea.domain.model.IAggregateRoot
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.gaea.log.ILogger
import com.synebula.gaea.mongo.query.MongoQuery
import com.synebula.gaea.mongo.repository.MongoRepository
import com.synebula.gaea.query.IQuery
import com.synebula.zeus.domain.service.contr.component.IUserNotifier
import com.synebula.gaea.domain.repository.IRepositoryFactory
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.ComponentScan.Filter
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Primary
import org.springframework.context.annotation.FilterType
import org.springframework.data.mongodb.core.MongoTemplate
@Configuration
open class ZeusBeans {
@Bean
@Primary
open fun <T : IAggregateRoot<String>> repository(template: MongoTemplate)
: IRepository = MongoRepository(template)
@ComponentScan(
basePackages = ["com.synebula.gaea.app.component"],
excludeFilters = [Filter(type = FilterType.ASSIGNABLE_TYPE, classes = [WebSecurity::class])]
)
class ZeusBeans {
@Bean
@Primary
open fun <T> query(template: MongoTemplate, logger: ILogger? = null)
: IQuery = MongoQuery(template, logger)
fun repoFactory(template: MongoTemplate): IRepositoryFactory {
return MongodbRepositoryFactory(template)
}
@Bean
open fun gson(): Gson = Gson()
fun queryFactory(template: MongoTemplate): IQueryFactory {
return MongodbQueryFactory(template)
}
@Bean
open fun serializer(gson: Gson): IJsonSerializer {
fun gson(): Gson = Gson()
@Bean
fun serializer(gson: Gson): IJsonSerializer {
return object : IJsonSerializer {
override fun <S> serialize(src: S): String {
return gson.toJson(src)

10
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusServices.kt Normal file
View File

@@ -0,0 +1,10 @@
package com.synebula.zeus.app.config
import com.synebula.gaea.app.autoconfig.service.ServiceScan
import com.synebula.gaea.mongodb.autoconfig.MongodbRepositoryScan
import org.springframework.stereotype.Component
@Component
@ServiceScan(basePackages = ["com.synebula.zeus.domain.service"])
@MongodbRepositoryScan(basePackages = ["com.synebula.zeus.domain.repository", "com.synebula.zeus.repository", "com.synebula.zeus.query"])
class ZeusServices

18
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/config/ZeusSpring.kt
View File

@@ -1,18 +0,0 @@
package com.synebula.zeus.app.config
import com.synebula.gaea.app.component.AllTypeFilter
import org.springframework.context.annotation.ComponentScan
import org.springframework.context.annotation.ComponentScan.Filter
import org.springframework.context.annotation.FilterType
import org.springframework.stereotype.Component
@Component
@ComponentScan(
basePackages = [
"com.synebula.gaea.app.component",
"com.synebula.zeus.domain.service.impl",
"com.synebula.zeus.query.impl"
],
includeFilters = [Filter(type = FilterType.CUSTOM, classes = [AllTypeFilter::class])]
)
class ZeusSpring

56
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/SignInOutApp.kt
View File

@@ -1,31 +1,73 @@
package com.synebula.zeus.app.controller
import com.synebula.gaea.app.IApplication
import com.synebula.gaea.app.component.HttpMessage
import com.synebula.gaea.app.component.security.TokenManager
import com.synebula.gaea.data.message.HttpMessage
import com.synebula.gaea.data.message.Status
import com.synebula.gaea.data.serialization.json.IJsonSerializer
import com.synebula.gaea.log.ILogger
import com.synebula.gaea.spring.aop.annotation.Method
import com.synebula.zeus.domain.service.cmd.rbac.UserCmd
import com.synebula.zeus.domain.service.contr.rbac.IUserService
import com.synebula.zeus.query.contr.IUserQuery
import com.synebula.zeus.query.impl.UserQuery
import org.springframework.data.mongodb.core.MongoTemplate
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.web.bind.annotation.PostMapping
import org.springframework.web.bind.annotation.RequestBody
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
@RestController
@RequestMapping("/sign")
class SignInOutApp(template: MongoTemplate, override var logger: ILogger?) : IApplication {
var query: IUserQuery = UserQuery(template)
class SignInOutApp(override var logger: ILogger) : IApplication {
@Autowired
lateinit var userQuery: IUserQuery
@Autowired
lateinit var userService: IUserService
@Autowired
lateinit var tokenHelper: TokenManager
@Autowired
lateinit var serializer: IJsonSerializer
override var name: String = "用户登录管理"
@Method("用户登录")
@PostMapping("/in")
fun signIn(name: String, password: String): HttpMessage {
fun signIn(name: String, password: String, remember: Boolean?): HttpMessage {
return this.safeExecute("用户登录出现异常") {
it.load(this.query.signIn(name, password))
val message = this.userQuery.signIn(name, password)
if (message.data != null) {
val user = message.data
user!!.remember = remember ?: false
val token = tokenHelper.sign(message.data!!)
it.data = token
} else {
it.load(message)
}
}
}
@Method("用户登出")
@PostMapping("/out")
fun signOut(user: String): HttpMessage {
return HttpMessage(user)
}
@Method("用户注册")
@PostMapping("/up")
fun signUp(@RequestBody command: UserCmd): HttpMessage {
return this.safeExecute("用户注册出错, 用户信息: ${serializer.serialize(command)}") {
val list = this.userQuery.list(mapOf(Pair("name", command.name)))
if (list.isEmpty()) {
val message = userService.add(command)
it.data = message.data
} else {
it.status = Status.Failure
it.message = "系统中已存在该用户"
}
}
}
}

41
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/AuthorityApp.kt Normal file
View File

@@ -0,0 +1,41 @@
package com.synebula.zeus.app.controller.rbac
import com.synebula.gaea.app.Application
import com.synebula.gaea.data.message.HttpMessage
import com.synebula.gaea.log.ILogger
import com.synebula.gaea.spring.aop.annotation.Method
import com.synebula.zeus.domain.service.cmd.rbac.AuthorityBatchAddCmd
import com.synebula.zeus.domain.service.cmd.rbac.AuthorityCmd
import com.synebula.zeus.domain.service.contr.rbac.IAuthorityService
import com.synebula.zeus.env.ResourceType
import com.synebula.zeus.query.contr.IAuthorityQuery
import com.synebula.zeus.query.view.AuthorityView
import org.springframework.web.bind.annotation.*
@RestController
@RequestMapping("/authorities")
class AuthorityApp(
query: IAuthorityQuery,
logger: ILogger,
private var authorityService: IAuthorityService
) : Application<AuthorityCmd, AuthorityView, String>(
"权限信息", authorityService, query, logger
) {
@Method("批量添加权限信息")
@PostMapping("/batch")
fun add(@RequestBody cmd: AuthorityBatchAddCmd): HttpMessage {
this.authorityService.add(cmd)
return HttpMessage()
}
@Method("根据资源和角色删除权限")
@DeleteMapping("/{type}/role/{role}")
fun removeByResourceRole(
@PathVariable type: ResourceType,
@PathVariable role: String,
@RequestBody resource: List<String>
): HttpMessage {
this.authorityService.removeByResourceRole(type, resource, role)
return HttpMessage()
}
}

7
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/GroupApp.kt
View File

@@ -2,7 +2,7 @@ package com.synebula.zeus.app.controller.rbac
import com.synebula.gaea.app.Application
import com.synebula.gaea.log.ILogger
import com.synebula.gaea.query.IQuery
import com.synebula.gaea.query.IQueryFactory
import com.synebula.zeus.domain.service.cmd.rbac.GroupCmd
import com.synebula.zeus.domain.service.contr.rbac.IGroupService
import com.synebula.zeus.query.view.GroupView
@@ -13,9 +13,8 @@ import org.springframework.web.bind.annotation.RestController
@RequestMapping("/groups")
class GroupApp(
service: IGroupService,
query: IQuery,
factory: IQueryFactory,
logger: ILogger
) : Application<GroupCmd, GroupView, String>(
"分组信息", GroupView::class.java,
service, query, logger
"用户组信息", service, factory.createQuery(GroupView::class.java), logger
)

7
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/RoleApp.kt
View File

@@ -2,7 +2,7 @@ package com.synebula.zeus.app.controller.rbac
import com.synebula.gaea.app.Application
import com.synebula.gaea.log.ILogger
import com.synebula.gaea.query.IQuery
import com.synebula.gaea.query.IQueryFactory
import com.synebula.zeus.domain.service.cmd.rbac.RoleCmd
import com.synebula.zeus.domain.service.contr.rbac.IRoleService
import com.synebula.zeus.query.view.RoleView
@@ -13,9 +13,8 @@ import org.springframework.web.bind.annotation.RestController
@RequestMapping("/roles")
class RoleApp(
service: IRoleService,
query: IQuery,
factory: IQueryFactory,
logger: ILogger
) : Application<RoleCmd, RoleView, String>(
"用户信息", RoleView::class.java,
service, query, logger
"用户信息", service, factory.createQuery(RoleView::class.java), logger
)

17
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt
View File

@@ -1,13 +1,13 @@
package com.synebula.zeus.app.controller.rbac
import com.synebula.gaea.app.Application
import com.synebula.gaea.app.component.HttpMessage
import com.synebula.gaea.data.message.HttpMessage
import com.synebula.gaea.data.message.Status
import com.synebula.gaea.data.serialization.json.IJsonSerializer
import com.synebula.gaea.log.ILogger
import com.synebula.gaea.query.IQuery
import com.synebula.zeus.domain.service.cmd.rbac.UserCmd
import com.synebula.zeus.domain.service.contr.rbac.IUserService
import com.synebula.zeus.query.contr.IUserQuery
import com.synebula.zeus.query.view.UserView
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.web.bind.annotation.*
@@ -16,11 +16,10 @@ import org.springframework.web.bind.annotation.*
@RequestMapping("/users")
class UserApp(
service: IUserService,
query: IQuery,
query: IUserQuery,
logger: ILogger
) : Application<UserCmd, UserView, String>(
"用户信息", UserView::class.java,
service, query, logger
"用户信息", service, query, logger
) {
@Autowired
@@ -28,8 +27,8 @@ class UserApp(
override fun add(command: UserCmd): HttpMessage {
return this.safeExecute("查询重复用户信息出错, 用户信息: ${serializer.serialize(command)}") {
val list = this.query!!.list(mapOf(Pair("name", command.name)), UserView::class.java)
if (list.count() == 0)
val list = this.query.list(mapOf(Pair("name", command.name)))
if (list.isEmpty())
it.from(super.add(command))
else {
it.status = Status.Failure
@@ -54,8 +53,8 @@ class UserApp(
@GetMapping("/{name}/forgot")
fun forgot(@PathVariable name: String): HttpMessage {
return this.safeExecute("遗忘用户密码出现异常") {
val users = this.query?.list(mapOf(Pair("name", name)), UserView::class.java)
if (users != null && users.isNotEmpty()) {
val users = this.query.list(mapOf(Pair("name", name)))
if (users.isNotEmpty()) {
it.load((this.service as IUserService).forgotPassword(users[0].id))
} else {

27
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/InterfaceApp.kt
View File

@@ -1,8 +1,9 @@
package com.synebula.zeus.app.controller.rbac.resource
import com.synebula.gaea.app.Application
import com.synebula.gaea.app.component.HttpMessage
import com.synebula.gaea.data.message.HttpMessage
import com.synebula.gaea.log.ILogger
import com.synebula.gaea.spring.aop.annotation.Method
import com.synebula.zeus.domain.service.cmd.rbac.resource.InterfaceCmd
import com.synebula.zeus.domain.service.contr.rbac.resource.IInterfaceService
import com.synebula.zeus.query.contr.resouce.IInterfaceQuery
@@ -19,28 +20,30 @@ class InterfaceApp(
logger: ILogger,
var interfaceQuery: IInterfaceQuery
) : Application<InterfaceCmd, InterfaceView, String>(
"接口信息", InterfaceView::class.java,
service, interfaceQuery, logger
"接口信息", service, interfaceQuery, logger
) {
@GetMapping("/in-system/{system}/permission/{role}")
fun withSystemPermission(@PathVariable system: String, @PathVariable role: String): HttpMessage {
@Method("获取角色系统下有权接口")
@GetMapping("/in-system/{system}/authorized/{role}")
fun authorized(@PathVariable system: String, @PathVariable role: String): HttpMessage {
return this.safeExecute("获取有权资源列表失败") { msg ->
msg.data = this.interfaceQuery.withPermission(role, system)
msg.data = this.interfaceQuery.authorized(role, system)
}
}
@GetMapping("/permission/{role}")
fun withPermission(@PathVariable role: String): HttpMessage {
@Method("获取角色全部有权接口")
@GetMapping("/authorized/{role}")
fun authorized(@PathVariable role: String): HttpMessage {
return this.safeExecute("获取有权资源列表失败") { msg ->
msg.data = this.interfaceQuery.withPermission(role)
msg.data = this.interfaceQuery.authorized(role)
}
}
@GetMapping("/{api}/authentication/{role}")
fun authentication(@PathVariable api: String, @PathVariable role: String): HttpMessage {
@Method("验证角色接口权限")
@GetMapping("/{api}/authorize/{role}")
fun authorize(@PathVariable api: String, @PathVariable role: String): HttpMessage {
return this.safeExecute("获取权限信息失败") { msg ->
msg.data = this.interfaceQuery.authentication(api, role)
msg.data = this.interfaceQuery.authorize(api, role)
}
}
}

44
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PageApp.kt
View File

@@ -1,8 +1,10 @@
package com.synebula.zeus.app.controller.rbac.resource
import com.synebula.gaea.app.Application
import com.synebula.gaea.app.component.HttpMessage
import com.synebula.gaea.data.message.HttpMessage
import com.synebula.gaea.log.ILogger
import com.synebula.gaea.spring.aop.annotation.Method
import com.synebula.gaea.spring.aop.annotation.Module
import com.synebula.zeus.domain.service.cmd.rbac.resource.PageCmd
import com.synebula.zeus.domain.service.contr.rbac.resource.IPageService
import com.synebula.zeus.query.contr.resouce.IPageQuery
@@ -14,40 +16,44 @@ import org.springframework.web.bind.annotation.RestController
@RestController
@RequestMapping("/pages")
@Module("页面")
class PageApp(
service: IPageService,
logger: ILogger,
var pageQuery: IPageQuery
) : Application<PageCmd, PageView, String>(
"页面信息", PageView::class.java,
service, pageQuery, logger
"页面信息", service, pageQuery, logger
) {
@GetMapping("/in-system/{system}/permission/{role}")
fun withSystemPermission(@PathVariable system: String, @PathVariable role: String): HttpMessage {
@Method("获取角色系统下有权页面")
@GetMapping("/in-system/{system}/authorized/{role}")
fun authorized(@PathVariable system: String, @PathVariable role: String): HttpMessage {
val msg = HttpMessage()
msg.data = this.pageQuery.authorized(role, system)
return msg
}
@Method("获取角色全部有权页面")
@GetMapping("/authorized/{role}")
fun authorized(@PathVariable role: String): HttpMessage {
return this.safeExecute("获取有权资源列表失败") { msg ->
msg.data = this.pageQuery.withPermission(role, system)
msg.data = this.pageQuery.authorized(role)
}
}
@GetMapping("/permission/{role}")
fun withPermission(@PathVariable role: String): HttpMessage {
return this.safeExecute("获取有权资源列表失败") { msg ->
msg.data = this.pageQuery.withPermission(role)
}
}
@GetMapping("/{page}/authentication/{role}")
fun authentication(@PathVariable page: String, @PathVariable role: String): HttpMessage {
@Method("验证角色页面权限")
@GetMapping("/{page}/authorize/{role}")
fun authorize(@PathVariable page: String, @PathVariable role: String): HttpMessage {
return this.safeExecute("获取权限信息失败") { msg ->
msg.data = this.pageQuery.authentication(page, role)
msg.data = this.pageQuery.authorize(page, role)
}
}
@GetMapping("/authentication/{role}")
fun uriAuthentication(@PathVariable role: String, uri: String): HttpMessage {
@Method("验证角色URL权限")
@GetMapping("/authorize/{role}")
fun uriAuthorize(@PathVariable role: String, uri: String): HttpMessage {
return this.safeExecute("获取权限信息失败") { msg ->
msg.data = this.pageQuery.uriAuthentication(uri, role)
msg.data = this.pageQuery.uriAuthorize(uri, role)
}
}

21
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/PermissionApp.kt
View File

@@ -1,21 +0,0 @@
package com.synebula.zeus.app.controller.rbac.resource
import com.synebula.gaea.app.Application
import com.synebula.gaea.log.ILogger
import com.synebula.zeus.domain.service.cmd.rbac.resource.PermissionCmd
import com.synebula.zeus.domain.service.contr.rbac.resource.IPermissionService
import com.synebula.zeus.query.contr.resouce.IPermissionQuery
import com.synebula.zeus.query.view.resource.PermissionView
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
@RestController
@RequestMapping("/permissions")
class PermissionApp(
service: IPermissionService,
query: IPermissionQuery,
logger: ILogger
) : Application<PermissionCmd, PermissionView, String>(
"权限信息", PermissionView::class.java,
service, query, logger
)

20
src/zeus.app/src/main/kotlin/com/synebula/zeus/app/controller/rbac/resource/SystemApp.kt
View File

@@ -1,8 +1,9 @@
package com.synebula.zeus.app.controller.rbac.resource
import com.synebula.gaea.app.Application
import com.synebula.gaea.app.component.HttpMessage
import com.synebula.gaea.data.message.HttpMessage
import com.synebula.gaea.log.ILogger
import com.synebula.gaea.spring.aop.annotation.Method
import com.synebula.zeus.domain.service.cmd.rbac.resource.SystemCmd
import com.synebula.zeus.domain.service.contr.rbac.resource.ISystemService
import com.synebula.zeus.query.contr.resouce.ISystemQuery
@@ -19,20 +20,21 @@ class SystemApp(
logger: ILogger,
var systemQuery: ISystemQuery
) : Application<SystemCmd, SystemView, String>(
"系统信息", SystemView::class.java,
service, systemQuery, logger
"系统信息", service, systemQuery, logger
) {
@GetMapping("/permission/{role}")
fun withPermission(@PathVariable role: String): HttpMessage {
@Method("获取角色有权系统")
@GetMapping("/authorized/{role}")
fun authorized(@PathVariable role: String): HttpMessage {
return this.safeExecute("获取有权资源列表失败") { msg ->
msg.data = this.systemQuery.withPermission(role)
msg.data = this.systemQuery.authorized(role)
}
}
@GetMapping("/{system}/authentication/{role}")
fun authentication(@PathVariable system: String, @PathVariable role: String): HttpMessage {
@Method("验证角色系统权限")
@GetMapping("/{system}/authorize/{role}")
fun authorize(@PathVariable system: String, @PathVariable role: String): HttpMessage {
return this.safeExecute("获取权限信息失败") { msg ->
msg.data = this.systemQuery.authentication(system, role)
msg.data = this.systemQuery.authorize(system, role)
}
}
}

4
src/zeus.domain/build.gradle
View File

@@ -1,6 +1,6 @@
dependencies {
compile project(":src:zeus.env")
compile "com.synebula:gaea:$gaea_version"
api project(":src:zeus.env")
api "com.synebula:gaea:$gaea_version"
}
publishing {

19
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Authority.kt Normal file
View File

@@ -0,0 +1,19 @@
package com.synebula.zeus.domain.model.rbac
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>() {
var role = ""
var resource = ""
var type: ResourceType? = null
var authority = AuthorityType.Allow
constructor(role: String, resource: String, type: ResourceType?, authority: AuthorityType) : this() {
this.role = role
this.resource = resource
this.type = type
this.authority = authority
}
}

1
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Group.kt
View File

@@ -4,4 +4,5 @@ import com.synebula.gaea.domain.model.AggregateRoot
class Group(override var id: String? = null) : AggregateRoot<String>() {
var name = ""
var desc = ""
}

3
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/Role.kt
View File

@@ -2,6 +2,7 @@ package com.synebula.zeus.domain.model.rbac
import com.synebula.gaea.domain.model.AggregateRoot
class Role(override var id: String?) : AggregateRoot<String>() {
class Role(override var id: String? = null) : AggregateRoot<String>() {
var name = ""
var desc = ""
}

12
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/model/rbac/resource/Permission.kt
View File

@@ -1,12 +0,0 @@
package com.synebula.zeus.domain.model.rbac.resource
import com.synebula.gaea.domain.model.AggregateRoot
import com.synebula.zeus.env.PermissionType
import com.synebula.zeus.env.ResourceType
class Permission(override var id: String? = null) : AggregateRoot<String>() {
var role = ""
var resource = ""
var type: ResourceType? = null
var authority = PermissionType.Allow
}

9
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/repository/rbac/IAuthorityRepository.kt Normal file
View File

@@ -0,0 +1,9 @@
package com.synebula.zeus.domain.repository.rbac
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.zeus.domain.model.rbac.Authority
import com.synebula.zeus.env.ResourceType
interface IAuthorityRepository : IRepository<Authority, String> {
fun removeByResourceRole(type: ResourceType, resource: List<String>, role: String)
}

7
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/repository/rbac/IUserRepository.kt Normal file
View File

@@ -0,0 +1,7 @@
package com.synebula.zeus.domain.repository.rbac
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.zeus.domain.model.rbac.User
interface IUserRepository : IRepository<User, String> {
}

12
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityBatchAddCmd.kt Normal file
View File

@@ -0,0 +1,12 @@
package com.synebula.zeus.domain.service.cmd.rbac
import com.synebula.gaea.domain.service.Command
import com.synebula.zeus.env.AuthorityType
import com.synebula.zeus.env.ResourceType
class AuthorityBatchAddCmd : Command() {
var role = ""
var resource = listOf<String>()
var type: ResourceType? = null
var authority = AuthorityType.Allow
}

8
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/resource/PermissionCmd.kt → src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/AuthorityCmd.kt
View File

@@ -1,13 +1,13 @@
package com.synebula.zeus.domain.service.cmd.rbac.resource
package com.synebula.zeus.domain.service.cmd.rbac
import com.synebula.gaea.domain.service.Command
import com.synebula.zeus.env.PermissionType
import com.synebula.zeus.env.AuthorityType
import com.synebula.zeus.env.ResourceType
class PermissionCmd : Command() {
class AuthorityCmd : Command() {
var id: String? = null
var role = ""
var resource = ""
var type: ResourceType? = null
var authority = PermissionType.Allow
var authority = AuthorityType.Allow
}

1
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/GroupCmd.kt
View File

@@ -5,4 +5,5 @@ import com.synebula.gaea.domain.service.Command
class GroupCmd : Command() {
var id: String? = null
var name = ""
var desc = ""
}

1
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/cmd/rbac/RoleCmd.kt
View File

@@ -5,4 +5,5 @@ import com.synebula.gaea.domain.service.Command
class RoleCmd : Command() {
var id: String? = null
var name = ""
var desc = ""
}

2
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/component/IUserNotifier.kt → src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/component/IUserNotifier.kt
View File

@@ -1,4 +1,4 @@
package com.synebula.zeus.domain.service.contr.component
package com.synebula.zeus.domain.service.component
interface IUserNotifier {
fun added(id: String, name: String, token: String)

13
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IAuthorityService.kt Normal file
View File

@@ -0,0 +1,13 @@
package com.synebula.zeus.domain.service.contr.rbac
import com.synebula.gaea.domain.service.IService
import com.synebula.zeus.domain.service.cmd.rbac.AuthorityBatchAddCmd
import com.synebula.zeus.env.ResourceType
interface IAuthorityService : IService<String> {
fun add(cmd: AuthorityBatchAddCmd)
fun removeByResourceRole(type: ResourceType, resource: List<String>, role: String)
}

7
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IGroupService.kt
View File

@@ -1,7 +1,8 @@
package com.synebula.zeus.domain.service.contr.rbac
import com.synebula.gaea.domain.service.Domain
import com.synebula.gaea.domain.service.IService
import com.synebula.zeus.domain.model.rbac.Group
interface IGroupService : IService<String> {
}
@Domain(clazz = Group::class)
interface IGroupService : IService<String>

7
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/IRoleService.kt
View File

@@ -1,7 +1,8 @@
package com.synebula.zeus.domain.service.contr.rbac
import com.synebula.gaea.domain.service.Domain
import com.synebula.gaea.domain.service.IService
import com.synebula.zeus.domain.model.rbac.Role
interface IRoleService : IService<String> {
}
@Domain(clazz = Role::class)
interface IRoleService : IService<String>

7
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/resource/IInterfaceService.kt
View File

@@ -1,7 +1,8 @@
package com.synebula.zeus.domain.service.contr.rbac.resource
import com.synebula.gaea.domain.service.Domain
import com.synebula.gaea.domain.service.IService
import com.synebula.zeus.domain.model.rbac.resource.Interface
interface IInterfaceService : IService<String> {
}
@Domain(clazz = Interface::class)
interface IInterfaceService : IService<String>

7
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/resource/IPageService.kt
View File

@@ -1,7 +1,8 @@
package com.synebula.zeus.domain.service.contr.rbac.resource
import com.synebula.gaea.domain.service.Domain
import com.synebula.gaea.domain.service.IService
import com.synebula.zeus.domain.model.rbac.resource.Page
interface IPageService : IService<String> {
}
@Domain(clazz = Page::class)
interface IPageService : IService<String>

7
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/resource/IPermissionService.kt
View File

@@ -1,7 +0,0 @@
package com.synebula.zeus.domain.service.contr.rbac.resource
import com.synebula.gaea.domain.service.IService
interface IPermissionService : IService<String> {
}

7
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/contr/rbac/resource/ISystemService.kt
View File

@@ -1,7 +1,8 @@
package com.synebula.zeus.domain.service.contr.rbac.resource
import com.synebula.gaea.domain.service.Domain
import com.synebula.gaea.domain.service.IService
import com.synebula.zeus.domain.model.rbac.resource.System
interface ISystemService : IService<String> {
}
@Domain(clazz = System::class)
interface ISystemService : IService<String>

25
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/AuthorityService.kt Normal file
View File

@@ -0,0 +1,25 @@
package com.synebula.zeus.domain.service.impl.rbac
import com.synebula.gaea.data.serialization.IObjectMapper
import com.synebula.gaea.domain.service.Service
import com.synebula.zeus.domain.model.rbac.Authority
import com.synebula.zeus.domain.repository.rbac.IAuthorityRepository
import com.synebula.zeus.domain.service.cmd.rbac.AuthorityBatchAddCmd
import com.synebula.zeus.domain.service.contr.rbac.IAuthorityService
import com.synebula.zeus.env.ResourceType
class AuthorityService(
private var authorityRepository: IAuthorityRepository,
mapper: IObjectMapper
) : Service<Authority, String>(Authority::class.java, authorityRepository, mapper),
IAuthorityService {
override fun add(cmd: AuthorityBatchAddCmd) {
val authorities = cmd.resource.map { Authority(cmd.role, it, cmd.type, cmd.authority) }
this.repository.add(authorities)
}
override fun removeByResourceRole(type: ResourceType, resource: List<String>, role: String) {
this.authorityRepository.removeByResourceRole(type, resource, role)
}
}

13
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/GroupService.kt
View File

@@ -1,13 +0,0 @@
package com.synebula.zeus.domain.service.impl.rbac
import com.synebula.gaea.data.IObjectConverter
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.gaea.domain.service.Service
import com.synebula.gaea.log.ILogger
import com.synebula.zeus.domain.model.rbac.Group
import com.synebula.zeus.domain.service.contr.rbac.IGroupService
class GroupService(
repository: IRepository,
converter: IObjectConverter, logger: ILogger
) : Service<Group, String>(Group::class.java, repository, converter, logger), IGroupService

13
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/RoleService.kt
View File

@@ -1,13 +0,0 @@
package com.synebula.zeus.domain.service.impl.rbac
import com.synebula.gaea.data.IObjectConverter
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.gaea.domain.service.Service
import com.synebula.gaea.log.ILogger
import com.synebula.zeus.domain.model.rbac.Role
import com.synebula.zeus.domain.service.contr.rbac.IRoleService
class RoleService(
repository: IRepository,
converter: IObjectConverter, logger: ILogger
) : Service<Role, String>(Role::class.java, repository, converter, logger), IRoleService

82
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt
View File

@@ -1,56 +1,49 @@
package com.synebula.zeus.domain.service.impl.rbac
import com.synebula.gaea.data.IObjectConverter
import com.synebula.gaea.bus.Subscribe
import com.synebula.gaea.data.message.DataMessage
import com.synebula.gaea.data.message.Message
import com.synebula.gaea.data.message.Status
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.gaea.data.serialization.IObjectMapper
import com.synebula.gaea.domain.event.BeforeRemoveEvent
import com.synebula.gaea.domain.repository.IRepositoryFactory
import com.synebula.gaea.domain.service.ICommand
import com.synebula.gaea.domain.service.Service
import com.synebula.gaea.exception.NoticeUserException
import com.synebula.gaea.ext.toMd5
import com.synebula.gaea.log.ILogger
import com.synebula.zeus.domain.model.rbac.Group
import com.synebula.zeus.domain.model.rbac.Role
import com.synebula.zeus.domain.model.rbac.User
import com.synebula.zeus.domain.service.contr.component.IUserNotifier
import com.synebula.zeus.domain.service.contr.rbac.IGroupService
import com.synebula.zeus.domain.service.contr.rbac.IRoleService
import com.synebula.zeus.domain.service.component.IUserNotifier
import com.synebula.zeus.domain.service.contr.rbac.IUserService
import java.util.*
class UserService(
repository: IRepository,
converter: IObjectConverter,
logger: ILogger,
groupService: IGroupService,
roleService: IRoleService,
var userNotifier: IUserNotifier
) : Service<User, String>(User::class.java, repository, converter, logger), IUserService {
factory: IRepositoryFactory,
mapper: IObjectMapper,
var userNotifier: IUserNotifier?,
var logger: ILogger
) : Service<User, String>(User::class.java, factory.createRepository(User::class.java), mapper), IUserService {
init {
groupService.addBeforeRemoveListener(this.clazz.name) { id ->
val msg = Message()
if (this.repository.count(mapOf(Pair("group", id)), this.clazz) > 0) {
msg.status = Status.Failure
msg.message = "组下还有用户"
}
msg
}
roleService.addBeforeRemoveListener(this.clazz.name) { id ->
val msg = Message()
if (this.repository.count(mapOf(Pair("role", id)), this.clazz) > 0) {
msg.status = Status.Failure
msg.message = "角色下还有用户"
}
msg
@Subscribe(["groupBeforeRemoveEvent"])
fun beforeRoleRemove(event: BeforeRemoveEvent<Role, String>) {
if (this.repository.count(mapOf(Pair("role", event.id!!))) > 0)
throw NoticeUserException("角色下还有用户")
}
@Subscribe(["groupBeforeRemoveEvent"])
fun beforeGroupRemove(event: BeforeRemoveEvent<Group, String>) {
if (this.repository.count(mapOf(Pair("group", event.id!!))) > 0)
throw NoticeUserException("用户组下还有用户")
}
override fun add(command: ICommand): DataMessage<String> {
val user = this.convert(command)
val user = this.map(command)
user.password = user.password.toMd5()
user.token = UUID.randomUUID().toString()
user.alive = false
this.repository.add(user, this.clazz)
userNotifier.added(user.id!!, user.name, user.token!!)
this.repository.add(user)
userNotifier?.added(user.id!!, user.name, user.token!!)
return DataMessage(user.id!!)
}
@@ -60,28 +53,28 @@ class UserService(
* @param key 用户ID
*/
override fun active(key: String, token: String): DataMessage<Any> {
val user = this.repository.get(key, this.clazz)
val user = this.repository.get(key)!!
return if (user.alive) {
DataMessage("用户${user.name}无需重复激活")
} else {
if (token == user.token) {
user.alive = true
user.token = null
this.repository.update(user, this.clazz)
this.repository.update(user)
DataMessage(Status.Success, "用户${user.name}激活成功")
} else {
logger.warn(this, "用户${user.name}激活失败, {key: ${key}, token: ${token}")
logger.warn(this, "用户${user.name}激活失败, {key: ${key}, token: $token")
DataMessage(Status.Failure, "用户${user.name}激活失败, 请从系统发送的邮件链接激活用户")
}
}
}
override fun changePassword(key: String, password: String, newPassword: String): DataMessage<Any> {
val user = this.repository.get(key, this.clazz)
val user = this.repository.get(key)!!
return if (user.password == password.toMd5()) {
user.password = newPassword.toMd5()
user.token = null
this.repository.update(user, this.clazz)
this.repository.update(user)
DataMessage()
} else {
logger.warn(this, "用户修改${user.name}密码失败, 旧密码验证不通过")
@@ -91,24 +84,27 @@ class UserService(
override fun resetPassword(key: String, password: String, token: String?): DataMessage<Any> {
val user = this.repository.get(key, this.clazz)
val user = this.repository.get(key)!!
return if (token == user.token) {
user.password = password.toMd5()
user.token = null
this.repository.update(user, this.clazz)
this.repository.update(user)
DataMessage()
} else {
logger.warn(this, "用户重置${user.name}密码失败, 系统密码修改令牌:${user.token}, {key: ${key} , token: ${token}")
logger.warn(
this,
"用户重置${user.name}密码失败, 系统密码修改令牌:${user.token}, {key: $key , token: $token"
)
DataMessage(Status.Failure, "用户重置密码失败, 如需重置密码请从系统发送的邮件链接中重置")
}
}
override fun forgotPassword(key: String): DataMessage<String> {
val user = this.repository.get(key, this.clazz)
val user = this.repository.get(key)!!
return if (user.alive) {
user.token = UUID.randomUUID().toString()
this.repository.update(user, this.clazz)
userNotifier.forgot(user.id!!, user.name, user.token!!)
this.repository.update(user)
userNotifier?.forgot(user.id!!, user.name, user.token!!)
DataMessage()
} else
DataMessage(Status.Failure, "用户还未激活, 请先激活用户")

13
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/InterfaceService.kt
View File

@@ -1,13 +0,0 @@
package com.synebula.zeus.domain.service.impl.rbac.resource
import com.synebula.gaea.data.IObjectConverter
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.gaea.domain.service.Service
import com.synebula.gaea.log.ILogger
import com.synebula.zeus.domain.model.rbac.resource.Interface
import com.synebula.zeus.domain.service.contr.rbac.resource.IInterfaceService
class InterfaceService(
repository: IRepository,
converter: IObjectConverter, logger: ILogger
) : Service<Interface, String>(Interface::class.java, repository, converter, logger), IInterfaceService

13
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/PageService.kt
View File

@@ -1,13 +0,0 @@
package com.synebula.zeus.domain.service.impl.rbac.resource
import com.synebula.gaea.data.IObjectConverter
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.gaea.domain.service.Service
import com.synebula.gaea.log.ILogger
import com.synebula.zeus.domain.model.rbac.resource.Page
import com.synebula.zeus.domain.service.contr.rbac.resource.IPageService
class PageService(
repository: IRepository,
converter: IObjectConverter, logger: ILogger
) : Service<Page, String>(Page::class.java, repository, converter, logger), IPageService

13
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/PermissionService.kt
View File

@@ -1,13 +0,0 @@
package com.synebula.zeus.domain.service.impl.rbac.resource
import com.synebula.gaea.data.IObjectConverter
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.gaea.domain.service.Service
import com.synebula.gaea.log.ILogger
import com.synebula.zeus.domain.model.rbac.resource.Permission
import com.synebula.zeus.domain.service.contr.rbac.resource.IPermissionService
class PermissionService(
repository: IRepository,
converter: IObjectConverter, logger: ILogger
) : Service<Permission, String>(Permission::class.java, repository, converter, logger), IPermissionService

13
src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/resource/SystemService.kt
View File

@@ -1,13 +0,0 @@
package com.synebula.zeus.domain.service.impl.rbac.resource
import com.synebula.gaea.data.IObjectConverter
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.gaea.domain.service.Service
import com.synebula.gaea.log.ILogger
import com.synebula.zeus.domain.model.rbac.resource.System
import com.synebula.zeus.domain.service.contr.rbac.resource.ISystemService
class SystemService(
repository: IRepository,
converter: IObjectConverter, logger: ILogger
) : Service<System, String>(System::class.java, repository, converter, logger), ISystemService

2
src/zeus.env/build.gradle
View File

@@ -1,5 +1,5 @@
dependencies {
compile "com.synebula:gaea:$gaea_version"
api "com.synebula:gaea:$gaea_version"
}
publishing {

2
src/zeus.env/src/main/kotlin/com/synebula/zeus/env/PermissionType.kt → src/zeus.env/src/main/kotlin/com/synebula/zeus/env/AuthorityType.kt vendored
View File

@@ -1,6 +1,6 @@
package com.synebula.zeus.env
enum class PermissionType {
enum class AuthorityType {
Default,
Deny,
Allow

6
src/zeus.query/build.gradle
View File

@@ -1,13 +1,13 @@
dependencies {
compile project(":src:zeus.env")
compile "com.synebula:gaea.mongo:$gaea_version"
api project(":src:zeus.env")
api "com.synebula:gaea.mongodb:$gaea_version"
}
publishing {
publications {
publish(MavenPublication) {
group 'com.synebula'
artifactId 'zeus.view'
artifactId 'zeus.query'
version "$version"
from components.java
}

26
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IAuthorityQuery.kt Normal file
View File

@@ -0,0 +1,26 @@
package com.synebula.zeus.query.contr
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
interface IAuthorityQuery : IQuery<AuthorityView, String> {
/**
* 获取角色已授权的资源
*
* @param resourceType 资源类型
* @param role 角色id
*/
fun authorized(resourceType: ResourceType, role: String): List<AuthorityView>
/**
* 获取角色资源的授权信息
*
* @param resourceType 资源里欸选哪个
* @param resource 资源id
* @param role 角色id
*/
fun authorize(resourceType: ResourceType, resource: String, role: String): AuthorityType
}

3
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt
View File

@@ -1,10 +1,11 @@
package com.synebula.zeus.query.contr
import com.synebula.gaea.data.message.DataMessage
import com.synebula.gaea.query.IQuery
import com.synebula.zeus.query.view.SignUserView
import com.synebula.zeus.query.view.UserView
interface IUserQuery {
interface IUserQuery : IQuery<UserView, String> {
/**
* 登录接口
*

10
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IInterfaceQuery.kt
View File

@@ -1,14 +1,14 @@
package com.synebula.zeus.query.contr.resouce
import com.synebula.gaea.query.IQuery
import com.synebula.zeus.env.PermissionType
import com.synebula.zeus.env.AuthorityType
import com.synebula.zeus.query.view.resource.InterfaceView
interface IInterfaceQuery : IQuery {
interface IInterfaceQuery : IQuery<InterfaceView, String> {
fun withPermission(role: String): List<InterfaceView>
fun authorized(role: String): List<InterfaceView>
fun withPermission(role: String, system: String?): List<InterfaceView>
fun authorized(role: String, system: String?): List<InterfaceView>
fun authentication(resource: String, role: String): PermissionType?
fun authorize(resource: String, role: String): AuthorityType?
}

12
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPageQuery.kt
View File

@@ -1,16 +1,16 @@
package com.synebula.zeus.query.contr.resouce
import com.synebula.gaea.query.IQuery
import com.synebula.zeus.env.PermissionType
import com.synebula.zeus.env.AuthorityType
import com.synebula.zeus.query.view.resource.PageView
interface IPageQuery : IQuery {
interface IPageQuery : IQuery<PageView, String> {
fun withPermission(role: String): List<PageView>
fun authorized(role: String): List<PageView>
fun withPermission(role: String, system: String? ): List<PageView>
fun authorized(role: String, system: String? ): List<PageView>
fun authentication(resource: String, role: String): PermissionType?
fun authorize(resource: String, role: String): AuthorityType?
fun uriAuthentication(path: String, role: String): PermissionType?
fun uriAuthorize(path: String, role: String): AuthorityType?
}

13
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPermissionQuery.kt
View File

@@ -1,13 +0,0 @@
package com.synebula.zeus.query.contr.resouce
import com.synebula.gaea.query.IQuery
import com.synebula.zeus.env.PermissionType
import com.synebula.zeus.env.ResourceType
import com.synebula.zeus.query.view.resource.PermissionView
interface IPermissionQuery : IQuery {
fun resourcePermissions(resourceType: ResourceType, role: String): List<PermissionView>
fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType
}

8
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/ISystemQuery.kt
View File

@@ -1,12 +1,12 @@
package com.synebula.zeus.query.contr.resouce
import com.synebula.gaea.query.IQuery
import com.synebula.zeus.env.PermissionType
import com.synebula.zeus.env.AuthorityType
import com.synebula.zeus.query.view.resource.SystemView
interface ISystemQuery : IQuery {
interface ISystemQuery : IQuery<SystemView, String> {
fun withPermission(role: String): List<SystemView>
fun authorized(role: String): List<SystemView>
fun authentication(resource: String, role: String): PermissionType?
fun authorize(resource: String, role: String): AuthorityType?
}

35
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/AuthorityQuery.kt Normal file
View File

@@ -0,0 +1,35 @@
package com.synebula.zeus.query.impl
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
import org.springframework.data.mongodb.core.MongoTemplate
import org.springframework.data.mongodb.core.query.Criteria
import org.springframework.data.mongodb.core.query.Query
class AuthorityQuery(template: MongoTemplate) :
MongodbQuery<AuthorityView, String>(AuthorityView::class.java, template), IAuthorityQuery {
var collection = this.collection(this.clazz)
override fun authorized(resourceType: ResourceType, role: String): List<AuthorityView> {
return this.template.find(
Query.query(
Criteria.where("type").`is`(resourceType)
.and("role").`is`(role)
), this.clazz, this.collection
)
}
override fun authorize(resourceType: ResourceType, resource: String, role: String): AuthorityType {
val authority = this.template.findOne(
Query.query(
Criteria.where("type").`is`(resourceType)
.and("resource").`is`(resource)
.and("role").`is`(role)
), this.clazz, this.collection
)
return authority?.authority ?: AuthorityType.Default
}
}

9
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt
View File

@@ -3,7 +3,8 @@ package com.synebula.zeus.query.impl
import com.synebula.gaea.data.message.DataMessage
import com.synebula.gaea.data.message.Status
import com.synebula.gaea.ext.toMd5
import com.synebula.gaea.mongo.whereId
import com.synebula.gaea.mongodb.query.MongodbQuery
import com.synebula.gaea.mongodb.whereId
import com.synebula.zeus.query.contr.IUserQuery
import com.synebula.zeus.query.view.GroupView
import com.synebula.zeus.query.view.RoleView
@@ -14,8 +15,8 @@ import org.springframework.data.mongodb.core.query.Criteria
import org.springframework.data.mongodb.core.query.Query
import org.springframework.data.mongodb.core.query.isEqualTo
class UserQuery(var template: MongoTemplate) : IUserQuery {
private val clazz = UserView::class.java
class UserQuery(template: MongoTemplate) :
MongodbQuery<UserView, String>(UserView::class.java, template), IUserQuery {
override fun signIn(name: String, password: String): DataMessage<SignUserView> {
val query = Query.query(
@@ -29,7 +30,7 @@ class UserQuery(var template: MongoTemplate) : IUserQuery {
val group = this.template.findOne(whereId(user.group), GroupView::class.java, "group")
DataMessage(
SignUserView(
user.id, user.name, user.realName ?: "",
user.id, user.realName ?: "",
user.role ?: "", role?.name ?: "",
user.group ?: "", group?.name ?: ""
)

40
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/InterfaceQuery.kt
View File

@@ -1,42 +1,42 @@
package com.synebula.zeus.query.impl.resouce
import com.synebula.gaea.mongo.query.MongoQuery
import com.synebula.zeus.env.PermissionType
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
import com.synebula.zeus.query.contr.resouce.IPermissionQuery
import com.synebula.zeus.query.contr.resouce.ISystemQuery
import com.synebula.zeus.query.view.resource.InterfaceView
import org.springframework.data.mongodb.core.MongoTemplate
class InterfaceQuery(template: MongoTemplate, var permissionQuery: IPermissionQuery, var systemQuery: ISystemQuery) :
MongoQuery(template),
IInterfaceQuery {
class InterfaceQuery(
template: MongoTemplate,
var authorityQuery: IAuthorityQuery,
var systemQuery: ISystemQuery
) : MongodbQuery<InterfaceView, String>(InterfaceView::class.java, template), IInterfaceQuery {
private val clazz = InterfaceView::class.java
override fun withPermission(role: String): List<InterfaceView> {
return this.withPermission(role, null)
override fun authorized(role: String): List<InterfaceView> {
return this.authorized(role, null)
}
override fun withPermission(role: String, system: String?): List<InterfaceView> {
override fun authorized(role: String, system: String?): List<InterfaceView> {
if (system != null) {
val permission = this.systemQuery.authentication(system, role)
if (permission == PermissionType.Deny)
val authority = this.systemQuery.authorize(system, role)
if (authority == AuthorityType.Deny)
return listOf()
}
val params = mutableMapOf<String, Any>()
val params = mutableMapOf<String, String>()
if (system != null) params["system"] = system
val interfaces = this.list(params, this.clazz)
val permissions = this.permissionQuery.resourcePermissions(ResourceType.Interface, role)
val interfaces = this.list(params)
val authorities = this.authorityQuery.authorized(ResourceType.Interface, role)
return interfaces.filter { i ->
val permission = permissions.find { p -> i.id == p.resource }
permission == null || permission.authority == PermissionType.Allow
val authority = authorities.find { p -> i.id == p.resource }
authority == null || authority.authority == AuthorityType.Allow
}
}
override fun authentication(resource: String, role: String): PermissionType? {
return this.permissionQuery.authentication(ResourceType.Interface, resource, role)
override fun authorize(resource: String, role: String): AuthorityType {
return this.authorityQuery.authorize(ResourceType.Interface, resource, role)
}
}

45
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt
View File

@@ -1,47 +1,48 @@
package com.synebula.zeus.query.impl.resouce
import com.synebula.gaea.mongo.query.MongoQuery
import com.synebula.zeus.env.PermissionType
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
import com.synebula.zeus.query.contr.resouce.IPermissionQuery
import com.synebula.zeus.query.contr.resouce.ISystemQuery
import com.synebula.zeus.query.view.resource.PageView
import org.springframework.data.mongodb.core.MongoTemplate
import org.springframework.data.mongodb.core.query.Criteria
import org.springframework.data.mongodb.core.query.Query
class PageQuery(template: MongoTemplate, var permissionQuery: IPermissionQuery, var systemQuery: ISystemQuery) :
MongoQuery(template), IPageQuery {
private val clazz = PageView::class.java
class PageQuery(template: MongoTemplate, var authorityQuery: IAuthorityQuery, var systemQuery: ISystemQuery) :
MongodbQuery<PageView, String>(PageView::class.java, template), IPageQuery {
override fun withPermission(role: String): List<PageView> {
return this.withPermission(role, null)
override fun authorized(role: String): List<PageView> {
return this.authorized(role, null)
}
override fun withPermission(role: String, system: String?): List<PageView> {
override fun authorized(role: String, system: String?): List<PageView> {
if (system != null) {
val permission = this.systemQuery.authentication(system, role)
if (permission == PermissionType.Deny)
val authority = this.systemQuery.authorize(system, role)
if (authority == AuthorityType.Deny)
return listOf()
}
val params = mutableMapOf<String, Any>()
val params = mutableMapOf<String, String>()
if (system != null) params["system"] = system
val pages = this.list(params, this.clazz)
val permissions = this.permissionQuery.resourcePermissions(ResourceType.Page, role)
val pages = this.list(params)
val authorities = this.authorityQuery.authorized(ResourceType.Page, role)
return pages.filter { i ->
val permission = permissions.find { p -> i.id == p.resource }
permission != null && permission.authority == PermissionType.Allow
val authority = authorities.find { p -> i.id == p.resource }
authority != null && authority.authority == AuthorityType.Allow
}
}
override fun authentication(resource: String, role: String): PermissionType? {
return this.permissionQuery.authentication(ResourceType.Page, resource, role)
override fun authorize(resource: String, role: String): AuthorityType {
return this.authorityQuery.authorize(ResourceType.Page, resource, role)
}
override fun uriAuthentication(path: String, role: String): PermissionType? {
val page = this.template.findOne(Query.query(Criteria.where("uri").`is`(path)),
this.clazz, this.collection(this.clazz)) ?: return null
return this.authentication(page.id!!, role)
override fun uriAuthorize(path: String, role: String): AuthorityType? {
val page = this.template.findOne(
Query.query(Criteria.where("uri").`is`(path)),
this.clazz, this.collection(this.clazz)
) ?: return null
return this.authorize(page.id!!, role)
}
}

33
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt
View File

@@ -1,33 +0,0 @@
package com.synebula.zeus.query.impl.resouce
import com.synebula.gaea.mongo.query.MongoQuery
import com.synebula.zeus.env.PermissionType
import com.synebula.zeus.env.ResourceType
import com.synebula.zeus.query.contr.resouce.IPermissionQuery
import com.synebula.zeus.query.view.resource.PermissionView
import org.springframework.data.mongodb.core.MongoTemplate
import org.springframework.data.mongodb.core.query.Criteria
import org.springframework.data.mongodb.core.query.Query
class PermissionQuery(template: MongoTemplate) : MongoQuery(template), IPermissionQuery {
var clazz = PermissionView::class.java
var collection = this.collection(this.clazz)
override fun resourcePermissions(resourceType: ResourceType, role: String): List<PermissionView> {
return this.template.find(
Query.query(
Criteria.where("type").`is`(resourceType)
.and("role").`is`(role)
), this.clazz, this.collection)
}
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 ?: PermissionType.Default
}
}

21
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/SystemQuery.kt
View File

@@ -1,22 +1,23 @@
package com.synebula.zeus.query.impl.resouce
import com.synebula.gaea.mongo.query.MongoQuery
import com.synebula.zeus.env.PermissionType
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
import com.synebula.zeus.query.view.resource.SystemView
import org.springframework.data.mongodb.core.MongoTemplate
class SystemQuery(template: MongoTemplate, var permissionQuery: PermissionQuery) : MongoQuery(template), ISystemQuery {
private val clazz = SystemView::class.java
class SystemQuery(template: MongoTemplate, var authorityQuery: IAuthorityQuery) :
MongodbQuery<SystemView, String>(SystemView::class.java, template), ISystemQuery {
override fun withPermission(role: String): List<SystemView> {
val systems = this.list(mapOf(), this.clazz)
val permissions = this.permissionQuery.resourcePermissions(ResourceType.System, role)
return systems.filter { i -> permissions.find { p -> i.id == p.resource }?.authority == PermissionType.Allow }
override fun authorized(role: String): List<SystemView> {
val systems = this.list(mapOf())
val authorities = this.authorityQuery.authorized(ResourceType.System, role)
return systems.filter { i -> authorities.find { p -> i.id == p.resource }?.authority == AuthorityType.Allow }
}
override fun authentication(resource: String, role: String): PermissionType? {
return this.permissionQuery.authentication(ResourceType.System, resource, role)
override fun authorize(resource: String, role: String): AuthorityType {
return this.authorityQuery.authorize(ResourceType.System, resource, role)
}
}

12
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/AuthorityView.kt Normal file
View File

@@ -0,0 +1,12 @@
package com.synebula.zeus.query.view
import com.synebula.zeus.env.AuthorityType
import com.synebula.zeus.env.ResourceType
class AuthorityView() {
var id: String? = null
var role = ""
var resource = ""
var type: ResourceType? = null
var authority = AuthorityType.Allow
}

11
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/GroupView.kt
View File

@@ -1,13 +1,16 @@
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
import com.synebula.gaea.query.Operator
import com.synebula.gaea.query.Table
import com.synebula.gaea.query.Where
@Table("group")
class GroupView {
var id: String? = null
@Where(Operator.like)
@Where(Operator.Like)
var name = ""
var desc = ""
}

3
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/RoleView.kt
View File

@@ -1,9 +1,10 @@
package com.synebula.zeus.query.view
import com.synebula.gaea.query.annotation.Table
import com.synebula.gaea.query.Table
@Table("role")
class RoleView {
var id: String? = null
var name = ""
var desc = ""
}

37
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt
View File

@@ -1,11 +1,34 @@
package com.synebula.zeus.query.view
class SignUserView(
var id: String = "",
var name: String = "",
var realName: String = "",
var role: String = "",
var roleName: String = "",
var group: String = "",
var groupName: String = ""
/**
* 用户id
*/
var uid: String = "",
/**
* 用户名称
*/
var uname: String = "",
/**
* 角色id
*/
var rid: String = "",
/**
* 角色名称
*/
var rname: String = "",
/**
* 组id
*/
var gid: String = "",
/**
* 组名称
*/
var gname: String = "",
var remember: Boolean = false
)

8
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/UserView.kt
View File

@@ -1,8 +1,8 @@
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
import com.synebula.gaea.query.Operator
import com.synebula.gaea.query.Table
import com.synebula.gaea.query.Where
@Table("user")
class UserView {
@@ -12,7 +12,7 @@ class UserView {
var password: String = ""
@Where(Operator.like)
@Where(Operator.Like)
var realName: String? = null
var phone: String? = null

12
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/resource/PermissionView.kt
View File

@@ -1,12 +0,0 @@
package com.synebula.zeus.query.view.resource
import com.synebula.zeus.env.PermissionType
import com.synebula.zeus.env.ResourceType
class PermissionView() {
var id: String? = null
var role = ""
var resource = ""
var type: ResourceType? = null
var authority = PermissionType.Allow
}

17
src/zeus.repository/build.gradle Normal file
View File

@@ -0,0 +1,17 @@
dependencies {
api project(":src:zeus.env")
api project(":src:zeus.domain")
api "com.synebula:gaea.mongodb:$gaea_version"
}
publishing {
publications {
publish(MavenPublication) {
group 'com.synebula'
artifactId 'zeus.repository'
version "$version"
from components.java
}
}
}

23
src/zeus.repository/src/main/kotlin/com/synebula/zeus/repository/AuthorityRepository.kt Normal file
View File

@@ -0,0 +1,23 @@
package com.synebula.zeus.repository
import com.synebula.gaea.mongodb.repository.MongodbRepository
import com.synebula.zeus.domain.model.rbac.Authority
import com.synebula.zeus.domain.repository.rbac.IAuthorityRepository
import com.synebula.zeus.env.ResourceType
import org.springframework.data.mongodb.core.MongoTemplate
import org.springframework.data.mongodb.core.query.Criteria
import org.springframework.data.mongodb.core.query.Query
class AuthorityRepository(var template: MongoTemplate) :
MongodbRepository<Authority, String>(Authority::class.java, template), IAuthorityRepository {
override fun removeByResourceRole(type: ResourceType, resource: List<String>, role: String) {
this.template.remove(
Query.query(
Criteria.where("type").`is`(type)
.and("resource").`in`(resource)
.and("role").`is`(role)
),
Authority::class.java
)
}
}