From d31bf1af9d9dcfb5354166a8f88821f0f9e8e156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com>
Date: Tue, 19 Oct 2021 17:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/UserController.cs             |   6 +++---
 .../SwaggerDoc.xml                            |  12 ++++++++++++
 .../Yi.Framework.ApiMicroservice/YIDB.db      | Bin 65536 -> 65536 bytes
 .../Yi.Framework.ApiMicroservice/YIDB.db-shm  | Bin 32768 -> 0 bytes
 .../Yi.Framework.ApiMicroservice/YIDB.db-wal  | Bin 206032 -> 0 bytes
 5 files changed, 15 insertions(+), 3 deletions(-)
 delete mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm
 delete mode 100644 Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
index 45ce5679..da355365 100644
--- a/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
+++ b/Yi.Framework/Yi.Framework.ApiMicroservice/Controllers/UserController.cs
@@ -112,10 +112,10 @@ namespace Yi.Framework.ApiMicroservice.Controllers
         /// 根据用户id得到该用户有哪些角色
         /// </summary>
         /// <returns></returns>
-        [HttpPost]
-        public async Task<Result> GetRolesByUserId(user _user)
+        [HttpGet]
+        public async Task<Result> GetRolesByUserId(int userId)
         {            
-            var roleList = await _userService.GetRolesByUser(_user);
+            var roleList = await _userService.GetRolesByUser(new user() { id=userId});
             return Result.Success().SetData(roleList);
         }
         /// <summary>
diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml b/Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml
index c66eed0d..33289157 100644
--- a/Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml
+++ b/Yi.Framework/Yi.Framework.ApiMicroservice/SwaggerDoc.xml
@@ -174,5 +174,17 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GetRolesByUserId(System.Int32)">
+            <summary>
+            根据用户id得到该用户有哪些角色
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Yi.Framework.ApiMicroservice.Controllers.UserController.GetUserInfoById">
+            <summary>
+            根据http上下文的用户得到该用户信息，关联角色
+            </summary>
+            <returns></returns>
+        </member>
     </members>
 </doc>
diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db
index ce65e2c6cf84ebb1b446089c7cab020962e55839..8f8280d7df279196d072660a70029a3f1798d353 100644
GIT binary patch
delta 289
zcmZo@U}<Pz+3>)hQGfG8e`N(`eJ+m4>;<7*T%BAQT<%<ITpXJP1r~8?$mnx3$cqXy
zFmiA(Fyy9W>K2zI7L}Bw7MGZrneoZ%fn+6tvXdLD#hCfzbtfCv$^mH|5Y54-pbe6j
zo;<NelGBi1Nejf22k|DKuHv0Mxkh~Q`zoHv7PaCW>I&*GrNWbSs|7)Vn?tMDyD;nX
zeVWXEK#QM+?;qa}zEAw^{Bitx{9K#O4s7C^EO4Ghicg=FnURrC4@~NUNgWW$uML#`
y!mQ6PHktiGC>OsLzbd~1zcjxX&}SR?Bw3gl81+Gf9*EEd5jr43d$a!iiwXci+(N_v

delta 135
zcmZo@U}<Pz+3>)hQET%<e`N(`Ew0s**$YB93kvviaVcqWGsug|Gca;Y4y+QJe7cGk
z%6ebL17UHiE2x9iNQ2bKRx3h8H-}cQcVX7z7nsa`K#R4VKaO8-v%`T+d=nRFOcpr*
V1t_CGnf(IDlFNLX_3vL)001keD5C%X

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm
deleted file mode 100644
index 41e182bc95dd14e1bdfdb866ed34f33dd9d12f52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI*J8D8v5CG6I#(e#}d_*^4FJwz%6>V%>K@h7{*-V;LZotmc!Yw58B#3Rm4}>!?
z+~IPWfwO=+-BmBjxX!FZ6zx2V%;i^YJo@Y}I-U8;d-Y>5eBDgev$tvYkMFb9Hp;%=
zd+~d{J8rUSWHvJoRqvWB2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
z2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N
z0t5&UAV7e?kp(JonScG><zKr+JRNzK_5=tJAV7cs0RjXF5FkL{v;r4V%dIl^xn1TV
yo=-d4Gy-Q9sK!;?Mm<{b808)&L4W`O0t5&UAV7cs0RjXF5FkK+009F3U*HFjk0?w4

diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal
deleted file mode 100644
index 9ce3a1253c6f427f4e2a59bb3e281e3bff4a4e63..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 206032
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
F_&=~s2nYZG