升级 RabbitMQ Client 6.2.1

lianggx · Sep 14, 2020 · deca8b0 · deca8b0
1 parent e412f1a
commit deca8b0
Show file tree

Hide file tree

Showing 15 changed files with 140 additions and 100 deletions.
diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.dll b/TomatoLog.Server/Plugins/TomatoLog.ToFile/TomatoLog.ToFile.dll
diff --git a/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.deps.json b/TomatoLog.Server/Plugins/TomatoLog.ToMongoDB/TomatoLog.ToMongoDB.deps.json
@@ -1735,7 +1735,7 @@
  "System.Linq.Expressions/4.1.0": {
  "type": "package",
  "serviceable": true,
- "sha512": "sha512-I+y02iqkgmCAyfbqOmSDOgqdZQ5tTj80Akm5BPSS8EeB0VGWdy6X1KCoYe8Pk6pwDoAKZUOdLVxnTJcExiv5zw==",
+ "sha512": "sha512-u2hTii1wBVnvBT4tMNCDGTEKHN47Q02gyYjl6CNNM7nrLJImWNVsWL6uAzLE8IGop7SDpHfiHs+5mO0hYOXc7w==",
  "path": "system.linq.expressions/4.1.0",
  "hashPath": "system.linq.expressions.4.1.0.nupkg.sha512"
  },

diff --git a/TomatoLog.sln b/TomatoLog.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.329
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{299FA2FB-6403-4AF5-ABC8-04E7F9EBA4DB}"
 EndProject

diff --git a/src/TomatoLog.Server/Properties/launchSettings.json b/src/TomatoLog.Server/Properties/launchSettings.json
@@ -1,27 +1,12 @@
 {
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:53180/",
- "sslPort": 0
- }
- },
  "profiles": {
- "IIS Express": {
- "commandName": "IISExpress",
- "launchBrowser": true,
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- },
  "TomatoLog.Server": {
  "commandName": "Project",
  "launchBrowser": true,
  "environmentVariables": {
  "ASPNETCORE_ENVIRONMENT": "Development"
  },
- "applicationUrl": "http://localhost:53182/"
+ "applicationUrl": "http://localhost:20272/"
  }
  }
 }
diff --git a/src/TomatoLog.Server/Views/Config/Index.cshtml b/src/TomatoLog.Server/Views/Config/Index.cshtml
@@ -13,22 +13,22 @@
  var email = Model.Email;
 }
 
-<div class="container">
+<div class="container warning-config">
  <div id="saveTips" class="alert alert-success invisible text-center">
  <strong>Success！</strong>
  </div>
- <h2>Global Config</h2>
- <div class="panel panel-info">
+ <h2>Global Configuration</h2>
+ <div class="card">
  <form class="form-group" action="/Config/Setting" method="post">
- <div class="panel-heading bg-info">
+ <div class="card-header">
  <nav class="navbar navbar-light bg-light">
  <div class="navbar-brand">
  <label>Foundation</label>
  <input type="submit" value="Save" class="btn btn-primary" />
  </div>
  </nav>
  </div>
- <div class="panel-body">
+ <div class="card-body">
  Enable <input class="form-control" type="text" id="On" name="On" value="@sett.On.ToString().ToLower()" />
  Report stage（Seconds）<input class="form-control" type="text" id="Time" name="Time" value="@sett.Time" />
  Trigger threshold<input class="form-control" type="text" id="Count" name="Count" value="@sett.Count" />
@@ -37,17 +37,17 @@
  </div>
  </form>
  </div>
- <div class="panel panel-danger">
+ <div class="card">
  <form class="form-group" action="/Config/Sms" method="post">
- <div class="panel-heading bg-danger">
+ <div class="card-header">
  <nav class="navbar navbar-light bg-light">
  <div class="navbar-brand">
- <label>SMS Config</label>
+ <label>SMS Configuration</label>
  <input type="submit" value="Save" class="btn btn-primary" />
  </div>
  </nav>
  </div>
- <div class="panel-body">
+ <div class="card-body">
  Enable<input class="form-control" type="text" id="On" name="On" value="@sms.On.ToString().ToLower()" />
  Url<input class="form-control" type="text" id="Url" name="Url" value="@sms.Url" />
  HttpMethoed<input class="form-control" type="text" id="Method" name="Method" value="@sms.Method" />
