From 7cc0986321f92b9e1923a806b8033edc2a694c9a Mon Sep 17 00:00:00 2001
From: dingsongjie <dingsongjie@DESKTOP-0AS088R>
Date: Fri, 28 Feb 2020 16:55:15 +0800
Subject: [PATCH] 添加 grpc web

---
 samples/apis/Backet.Api/Backet.Api.csproj             | 4 ++++
 samples/apis/Backet.Api/GrpcServices/BacketService.cs | 5 +++--
 samples/apis/Backet.Api/Startup.cs                    | 3 +++
 src/Pole.Grpc/Pole.Grpc.csproj                        | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/samples/apis/Backet.Api/Backet.Api.csproj b/samples/apis/Backet.Api/Backet.Api.csproj
index c9da4a3..ae744f7 100644
--- a/samples/apis/Backet.Api/Backet.Api.csproj
+++ b/samples/apis/Backet.Api/Backet.Api.csproj
@@ -6,9 +6,13 @@
 
   <ItemGroup>
     <Compile Remove="Application\**" />
+    <Compile Remove="Logger\**" />
     <Content Remove="Application\**" />
+    <Content Remove="Logger\**" />
     <EmbeddedResource Remove="Application\**" />
+    <EmbeddedResource Remove="Logger\**" />
     <None Remove="Application\**" />
+    <None Remove="Logger\**" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/apis/Backet.Api/GrpcServices/BacketService.cs b/samples/apis/Backet.Api/GrpcServices/BacketService.cs
index cf1212d..ca4ecac 100644
--- a/samples/apis/Backet.Api/GrpcServices/BacketService.cs
+++ b/samples/apis/Backet.Api/GrpcServices/BacketService.cs
@@ -16,12 +16,13 @@ namespace Backet.Api.GrpcServices
         {
             this.clusterClient = clusterClient;
         }
-        public override Task<Pole.Grpc.ExtraType.CommonCommandResponse> AddBacket(AddBacketRequest backetDto, ServerCallContext context)
+        public override async Task<Pole.Grpc.ExtraType.CommonCommandResponse> AddBacket(AddBacketRequest backetDto, ServerCallContext context)
         {
             var newId = Guid.NewGuid().ToString("N").ToLower();
             backetDto.Id = newId;
             var grain = clusterClient.GetGrain<IAddBacketGrain>(newId);
-            return Task.FromResult(Pole.Grpc.ExtraType.CommonCommandResponse.SuccessResponse);
+            //await  grain.AddBacket(backetDto);
+            return Pole.Grpc.ExtraType.CommonCommandResponse.SuccessResponse;
         }
     }
 }
diff --git a/samples/apis/Backet.Api/Startup.cs b/samples/apis/Backet.Api/Startup.cs
index e7ef81e..0ee2331 100644
--- a/samples/apis/Backet.Api/Startup.cs
+++ b/samples/apis/Backet.Api/Startup.cs
@@ -31,6 +31,7 @@ namespace Backet.Api
             services.AddGrpc();
             services.AddGrpcValidation();
             services.AddGrpcRequestValidator();
+            services.AddGrpcWeb(o => o.GrpcWebEnabled = true);
 
             services.AddPole(config =>
             {
@@ -64,6 +65,8 @@ namespace Backet.Api
             app.UsePole();
             app.UseRouting();
 
+            app.UseGrpcWeb();
+
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapDefaultControllerRoute();
diff --git a/src/Pole.Grpc/Pole.Grpc.csproj b/src/Pole.Grpc/Pole.Grpc.csproj
index ba5b54b..03700a5 100644
--- a/src/Pole.Grpc/Pole.Grpc.csproj
+++ b/src/Pole.Grpc/Pole.Grpc.csproj
@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="FluentValidation" Version="8.6.0" />
     <PackageReference Include="Grpc.AspNetCore" Version="2.26.0" />
+    <PackageReference Include="Grpc.AspNetCore.Web" Version="2.27.0-pre1" />
   </ItemGroup>
 
   <ItemGroup>
--
libgit2 0.25.0