Skip to content

Commit 8bd5d40

Browse files
committed
升级 Anno
1 parent 898133d commit 8bd5d40

36 files changed

+69
-60
lines changed

Anno.CommandBus/Anno.CommandBus.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Anno.Loader" Version="2.1.0.1" />
8+
<PackageReference Include="Anno.Loader" Version="2.1.0.4" />
99
</ItemGroup>
1010
</Project>

Anno.Common/Anno.Common.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Compile Remove="RSAWinHelper.cs" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Anno.Const" Version="2.1.0.1" />
11+
<PackageReference Include="Anno.Const" Version="2.1.0.4" />
1212
</ItemGroup>
1313

1414
</Project>

Anno.Infrastructure/Anno.Infrastructure.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Anno.Const" Version="2.1.0.1" />
8+
<PackageReference Include="Anno.Const" Version="2.1.0.4" />
99
<PackageReference Include="sqlSugarCore" Version="5.0.0.15" />
1010
</ItemGroup>
1111

Anno.Plugs.DLockService/Anno.Plugs.DLockService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
8+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
99
</ItemGroup>
1010
</Project>

Anno.Plugs.LogicService/Anno.Plugs.LogicService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
8+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
99
</ItemGroup>
1010

1111
<ItemGroup>

Anno.Plugs.MonitorService/Anno.Plugs.MonitorService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<ItemGroup>
2222
<Content Include="$(SolutionDir)Viper\wwwroot\img\logo.jpg" Link="logo.jpg" PackagePath="\" />
2323
<Content Include="$(SolutionDir)LICENSE" Link="LICENSE" PackagePath="\" />
24-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
24+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
2525
</ItemGroup>
2626
</Project>

Anno.Plugs.TraceService/Anno.Plugs.TraceService.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
9-
<PackageReference Include="Anno.Rpc.Client" Version="2.1.0.1" />
8+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
9+
<PackageReference Include="Anno.Rpc.Client" Version="2.1.0.4" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

Anno.Plugs.ViperService/Anno.Plugs.ViperService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
8+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
99
</ItemGroup>
1010

1111
</Project>

Anno.Redis/Anno.Redis.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<ItemGroup>
88

9-
<PackageReference Include="Anno.Log" Version="2.1.0.1" />
9+
<PackageReference Include="Anno.Log" Version="2.1.0.4" />
1010

11-
<PackageReference Include="Anno.Rpc.Client" Version="2.1.0.1" />
11+
<PackageReference Include="Anno.Rpc.Client" Version="2.1.0.4" />
1212
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
1313
<PackageReference Include="StackExchange.Redis" Version="2.6.70" />
1414
</ItemGroup>

Samples/HelloWorldService/HelloWorldService.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
9+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
1010
<PackageReference Include="Anno.Plugs.MonitorService" Version="1.7.0.1" />
11-
<PackageReference Include="Anno.Rpc.Server" Version="2.1.0.1" />
11+
<PackageReference Include="Anno.Rpc.Server" Version="2.1.0.4" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

Samples/Mvc/MvcCallAnno/MvcCallAnno.csproj