@@ -57,17 +57,17 @@
  </div>
  </form>
  </div>
- <div class="panel panel-success">
+ <div class="card">
  <form class="form-group" action="/Config/Email" method="post">
- <div class="panel-heading bg-success">
+ <div class="card-header">
  <nav class="navbar navbar-light bg-light">
  <div class="navbar-brand">
- <label>Email Config</label>
+ <label>Email Configuration</label>
  <input type="submit" value="Save" class="btn btn-primary" />
  </div>
  </nav>
  </div>
- <div class="panel-body">
+ <div class="card-body">
  Enable<input class="form-control" type="text" id="On" name="On" value="@email.On.ToString().ToLower()" />
  Mailbox<input class="form-control" type="text" id="UserName" name="UserName" value="@email.UserName" />
  Password<input class="form-control" type="text" id="Password" name="Password" value="@email.Password" />

diff --git a/src/TomatoLog.Server/Views/Home/Index.cshtml b/src/TomatoLog.Server/Views/Home/Index.cshtml
@@ -3,7 +3,7 @@
  List<string> projs = ViewBag.Projects;
 }
 <div class="container">
- <h2>Project List</h2>
+ <h2> <span class="badge badge-secondary">Project List</span></h2>
  <div class="row log-list">
  @foreach (var p in projs)
  {
@@ -22,4 +22,5 @@
  </div>
  }
  </div>
+
 </div>
diff --git a/src/TomatoLog.Server/Views/ProConfig/Detail.cshtml b/src/TomatoLog.Server/Views/ProConfig/Detail.cshtml
@@ -9,7 +9,7 @@
  }
 }
 
-<div class="container">
+<div class="container warning-config">
  <div id="saveTips" class="alert alert-success invisible text-center">
  <strong>Success！</strong>
  </div>
@@ -22,13 +22,20 @@
  </div>
  </div>
  }
- <h2>Report Config</h2>
+
  <form class="form-group" action="/ProConfig/Detail" method="post">
- <input type="submit" value="Save" class="btn btn-primary" />
- <a href="/ProConfig" class="btn btn-success">Back to list</a>
- <div class="panel panel-info">
- <div class="panel-heading bg-info"></div>
- <div class="panel-body">
+ <div class="card">
+ <div class="card-header">
+ <h2>Report Config</h2>
+ </div>
+ <div class="card-body">
+ <input type="submit" value="Save" class="btn btn-primary" />
+ <a href="/ProConfig" class="btn btn-success">Back to list</a>
+ </div>
+ </div>
+ <div class="card">
+ <div class="card-header">Root Configuration</div>
+ <div class="card-body">
  ProjectName <input class="form-control" type="text" id="Setting_ProjectName" name="Setting_ProjectName" value="@Model.Setting_ProjectName" />
  Enable <input class="form-control" type="text" id="Setting_On" name="Setting_On" value="@Model.Setting_On.ToString().ToLower()" />
  Report stage（Seconds）<input class="form-control" type="text" id="Setting_Time" name="Setting_Time" value="@Model.Setting_Time" />
@@ -37,9 +44,9 @@
  <input class="form-control" type="text" id="Setting_Levels" name="Setting_Levels" value="@Model.Setting_Levels" />
  </div>
  </div>
- <div class="panel panel-danger">
- <div class="panel-heading bg-danger"></div>
- <div class="panel-body">
+ <div class="card">
+ <div class="card-header">Sms Configuration</div>
+ <div class="card-body">
  Enable<input class="form-control" type="text" id="Sms_On" name="Sms_On" value="@Model.Sms_On.ToString().ToLower()" />
  Url<input class="form-control" type="text" id="Sms_Url" name="Sms_Url" value="@Model.Sms_Url" />
  HttpMethoed<input class="form-control" type="text" id="Sms_Method" name="Sms_Method" value="@Model.Sms_Method" />
@@ -48,9 +55,9 @@
  <textarea class="form-control" id="Sms_Content" name="Sms_Content">@Model.Sms_Content</textarea>
  </div>
  </div>
