diff --git a/build.gradle b/build.gradle index 153c20c..241d8e2 100644 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,8 @@ allprojects { subprojects { ext { - version '0.6.1' - gaea_version = '0.9.0' + version '0.6.2' + gaea_version = '0.9.1' spring_version = "2.3.0.RELEASE" } 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 7a338af..aa1a8e5 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,6 +1,7 @@ package com.synebula.zeus.app.controller import com.synebula.gaea.app.IApplication +import com.synebula.gaea.app.component.aop.annotation.MethodName import com.synebula.gaea.app.component.security.TokenManager import com.synebula.gaea.app.struct.HttpMessage import com.synebula.gaea.data.message.Status @@ -37,6 +38,7 @@ class SignInOutApp(override var logger: ILogger?) : IApplication { override var name: String = "用户登录管理" + @MethodName("用户登录") @PostMapping("/in") fun signIn(name: String, password: String, remember: Boolean?): HttpMessage { return this.safeExecute("用户登录出现异常") { @@ -52,11 +54,13 @@ class SignInOutApp(override var logger: ILogger?) : IApplication { } } + @MethodName("用户登出") @PostMapping("/out") fun signOut(user: String): HttpMessage { return HttpMessage(user) } + @MethodName("用户注册") @PostMapping("/up") fun signUp(@RequestBody command: UserCmd): HttpMessage { return this.safeExecute("用户注册出错, 用户信息: ${serializer.serialize(command)}") { 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 9e84bc7..6ae965c 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,7 @@ package com.synebula.zeus.app.controller.rbac.resource import com.synebula.gaea.app.Application +import com.synebula.gaea.app.component.aop.annotation.MethodName import com.synebula.gaea.app.struct.HttpMessage import com.synebula.gaea.log.ILogger import com.synebula.zeus.domain.service.cmd.rbac.resource.InterfaceCmd @@ -23,6 +24,7 @@ class InterfaceApp( service, interfaceQuery, logger ) { + @MethodName("获取角色系统下有权接口") @GetMapping("/in-system/{system}/authorized/{role}") fun authorized(@PathVariable system: String, @PathVariable role: String): HttpMessage { return this.safeExecute("获取有权资源列表失败") { msg -> @@ -30,6 +32,7 @@ class InterfaceApp( } } + @MethodName("获取角色全部有权接口") @GetMapping("/authorized/{role}") fun authorized(@PathVariable role: String): HttpMessage { return this.safeExecute("获取有权资源列表失败") { msg -> @@ -37,6 +40,7 @@ class InterfaceApp( } } + @MethodName("验证角色接口权限") @GetMapping("/{api}/authorize/{role}") fun authorize(@PathVariable api: String, @PathVariable role: String): HttpMessage { return this.safeExecute("获取权限信息失败") { msg -> 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 ddf73d0..cd6501e 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,7 @@ package com.synebula.zeus.app.controller.rbac.resource import com.synebula.gaea.app.Application +import com.synebula.gaea.app.component.aop.annotation.MethodName import com.synebula.gaea.app.component.aop.annotation.ModuleName import com.synebula.gaea.app.struct.HttpMessage import com.synebula.gaea.log.ILogger @@ -25,6 +26,7 @@ class PageApp( service, pageQuery, logger ) { + @MethodName("获取角色系统下有权页面") @GetMapping("/in-system/{system}/authorized/{role}") fun authorized(@PathVariable system: String, @PathVariable role: String): HttpMessage { val msg = HttpMessage() @@ -32,6 +34,7 @@ class PageApp( return msg } + @MethodName("获取角色全部有权页面") @GetMapping("/authorized/{role}") fun authorized(@PathVariable role: String): HttpMessage { return this.safeExecute("获取有权资源列表失败") { msg -> @@ -39,6 +42,7 @@ class PageApp( } } + @MethodName("验证角色页面权限") @GetMapping("/{page}/authorize/{role}") fun authorize(@PathVariable page: String, @PathVariable role: String): HttpMessage { return this.safeExecute("获取权限信息失败") { msg -> @@ -46,6 +50,7 @@ class PageApp( } } + @MethodName("验证角色URL权限") @GetMapping("/authorize/{role}") fun uriAuthorize(@PathVariable role: String, uri: String): HttpMessage { return this.safeExecute("获取权限信息失败") { msg -> 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 cbdfd2b..b249078 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,7 @@ package com.synebula.zeus.app.controller.rbac.resource import com.synebula.gaea.app.Application +import com.synebula.gaea.app.component.aop.annotation.MethodName import com.synebula.gaea.app.struct.HttpMessage import com.synebula.gaea.log.ILogger import com.synebula.zeus.domain.service.cmd.rbac.resource.SystemCmd @@ -22,6 +23,7 @@ class SystemApp( "系统信息", SystemView::class.java, service, systemQuery, logger ) { + @MethodName("获取角色有权系统") @GetMapping("/authorized/{role}") fun authorized(@PathVariable role: String): HttpMessage { return this.safeExecute("获取有权资源列表失败") { msg -> @@ -29,6 +31,7 @@ class SystemApp( } } + @MethodName("验证角色系统权限") @GetMapping("/{system}/authorize/{role}") fun authorize(@PathVariable system: String, @PathVariable role: String): HttpMessage { return this.safeExecute("获取权限信息失败") { msg ->