gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、调整rabbitMQ自定义事件源 2、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2024-11-18 01:29:08 +08:00
parent ed4dde274c
commit aba126a7cc
8 changed files with 112 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -38,7 +38,7 @@
<PackageReference Include="NewLife.Redis" Version="6.0.2024.1101" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
<PackageReference Include="QRCoder" Version="1.6.0" />
<PackageReference Include="RabbitMQ.Client" Version="6.8.1" />
<PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.9" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.6.0" />

70
Admin.NET/Admin.NET.Core/EventBus/RabbitMQEventSourceStore.cs
View File

@ -13,27 +13,27 @@ namespace Admin.NET.Core;
/// <summary>
/// RabbitMQ自定义事件源存储器
/// </summary>
public class RabbitMQEventSourceStore : IEventSourceStorer
public class RabbitMQEventSourceStore : IEventSourceStorer, IDisposable
{
/// <summary>
/// 内存通道事件源存储器
/// </summary>
private readonly Channel<IEventSource> _channel;
/// <summary>
/// 通道对象
/// </summary>
private readonly IModel _model;
/// <summary>
/// 连接对象
/// </summary>
private readonly IConnection _connection;
private Channel<IEventSource> _channelEventSource;
/// <summary>
/// 路由键
/// </summary>
private readonly string _routeKey;
private string _routeKey;
/// <summary>
/// 连接对象
/// </summary>
private IConnection _connection;
/// <summary>
/// 通道对象
/// </summary>
private IChannel _channel;
/// <summary>
/// 构造函数
@ -43,30 +43,41 @@ public class RabbitMQEventSourceStore : IEventSourceStorer
/// <param name="capacity">存储器最多能够处理多少消息，超过该容量进入等待写入</param>
public RabbitMQEventSourceStore(ConnectionFactory factory, string routeKey, int capacity)
{
// 配置通道，设置超出默认容量后进入等待
InitEventSourceStore(factory, routeKey, capacity).GetAwaiter().GetResult();
}
/// <summary>
/// 初始化事件源存储器
/// </summary>
/// <param name="factory">连接工厂</param>
/// <param name="routeKey">路由键</param>
/// <param name="capacity">存储器最多能够处理多少消息，超过该容量进入等待写入</param>
private async Task InitEventSourceStore(ConnectionFactory factory, string routeKey, int capacity)
{
// 配置通道（超出默认容量后进入等待）
var boundedChannelOptions = new BoundedChannelOptions(capacity)
{
FullMode = BoundedChannelFullMode.Wait
};
// 创建有限容量通道
_channel = Channel.CreateBounded<IEventSource>(boundedChannelOptions);
_channelEventSource = Channel.CreateBounded<IEventSource>(boundedChannelOptions);
// 创建连接
_connection = factory.CreateConnection();
_connection = await factory.CreateConnectionAsync();
// 路由键名
_routeKey = routeKey;
// 创建通道
_model = _connection.CreateModel();
_channel = await _connection.CreateChannelAsync();
// 声明路由队列
_model.QueueDeclare(routeKey, false, false, false, null);
await _channel.QueueDeclareAsync(routeKey, false, false, false, null);
// 创建消息订阅者
var consumer = new EventingBasicConsumer(_model);
var consumer = new AsyncEventingBasicConsumer(_channel);
// 订阅消息并写入内存 Channel
consumer.Received += (ch, ea) =>
consumer.ReceivedAsync += async (ch, ea) =>
{
// 读取原始消息
var stringEventSource = Encoding.UTF8.GetString(ea.Body.ToArray());
@ -75,14 +86,14 @@ public class RabbitMQEventSourceStore : IEventSourceStorer
var eventSource = JSON.Deserialize<ChannelEventSource>(stringEventSource);
// 写入内存管道存储器
_channel.Writer.WriteAsync(eventSource);
await _channelEventSource.Writer.WriteAsync(eventSource);
// 确认该消息已被消费
_model.BasicAck(ea.DeliveryTag, false);
await _channel.BasicAckAsync(ea.DeliveryTag, false);
};
// 启动消费者且设置为手动应答消息
_model.BasicConsume(routeKey, false, consumer);
await _channel.BasicConsumeAsync(routeKey, false, consumer);
}
/// <summary>
@ -101,12 +112,15 @@ public class RabbitMQEventSourceStore : IEventSourceStorer
{
// 序列化及发布
var data = Encoding.UTF8.GetBytes(JSON.Serialize(source));
_model.BasicPublish("", _routeKey, null, data);
var props = new BasicProperties();
props.ContentType = "text/plain";
props.DeliveryMode = DeliveryModes.Persistent;
await _channel.BasicPublishAsync("", _routeKey, false, props, data);
}
else
{
// 处理动态订阅
await _channel.Writer.WriteAsync(eventSource, cancellationToken);
await _channelEventSource.Writer.WriteAsync(eventSource, cancellationToken);
}
}
@ -117,7 +131,7 @@ public class RabbitMQEventSourceStore : IEventSourceStorer
/// <returns>事件源对象</returns>
public async ValueTask<IEventSource> ReadAsync(CancellationToken cancellationToken)
{
var eventSource = await _channel.Reader.ReadAsync(cancellationToken);
var eventSource = await _channelEventSource.Reader.ReadAsync(cancellationToken);
return eventSource;
}
@ -126,7 +140,7 @@ public class RabbitMQEventSourceStore : IEventSourceStorer
/// </summary>
public void Dispose()
{
_model.Dispose();
_channel.Dispose();
_connection.Dispose();
}
}