- <div class="panel panel-success">
- <div class="panel-heading bg-success"></div>
- <div class="panel-body">
+ <div class="card">
+ <div class="card-header">Email Configuration</div>
+ <div class="card-body">
  Enable<input class="form-control" type="text" id="Email_On" name="Email_On" value="@Model.Email_On.ToString().ToLower()" />
  Mailbox<input class="form-control" type="text" id="Email_UserName" name="Email_UserName" value="@Model.Email_UserName" />
  Password<input class="form-control" type="text" id="Email_Password" name="Email_Password" value="@Model.Email_Password" />
@@ -81,4 +88,4 @@
  </script>
  }
  }
-</div>
+</div>
diff --git a/src/TomatoLog.Server/Views/ProConfig/Index.cshtml b/src/TomatoLog.Server/Views/ProConfig/Index.cshtml
@@ -3,36 +3,40 @@
  <div id="saveTips" class="alert alert-success invisible text-center">
  <strong>Success！</strong>
  </div>
- <h2>Project Config</h2>
- <table class="table table-striped">
- <thead>
- <tr>
- <th scope="col">ProjectName</th>
- <th scope="col">On</th>
- <th scope="col">Time</th>
- <th scope="col">Count</th>
- <th scope="col">Levels</th>
- <th scope="col">Options<a href="/ProConfig/Detail"><strong>+New</strong></a></th>
- </tr>
- </thead>
- <tbody>
- @foreach (var c in Model)
- {
- var sett = c.Setting;
- <tr scope="row">
- <td>@sett.ProjectName</td>
- <td>@sett.On</td>
- <td>@sett.Time</td>
- <td>@sett.Count</td>
- <td>@sett.Levels</td>
- <td>
- <a href="/ProConfig/[email protected]">Detail</a>
- <a href="###" onclick="OnDelete(this,'@sett.ProjectName')">Delete</a>
- </td>
+ <div class="card">
+ <div class="card-header">
+ <h2>Project Config</h2>
+ </div>
+ <table class="table table-striped card-body">
+ <thead>
+ <tr>
+ <th scope="col">ProjectName</th>
+ <th scope="col">On</th>
+ <th scope="col">Time</th>
+ <th scope="col">Count</th>
+ <th scope="col">Levels</th>
+ <th scope="col">Options<a href="/ProConfig/Detail"><strong>+New</strong></a></th>
  </tr>
- }
- </tbody>
- </table>
+ </thead>
+ <tbody>
+ @foreach (var c in Model)
+ {
+ var sett = c.Setting;
+ <tr scope="row">
+ <td>@sett.ProjectName</td>
+ <td>@sett.On</td>
+ <td>@sett.Time</td>
+ <td>@sett.Count</td>
+ <td>@sett.Levels</td>
+ <td>
+ <a href="/ProConfig/[email protected]">Detail</a>
+ <a href="###" onclick="OnDelete(this,'@sett.ProjectName')">Delete</a>
+ </td>
+ </tr>
+ }
+ </tbody>
+ </table>
+ </div>
 </div>
 
 @section Scripts{

diff --git a/src/TomatoLog.Server/Views/Shared/SySVariables.cshtml b/src/TomatoLog.Server/Views/Shared/SySVariables.cshtml
@@ -1,9 +1,9 @@
-<div class="panel panel-warning">
+<div class="card">
  <a name="SysVariable"></a>
- <div class="panel-heading bg-warning">
+ <div class="card-header">
  <label>System variables（Case sensitive）</label>
  </div>
- <div class="panel-body">
+ <div class="card-body">
  <ul class="list-group">
  <li class="list-group-item">Events Timestamp：{Timestamp}</li>
  <li class="list-group-item">Source IP：{IP}</li>

diff --git a/src/TomatoLog.Server/appsettings.Development.json b/src/TomatoLog.Server/appsettings.Development.json
@@ -21,7 +21,7 @@
  "Others": null
  },
  "Flow": {
- "Type": "Kafka", // Redis/RabbitMQ/Kafka
+ "Type": "RabbitMQ", // Redis/RabbitMQ/Kafka
  "Redis": {
  "Connection": "127.0.0.1:6379,defaultDatabase=10,password=123456,prefix=TomatoLog,abortConnect=false",
  "Channel": "TomatoLogChannel"

diff --git a/src/TomatoLog.Server/wwwroot/css/site.css b/src/TomatoLog.Server/wwwroot/css/site.css
@@ -49,3 +49,6 @@
 }
 .log-list .col-sm-2{padding-left:0px;padding-right:5px;margin-bottom:5px;max-width:200px;text-align:center;}
 .hidden {display: none;}
+.warning-config .card {
+ margin-bottom: 20px;
+}
diff --git a/src/clients/TomatoLog.Client.RabbitMQ/MQHelper/MQChannel.cs b/src/clients/TomatoLog.Client.RabbitMQ/MQHelper/MQChannel.cs
@@ -22,10 +22,8 @@ public class MQChannel
  public void Publish(string content)
  {
  byte[] body = MQConnection.UTF8.GetBytes(content);
- IBasicProperties prop = new BasicProperties
- {
- DeliveryMode = 1
- };
+ IBasicProperties prop = Consumer.Model.CreateBasicProperties();
+ prop.DeliveryMode = 1;
  Consumer.Model.BasicPublish(this.ExchangeName, this.RoutekeyName, false, prop, body);
  }
 
@@ -34,7 +32,7 @@ internal void Receive(object sender, BasicDeliverEventArgs e)
  MessageBody msgBody = new MessageBody();
  try
  {
- string content = MQConnection.UTF8.GetString(e.Body);
+ string content = MQConnection.UTF8.GetString(e.Body.ToArray());
  msgBody.Content = content;
  msgBody.Consumer = (EventingBasicConsumer)sender;
  msgBody.BasicDeliver = e;

diff --git a/src/clients/TomatoLog.Client.RabbitMQ/MQHelper/MQConnection.cs b/src/clients/TomatoLog.Client.RabbitMQ/MQHelper/MQConnection.cs
@@ -69,9 +69,9 @@ public MQChannel CreateReceiveChannel(string exchangeType, string exchange, stri
  IModel model = this.CreateModel(exchangeType, exchange, queue, routekey);
  model.BasicQos(0, 1, false);
  EventingBasicConsumer consumer = this.Receive(model, queue);
- consumer.Registered += (object sender, ConsumerEventArgs e) => { _logger?.LogDebug($"已注册消费队列，{e.ConsumerTag}"); };
+ consumer.Registered += (object sender, ConsumerEventArgs e) => { _logger?.LogDebug($"已注册消费队列，{string.Join(",", e.ConsumerTags)}"); };
  consumer.Shutdown += (object sender, ShutdownEventArgs e) => { _logger?.LogDebug($"已关闭消费队列，{e.ReplyCode}，{e.ReplyText}"); };
- consumer.ConsumerCancelled += (object sender, ConsumerEventArgs e) => { _logger?.LogDebug($"已退出消费队列，{e.ConsumerTag}"); };
+ consumer.ConsumerCancelled += (object sender, ConsumerEventArgs e) => { _logger?.LogDebug($"已退出消费队列，{string.Join(",", e.ConsumerTags)}"); };
 
  MQChannel channel = new MQChannel()
  {

diff --git a/src/clients/TomatoLog.Client.RabbitMQ/TomatoLog.Client.RabbitMQ.csproj b/src/clients/TomatoLog.Client.RabbitMQ/TomatoLog.Client.RabbitMQ.csproj
@@ -5,7 +5,7 @@
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
  <PackageLicenseUrl>https://github.com/lianggx/TomatoLog/blob/master/LICENSE</PackageLicenseUrl>
- <Version>1.2.0</Version>
+ <Version>1.2.1</Version>
  <Authors>lianggx</Authors>
  <Product>TomatoLog</Product>
  <PackageProjectUrl>https://github.com/lianggx/TomatoLog</PackageProjectUrl>
@@ -14,7 +14,7 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="RabbitMQ.Client" Version="5.1.0" />
+ <PackageReference Include="RabbitMQ.Client" Version="6.2.1" />
  </ItemGroup>
 
  <ItemGroup>