xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: xwl2023:ag-ui
Branches Tags
xwl2023:main xwl2023:ai-hub xwl2023:url xwl2023:ai-hub-dark xwl2023:ai-agent xwl2023:ai-agent-backend xwl2023:bubblelist xwl2023:new-md xwl2023:markdown xwl2023:abp xwl2023:codex xwl2023:ag-ui
...
pull from: xwl2023:abp
Branches Tags
xwl2023:ai-hub xwl2023:url xwl2023:main xwl2023:ai-hub-dark xwl2023:ai-agent xwl2023:ai-agent-backend xwl2023:bubblelist xwl2023:new-md xwl2023:markdown xwl2023:abp xwl2023:codex xwl2023:ag-ui

7 Commits
ag-ui ... 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
chenchun
0d2f2cb826 fix: 仅从 Query 获取 access_token/refresh_token，简化 OnMessageReceived 逻辑 
- 修改文件：Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
- 将 JwtBearerEvents.OnMessageReceived 的上下文参数名改为 messageContext，统一变量名。
- 简化 Token 获取逻辑：只从 request.Query 中读取 access_token 与 refresh_token，移除从 Cookies（Token）和请求头（refresh_token）读取的分支。
 2025-12-11 17:41:38 +08:00
chenchun
571df74c43 chore: 在 common.props 添加 SatelliteResourceLanguages=en;zh-CN 
在 Yi.Abp.Net8/common.props 中新增 SatelliteResourceLanguages 属性，指定生成卫星资源语言为 en 和 zh-CN，以便打包对应的本地化资源。
 2025-12-10 15:53:18 +08:00
chenchun
cefde6848d perf: 去除35MB又臭又大的腾讯云sdk 2025-12-10 15:10:54 +08:00
10 changed files with 75 additions and 80 deletions
Expand all files Collapse all files

1
Yi.Abp.Net8/common.props
View File

@@ -12,6 +12,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SatelliteResourceLanguages>en;zh-CN</SatelliteResourceLanguages>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<Version>1.0.0</Version> <Version>1.0.0</Version>
<NoWarn>$(NoWarn);CS1591;CS8618;CS1998;CS8604;CS8620;CS8600;CS8602</NoWarn> <NoWarn>$(NoWarn);CS1591;CS8618;CS1998;CS8604;CS8620;CS8600;CS8602</NoWarn>

1
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs
View File

@@ -3,7 +3,6 @@ using Mapster;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SqlSugar; using SqlSugar;
using TencentCloud.Pds.V20210701.Models;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.EventBus.Local; using Volo.Abp.EventBus.Local;

3
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/EventHandlers/CommentCreatedEventHandler.cs
View File

@@ -1,5 +1,4 @@
using TencentCloud.Tbm.V20180129.Models; using Volo.Abp.DependencyInjection;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Entities.Events; using Volo.Abp.Domain.Entities.Events;
using Volo.Abp.EventBus; using Volo.Abp.EventBus;
using Volo.Abp.EventBus.Local; using Volo.Abp.EventBus.Local;

1
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/Monitor/MonitorCacheService.cs
View File

@@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.VisualBasic; using Microsoft.VisualBasic;
using TencentCloud.Mna.V20210119.Models;
using Volo.Abp.Application.Services; using Volo.Abp.Application.Services;
using Volo.Abp.Caching; using Volo.Abp.Caching;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;

1
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Application/Services/System/UserService.cs
View File

@@ -1,6 +1,5 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using SqlSugar; using SqlSugar;
using TencentCloud.Tcr.V20190924.Models;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Dtos;
using Volo.Abp.Caching; using Volo.Abp.Caching;

118
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Managers/TencentCloudManager.cs
View File

