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

修改引用0.11.0

Browse Source
This commit is contained in:
alex
2021-05-13 19:07:33 +08:00
parent d0807c56fa
commit 65ced3febe
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -22,7 +22,7 @@ allprojects {
subprojects { subprojects {
ext { ext {
version '0.7.0' version '0.7.0'
gaea_version = '0.10.3' gaea_version = '0.11.0'
spring_version = "2.3.0.RELEASE" spring_version = "2.3.0.RELEASE"
} }

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

@@ -60,7 +60,7 @@ class UserService(
* @param key 用户ID * @param key 用户ID
*/ */
override fun active(key: String, token: String): DataMessage<Any> { override fun active(key: String, token: String): DataMessage<Any> {
val user = this.repository.get(key, this.clazz) val user = this.repository.get(key, this.clazz)!!
return if (user.alive) { return if (user.alive) {
DataMessage("用户${user.name}无需重复激活") DataMessage("用户${user.name}无需重复激活")
} else { } else {
@@ -77,7 +77,7 @@ class UserService(
} }
override fun changePassword(key: String, password: String, newPassword: String): DataMessage<Any> { 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, this.clazz)!!
return if (user.password == password.toMd5()) { return if (user.password == password.toMd5()) {
user.password = newPassword.toMd5() user.password = newPassword.toMd5()
user.token = null user.token = null
@@ -91,7 +91,7 @@ class UserService(
override fun resetPassword(key: String, password: String, token: String?): DataMessage<Any> { 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, this.clazz)!!
return if (token == user.token) { return if (token == user.token) {
user.password = password.toMd5() user.password = password.toMd5()
user.token = null user.token = null
@@ -104,7 +104,7 @@ class UserService(
} }
override fun forgotPassword(key: String): DataMessage<String> { override fun forgotPassword(key: String): DataMessage<String> {
val user = this.repository.get(key, this.clazz) val user = this.repository.get(key, this.clazz)!!
return if (user.alive) { return if (user.alive) {
user.token = UUID.randomUUID().toString() user.token = UUID.randomUUID().toString()
this.repository.update(user, this.clazz) this.repository.update(user, this.clazz)