Master 2.2

Statement-of-Income-and-Expense.md

@@ -6,7 +6,7 @@
 ## 汇总
 
 截止到 2018 年 12 月 28 日：
-+ 共获得捐赠 `38` 笔计 `8250.4` 元人民币
++ 共获得捐赠 `40` 笔计 `8380.4` 元人民币
 + 暂无支出项
 
 ## 明细
@@ -51,3 +51,5 @@
 | 36 |  忠全 | 2018-01-02 | 200 | 忠全个人捐赠    | 学习一下  |获赠 |
 | 37 |  思恒 | 2018-01-03 | 10 | 思恒个人捐赠    | 这家伙很懒   |获赠 |
 | 38 |  松波 | 2018-01-04 | 100 | 松波个人捐赠    | 出精品   |获赠 |
+| 39 |  先鸿 | 2019-01-05 | 30 | 先鸿个人捐赠    | 加油   |获赠 |
+| 40 |  杨坚 | 2019-01-08 | 100 | 杨坚个人捐赠    | 加油，希望surging能形成自己的社区   |获赠 |

src/Surging.ApiGateway/Surging.ApiGateway.csproj

@@ -1,11 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
     <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
     <UserSecretsId>aspnet-Surging.ApiGateway-147A234E-A922-4E6A-89B8-DCC64AEA96EE</UserSecretsId>
- <ServerGarbageCollection>false</ServerGarbageCollection>
+    <ServerGarbageCollection>false</ServerGarbageCollection>
+     <TieredCompilation>true</TieredCompilation>
  <Version>1.0.0.0</Version>
  <Authors>fanly</Authors>
  <Product>surging Micro Service Framework</Product>

src/Surging.Core/Surging.Core.ApiGateWay/Surging.Core.ApiGateWay.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>
     <Product>surging Micro Service Framework</Product>

src/Surging.Core/Surging.Core.CPlatform/Configurations/SurgingServerOptions.cs

@@ -1,4 +1,5 @@
 using Surging.Core.CPlatform.Support;
+using System;
 using System.Collections.Generic;
 using System.Net;
 
@@ -16,6 +17,8 @@ public  partial class SurgingServerOptions: ServiceCommand
 
         public double WatchInterval { get; set; } = 20d;
 
+        public int DisconnTimeInterval { get; set; } = 60;
+
         public bool Libuv { get; set; } = false;
 
         public int SoBacklog { get; set; } = 8192;
@@ -29,6 +32,8 @@ public  partial class SurgingServerOptions: ServiceCommand
         public CommunicationProtocol Protocol { get; set; }
         public string RootPath { get; set; }
 
+        public string WebRootPath { get; set; } = AppContext.BaseDirectory;
+
         public int Port { get; set; }
 
         public ProtocolPortOptions Ports { get; set; } = new  ProtocolPortOptions();

src/Surging.Core/Surging.Core.CPlatform/Surging.Core.CPlatform.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
      <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
      <PackageId>surging</PackageId>
      <Authors>fanly</Authors>

src/Surging.Core/Surging.Core.CPlatform/Utilities/NetUtils.cs

@@ -36,8 +36,7 @@ public static bool IsAnyHost(String host)
         private static bool IsValidAddress(string address)
         {
             return (address != null
-                    && !ANYHOST.Equals(address)
-                    && !LOCALHOST.Equals(address)
+                    && !ANYHOST.Equals(address) 
                     && address.IsMatch(IP_PATTERN));
         }
 
