修正依赖

guoming · Dec 23, 2021 · daa882b · daa882b
1 parent 1e8dadb
commit daa882b
Show file tree

Hide file tree

Showing 51 changed files with 232 additions and 271 deletions.
diff --git a/ci-nuget-pack.sh b/ci-nuget-pack.sh
@@ -0,0 +1,3 @@
+find . -name "*.nupkg"|xargs rm -rf
+dotnet pack --configuration Debug
+find . -name "*.nupkg"|xargs -I {} dotnet nuget push "{}"  --api-key oy2lf5bairpuqwucpxsa3w2f7hoj7txupek3prt4a2bi5u -s https://api.nuget.org/v3/index.json
diff --git a/example/.DS_Store b/example/.DS_Store
diff --git a/example/Hummingbird.WebApi/.DS_Store b/example/Hummingbird.WebApi/.DS_Store
diff --git a/example/Hummingbird.WebApi/Config/appsettings.json b/example/Hummingbird.WebApi/Config/appsettings.json
@@ -25,10 +25,10 @@
   },
   "Database": {
     "SQLServer": {
-      "Server": "192.168.10.227",
-      "Database": "zongteng_TMS-dev",
-      "UserId": "zt-2874-dev",
-      "Password": "qXSW!9vXYfFxQYbg"
+      "Server": "localhost",
+      "Database": "example",
+      "UserId": "sa",
+      "Password": "123456"
     }
   },
   "AppMetrics": {
@@ -37,7 +37,7 @@
     },
     "Influxdb": {
       "Enable": true,
-      "Address": "http://influxdb.service.consul:8086",
+      "Address": "http://localhost:8086",
       "Database": "AppMetrics",
       "UserName": "root",
       "Password": "influxdb",
@@ -52,22 +52,22 @@
     }
   },
   "EventBus": {
-    "HostName": "192.168.109.166,test.rabbitmq.service.consul",
+    "HostName": "localhost",
     "Port": "5672",
     "VirtualHost": "/LMS_TEST",
-    "UserName": "lms_portal_user",
-    "Password": "lms_portal_user@passw0rd"
+    "UserName": "guest",
+    "Password": "123456"
   },
   "Kafka": {
     "Sender": {
       "Debug": "broker,topic,msg",
-      "bootstrap.servers": "192.168.87.7:9092"
+      "bootstrap.servers": "localhost:9092"
 
     },
     "Receiver": {
       "Debug": "consumer,cgrp,topic,fetch",
       "GroupId": "dev1",
-      "bootstrap.servers": "192.168.87.7:9092"
+      "bootstrap.servers": "localhost:9092"
     }
   },
   "Canal": {
@@ -105,15 +105,13 @@
       }
     ]
   },
-  "SERVICE_REGISTRY_ADDRESS": "192.168.109.127",
+  "SERVICE_REGISTRY_ADDRESS": "localhost",
   "SERVICE_REGISTRY_PORT": "8500",
   "SERVICE_SELF_REGISTER": true,
-  "SERVICE_NAME": "SERVICE_EXAMPLE",
-  "SERVICE_TAGS": "TEST",
+  "SERVICE_NAME": "example",
+  "SERVICE_TAGS": "test",
   "SERVICE_REGION": "dc1",
-  //"SERVICE_80_CHECK_HTTP": "/healthcheck",
-  //"SERVICE_80_CHECK_INTERVAL": "15",
-  //"SERVICE_80_CHECK_TIMEOUT": "15",
+  "SERVICE_CHECK_HTTP": "/healthcheck",
   "SERVICE_CHECK_TCP": null,
   "SERVICE_CHECK_SCRIPT": null,
   "SERVICE_CHECK_TTL": "15",

