feat: 1.1.1 fix typo
This commit is contained in:
@@ -4,7 +4,7 @@ buildscript {
|
||||
ext {
|
||||
jvm_version = '21'
|
||||
kotlin_version = '2.0.0'
|
||||
gaea_version = '1.7.1'
|
||||
gaea_version = '1.7.2'
|
||||
spring_version = "3.3.0"
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ subprojects {
|
||||
version version
|
||||
|
||||
ext {
|
||||
version '1.1.0'
|
||||
version '1.1.1'
|
||||
}
|
||||
|
||||
buildscript {
|
||||
|
||||
@@ -4,5 +4,5 @@ import com.synebula.gaea.domain.model.IAggregateRoot
|
||||
|
||||
class Interface : Resource(), IAggregateRoot<String> {
|
||||
var system = ""
|
||||
override var avalible = true
|
||||
override var available = true
|
||||
}
|
||||
@@ -16,6 +16,6 @@ class Page : Resource(), IAggregateRoot<String> {
|
||||
// 所属系统
|
||||
var system = ""
|
||||
|
||||
override var avalible = true
|
||||
override var available = true
|
||||
|
||||
}
|
||||
@@ -3,5 +3,5 @@ package com.synebula.zeus.domain.model.rbac.resource
|
||||
import com.synebula.gaea.domain.model.IAggregateRoot
|
||||
|
||||
class System : Resource(), IAggregateRoot<String> {
|
||||
override var avalible = true
|
||||
override var available = true
|
||||
}
|
||||
@@ -41,7 +41,7 @@ class UserService(
|
||||
val user = this.map(command)
|
||||
user.password = user.password.toMd5()
|
||||
user.token = UUID.randomUUID().toString()
|
||||
user.avalible = false
|
||||
user.available = false
|
||||
this.repository.add(user)
|
||||
userNotifier?.added(user.id!!, user.name, user.token!!)
|
||||
return DataMessage(user.id!!)
|
||||
@@ -54,11 +54,11 @@ class UserService(
|
||||
*/
|
||||
override fun active(key: String, token: String): DataMessage<Any> {
|
||||
val user = this.repository.get(key)!!
|
||||
return if (user.avalible) {
|
||||
return if (user.available) {
|
||||
DataMessage("用户${user.name}无需重复激活")
|
||||
} else {
|
||||
if (token == user.token) {
|
||||
user.avalible = true
|
||||
user.available = true
|
||||
user.token = null
|
||||
this.repository.update(user)
|
||||
DataMessage(Status.SUCCESS, "用户${user.name}激活成功")
|
||||
@@ -101,7 +101,7 @@ class UserService(
|
||||
|
||||
override fun forgotPassword(key: String): DataMessage<String> {
|
||||
val user = this.repository.get(key)!!
|
||||
return if (user.avalible) {
|
||||
return if (user.available) {
|
||||
user.token = UUID.randomUUID().toString()
|
||||
this.repository.update(user)
|
||||
userNotifier?.forgot(user.id!!, user.name, user.token!!)
|
||||
|
||||
Reference in New Issue
Block a user