From 3d3d6099fea630402aba5ffbe4b2412f89b95f7d Mon Sep 17 00:00:00 2001
From: alex <reizero@live.com>
Date: Wed, 27 May 2020 17:22:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kotlin/com/synebula/zeus/query/contr/IUserQuery.kt     | 3 ++-
 .../main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt  | 5 +++--
 .../kotlin/com/synebula/zeus/query/view/SignUserView.kt    | 7 +++++++
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt

diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt
index d48ddf2..6938c3e 100644
--- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt
+++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/IUserQuery.kt
@@ -1,6 +1,7 @@
 package com.synebula.zeus.query.contr
 
 import com.synebula.gaea.data.message.Message
+import com.synebula.zeus.query.view.SignUserView
 
 interface IUserQuery {
     /**
@@ -11,5 +12,5 @@ interface IUserQuery {
      *
      * @return 返回消息体, 200为登录成功, data为用户ID
      */
-    fun signIn(name: String, password: String): Message<String>
+    fun signIn(name: String, password: String): Message<SignUserView>
 }
\ No newline at end of file
diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt
index 0038968..eb68eef 100644
--- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt
+++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/UserQuery.kt
@@ -6,6 +6,7 @@ import com.synebula.gaea.extension.toMd5
 import com.synebula.gaea.mongo.query.MongoGenericQuery
 import com.synebula.gaea.mongo.query.MongoQuery
 import com.synebula.zeus.query.contr.IUserQuery
+import com.synebula.zeus.query.view.SignUserView
 import com.synebula.zeus.query.view.UserView
 import org.springframework.data.mongodb.core.MongoTemplate
 import org.springframework.data.mongodb.core.query.Criteria
@@ -15,7 +16,7 @@ import org.springframework.data.mongodb.core.query.isEqualTo
 class UserQuery(template: MongoTemplate) :
     MongoGenericQuery<UserView>("user", UserView::class.java, template), IUserQuery {
 
-    override fun signIn(name: String, password: String): Message<String> {
+    override fun signIn(name: String, password: String): Message<SignUserView> {
         this.check()
         val query = Query.query(
             Criteria.where("name").isEqualTo(name)
@@ -24,7 +25,7 @@ class UserQuery(template: MongoTemplate) :
         )
         val user = this.template.findOne(query, this.clazz!!)
         return if (user != null)
-            Message(user.id)
+            Message(SignUserView(user.id, user.name, user.role ?: ""))
         else
             Message(Status.Failure, "用户名或密码错误")
     }
diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt
new file mode 100644
index 0000000..d583f4b
--- /dev/null
+++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/view/SignUserView.kt
@@ -0,0 +1,7 @@
+package com.synebula.zeus.query.view
+
+class SignUserView(
+    var id: String = "",
+    var name: String = "",
+    var role: String = ""
+)
\ No newline at end of file