Skip to content

Commit 9b4f3d1

Browse files
yang-xiaodongyang-xiaodong
committed
resolve conflict
2 parents 544325a + ccd72ce commit 9b4f3d1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+363
-235
lines changed

‎build.cake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Task("Pack")
6868
{
6969
Configuration = build.Configuration,
7070
VersionSuffix = build.Version.Suffix,
71+
IncludeSymbols = true,
7172
OutputDirectory = "./artifacts/packages"
7273
};
7374
foreach (var project in build.ProjectFiles)

‎build/version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<VersionMajor>2</VersionMajor>
44
<VersionMinor>1</VersionMinor>
5-
<VersionPatch>0</VersionPatch>
5+
<VersionPatch>3</VersionPatch>
66
<VersionQuality></VersionQuality>
77
<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
88
</PropertyGroup>

‎samples/Sample.Kafka.SqlServer/Sample.Kafka.SqlServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
1212
</ItemGroup>
1313
<ItemGroup>
1414
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />

‎samples/Sample.RabbitMQ.MySql/Sample.RabbitMQ.MySql.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
14-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.0.0" />
13+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
14+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.0.1" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />

‎samples/Sample.RabbitMQ.PostgreSql/Sample.RabbitMQ.PostgreSql.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
9-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.0" />
8+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
9+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.1" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎samples/Sample.RabbitMQ.SqlServer/Sample.RabbitMQ.SqlServer.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
1010
</ItemGroup>
1111
<ItemGroup>
1212
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.0" />

‎src/DotNetCore.CAP.Kafka/DotNetCore.CAP.Kafka.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
<PackageTags>$(PackageTags);Kafka</PackageTags>
99
</PropertyGroup>
1010

11-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
11+
<PropertyGroup>
1212
<WarningsAsErrors>NU1605;NU1701</WarningsAsErrors>
13-
<NoWarn>NU1701</NoWarn>
13+
<NoWarn>NU1701;CS1591</NoWarn>
14+
<DocumentationFile>bin\$(Configuration)\netstandard2.0\DotNetCore.CAP.Kafka.xml</DocumentationFile>
1415
</PropertyGroup>
1516

1617
<ItemGroup>
17-
<PackageReference Include="Confluent.Kafka" Version="0.11.2" />
18+
<PackageReference Include="Confluent.Kafka" Version="0.11.3" />
1819
</ItemGroup>
1920

2021
<ItemGroup>

‎src/DotNetCore.CAP.Kafka/KafkaConsumerClient.cs‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public KafkaConsumerClient(string groupId, KafkaOptions options)
2424

2525
public event EventHandler<MessageContext> OnMessageReceived;
2626

27-
public event EventHandler<string> OnError;
27+
public event EventHandler<LogMessageEventArgs> OnLog;
2828

2929
public void Subscribe(IEnumerable<string> topics)
3030
{
@@ -34,7 +34,6 @@ public void Subscribe(IEnumerable<string> topics)
3434
if (_consumerClient == null)
3535
InitKafkaClient();
3636

37-
//_consumerClient.Assign(topics.Select(x=> new TopicPartition(x, 0)));
3837
_consumerClient.Subscribe(topics);
3938
}
4039

@@ -55,7 +54,7 @@ public void Commit()
5554

5655
public void Reject()
5756
{
58-
// Ignore, Kafka will not commit offset when not commit.
57+
_consumerClient.Assign(_consumerClient.Assignment);
5958
}
6059

6160
public void Dispose()
@@ -76,12 +75,17 @@ private void InitKafkaClient()
7675
_consumerClient.OnError += ConsumerClient_OnError;
7776
}
7877

78+
7979
private void ConsumerClient_OnConsumeError(object sender, Message e)
8080
{
8181
var message = e.Deserialize<Null, string>(null, StringDeserializer);
82-
83-
OnError?.Invoke(sender, $"An error occurred during consume the message; Topic:'{e.Topic}'," +
84-
$"Message:'{message.Value}', Reason:'{e.Error}'.");
82+
var logArgs = new LogMessageEventArgs
83+
{
84+
LogType = MqLogType.ConsumeError,
85+
Reason = $"An error occurred during consume the message; Topic:'{e.Topic}'," +
86+
$"Message:'{message.Value}', Reason:'{e.Error}'."
87+
};
88+
OnLog?.Invoke(sender, logArgs);
8589
}
8690

8791
private void ConsumerClient_OnMessage(object sender, Message<Null, string> e)
@@ -98,7 +102,12 @@ private void ConsumerClient_OnMessage(object sender, Message<Null, string> e)
98102

99103
private void ConsumerClient_OnError(object sender, Error e)
100104
{
101-
OnError?.Invoke(sender, e.ToString());
105+
var logArgs = new LogMessageEventArgs
106+
{
107+
LogType = MqLogType.ServerConnError,
108+
Reason = e.ToString()
109+
};
110+
OnLog?.Invoke(sender, logArgs);
102111
}
103112

104113
#endregion private methods

‎src/DotNetCore.CAP.MySql/CapPublisher.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,12 @@ protected override void Execute(IDbConnection dbConnection, IDbTransaction dbTra
6262
_logger.LogInformation("Published Message has been persisted in the database. name:" + message);
6363
}
6464

65-
protected override Task ExecuteAsync(IDbConnection dbConnection, IDbTransaction dbTransaction,
65+
protected override async Task ExecuteAsync(IDbConnection dbConnection, IDbTransaction dbTransaction,
6666
CapPublishedMessage message)
6767
{
68-
dbConnection.ExecuteAsync(PrepareSql(), message, dbTransaction);
68+
await dbConnection.ExecuteAsync(PrepareSql(), message, dbTransaction);
6969

7070
_logger.LogInformation("Published Message has been persisted in the database. name:" + message);
71-
72-
return Task.CompletedTask;
7371
}
7472

7573
#region private methods

‎src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,16 @@
88
<PackageTags>$(PackageTags);MySQL</PackageTags>
99
</PropertyGroup>
1010

11+
<PropertyGroup>
12+
<DocumentationFile>bin\$(Configuration)\netstandard2.0\DotNetCore.CAP.MySql.xml</DocumentationFile>
13+
<NoWarn>1701;1702;1705;CS1591</NoWarn>
14+
</PropertyGroup>
15+
1116
<ItemGroup>
12-
<PackageReference Include="Dapper" Version="1.50.2" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" />
15-
<PackageReference Include="MySqlConnector" Version="0.28.2" />
17+
<PackageReference Include="Dapper" Version="1.50.4" />
18+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.1" />
20+
<PackageReference Include="MySqlConnector" Version="0.34.2" />
1621
</ItemGroup>
1722

1823
<ItemGroup>

0 commit comments

Comments
 (0)