From 48d761e79c7739be53131bae3ce4df8929ec5575 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 25 May 2021 15:13:08 +0800 Subject: [PATCH] =?UTF-8?q?0.7.1=20=E4=BF=AE=E6=94=B9=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=ACgaea=E5=BC=95=E5=85=A5=E5=B8=A6=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E8=AF=AD=E6=B3=95=E8=A7=84=E8=8C=83=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++-- .../kotlin/com/synebula/zeus/app/controller/rbac/UserApp.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 843f9ad..4d5dcd0 100644 --- a/build.gradle +++ b/build.gradle @@ -21,8 +21,8 @@ allprojects { subprojects { ext { - version '0.7.0' - gaea_version = '0.11.0' + version '0.7.1' + gaea_version = '0.13.0' spring_version = "2.3.0.RELEASE" } 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 80eca15..cc44721 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 @@ -28,7 +28,7 @@ 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) + val list = this.query.list(mapOf(Pair("name", command.name)), UserView::class.java) if (list.count() == 0) it.from(super.add(command)) else { @@ -54,8 +54,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)), UserView::class.java) + if (users.isNotEmpty()) { it.load((this.service as IUserService).forgotPassword(users[0].id)) } else {