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 {