diff --git a/build.gradle b/build.gradle index 827745d..843f9ad 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ allprojects { subprojects { ext { version '0.7.0' - gaea_version = '0.10.3' + gaea_version = '0.11.0' spring_version = "2.3.0.RELEASE" } diff --git a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt index 0af5f01..fbea66e 100644 --- a/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt +++ b/src/zeus.domain/src/main/kotlin/com/synebula/zeus/domain/service/impl/rbac/UserService.kt @@ -60,7 +60,7 @@ class UserService( * @param key 用户ID */ override fun active(key: String, token: String): DataMessage { - val user = this.repository.get(key, this.clazz) + val user = this.repository.get(key, this.clazz)!! return if (user.alive) { DataMessage("用户${user.name}无需重复激活") } else { @@ -77,7 +77,7 @@ class UserService( } override fun changePassword(key: String, password: String, newPassword: String): DataMessage { - val user = this.repository.get(key, this.clazz) + val user = this.repository.get(key, this.clazz)!! return if (user.password == password.toMd5()) { user.password = newPassword.toMd5() user.token = null @@ -91,7 +91,7 @@ class UserService( override fun resetPassword(key: String, password: String, token: String?): DataMessage { - val user = this.repository.get(key, this.clazz) + val user = this.repository.get(key, this.clazz)!! return if (token == user.token) { user.password = password.toMd5() user.token = null @@ -104,7 +104,7 @@ class UserService( } override fun forgotPassword(key: String): DataMessage { - val user = this.repository.get(key, this.clazz) + val user = this.repository.get(key, this.clazz)!! return if (user.alive) { user.token = UUID.randomUUID().toString() this.repository.update(user, this.clazz)