4 Commits
codex ... abp

Author SHA1 Message Date
橙子
a50c45f7a3 !102 修正删除部门无效问题
Merge pull request !102 from Po/cherry-pick-1765609320
2025-12-14 04:37:59 +00:00
Po
2bc8837155 修正删除部门无效问题 2025-12-13 07:02:19 +00:00
ccnetcore
8a6e5abf48 fix: 修复token鉴权 2025-12-11 23:32:57 +08:00
ccnetcore
8b191330b8 Revert "fix: 仅从 Query 获取 access_token/refresh_token,简化 OnMessageReceived 逻辑"
This reverts commit 0d2f2cb826.
2025-12-11 23:31:29 +08:00
2 changed files with 21 additions and 5 deletions

View File

@@ -282,12 +282,20 @@ namespace Yi.Abp.Web
{ {
OnMessageReceived = messageContext => OnMessageReceived = messageContext =>
{ {
//优先Query中获取 //优先Query中获取再去cookies中获取
var accessToken = messageContext.Request.Query["access_token"]; var accessToken = messageContext.Request.Query["access_token"];
if (!string.IsNullOrEmpty(accessToken)) if (!string.IsNullOrEmpty(accessToken))
{ {
messageContext.Token = accessToken; messageContext.Token = accessToken;
} }
else
{
if (messageContext.Request.Cookies.TryGetValue("Token", out var cookiesToken))
{
messageContext.Token = cookiesToken;
}
}
return Task.CompletedTask; return Task.CompletedTask;
} }
}; };
@@ -307,11 +315,19 @@ namespace Yi.Abp.Web
{ {
OnMessageReceived = messageContext => OnMessageReceived = messageContext =>
{ {
var refreshToken = messageContext.Request.Query["refresh_token"]; var headerRefreshToken = messageContext.Request.Headers["refresh_token"];
if (!string.IsNullOrEmpty(refreshToken)) if (!string.IsNullOrEmpty(headerRefreshToken))
{ {
messageContext.Token = refreshToken; messageContext.Token = headerRefreshToken;
return Task.CompletedTask;
} }
var queryRefreshToken = messageContext.Request.Query["refresh_token"];
if (!string.IsNullOrEmpty(queryRefreshToken))
{
messageContext.Token = queryRefreshToken;
}
return Task.CompletedTask; return Task.CompletedTask;
} }
}; };

View File

@@ -50,7 +50,7 @@ export function delDept(deptId) {
return request({ return request({
url: `/dept`, url: `/dept`,
method: 'delete', method: 'delete',
params:{id:deptId} params:{ids:deptId}
}) })
} }