@@ -75,7 +74,7 @@ public static string GetAnyHostAddress()
         public static string GetHostAddress(string hostAddress)
         {
             var result = hostAddress;
-            if(IsValidAddress(hostAddress) || IsAnyHost(hostAddress))
+            if((!IsValidAddress(hostAddress) && !IsLocalHost(hostAddress)) || IsAnyHost(hostAddress))
             {
                 result = GetAnyHostAddress();
             }

src/Surging.Core/Surging.Core.Caching/Surging.Core.Caching.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>
     <Product>surging Micro Service Framework</Product>

src/Surging.Core/Surging.Core.Codec.MessagePack/Messages/DynamicItem.cs

@@ -23,7 +23,7 @@ public DynamicItem(object value)
             var valueType = value.GetType();
             var code = Type.GetTypeCode(valueType);
 
-            if (code != TypeCode.Object)
+            if (code != TypeCode.Object && valueType.BaseType!=typeof(Enum))
                 TypeName = valueType.FullName;
             else
                 TypeName = valueType.AssemblyQualifiedName;

src/Surging.Core/Surging.Core.Codec.MessagePack/Surging.Core.Codec.MessagePack.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>
     <Product>surging Micro Service Framework</Product>

src/Surging.Core/Surging.Core.Codec.ProtoBuffer/Surging.Core.Codec.ProtoBuffer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Description>surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec</Description>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>

src/Surging.Core/Surging.Core.Common/Surging.Core.Common.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/Surging.Core/Surging.Core.Consul/Surging.Core.Consul.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Authors>fanly</Authors>
     <Version>1.0.0.0</Version>
     <Product>surging Micro Service Framework</Product>

src/Surging.Core/Surging.Core.DotNetty/Surging.Core.DotNetty.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Version>1.0.0.0</Version>
     <Product>surging Micro Service Framework</Product>
     <Company />

src/Surging.Core/Surging.Core.EventBusKafka/Surging.Core.EventBusKafka.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>
     <Company>fanly</Company>

src/Surging.Core/Surging.Core.EventBusRabbitMQ/Surging.Core.EventBusRabbitMQ.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Description>surging is a distributed micro service framework that provides high-performance RPC remote service calls, using Zookeeper, Consul as the registration center for surging services, integrating hash, random, polling as a load balancing algorithm, RPC integration using the netty framework, Using asynchronous transmission. Use json.net, protobuf, messagepack for serialization Codec</Description>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>

src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpMessageListener.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Surging.Core.CPlatform.Engines;
 using Surging.Core.CPlatform.Serialization;
 using Surging.Core.KestrelHttpServer.Internal;
 using Surging.Core.Swagger.Builder;
@@ -19,25 +20,27 @@ public class KestrelHttpMessageListener : HttpMessageListener, IDisposable
         private IWebHost _host;
         private readonly ISerializer<string> _serializer;
         private readonly IServiceSchemaProvider _serviceSchemaProvider;
+        private readonly IServiceEngineLifetime _lifetime;
 
 
         public KestrelHttpMessageListener(ILogger<KestrelHttpMessageListener> logger, 
             ISerializer<string> serializer,
-            IServiceSchemaProvider serviceSchemaProvider) :base(logger, serializer)
+            IServiceSchemaProvider serviceSchemaProvider, IServiceEngineLifetime lifetime) :base(logger, serializer)
         {
             _logger = logger;
             _serializer = serializer;
             _serviceSchemaProvider = serviceSchemaProvider;
+            _lifetime = lifetime;
         }
 
         public async Task StartAsync(EndPoint endPoint)
         {
             var ipEndPoint = endPoint as IPEndPoint; 
             try
             {
-                _host = new WebHostBuilder()
+               var hostBuilder = new WebHostBuilder()
                  .UseContentRoot(Directory.GetCurrentDirectory())
-                 .UseKestrel(options=> {
+                 .UseKestrel(options => {
                      options.Listen(ipEndPoint);
 
                  })
@@ -46,10 +49,16 @@ public async Task StartAsync(EndPoint endPoint)
                      logger.AddConfiguration(
                             CPlatform.AppConfig.GetSection("Logging"));
                  })
-                 .Configure(AppResolve)
-                 .Build();
+                 .Configure(AppResolve);
 
-               await _host.RunAsync();
+                if (Directory.Exists(CPlatform.AppConfig.ServerOptions.WebRootPath))
+                    hostBuilder = hostBuilder.UseWebRoot(CPlatform.AppConfig.ServerOptions.WebRootPath); 
+                _host= hostBuilder.Build();
+                _lifetime.ServiceEngineStarted.Register(async () =>
+                {
+                    await _host.RunAsync();
+                });
+
             }
             catch
             {

src/Surging.Core/Surging.Core.KestrelHttpServer/KestrelHttpModule.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Surging.Core.CPlatform;
+using Surging.Core.CPlatform.Engines;
 using Surging.Core.CPlatform.Module;
 using Surging.Core.CPlatform.Runtime.Server;
 using Surging.Core.CPlatform.Runtime.Server.Implementation;
@@ -52,7 +53,8 @@ private static void RegisterDefaultProtocol(ContainerBuilderWrapper builder)
                 return new KestrelHttpMessageListener(
                     provider.Resolve<ILogger<KestrelHttpMessageListener>>(),
                     provider.Resolve<ISerializer<string>>(),
-                    provider.Resolve<IServiceSchemaProvider>()
+                    provider.Resolve<IServiceSchemaProvider>(),
+                     provider.Resolve<IServiceEngineLifetime>()
                       );
             }).SingleInstance();
             builder.Register(provider =>
@@ -75,7 +77,8 @@ private static void RegisterHttpProtocol(ContainerBuilderWrapper builder)
                 return new KestrelHttpMessageListener(
                     provider.Resolve<ILogger<KestrelHttpMessageListener>>(),
                     provider.Resolve<ISerializer<string>>(),
-                    provider.Resolve<IServiceSchemaProvider>()
+                    provider.Resolve<IServiceSchemaProvider>(), 
+                     provider.Resolve<IServiceEngineLifetime>()
                       );
             }).SingleInstance();
             builder.Register(provider =>

src/Surging.Core/Surging.Core.KestrelHttpServer/Surging.Core.KestrelHttpServer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>
     <Company>fanly</Company>

src/Surging.Core/Surging.Core.Log4net/Surging.Core.Log4net.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>
     <Company></Company>

src/Surging.Core/Surging.Core.NLog/Surging.Core.Nlog.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <PackageReleaseNotes>1. fix bug</PackageReleaseNotes>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>

src/Surging.Core/Surging.Core.Protocol.Http/Surging.Core.Protocol.Http.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
     <Version>1.0.0.0</Version>
     <Authors>fanly</Authors>
     <Company>fanly</Company>

src/Surging.Core/Surging.Core.Protocol.Mqtt/Implementation/ServerMqttHandlerService.cs

@@ -48,7 +48,7 @@ public async Task Login(IChannelHandlerContext context, ConnectPacket packet)
                         && await mqttBehavior.Authorized(packet.Username, packet.Password))
                 {
                     var mqttChannel = _channelService.GetMqttChannel(deviceId);
-                    if (mqttChannel == null || mqttChannel.SessionStatus == SessionStatus.CLOSE)
+                    if (mqttChannel == null || !mqttChannel.IsOnine())
                     {
                         byte[] bytes = null;
                         if (packet.WillMessage != null)
@@ -108,6 +108,7 @@ public async Task  PingReq(IChannelHandlerContext context, PingReqPacket packet)
             {
                 if (_logger.IsEnabled(LogLevel.Information))
                     _logger.LogInformation("收到来自：【" + context.Channel.RemoteAddress.ToString() + "】心跳");
+                await _channelService.PingReq(context.Channel);
                 await PingResp(context, PingRespPacket.Instance);
             }
         }

src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Channel/MqttChannel.cs

@@ -1,5 +1,6 @@
 using DotNetty.Common.Utilities;
 using DotNetty.Transport.Channels;
+using Surging.Core.CPlatform;
 using Surging.Core.Protocol.Mqtt.Internal.Enums;
 using Surging.Core.Protocol.Mqtt.Internal.Messages;
 using System;
@@ -18,6 +19,9 @@ public class MqttChannel
         public SubscribeStatus SubscribeStatus { get; set; }
         public List<string> Topics { get; set; }
         public SessionStatus SessionStatus { get; set; }
+
+        public DateTime PingReqTime { get; set; } = DateTime.Now;
+
         public bool CleanSession { get; set; }
         public ConcurrentDictionary<int, SendMqttMessage> Messages { get; set; }
 
@@ -57,6 +61,11 @@ public async Task Close()
                 await Channel.CloseAsync();
         }
 
