123

TEAMModelGrpc/Models/RequestDict.cs

@@ -1,20 +0,0 @@
-using ProtoBuf;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace TEAMModelGrpc.Models
-{
-    [ProtoContract]
-    public class RequestDict
-    {
-        /// <summary>
-        /// 查询dict
-        /// </summary>
-        [ProtoMember(1)]
-        public Dictionary<string, string> dict { get; set; }
-
-
-    }
-}

TEAMModelGrpc/Protos/KnowledgeService.proto

@@ -1,31 +1,19 @@
 syntax = "proto3";
-option csharp_namespace = "TEAMModelGrpc";
+option csharp_namespace = "TEAMModelGrpc.KnowledgeService";
 package math;
 
 
 service KnowledgeService {
-   rpc FinKnowledge(RequestDict) returns(stream Knowledge);
+   rpc SayHello(ByteString) returns(HelloReply);
 
 }
 
 
 
-message RequestDict {
-   //查询dict
-   map<string,string> dict = 1;
+message ByteString {
+   repeated uint32 items = 1;
 }
 
-message Knowledge {
-   string id = 1;
-   int32 type = 2;
-   string name = 3;
-   string alias = 4;
-   string subjectCode = 5;
-   string scopeCode = 6;
-   int32 order = 7;
-   int32 status = 8;
-   repeated string points = 9;
-   string knowledgeId = 10;
-   int32 source = 11;
-   string period = 12;
+//The response message containing the greetings.
+message HelloReply {
 }

TEAMModelGrpc/Services/KnowledgeService.cs

@@ -1,11 +1,11 @@
-using Grpc.Core;
+using Google.Protobuf;
+using Grpc.Core;
 using Grpc.Extension.Abstract;
 using Microsoft.AspNetCore.Authorization;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using TEAMModelGrpc.Models;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 using TEAMModelOS.Service.Models.Syllabus;
@@ -26,27 +26,19 @@ namespace TEAMModelGrpc.Services
         {
             this.cosmosDBV3Repository = cosmosDBV3Repository;
         }
+     
         /// <summary>
         /// 
         /// </summary>
         /// <param name="request"></param>
-        /// <param name="responseStream"></param>
         /// <param name="context"></param>
         /// <returns></returns>
-        //[Authorize]
-        public async Task FinKnowledge(RequestDict request, IServerStreamWriter<Knowledge> responseStream, ServerCallContext context)
+        public  Task<HelloReply> SayHello(Byte  request, ServerCallContext context)
         {
-            string a = request.dict.ToJson();
-            Dictionary<string, object> keyValuePairs = JsonNetHelper.FromJson<Dictionary<string, object>>(a);
-            List<Knowledge> knowledges = await cosmosDBV3Repository.FindByDict<Knowledge>(keyValuePairs);
-
-            knowledges.ForEach(x =>
+            return Task.FromResult(new HelloReply
             {
-                responseStream.WriteAsync(x);
+                Message = "Hello " + request
             });
-            //ResponseList<Knowledge> listKnowledge = new ResponseList<Knowledge>();
-            //listKnowledge.response = knowledges;
-            //return await Task.FromResult(listKnowledge);
         }
         //[Authorize]
         //public async Task FinKnowledge(string request, IServerStreamWriter<Family> responseStream, ServerCallContext context)

TEAMModelGrpc/TEAMModelGrpc.csproj

@@ -25,4 +25,8 @@
     <Protobuf Include="Protos\greet.proto" GrpcServices="Server" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="Models\" />
+  </ItemGroup>
+
 </Project>

TEAMModelGrpc/TEAMModelOS.GRPC.xml

@@ -4,11 +4,6 @@
         <name>TEAMModelGrpc</name>
     </assembly>
     <members>
-        <member name="P:TEAMModelGrpc.Models.RequestDict.dict">
-            <summary>
-            查询dict
-            </summary>
-        </member>
         <member name="T:TEAMModelGrpc.Services.KnowledgeService">
             <summary>
             
@@ -20,12 +15,11 @@
             </summary>
             <param name="cosmosDBV3Repository"></param>
         </member>
-        <member name="M:TEAMModelGrpc.Services.KnowledgeService.FinKnowledge(TEAMModelGrpc.Models.RequestDict,Grpc.Core.IServerStreamWriter{TEAMModelOS.Service.Models.Syllabus.Knowledge},Grpc.Core.ServerCallContext)">
+        <member name="M:TEAMModelGrpc.Services.KnowledgeService.SayHello(System.Byte,Grpc.Core.ServerCallContext)">
             <summary>
             
             </summary>
             <param name="request"></param>
-            <param name="responseStream"></param>
             <param name="context"></param>
             <returns></returns>
         </member>

TEAMModelOS.Grpc/Models/Dtos/RequestDict.cs

@@ -16,6 +16,8 @@ namespace TEAMModelOS.GRPC.Models.Dtos
         public Dictionary<string, int> dict { get; set; }
         [ProtoMember(2)]
         public Dictionary<string, Cv> cv { get; set; }
+        [ProtoMember(3)]
+        public List<Cv> lsit { get; set; }
     }
     [ProtoContract]
     public class Cv

TEAMModelOS.Grpc/Protos/KnowledgeService.proto

@@ -21,6 +21,7 @@ message RequestDict {
    //查询dict
    map<string,int32> dict = 1;
    map<string,Cv> cv = 2;
+   repeated Cv lsit = 3;
 }
 
 message Knowledge {

TEAMModelOS.Grpc/TEAMModelOS.GRPC.xml

@@ -90,71 +90,5 @@
             <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:MathGrpc.KnowledgeService.KnowledgeServiceReflection">
-            <summary>Holder for reflection information generated from Protos/KnowledgeService.proto</summary>
-        </member>
-        <member name="P:MathGrpc.KnowledgeService.KnowledgeServiceReflection.Descriptor">
-            <summary>File descriptor for Protos/KnowledgeService.proto</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.RequestDict.DictFieldNumber">
-            <summary>Field number for the "dict" field.</summary>
-        </member>
-        <member name="P:MathGrpc.KnowledgeService.RequestDict.Dict">
-             <summary>
-            查询dict
-             </summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.IdFieldNumber">
-            <summary>Field number for the "id" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.TypeFieldNumber">
-            <summary>Field number for the "type" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.NameFieldNumber">
-            <summary>Field number for the "name" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.AliasFieldNumber">
-            <summary>Field number for the "alias" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.SubjectCodeFieldNumber">
-            <summary>Field number for the "subjectCode" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.ScopeCodeFieldNumber">
-            <summary>Field number for the "scopeCode" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.OrderFieldNumber">
-            <summary>Field number for the "order" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.StatusFieldNumber">
-            <summary>Field number for the "status" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.PointsFieldNumber">
-            <summary>Field number for the "points" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.KnowledgeIdFieldNumber">
-            <summary>Field number for the "knowledgeId" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.SourceFieldNumber">
-            <summary>Field number for the "source" field.</summary>
-        </member>
-        <member name="F:MathGrpc.KnowledgeService.Knowledge.PeriodFieldNumber">
-            <summary>Field number for the "period" field.</summary>
-        </member>
-        <member name="P:MathGrpc.KnowledgeService.KnowledgeService.Descriptor">
-            <summary>Service descriptor</summary>
-        </member>
-        <member name="T:MathGrpc.KnowledgeService.KnowledgeService.KnowledgeServiceBase">
-            <summary>Base class for server-side implementations of KnowledgeService</summary>
-        </member>
-        <member name="M:MathGrpc.KnowledgeService.KnowledgeService.BindService(MathGrpc.KnowledgeService.KnowledgeService.KnowledgeServiceBase)">
-            <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:MathGrpc.KnowledgeService.KnowledgeService.BindService(Grpc.Core.ServiceBinderBase,MathGrpc.KnowledgeService.KnowledgeService.KnowledgeServiceBase)">
-            <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>
     </members>
 </doc>

TEAMModelOS.Grpc/TEAMModelOS.Grpc.csproj

@@ -6,9 +6,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DocumentationFile>TEAMModelOS.GRPC.xml</DocumentationFile>
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="Protos\KnowledgeService.proto" />
-  </ItemGroup>
  
   <ItemGroup>
     <PackageReference Include="Grpc.AspNetCore" Version="2.24.0" />
@@ -19,7 +16,6 @@
   </ItemGroup>
   <ItemGroup>
     <Protobuf Include="Protos\greet.proto" GrpcServices="Server" />
-    <Protobuf Include="Protos\KnowledgeService.proto" GrpcServices="Server" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Services\Core\" />

TEAMModelOS/appsettings.json

@@ -18,7 +18,7 @@
     "CosmosDB": {
       "ConnectionString": "https://teammodelos.documents.azure.cn:443/",
       "ConnectionKey": "clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==",
-      "Database": "TEAMModelOS",
+      "Database": "TEAMModelOSTest",
       "CollectionThroughput": 400,
       "ScanModel": [ "TEAMModelOS.Service" ]
     },