增加用户重置密码功能

This commit is contained in:
2020-05-28 17:02:13 +08:00
parent 3d3d6099fe
commit 2535ae08d0
8 changed files with 101 additions and 29 deletions

View File

@@ -8,4 +8,5 @@ class User(override var id: String? = null) : AggregateRoot<String>() {
var realName: String? = null
var phone: String? = null
var role: String = ""
var token: String? = null
}

View File

@@ -0,0 +1,7 @@
package com.synebula.zeus.domain.service.contr.component
interface IUserNotifier {
fun added(id: String, name: String, token: String)
fun forgot(id: String, name: String, token: String)
}

View File

@@ -1,5 +1,6 @@
package com.synebula.zeus.domain.service.contr.rbac
import com.synebula.gaea.data.message.Message
import com.synebula.gaea.domain.service.IService
interface IUserService : IService<String> {
@@ -7,6 +8,23 @@ interface IUserService : IService<String> {
* 激活用户
*
* @param key 用户ID
* @param token 激活密令
*/
fun active(key: String)
fun active(key: String, token: String): Message<Any>
/**
* 激活用户
*
* @param key 用户ID
* @param token 激活密令
*/
fun changePassword(key: String, password: String, token: String): Message<Any>
/**
* 激活用户
*
* @param key 用户ID
*/
fun forgotPassword(key: String): Message<String>
}

View File

@@ -2,21 +2,31 @@ package com.synebula.zeus.domain.service.impl.rbac
import com.synebula.gaea.data.IObjectConverter
import com.synebula.gaea.data.message.Message
import com.synebula.gaea.data.message.Status
import com.synebula.gaea.domain.repository.IRepository
import com.synebula.gaea.domain.service.ICommand
import com.synebula.gaea.domain.service.Service
import com.synebula.gaea.extension.*
import com.synebula.gaea.log.ILogger
import com.synebula.zeus.domain.model.rbac.User
import com.synebula.zeus.domain.service.contr.component.IUserNotifier
import com.synebula.zeus.domain.service.contr.rbac.IUserService
import java.util.*
class UserService(repository: IRepository, converter: IObjectConverter, logger: ILogger) :
class UserService(
repository: IRepository,
converter: IObjectConverter,
logger: ILogger,
var userNotifier: IUserNotifier
) :
Service<User, String>(User::class.java, repository, converter, logger), IUserService {
override fun add(command: ICommand): Message<String> {
val user = this.convert(command)
user.password = user.password.toMd5()
user.token = UUID.randomUUID().toString()
user.alive = false
this.repository.add(user, this.clazz)
userNotifier.added(user.id!!, user.name, user.token!!)
return Message(user.id!!)
}
@@ -25,11 +35,42 @@ class UserService(repository: IRepository, converter: IObjectConverter, logger:
*
* @param key 用户ID
*/
override fun active(key: String) {
override fun active(key: String, token: String): Message<Any> {
val user = this.repository.get(key, this.clazz)
if (!user.alive) {
user.alive = true
this.repository.update(user, this.clazz)
return if (user.alive) {
Message("用户${user.name}无需重复激活")
} else {
if (token == user.token) {
user.alive = true
user.token = null
this.repository.update(user, this.clazz)
Message(Status.Success, "用户${user.name}激活成功")
} else {
Message(Status.Failure, "用户${user.name}激活失败, 请从系统发送的邮件链接激活用户")
}
}
}
override fun changePassword(key: String, password: String, token: String): Message<Any> {
val user = this.repository.get(key, this.clazz)
return if (token == user.token) {
user.password = password.toMd5()
user.token = null
this.repository.update(user, this.clazz)
Message()
} else {
Message(Status.Failure, "用户密码修改失败, 请从系统发送的邮件链接中修改密码")
}
}
override fun forgotPassword(key: String): Message<String> {
val user = this.repository.get(key, this.clazz)
return if (user.alive) {
user.token = UUID.randomUUID().toString()
this.repository.update(user, this.clazz)
userNotifier.forgot(user.id!!, user.name, user.token!!)
Message()
} else
Message(Status.Failure, "用户还未激活, 请先激活用户")
}
}