+        public bool IsOnine()
+        {
+            return (DateTime.Now - PingReqTime).TotalSeconds <= AppConfig.ServerOptions.DisconnTimeInterval && SessionStatus== SessionStatus.OPEN;
+        }
+
         public bool IsActive()
         {
             return Channel != null && Channel.Active;

src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/AbstractChannelService.cs

@@ -104,9 +104,8 @@ public async ValueTask<string> GetDeviceId(IChannel channel)
         {
             string deviceId = null;
             if (channel != null)
-            {
-                AttributeKey<string> deviceIdAttrKey = AttributeKey<string>.ValueOf("deviceId");
-                deviceId = channel.GetAttribute<string>(deviceIdAttrKey).Get();
+            { 
+                deviceId = channel.GetAttribute<string>(DeviceIdAttrKey).Get();
             }
             return await new ValueTask<string>(deviceId);
         }
@@ -172,6 +171,8 @@ await _mqttRemoteInvokeService.InvokeAsync(new MqttRemoteInvokeContext
 
         public abstract Task Pubrec(MqttChannel channel, int messageId);
 
+        public abstract ValueTask PingReq(IChannel channel);
+
         public abstract Task Pubrel(IChannel channel, int messageId);
 
         public abstract Task SendWillMsg(MqttWillMessage willMeaasge);
@@ -181,15 +182,15 @@ await _mqttRemoteInvokeService.InvokeAsync(new MqttRemoteInvokeContext
 
         public abstract Task Publish(string deviceId, MqttWillMessage willMessage);
 
-        public ValueTask<SessionStatus?> GetDeviceStatus(string deviceId)
+        public ValueTask<bool> GetDeviceIsOnine(string deviceId)
         {
-            SessionStatus? result = null;
+            bool result = false;
             if (!string.IsNullOrEmpty(deviceId))
             {
                 MqttChannels.TryGetValue(deviceId, out MqttChannel mqttChannel);
-                result = mqttChannel?.SessionStatus;
+                result = mqttChannel==null?false: mqttChannel.IsOnine();
             }
-            return new ValueTask<SessionStatus?>(result);
+            return new ValueTask<bool>(result);
         }
     }
 }

src/Surging.Core/Surging.Core.Protocol.Mqtt/Internal/Services/IChannelService.cs

@@ -17,9 +17,10 @@ public interface IChannelService
         Task Suscribe(String deviceId, params string[] topics);
         Task Login(IChannel channel, string deviceId, ConnectMessage mqttConnectMessage);
         Task Publish(IChannel channel, PublishPacket mqttPublishMessage);
+        ValueTask PingReq(IChannel channel);
         Task Publish(string deviceId, MqttWillMessage willMessage);
         Task Close(string deviceId, bool isDisconnect);
-        ValueTask<SessionStatus?> GetDeviceStatus(string deviceId);
+        ValueTask<bool> GetDeviceIsOnine(string deviceId);
         Task SendWillMsg(MqttWillMessage willMeaasge);
         ValueTask<string> GetDeviceId(IChannel channel);
         Task UnSubscribe(string deviceId, params string[] topics);