+11-11
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@
4343
</PropertyGroup>
4444
<ItemGroup>
4545
<Reference Include="Anno.Const, Version=1.0.0.0, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
46-
<HintPath>..\..\..\packages\Anno.Const.2.1.0.1\lib\net461\Anno.Const.dll</HintPath>
46+
<HintPath>..\..\..\packages\Anno.Const.2.1.0.4\lib\net461\Anno.Const.dll</HintPath>
4747
</Reference>
48-
<Reference Include="Anno.CronNET, Version=2.1.0.1, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
49-
<HintPath>..\..\..\packages\Anno.CronNET.2.1.0.1\lib\net461\Anno.CronNET.dll</HintPath>
48+
<Reference Include="Anno.CronNET, Version=2.1.0.4, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
49+
<HintPath>..\..\..\packages\Anno.CronNET.2.1.0.4\lib\net461\Anno.CronNET.dll</HintPath>
5050
</Reference>
51-
<Reference Include="Anno.EngineData, Version=2.1.0.1, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
52-
<HintPath>..\..\..\packages\Anno.EngineData.2.1.0.1\lib\net461\Anno.EngineData.dll</HintPath>
51+
<Reference Include="Anno.EngineData, Version=2.1.0.4, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
52+
<HintPath>..\..\..\packages\Anno.EngineData.2.1.0.4\lib\net461\Anno.EngineData.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Anno.Loader, Version=2.1.0.1, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
55-
<HintPath>..\..\..\packages\Anno.Loader.2.1.0.1\lib\net461\Anno.Loader.dll</HintPath>
54+
<Reference Include="Anno.Loader, Version=2.1.0.4, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
55+
<HintPath>..\..\..\packages\Anno.Loader.2.1.0.4\lib\net461\Anno.Loader.dll</HintPath>
5656
</Reference>
57-
<Reference Include="Anno.Log, Version=2.1.0.1, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
58-
<HintPath>..\..\..\packages\Anno.Log.2.1.0.1\lib\net461\Anno.Log.dll</HintPath>
57+
<Reference Include="Anno.Log, Version=2.1.0.4, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
58+
<HintPath>..\..\..\packages\Anno.Log.2.1.0.4\lib\net461\Anno.Log.dll</HintPath>
5959
</Reference>
60-
<Reference Include="Anno.Rpc.Client, Version=2.1.0.1, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
61-
<HintPath>..\..\..\packages\Anno.Rpc.Client.2.1.0.1\lib\net461\Anno.Rpc.Client.dll</HintPath>
60+
<Reference Include="Anno.Rpc.Client, Version=2.1.0.4, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
61+
<HintPath>..\..\..\packages\Anno.Rpc.Client.2.1.0.4\lib\net461\Anno.Rpc.Client.dll</HintPath>
6262
</Reference>
6363
<Reference Include="Anno.Rpc.Client.DynamicProxy, Version=2.0.0.0, Culture=neutral, PublicKeyToken=2655831855184ca4, processorArchitecture=MSIL">
6464
<HintPath>..\..\..\packages\Anno.Rpc.Client.DynamicProxy.2.0.0\lib\net461\Anno.Rpc.Client.DynamicProxy.dll</HintPath>

Samples/Mvc/MvcCallAnno/packages.config

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Anno.Const" version="2.1.0.1" targetFramework="net472" />
4-
<package id="Anno.CronNET" version="2.1.0.1" targetFramework="net472" />
5-
<package id="Anno.EngineData" version="2.1.0.1" targetFramework="net472" />
6-
<package id="Anno.Loader" version="2.1.0.1" targetFramework="net472" />
7-
<package id="Anno.Log" version="2.1.0.1" targetFramework="net472" />
8-
<package id="Anno.Rpc.Client" version="2.1.0.1" targetFramework="net472" />
3+
<package id="Anno.Const" version="2.1.0.4" targetFramework="net472" />
4+
<package id="Anno.CronNET" version="2.1.0.4" targetFramework="net472" />
5+
<package id="Anno.EngineData" version="2.1.0.4" targetFramework="net472" />
6+
<package id="Anno.Loader" version="2.1.0.4" targetFramework="net472" />
7+
<package id="Anno.Log" version="2.1.0.4" targetFramework="net472" />
8+
<package id="Anno.Rpc.Client" version="2.1.0.4" targetFramework="net472" />
99
<package id="Anno.Rpc.Client.DynamicProxy" version="2.0.0" targetFramework="net472" />
1010
<package id="Autofac" version="6.4.0" targetFramework="net472" />
1111
<package id="Autofac.WebApi2" version="6.1.1" targetFramework="net472" />

Samples/Plugs/Anno.Plugs.HelloWorldService/Anno.Plugs.HelloWorldService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
8+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
99
</ItemGroup>
1010

1111
<ItemGroup>

Samples/Plugs/Anno.Plugs.SoEasyService/Anno.Plugs.SoEasyService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
8+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
99
</ItemGroup>
1010

1111
<ItemGroup>

Trace/Anno.Domain/Anno.Domain.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
8+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
99
<PackageReference Include="Anno.EventBus" Version="1.0.3.4" />
1010
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
1111
</ItemGroup>

Viper.Test/Viper.Test.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Anno.Rpc.Server" Version="2.1.0.1" />
9+
<PackageReference Include="Anno.Rpc.Server" Version="2.1.0.4" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

