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得到该用户有哪些角色 /// /// - [HttpPost] - public async Task GetRolesByUserId(user _user) + [HttpGet] + public async Task GetRolesByUserId(int userId) { - var roleList = await _userService.GetRolesByUser(_user); + var roleList = await _userService.GetRolesByUser(new user() { id=userId}); return Result.Success().SetData(roleList); } /// 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 @@ + + + 根据用户id得到该用户有哪些角色 + + + + + + 根据http上下文的用户得到该用户信息,关联角色 + + + diff --git a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db index ce65e2c6..8f8280d7 100644 Binary files a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db and b/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db differ 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 41e182bc..00000000 Binary files a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-shm and /dev/null differ 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 9ce3a125..00000000 Binary files a/Yi.Framework/Yi.Framework.ApiMicroservice/YIDB.db-wal and /dev/null differ