2
Web/package.json
View File

@ -90,7 +90,7 @@
"@vitejs/plugin-vue": "^5.2.0",
"@vitejs/plugin-vue-jsx": "^4.1.0",
"@vue/compiler-sfc": "^3.5.13",
"code-inspector-plugin": "^0.18.0",
"code-inspector-plugin": "^0.18.1",
"eslint": "^9.15.0",
"eslint-plugin-vue": "^9.31.0",
"globals": "^15.12.0",

96
Web/src/api-services/models/page-code-gen-input.ts
View File

@ -82,6 +82,30 @@ export interface PageCodeGenInput {
*/
descStr?: string | null;
/**
* 数据库表名
*
* @type {string}
* @memberof PageCodeGenInput
*/
tableName?: string | null;
/**
* 业务名（业务代码包名称）
*
* @type {string}
* @memberof PageCodeGenInput
*/
busName?: string | null;
/**
* 命名空间
*
* @type {string}
* @memberof PageCodeGenInput
*/
nameSpace?: string | null;
/**
* 作者姓名
*
@ -90,6 +114,30 @@ export interface PageCodeGenInput {
*/
authorName?: string | null;
/**
* 生成方式
*
* @type {string}
* @memberof PageCodeGenInput
*/
generateType?: string | null;
/**
* 是否生成菜单
*
* @type {boolean}
* @memberof PageCodeGenInput
*/
generateMenu?: boolean;
/**
* 是否使用 Api Service
*
* @type {boolean}
* @memberof PageCodeGenInput
*/
isApiService?: boolean;
/**
* 类名
*
@ -138,38 +186,6 @@ export interface PageCodeGenInput {
*/
connectionString?: string | null;
/**
* 生成方式
*
* @type {string}
* @memberof PageCodeGenInput
*/
generateType?: string | null;
/**
* 数据库表名
*
* @type {string}
* @memberof PageCodeGenInput
*/
tableName?: string | null;
/**
* 命名空间
*
* @type {string}
* @memberof PageCodeGenInput
*/
nameSpace?: string | null;
/**
* 业务名（业务代码包名称）
*
* @type {string}
* @memberof PageCodeGenInput
*/
busName?: string | null;
/**
* 功能名（数据库表名称）
*
@ -186,14 +202,6 @@ export interface PageCodeGenInput {
*/
menuApplication?: string | null;
/**
* 是否生成菜单
*
* @type {boolean}
* @memberof PageCodeGenInput
*/
generateMenu?: boolean;
/**
* 菜单父级
*
@ -233,12 +241,4 @@ export interface PageCodeGenInput {
* @memberof PageCodeGenInput
*/
printName?: string | null;
/**
* 是否使用 Api Service
*
* @type {boolean}
* @memberof PageCodeGenInput
*/
isApiService?: boolean;
}

16
Web/src/api-services/models/sys-region.ts
View File

@ -29,14 +29,6 @@ export interface SysRegion {
*/
id?: number;
/**
* 父Id
*
* @type {number}
* @memberof SysRegion
*/
pid?: number;
/**
* 名称
*
@ -45,6 +37,14 @@ export interface SysRegion {
*/
name: string;
/**
* 父Id
*
* @type {number}
* @memberof SysRegion
*/
pid?: number;
/**
* 简称
*

16
Web/src/api-services/models/sys-schedule.ts
View File

@ -93,6 +93,14 @@ export interface SysSchedule {
*/
tenantId?: number | null;
/**
* 日程内容
*
* @type {string}
* @memberof SysSchedule
*/
content: string;
/**
* 用户Id
*
@ -125,14 +133,6 @@ export interface SysSchedule {
*/
endTime?: string | null;
/**
* 日程内容
*
* @type {string}
* @memberof SysSchedule
*/
content: string;
/**
* @type {FinishStatusEnum}
* @memberof SysSchedule

7
Web/src/components/editor/index.vue
View File

@ -56,12 +56,11 @@ const state = reactive({
MENU_CONF: {
uploadImage: {
fieldName: 'file',
customUpload(file, insertFn) {
// console.log('customUpload', file);
customUpload(file: any, insertFn: any) {
const uploadFun = async () => {
const rps = await getAPI(SysFileApi).apiSysFileUploadFilePostForm(file);
const rps = await getAPI(SysFileApi).apiSysFileUploadFilesPostForm([file]);
if (rps.data.type == 'success' && rps.data.result != null) {
insertFn(rps.data.result.url, rps.data.result.name, rps.data.result.url);
insertFn(rps.data.result[0].url, rps.data.result[0].fileName, rps.data.result[0].url);
} else {
ElMessage.error('上传失败！');
}

2
Web/src/views/system/file/index.vue
View File

@ -277,7 +277,7 @@ const handleChange = (file: any, fileList: []) => {
// 上传
const handleUpload = async () => {
if (state.fileList.length < 1) return;
await getAPI(SysFileApi).apiSysFileUploadFilePostForm(state.fileList[0].raw, state.fileType, state.isPublic);
await getAPI(SysFileApi).apiSysFileUploadFilesPostForm([state.fileList[0].raw]);
handleQuery();
ElMessage.success('上传成功');
state.visible = false;