Viper.sln

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31410.414
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Viper.GetWay", "Viper\Viper.GetWay.csproj", "{E762B341-4B1E-4288-8B6B-6EBDB592DB79}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Viper.GateWay", "Viper\Viper.GateWay.csproj", "{E762B341-4B1E-4288-8B6B-6EBDB592DB79}"
77
EndProject
88
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ViperCenter", "ViperCenter\ViperCenter.csproj", "{D5394B7C-98A8-4625-AC5B-0AEFC1846E45}"
99
EndProject
@@ -56,7 +56,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Builder", "Builder", "{A61F
5656
LICENSE = LICENSE
5757
README.md = README.md
5858
viperCenter.bat = viperCenter.bat
59-
viperGetWayDebug.bat = viperGetWayDebug.bat
59+
viperGateWayDebug.bat = viperGateWayDebug.bat
6060
viperService.bat = viperService.bat
6161
EndProjectSection
6262
EndProject

Viper/Controllers/ErrorController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.AspNetCore.Diagnostics;
66
using Microsoft.AspNetCore.Mvc;
77

8-
namespace Viper.GetWay.Controllers
8+
namespace Viper.GateWay.Controllers
99
{
1010

1111
[Route("error")]

Viper/Controllers/HomeController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.Mvc;
66

7-
namespace Viper.GetWay.Controllers
7+
namespace Viper.GateWay.Controllers
88
{
99
public class HomeController : Controller
1010
{

Viper/Extensions/Middleware/AnnoWebHostBuilderExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ namespace Microsoft.AspNetCore
1414
{
1515
using Anno.EngineData;
1616
using Anno.Rpc.Client;
17-
using Viper.GetWay;
1817
using Anno.RateLimit;
1918
using System.Collections.Concurrent;
2019
using Anno.CronNET;
2120

2221
using Anno.Const.Enum;
2322
using System.Net;
2423
using System.Threading;
24+
using Viper.GateWay;
2525

2626
/// <summary>
2727
/// 接入服务中心的HostBuilder中间件

Viper/Extensions/ViperConfig.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Threading.Tasks;
55
using NetTools;
66

7-
namespace Viper.GetWay
7+
namespace Viper.GateWay
88
{
99
public class ViperConfig
1010
{

Viper/Hubs/MonitorHub.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.SignalR;
66
using Anno.EngineData.SysInfo;
7-
using Viper.GetWay.Hubs.Util;
7+
using Viper.GateWay.Hubs.Util;
88
using Anno.Log;
99

10-
namespace Viper.GetWay.Hubs
10+
namespace Viper.GateWay.Hubs
1111
{
1212
public class MonitorHub : Hub
1313
{

Viper/Hubs/SystemHub.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNetCore.SignalR;
66

7-
namespace Viper.GetWay.Hubs
7+
namespace Viper.GateWay.Hubs
88
{
99
public class SystemHub : Hub
1010
{

Viper/Hubs/TaskManager.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
using Anno.EngineData.SysInfo;
88
using Anno.EngineData;
99
using Anno.Rpc.Client;
10-
using Viper.GetWay.Hubs.Util;
10+
using Viper.GateWay.Hubs.Util;
1111
using Microsoft.AspNetCore;
1212

13-
namespace Viper.GetWay.Hubs
13+
namespace Viper.GateWay.Hubs
1414
{
1515

1616
public class TaskManager

Viper/Hubs/Util/WatchDataUtil.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
using System.Threading;
77
using System.Threading.Tasks;
88

9-
namespace Viper.GetWay.Hubs.Util
9+
namespace Viper.GateWay.Hubs.Util
1010
{
1111
public static class WatchDataUtil
1212
{

Viper/Hubs/WatchUser.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Linq;
44
using System.Threading.Tasks;
55

6-
namespace Viper.GetWay.Hubs
6+
namespace Viper.GateWay.Hubs
77
{
88
public class WatchUser
99
{

Viper/Program.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
using Microsoft.Extensions.Hosting;
1212
using Microsoft.Extensions.Logging;
1313

14-
namespace Viper.GetWay
14+
namespace Viper.GateWay
1515
{
1616
public class Program
1717
{
@@ -31,7 +31,7 @@ private static IHostBuilder CreateHostBuilder(string[] args) =>
3131
webBuilder.UseUrls(urls);
3232
}
3333
/**
34-
* active 为prod 的时候关闭日志 None,默认日志级别 Information
34+
* active Ϊprod ��ʱ��ر���־ None��Ĭ����־���� Information
3535
*/
3636
var active = Anno.Rpc.Server.ArgsValue.GetValueByName("-active", args);
3737
LogLevel logLevel = LogLevel.Information;

Viper/Startup.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Microsoft.Extensions.DependencyInjection;
1111
using Microsoft.Extensions.Hosting;
1212

13-
namespace Viper.GetWay
13+
namespace Viper.GateWay
1414
{
1515
public class Startup
1616
{
@@ -42,10 +42,10 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
4242
}
4343
app.UseResponseCompression();
4444

45-
//添加MIME
45+
//����MIME
4646
var provider = new FileExtensionContentTypeProvider();
4747
provider.Mappings[".vue"] = "text/plain";
48-
//使用静态文件默认的文件夹为wwwroot
48+
//ʹ�þ�̬�ļ�Ĭ�ϵ��ļ���Ϊwwwroot
4949
app.UseStaticFiles(new StaticFileOptions
5050
{
5151
ContentTypeProvider = provider

Viper/Views/Home/Index.cshtml

+9
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,15 @@
5151
</div>
5252
<a v-show="(_isMobile&&isCollapse)||(!_isMobile)" style="cursor: pointer; text-decoration: underline; float:left;margin-left:40px;color:#3e3434;" target="_blank" href="https://duyanming.github.io/">官方文档</a>
5353
<div uInfo style="height: 60px; float: right; margin-right:10px;">
54+
<el-tag v-show="(_isMobile&&isCollapse)||(!_isMobile)">
55+
系统:
56+
<span style="color:#606266;">
57+
@($"{System.Environment.OSVersion}"),<b>@System.Runtime.InteropServices.RuntimeInformation.OSArchitecture.ToString().ToLower()</b>,处理器 <b>@System.Environment.ProcessorCount</b>
58+
</span>
59+
</el-tag>
60+
<el-tag>注册中心:<span style="color:#606266;">@(Anno.Const.SettingService.Local?.IpAddress + ":" + Anno.Const.SettingService.Local?.Port)</span></el-tag>
61+
<el-tag>运行服务:<span style="color:#606266;">@Anno.Rpc.Client.Connector.Micros?.LongCount()</span></el-tag>
62+
<el-tag>网关版本:<span style="color:#606266;">@(typeof(Anno.Rpc.Client.Connector).Assembly.GetName().Version)</span></el-tag>
5463
<el-avatar size="medium" style="vertical-align: middle;">{{profile.account}}</el-avatar>
5564
<el-dropdown trigger="click" @@command="handleCommand">
5665
<span class="el-dropdown-link">

Viper/Viper.GetWay.csproj Viper/Viper.GateWay.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Anno.EngineData" Version="2.1.0.1" />
14+
<PackageReference Include="Anno.EngineData" Version="2.1.0.4" />
1515
<PackageReference Include="Anno.RateLimit" Version="1.7.0.1" />
16-
<PackageReference Include="Anno.Rpc.Client" Version="2.1.0.1" />
17-
<PackageReference Include="Anno.Rpc.Server" Version="2.1.0.1" />
16+
<PackageReference Include="Anno.Rpc.Client" Version="2.1.0.4" />
17+
<PackageReference Include="Anno.Rpc.Server" Version="2.1.0.4" />
1818
<PackageReference Include="IPAddressRange" Version="4.2.0" />
1919
</ItemGroup>
2020

File renamed without changes.
File renamed without changes.

ViperCenter/ViperCenter.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Anno.Rpc.Center" Version="2.1.0.1" />
9+
<PackageReference Include="Anno.Rpc.Center" Version="2.1.0.4" />
1010
<PackageReference Include="Flurl.Http" Version="3.2.4" />
1111
</ItemGroup>
1212

ViperService/ViperService.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Anno.Rpc.Server" Version="2.1.0.1" />
9+
<PackageReference Include="Anno.Rpc.Server" Version="2.1.0.4" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

viperGateWayDebug.bat

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
cd %cd%
2+
cd ./Viper
3+
dotnet watch run Viper.GateWay

viperGetWayDebug.bat

-3
This file was deleted.

0 commit comments

Comments
 (0)