@@ -1,59 +1,59 @@
using System; // using System;
using System.Collections.Generic; // using System.Collections.Generic;
using System.Linq; // using System.Linq;
using System.Text; // using System.Text;
using System.Threading.Tasks; // using System.Threading.Tasks;
using TencentCloud.Common.Profile; // using TencentCloud.Common.Profile;
using TencentCloud.Common; // using TencentCloud.Common;
using TencentCloud.Sms.V20210111.Models; // using TencentCloud.Sms.V20210111.Models;
using TencentCloud.Sms.V20210111; // using TencentCloud.Sms.V20210111;
using Volo.Abp.Domain.Services; // using Volo.Abp.Domain.Services;
using Microsoft.Extensions.Logging; // using Microsoft.Extensions.Logging;
//
namespace Yi.Framework.Rbac.Domain.Managers // namespace Yi.Framework.Rbac.Domain.Managers
{ // {
public class TencentCloudManager : DomainService // public class TencentCloudManager : DomainService
{ // {
private ILogger<TencentCloudManager> _logger; // private ILogger<TencentCloudManager> _logger;
public TencentCloudManager(ILogger<TencentCloudManager> logger) // public TencentCloudManager(ILogger<TencentCloudManager> logger)
{ // {
_logger= logger; // _logger= logger;
} // }
//
public async Task SendSmsAsync() // public async Task SendSmsAsync()
{ // {
//
try // try
{ // {
// 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密 // // 实例化一个认证对象，入参需要传入腾讯云账户 SecretId 和 SecretKey，此处还需注意密钥对的保密
// 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考，建议采用更安全的方式来使用密钥，请参见：https://cloud.tencent.com/document/product/1278/85305 // // 代码泄露可能会导致 SecretId 和 SecretKey 泄露，并威胁账号下所有资源的安全性。以下代码示例仅供参考，建议采用更安全的方式来使用密钥，请参见：https://cloud.tencent.com/document/product/1278/85305
// 密钥可前往官网控制台 https://console.cloud.tencent.com/cam/capi 进行获取 // // 密钥可前往官网控制台 https://console.cloud.tencent.com/cam/capi 进行获取
Credential cred = new Credential // Credential cred = new Credential
{ // {
SecretId = "SecretId", // SecretId = "SecretId",
SecretKey = "SecretKey" // SecretKey = "SecretKey"
}; // };
// 实例化一个client选项，可选的，没有特殊需求可以跳过 // // 实例化一个client选项，可选的，没有特殊需求可以跳过
ClientProfile clientProfile = new ClientProfile(); // ClientProfile clientProfile = new ClientProfile();
// 实例化一个http选项，可选的，没有特殊需求可以跳过 // // 实例化一个http选项，可选的，没有特殊需求可以跳过
HttpProfile httpProfile = new HttpProfile(); // HttpProfile httpProfile = new HttpProfile();
httpProfile.Endpoint = ("sms.tencentcloudapi.com"); // httpProfile.Endpoint = ("sms.tencentcloudapi.com");
clientProfile.HttpProfile = httpProfile; // clientProfile.HttpProfile = httpProfile;
//
// 实例化要请求产品的client对象,clientProfile是可选的 // // 实例化要请求产品的client对象,clientProfile是可选的
SmsClient client = new SmsClient(cred, "", clientProfile); // SmsClient client = new SmsClient(cred, "", clientProfile);
// 实例化一个请求对象,每个接口都会对应一个request对象 // // 实例化一个请求对象,每个接口都会对应一个request对象
SendSmsRequest req = new SendSmsRequest(); // SendSmsRequest req = new SendSmsRequest();
//
// 返回的resp是一个SendSmsResponse的实例，与请求对象对应 // // 返回的resp是一个SendSmsResponse的实例，与请求对象对应
SendSmsResponse resp = await client.SendSms(req); // SendSmsResponse resp = await client.SendSms(req);
// 输出json格式的字符串回包 // // 输出json格式的字符串回包
_logger.LogInformation("腾讯云Sms返回："+AbstractModel.ToJsonString(resp)); // _logger.LogInformation("腾讯云Sms返回："+AbstractModel.ToJsonString(resp));
} // }
catch (Exception e) // catch (Exception e)
{ // {
_logger.LogError(e,e.ToString()); // _logger.LogError(e,e.ToString());
} // }
} // }
} // }
} // }

2
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Yi.Framework.Rbac.Domain.csproj
View File

@@ -8,7 +8,7 @@
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />
<PackageReference Include="TencentCloudSDK" Version="3.0.966" /> <!-- <PackageReference Include="TencentCloudSDK" Version="3.0.966" />-->
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />

24
Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
View File

@@ -280,19 +280,19 @@ namespace Yi.Abp.Web
}; };
options.Events = new JwtBearerEvents options.Events = new JwtBearerEvents
{ {
OnMessageReceived = context => OnMessageReceived = messageContext =>
{ {
//优先Query中获取，再去cookies中获取 //优先Query中获取，再去cookies中获取
var accessToken = context.Request.Query["access_token"]; var accessToken = messageContext.Request.Query["access_token"];
if (!string.IsNullOrEmpty(accessToken)) if (!string.IsNullOrEmpty(accessToken))
{ {
context.Token = accessToken; messageContext.Token = accessToken;
} }
else else
{ {
if (context.Request.Cookies.TryGetValue("Token", out var cookiesToken)) if (messageContext.Request.Cookies.TryGetValue("Token", out var cookiesToken))
{ {
context.Token = cookiesToken; messageContext.Token = cookiesToken;
} }
} }
@@ -313,19 +313,19 @@ namespace Yi.Abp.Web
}; };
options.Events = new JwtBearerEvents options.Events = new JwtBearerEvents
{ {
OnMessageReceived = context => OnMessageReceived = messageContext =>
{ {
var refresh_token = context.Request.Headers["refresh_token"]; var headerRefreshToken = messageContext.Request.Headers["refresh_token"];
if (!string.IsNullOrEmpty(refresh_token)) if (!string.IsNullOrEmpty(headerRefreshToken))
{ {
context.Token = refresh_token; messageContext.Token = headerRefreshToken;
return Task.CompletedTask; return Task.CompletedTask;
} }
var refreshToken = context.Request.Query["refresh_token"]; var queryRefreshToken = messageContext.Request.Query["refresh_token"];
if (!string.IsNullOrEmpty(refreshToken)) if (!string.IsNullOrEmpty(queryRefreshToken))
{ {
context.Token = refreshToken; messageContext.Token = queryRefreshToken;
} }
return Task.CompletedTask; return Task.CompletedTask;

2
Yi.Abp.Net8/test/Yi.Framework.Rbac.Test/System/UserFrameworkRbacTest.cs
View File

@@ -1,7 +1,5 @@
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Shouldly; using Shouldly;
using TencentCloud.Ame.V20190916.Models;
using TencentCloud.Tiw.V20190919.Models;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Xunit; using Xunit;
using Yi.Framework.Rbac.Application.Contracts.Dtos.User; using Yi.Framework.Rbac.Application.Contracts.Dtos.User;

2
Yi.RuoYi.Vue3/src/api/system/dept.js
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}
}) })
} }