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

修改命名和Message引用

Browse Source
This commit is contained in:
alex
2020-10-30 22:58:38 +08:00
parent dda4411f05
commit 95536cf6f9
4 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt
View File

@@ -1,6 +1,6 @@
package com.synebula.zeus.query.contr
import com.synebula.gaea.data.message.Message
import com.synebula.gaea.data.message.DataMessage
import com.synebula.zeus.query.view.SignUserView
import com.synebula.zeus.query.view.UserView
@@ -13,7 +13,7 @@ interface IUserQuery {
*
* @return 返回消息体, 200为登录成功, data为用户ID
*/
fun signIn(name: String, password: String): Message<SignUserView>
fun signIn(name: String, password: String): DataMessage<SignUserView>
/**
* 列出用户列表

10
src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt
View File

@@ -1,8 +1,8 @@
package com.synebula.zeus.query.impl
import com.synebula.gaea.data.message.Message
import com.synebula.gaea.data.message.DataMessage
import com.synebula.gaea.data.message.Status
import com.synebula.gaea.extension.toMd5
import com.synebula.gaea.ext.toMd5
import com.synebula.gaea.mongo.whereId
import com.synebula.zeus.query.contr.IUserQuery
import com.synebula.zeus.query.view.GroupView
@@ -17,7 +17,7 @@ import org.springframework.data.mongodb.core.query.isEqualTo
class UserQuery(var template: MongoTemplate) : IUserQuery {
private val clazz = UserView::class.java
override fun signIn(name: String, password: String): Message<SignUserView> {
override fun signIn(name: String, password: String): DataMessage<SignUserView> {
val query = Query.query(
Criteria.where("name").isEqualTo(name)
.and("password").isEqualTo(password.toMd5())
@@ -27,7 +27,7 @@ class UserQuery(var template: MongoTemplate) : IUserQuery {
return if (user != null) {
val role = this.template.findOne(whereId(user.role), RoleView::class.java, "role")
val group = this.template.findOne(whereId(user.group), GroupView::class.java, "group")
Message(
DataMessage(
SignUserView(
user.id, user.name, user.realName ?: "",
user.role ?: "", role?.name ?: "",
@@ -35,7 +35,7 @@ class UserQuery(var template: MongoTemplate) : IUserQuery {
)
)
} else
Message(Status.Failure, "用户名或密码错误")
DataMessage(Status.Failure, "用户名或密码错误")
}