1

TEAMModelOS.GRPC/Startup.cs

@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using TEAMModelOS.Grpc;
 using TEAMModelOS.GRPC.Services.Syllabus;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
 using TEAMModelOS.SDK.Module.AzureCosmosDB.Configuration;
@@ -18,7 +19,7 @@ using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 using TEAMModelOS.SDK.Module.AzureTable.Implements;
 using TEAMModelOS.SDK.Module.AzureTable.Interfaces;
 
-namespace TEAMModelOS.GRPC
+namespace TEAMModelOS.Grpc
 {
     public class Startup
     {
@@ -34,9 +35,6 @@ namespace TEAMModelOS.GRPC
             services.AddGrpc();
             //添加Grpc扩展
             services.AddGrpcExtensions(_conf);
-
-
-            
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -51,8 +49,8 @@ namespace TEAMModelOS.GRPC
 
             app.UseEndpoints(endpoints =>
             {
-                //endpoints.MapGrpcService<GreeterService>();
-
+                endpoints.MapGrpcService<GreeterService>();
+                endpoints.MapGrpcService<KnowledgeService>();
                 endpoints.MapGet("/", async context =>
                 {
                     await context.Response.WriteAsync("Communication with gRPC endpoints must be made through a gRPC client. To learn how to create a client, visit: https://go.microsoft.com/fwlink/?linkid=2086909");

TEAMModelOS.GRPC/TEAMModelOS.GRPC.csproj

@@ -7,17 +7,19 @@
     <DocumentationFile>TEAMModelOS.GRPC.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <None Remove="Protos\KnowledgeService.proto" />
+    <None Remove="Protos\greet.proto" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.24.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.24.0">
+    <PackageReference Include="Google.Protobuf" Version="3.11.4" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.27.0" />
+    <PackageReference Include="protobuf-net" Version="2.4.6" />
+    <PackageReference Include="Grpc.Tools" Version="2.27.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <Protobuf Include="Protos\KnowledgeService.proto" GrpcServices="Server" />
+    <Protobuf Include="Protos\greet.proto" GrpcServices="Server" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Services\Core\" />

TEAMModelOS.GRPC/appsettings.Development.json

@@ -13,7 +13,7 @@
     //用于grpc启动后注册到服务发现的ip地址段
     "ServiceAddress": "192.168.*.*:",
     //是否启用服务注册和服务发现,默认是true
-    "EnableDiscovery": true,
+    "EnableDiscovery": false,
     //服务发现服务器地址
     "DiscoveryUrl": "http://106.12.23.251:8500",
     //注册到服务发现的服务名称

TEAMModelOS.GRPC/appsettings.json

@@ -11,7 +11,7 @@
     //用于grpc启动后注册到服务发现的ip地址段
     "ServiceAddress": "192.168.*.*:",
     //是否启用服务注册和服务发现,默认是true
-    "EnableDiscovery": true,
+    "EnableDiscovery": false,
     //服务发现服务器地址
     "DiscoveryUrl": "http://106.12.23.251:8500",
     //注册到服务发现的服务名称

TEAMModelOS.Grpc/Protos/KnowledgeService.proto

@@ -4,7 +4,7 @@ package TMDOSGRPC.KnowledgeService;
 
 
 service KnowledgeService {
-   rpc FinKnowledge1(RequestDict) returns(stream Knowledge);
+   rpc FinKnowledge(RequestDict) returns(stream Knowledge);
 
 }
 

TEAMModelOS.Grpc/Services/GreeterService.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Grpc.Core;
 using Microsoft.Extensions.Logging;
-
+using TEAMModelOS.Grpc;
 namespace TEAMModelOS.Grpc
 {
     public class GreeterService : Greeter.GreeterBase
@@ -23,4 +23,5 @@ namespace TEAMModelOS.Grpc
             });
         }
     }
+
 }

TEAMModelOS.Grpc/Services/Syllabus/KnowledgeService.cs

@@ -13,17 +13,29 @@ using TEAMModelOS.GRPC.Models.Dtos;
 
 namespace TEAMModelOS.GRPC.Services.Syllabus
 {
+    /// <summary>
+    /// 
+    /// </summary>
     public class KnowledgeService : IGrpcService
     {
         public IAzureCosmosDBV3Repository cosmosDBV3Repository;
-
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="cosmosDBV3Repository"></param>
         public KnowledgeService(IAzureCosmosDBV3Repository cosmosDBV3Repository)
         {
             this.cosmosDBV3Repository = cosmosDBV3Repository;
         }
-
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="request"></param>
+        /// <param name="responseStream"></param>
+        /// <param name="context"></param>
+        /// <returns></returns>
         //[Authorize]
-        public async Task FinKnowledge1(RequestDict request, IServerStreamWriter<Knowledge> responseStream, ServerCallContext context)
+        public async Task FinKnowledge(RequestDict request, IServerStreamWriter<Knowledge> responseStream, ServerCallContext context)
         {
             string a = request.dict.ToJson();
             Dictionary<string, object> keyValuePairs = JsonNetHelper.FromJson<Dictionary<string, object>>(a);

TEAMModelOS.Grpc/TEAMModelOS.GRPC.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>TEAMModelOS.GRPC</name>
+        <name>TEAMModelOS.Grpc</name>
     </assembly>
     <members>
         <member name="P:TEAMModelOS.GRPC.Models.Dtos.RequestDict.dict">
@@ -9,40 +9,60 @@
             查询dict
             </summary>
         </member>
-        <member name="T:Helloworld.HelloworldReflection">
-            <summary>Holder for reflection information generated from Protos/helloworld.proto</summary>
+        <member name="T:TEAMModelOS.GRPC.Services.Syllabus.KnowledgeService">
+            <summary>
+            
+            </summary>
         </member>
-        <member name="P:Helloworld.HelloworldReflection.Descriptor">
-            <summary>File descriptor for Protos/helloworld.proto</summary>
+        <member name="M:TEAMModelOS.GRPC.Services.Syllabus.KnowledgeService.#ctor(TEAMModelOS.SDK.Module.AzureCosmosDBV3.IAzureCosmosDBV3Repository)">
+            <summary>
+            
+            </summary>
+            <param name="cosmosDBV3Repository"></param>
         </member>
-        <member name="T:Helloworld.HelloRequest">
+        <member name="M:TEAMModelOS.GRPC.Services.Syllabus.KnowledgeService.FinKnowledge(TEAMModelOS.GRPC.Models.Dtos.RequestDict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.Syllabus.Knowledge},Grpc.Core.ServerCallContext)">
+            <summary>
+            
+            </summary>
+            <param name="request"></param>
+            <param name="responseStream"></param>
+            <param name="context"></param>
+            <returns></returns>
+        </member>
+        <member name="T:TEAMModelOS.Grpc.GreetReflection">
+            <summary>Holder for reflection information generated from Protos/greet.proto</summary>
+        </member>
+        <member name="P:TEAMModelOS.Grpc.GreetReflection.Descriptor">
+            <summary>File descriptor for Protos/greet.proto</summary>
+        </member>
+        <member name="T:TEAMModelOS.Grpc.HelloRequest">
             <summary>
             The request message containing the user's name.
             </summary>
         </member>
-        <member name="F:Helloworld.HelloRequest.NameFieldNumber">
+        <member name="F:TEAMModelOS.Grpc.HelloRequest.NameFieldNumber">
             <summary>Field number for the "name" field.</summary>
         </member>
-        <member name="T:Helloworld.HelloReply">
+        <member name="T:TEAMModelOS.Grpc.HelloReply">
             <summary>
-            The response message containing the greetings
+            The response message containing the greetings.
             </summary>
         </member>
-        <member name="F:Helloworld.HelloReply.MessageFieldNumber">
+        <member name="F:TEAMModelOS.Grpc.HelloReply.MessageFieldNumber">
             <summary>Field number for the "message" field.</summary>
         </member>
-        <member name="T:Helloworld.Greeter">
+        <member name="T:TEAMModelOS.Grpc.Greeter">
             <summary>
             The greeting service definition.
             </summary>
         </member>
-        <member name="P:Helloworld.Greeter.Descriptor">
+        <member name="P:TEAMModelOS.Grpc.Greeter.Descriptor">
             <summary>Service descriptor</summary>
         </member>
-        <member name="T:Helloworld.Greeter.GreeterBase">
+        <member name="T:TEAMModelOS.Grpc.Greeter.GreeterBase">
             <summary>Base class for server-side implementations of Greeter</summary>
         </member>
-        <member name="M:Helloworld.Greeter.GreeterBase.SayHello(Helloworld.HelloRequest,Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelOS.Grpc.Greeter.GreeterBase.SayHello(TEAMModelOS.Grpc.HelloRequest,Grpc.Core.ServerCallContext)">
             <summary>
             Sends a greeting
             </summary>
@@ -50,85 +70,11 @@
             <param name="context">The context of the server-side call handler being invoked.</param>
             <returns>The response to send back to the client (wrapped by a task).</returns>
         </member>
-        <member name="M:Helloworld.Greeter.GreeterBase.SayHelloStream(Grpc.Core.IAsyncStreamReader{Helloworld.HelloRequest},Grpc.Core.ServerCallContext)">
-            <summary>
-            Stream Sends a greeting
-            </summary>
-            <param name="requestStream">Used for reading requests from the client.</param>
-            <param name="context">The context of the server-side call handler being invoked.</param>
-            <returns>The response to send back to the client (wrapped by a task).</returns>
-        </member>
-        <member name="M:Helloworld.Greeter.BindService(Helloworld.Greeter.GreeterBase)">
-            <summary>Creates service definition that can be registered with a server</summary>
-            <param name="serviceImpl">An object implementing the server-side handling logic.</param>
-        </member>
-        <member name="M:Helloworld.Greeter.BindService(Grpc.Core.ServiceBinderBase,Helloworld.Greeter.GreeterBase)">
-            <summary>Register service method with a service binder with or without implementation. Useful when customizing the  service binding logic.
-            Note: this method is part of an experimental API that can change or be removed without any prior notice.</summary>
-            <param name="serviceBinder">Service methods will be bound by calling <c>AddMethod</c> on this object.</param>
-            <param name="serviceImpl">An object implementing the server-side handling logic.</param>
-        </member>
-        <member name="T:TMDOSGRPC.KnowledgeService.KnowledgeServiceReflection">
-            <summary>Holder for reflection information generated from Protos/KnowledgeService.proto</summary>
-        </member>
-        <member name="P:TMDOSGRPC.KnowledgeService.KnowledgeServiceReflection.Descriptor">
-            <summary>File descriptor for Protos/KnowledgeService.proto</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.RequestDict.DictFieldNumber">
-            <summary>Field number for the "dict" field.</summary>
-        </member>
-        <member name="P:TMDOSGRPC.KnowledgeService.RequestDict.Dict">
-             <summary>
-            查询dict
-             </summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.IdFieldNumber">
-            <summary>Field number for the "id" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.TypeFieldNumber">
-            <summary>Field number for the "type" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.NameFieldNumber">
-            <summary>Field number for the "name" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.AliasFieldNumber">
-            <summary>Field number for the "alias" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.SubjectCodeFieldNumber">
-            <summary>Field number for the "subjectCode" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.ScopeCodeFieldNumber">
-            <summary>Field number for the "scopeCode" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.OrderFieldNumber">
-            <summary>Field number for the "order" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.StatusFieldNumber">
-            <summary>Field number for the "status" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.PointsFieldNumber">
-            <summary>Field number for the "points" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.KnowledgeIdFieldNumber">
-            <summary>Field number for the "knowledgeId" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.SourceFieldNumber">
-            <summary>Field number for the "source" field.</summary>
-        </member>
-        <member name="F:TMDOSGRPC.KnowledgeService.Knowledge.PeriodFieldNumber">
-            <summary>Field number for the "period" field.</summary>
-        </member>
-        <member name="P:TMDOSGRPC.KnowledgeService.KnowledgeService.Descriptor">
-            <summary>Service descriptor</summary>
-        </member>
-        <member name="T:TMDOSGRPC.KnowledgeService.KnowledgeService.KnowledgeServiceBase">
-            <summary>Base class for server-side implementations of KnowledgeService</summary>
-        </member>
-        <member name="M:TMDOSGRPC.KnowledgeService.KnowledgeService.BindService(TMDOSGRPC.KnowledgeService.KnowledgeService.KnowledgeServiceBase)">
+        <member name="M:TEAMModelOS.Grpc.Greeter.BindService(TEAMModelOS.Grpc.Greeter.GreeterBase)">
             <summary>Creates service definition that can be registered with a server</summary>
             <param name="serviceImpl">An object implementing the server-side handling logic.</param>
         </member>
-        <member name="M:TMDOSGRPC.KnowledgeService.KnowledgeService.BindService(Grpc.Core.ServiceBinderBase,TMDOSGRPC.KnowledgeService.KnowledgeService.KnowledgeServiceBase)">
+        <member name="M:TEAMModelOS.Grpc.Greeter.BindService(Grpc.Core.ServiceBinderBase,TEAMModelOS.Grpc.Greeter.GreeterBase)">
             <summary>Register service method with a service binder with or without implementation. Useful when customizing the  service binding logic.
             Note: this method is part of an experimental API that can change or be removed without any prior notice.</summary>
             <param name="serviceBinder">Service methods will be bound by calling <c>AddMethod</c> on this object.</param>

TEAMModelOS.Service/TEAMModelOS.Model.xml

@@ -239,6 +239,11 @@
             编序学习
             </summary>
         </member>
+        <member name="P:TEAMModelOS.Service.Models.Learn.LeanProcess.periodCode">
+            <summary>
+            学段code
+            </summary>
+        </member>
         <member name="P:TEAMModelOS.Service.Models.Learn.LeanProcess.Introduce">
             <summary>
             活动介绍

TEAMModelOS.Service/TEAMModelOS.Service.csproj

@@ -9,5 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\TEAMModelOS.SDK\TEAMModelOS.SDK.csproj" />
   </ItemGroup>
-
+  <ItemGroup>
+    <PackageReference Include="protobuf-net" Version="2.4.6" />
+  </ItemGroup>
 </Project>