diff --git a/example/Hummingbird.WebApi/Controllers/CacheingTestController.cs b/example/Hummingbird.WebApi/Controllers/CacheingTestController.cs
@@ -20,7 +20,7 @@ public CacheingTestController(
 
         [HttpGet]
         [Route("Test")]
-        public async Task<string> Test()
+        public  string Test()
         {
             var cacheKey = "cacheKey";
             var cacheValue = cacheManager.StringGet<string>(cacheKey);

diff --git a/example/Hummingbird.WebApi/Controllers/OpenTracingTestController.cs b/example/Hummingbird.WebApi/Controllers/OpenTracingTestController.cs
@@ -8,20 +8,7 @@ public class OpenTracingTestController : Controller
     {
 
 
-        [HttpGet]
-        [Route("Test")]
-        public async Task Test()
-        {
-            using (Hummingbird.Extensions.Tracing.Tracer tracer = new Hummingbird.Extensions.Tracing.Tracer("Test"))
-            {
-                tracer.SetTag("tag1", "value1");
-                tracer.SetError();
-                tracer.Log("key1", "value1");
-
-            }
-
-
-        }
+
 
     }
 

diff --git a/example/Hummingbird.WebApi/Events/.DS_Store b/example/Hummingbird.WebApi/Events/.DS_Store
diff --git a/...nts/MongoSharkEvent2/MongodbSharkEvent.cs → ...ents/MongoSharkEvent/MongodbSharkEvent.cs b/...nts/MongoSharkEvent2/MongodbSharkEvent.cs → ...ents/MongoSharkEvent/MongodbSharkEvent.cs
diff --git a/...goSharkEvent2/MongodbSharkEventHandler.cs → ...ngoSharkEvent/MongodbSharkEventHandler.cs b/...goSharkEvent2/MongodbSharkEventHandler.cs → ...ngoSharkEvent/MongodbSharkEventHandler.cs
diff --git a/example/Hummingbird.WebApi/Hummingbird.Example.csproj b/example/Hummingbird.WebApi/Hummingbird.Example.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
 
@@ -20,8 +20,7 @@
 
   <ItemGroup>
     <PackageReference Include="Autofac.Extras.DynamicProxy" Version="4.5.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.3" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+<!--    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.2.0" />-->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/example/Hummingbird.WebApi/Program.cs b/example/Hummingbird.WebApi/Program.cs
@@ -1,11 +1,10 @@
-using Hummingbird.AspNetCore.HealthChecks;
+using System.IO;
+using Hummingbird.AspNetCore.HealthChecks;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Logging;
-using System.IO;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Hosting.Internal;
+using Microsoft.Extensions.Logging;
 
 namespace Hummingbird.Example
 {
@@ -14,10 +13,6 @@ public class Program
         public static void Main(string[] args)
         {
             BuildWebHost(args).Run();
-
-
-
-
         }
 
         public static IWebHost BuildWebHost(string[] args) =>

diff --git a/example/Hummingbird.WebApi/Startup.cs b/example/Hummingbird.WebApi/Startup.cs
@@ -27,25 +27,30 @@ public Startup(IConfiguration configuration)
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc();
+            services.AddCors()
+             .AddMvc(a => a.EnableEndpointRouting = false)
+             .SetCompatibilityVersion(Microsoft.AspNetCore.Mvc.CompatibilityVersion.Version_3_0)
+             .AddControllersAsServices();  //全局配置Json序列化处理
+
+
+
             services.AddHealthChecks(checks =>
             {
                 checks.WithDefaultCacheDuration(TimeSpan.FromSeconds(5));
-                checks.AddMySqlCheck("mysql", "Server=dev.mysql.service.consul;Port=63307;Database=lms_openapi_cn_dev; User=lms-dev;Password=97bL8AtWmlfxQtK10Afg;pooling=True;minpoolsize=1;maxpoolsize=100;connectiontimeout=180;SslMode=None");
-                checks.AddSqlCheck("sqlserver", "Data Source=test.sqlserver.service.consul,63341;Initial Catalog=ZT_ConfigCenter_TEST;User Id=tms-test;Password=qtvf12Croexy4cXH7lZB");
+                checks.AddMySqlCheck("mysql", "Server=localhost;Port=3306;Database=example; User=root;Password=123456;pooling=True;minpoolsize=1;maxpoolsize=100;connectiontimeout=180;SslMode=None");
                 checks.AddRedisCheck("redis", Configuration["redis:0:connectionString"]);
-                checks.AddRabbitMQCheck("rabbitmq", factory =>
-                {
-                    factory.WithEndPoint(Configuration["EventBus:HostName"] ?? "localhost", int.Parse(Configuration["EventBus:Port"] ?? "5672"));
-                    factory.WithAuth(Configuration["EventBus:UserName"] ?? "guest", Configuration["EventBus:Password"] ?? "guest");
-                    factory.WithExchange(Configuration["EventBus:VirtualHost"] ?? "/");
-                });
-                checks.AddKafkaCheck("kafka", new Confluent.Kafka.ProducerConfig()
-                {
-                    Acks = Confluent.Kafka.Acks.All,
-                    //BootstrapServers = "192.168.78.29:9092,192.168.78.30:9092,192.168.78.31:9092",
-                    BootstrapServers = Configuration["Kafka:Sender:bootstrap.servers"]
-                });
+                //checks.AddRabbitMQCheck("rabbitmq", factory =>
+                //{
+                //    factory.WithEndPoint(Configuration["EventBus:HostName"] ?? "localhost", int.Parse(Configuration["EventBus:Port"] ?? "5672"));
+                //    factory.WithAuth(Configuration["EventBus:UserName"] ?? "guest", Configuration["EventBus:Password"] ?? "guest");
+                //    factory.WithExchange(Configuration["EventBus:VirtualHost"] ?? "/");
+                //});
+                //checks.AddKafkaCheck("kafka", new Confluent.Kafka.ProducerConfig()
+                //{
+                //    Acks = Confluent.Kafka.Acks.All,
+                //    //BootstrapServers = "192.168.78.29:9092,192.168.78.30:9092,192.168.78.31:9092",
+                //    BootstrapServers = Configuration["Kafka:Sender:bootstrap.servers"]
+                //});
             });
 
             services.AddHummingbird(hummingbird =>
@@ -175,7 +180,7 @@ public void ConfigureServices(IServiceCollection services)
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
             var eventBus = app.ApplicationServices.GetRequiredService<IEventBus>();
             var logger = app.ApplicationServices.GetRequiredService<ILogger<IEventLogger>>();
@@ -188,10 +193,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 {
                     sp.UseSubscriber(eventbus =>
                     {
-                        eventbus.RegisterBatch<CanalEntryEvent, CanalEntryEventHandler > ("", "canal_dwh_test2");
                         eventbus.RegisterBatch<TestEvent, TestEventHandler1>("TestEventHandler", "TestEventHandler");
-                        eventbus.RegisterBatch<Hummingbird.Example.Events.MongoShark.MongodbSharkEvent, Example.Events.MongoShark.MongodbSharkEventHandler>("", "mongodb_test.tmstracking.sync_order");
-
+
                         //订阅消息
                         eventbus.Subscribe((Messages) =>
                         {
@@ -223,9 +226,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 });
 
             });
-            app.UseMvc();
-
-
+
         }
     }
 }
diff --git a/example/Test/Program.cs b/example/Test/Program.cs
diff --git a/example/Test/Test.csproj b/example/Test/Test.csproj
diff --git a/src/Hummingbird.AspNet.HealthChecks/.DS_Store b/src/Hummingbird.AspNet.HealthChecks/.DS_Store
diff --git a/src/Hummingbird.AspNet.HealthChecks/Hummingbird.AspNet.HealthChecks.csproj b/src/Hummingbird.AspNet.HealthChecks/Hummingbird.AspNet.HealthChecks.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
-    <Version>1.16.0</Version>
+    <TargetFrameworks>net46;</TargetFrameworks>
+    <Version>1.17.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 

diff --git a/src/Hummingbird.AspNetCore.HealthChecks/Hummingbird.AspNetCore.HealthChecks.csproj b/src/Hummingbird.AspNetCore.HealthChecks/Hummingbird.AspNetCore.HealthChecks.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
-    <Version>1.16.0</Version>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Version>1.17.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 

diff --git a/src/Hummingbird.AspNetCore.Metrics/Hummingbird.AspNetCore.Metrics.csproj b/src/Hummingbird.AspNetCore.Metrics/Hummingbird.AspNetCore.Metrics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>1.16.0</Version>
+        <Version>1.17.0</Version>
 
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>Hummingbird.AspNetCore.Metrics</PackageId>
@@ -17,7 +17,6 @@
     <PackageReference Include="App.Metrics.Prometheus" Version="4.1.0" />
     <PackageReference Include="App.Metrics.Reporting.Console" Version="4.1.0" />
     <PackageReference Include="App.Metrics.Reporting.InfluxDB" Version="4.1.0" />
-    <PackageReference Include="DumpExtensions" Version="2.0.0" />    
   </ItemGroup>
 
 </Project>
diff --git a/src/Hummingbird.Core/Hummingbird.Core.csproj b/src/Hummingbird.Core/Hummingbird.Core.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;netstandard2.0</TargetFrameworks>
-    <Version>1.16.0</Version>
+    <TargetFrameworks>netcoreapp2.2;netstandard2.0</TargetFrameworks>
+    <Version>1.17.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <RootNamespace>Hummingbird.Core</RootNamespace>
     <Authors>guoming</Authors>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">
     <DefineConstants>NETCORE</DefineConstants>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.0.2" />
   </ItemGroup>
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
     <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.1.0" />
   </ItemGroup>

diff --git a/src/Hummingbird.DynamicRoute/Hummingbird.DynamicRoute.csproj b/src/Hummingbird.DynamicRoute/Hummingbird.DynamicRoute.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.16.0</Version>
+    <Version>1.17.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>guoming</Authors>
     <Company>guoming</Company>

diff --git a/src/Hummingbird.DynamicRoute/IServiceDiscoveryProvider.cs b/src/Hummingbird.DynamicRoute/IServiceDiscoveryProvider.cs
@@ -10,6 +10,8 @@ public interface IServiceDiscoveryProvider
 
         void Deregister();
 
+        void Heartbeat();
+
         string ServiceId { get;  }
     }
 }
diff --git a/src/Hummingbird.Extensions.Cache/Hummingbird.Extensions.Cache.csproj b/src/Hummingbird.Extensions.Cache/Hummingbird.Extensions.Cache.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.1;net4.6.1;</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;net4.6.1;</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.16.0</Version>
+    <Version>1.17.0</Version>
     <RepositoryUrl>https://github.com/guoming/Hummingbird</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Description>分布式缓存</Description>
     <Authors>GUOMING</Authors>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">
     <DefineConstants>NETCORE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net4.6.1' ">
     <DefineConstants>NET461</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">    
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">    
     <PackageReference Include="CacheManager.Core" Version="1.2.0" />
     <PackageReference Include="CacheManager.Microsoft.Extensions.Caching.Memory" Version="1.2.0" />
     <PackageReference Include="CacheManager.Microsoft.Extensions.Configuration" Version="1.2.0" />