更新学校接口

TEAMModelOS.Model/Common/Models/Product.cs

@@ -11,5 +11,10 @@ namespace TEAMModelOS.Model.Common.Models
     public class Product : TableEntity
     {
         public string Name { get; set; }
+        public string Code { get; set; }
+        public int Type { get; set; }
+        public int Status { get; set; }
+        public string SchoolCode { get; set; }
+        public string SchoolName { get; set; }
     }
 }

TEAMModelOS.Model/Common/Models/School.cs

@@ -11,39 +11,22 @@ namespace TEAMModelOS.Model.Common.Models
     [MessagePackObject(keyAsPropertyName: true)]
     public class School :TableEntity
     {
-        [Key("code")]
-        public string Code { get; set; }
-        [Key("name")]
-        public string Name { get; set; }
-        [Key("countryId")]
-        public string CountryId { get; set; }
-        [Key("countryName")]
-        public string CountryName { get; set; }
-        [Key("provinceId")]
-        public string ProvinceId { get; set; }
-        [Key("provinceName")]
-        public string ProvinceName { get; set; }
-        [Key("cityId")]
-        public string CityId { get; set; }
-        [Key("cityName")]
-        public string CityName { get; set; }
-        [Key("address")]
-        public string Address { get; set; }
-        [Key("typeId")]
-        public string TypeId { get; set; }
-        [Key("typeName")]
-        public string TypeName { get; set; }
-        [Key("source")]
-        public string Source { get; set; }
-        [Key("distId")]
-        public string DistId { get; set; }
-        [Key("distName")]
-        public string DistName { get; set; }
-        [Key("schoolDist")]
-        public string SchoolDist { get; set; }
-        [Key("aliasName")]
-        public string AliasName { get; set; }
-        [Key("shortCode")]
-        public string ShortCode { get; set; }
+        public string code { get; set; }
+        public string name { get; set; }
+        public string countryId { get; set; }
+        public string countryName { get; set; }
+        public string provinceId { get; set; }
+        public string provinceName { get; set; }
+        public string cityId { get; set; }
+        public string cityName { get; set; }
+        public string address { get; set; }
+        public string typeId { get; set; }
+        public string typeName { get; set; }
+        public string source { get; set; }
+        public string distId { get; set; }
+        public string distName { get; set; }
+        public string schoolDist { get; set; }
+        public string aliasName { get; set; }
+        public string shortCode { get; set; }
     }
 }

TEAMModelOS.Model/Syllabus/Models/SyllabusNode.cs

@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Text;
-using TEAMModelOS.SDK.Helper.Common.TreeList;
 
 namespace TEAMModelOS.Model.Syllabus.Models
 {

TEAMModelOS.SDK/Helper/Common/TreeList/ListToTree.cs

@@ -1,32 +0,0 @@
-using Microsoft.WindowsAzure.Storage.Table;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using TEAMModelOS.SDK.Helper.Common.JsonHelper;
-
-namespace TEAMModelOS.SDK.Helper.Common.TreeList
-{
-    public class ListToTree
-    {
-        public static List<N> Convert<N>(List<N> list) where N: Node , new() {
-            var lookup = list.ToDictionary(n => n.Id, n => n);
-            var rootNodes = new List<N>();
-            foreach (var node in list)
-            {
-                if (!string.IsNullOrEmpty(node.Pid))
-                {
-                    Tree<N> parent = new Tree<N>();
-                    bool  s=   lookup.TryGetValue(node.Pid ,out N ss);
-                    parent.Children.Add(MessagePackHelper.JsonToObject<Tree<N>>(MessagePackHelper.ObjectToJson(node)));
-                }
-                else
-                {
-                    rootNodes.Add(node);
-                }
-            }
-            return rootNodes;
-        }
-    }
-}

TEAMModelOS.SDK/Helper/Common/TreeList/Node.cs

@@ -1,15 +0,0 @@
-using MessagePack;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using TEAMModelOS.SDK.Module.GrpcServer.Implements;
-
-namespace TEAMModelOS.SDK.Helper.Common.TreeList
-{
-    
-    public interface Node 
-    {
-         dynamic Id { get; set; }
-         dynamic Pid { get; set; }
-    }
-}

TEAMModelOS.SDK/Helper/Common/TreeList/Tree.cs

@@ -1,14 +0,0 @@
-using MessagePack;
-using System;
-using System.Collections.Generic;
-
-namespace TEAMModelOS.SDK.Helper.Common.TreeList
-{
-    [MessagePackObject(keyAsPropertyName: true)]
-    public class Tree<N>
-    {
-        public dynamic Id { get; set; }
-        public dynamic Pid { get; set; }
-        public List<Tree<N>> Children { get; set; } = new List<Tree<N>>();
-    }
-}

TEAMModelOS.Service/Common/Implements/SchoolService.cs

@@ -28,7 +28,7 @@ namespace TEAMModelOS.Service.Common.Implements
         /// <param name="getSchool"></param>
         /// <returns></returns>
         public Task<List<School>> GetSchool(SchoolCode schoolCode) {
-            Dictionary<string, object> datas = new Dictionary<string, object>
+            Dictionary<string, string> datas = new Dictionary<string, string>
             {
                 { "countryId", schoolCode.CountryId },
                 { "provinceId", schoolCode.ProvinceId },

TEAMModelOS.Service/Common/Interfaces/ISchoolService.cs

@@ -7,7 +7,7 @@ using TEAMModelOS.Model.Common.Models;
 
 namespace TEAMModelOS.Service.Common.Interfaces
 {
-   public interface ISchoolService
+   public interface ISchoolService :IBusinessService
     {
         /// <summary>
         /// 查看各个地区城市学校信息

TEAMModelOS/TEAMModelOS.csproj

@@ -49,5 +49,5 @@
     </ItemGroup>
   </Target>
 
-  <ProjectExtensions><VisualStudio><UserProperties JsonFile_4EcharsL_1json__JSONSchema="http://json.schemastore.org/band-manifest" /></VisualStudio></ProjectExtensions>
+  <ProjectExtensions><VisualStudio><UserProperties JsonFile_4EcharsL_1json__JSONSchema="http://json.schemastore.org/band-manifest" appsettings_1Development_1json__JSONSchema="" /></VisualStudio></ProjectExtensions>
 </Project>

TEAMModelOS/appsettings.Development.json

@@ -74,41 +74,13 @@
     }
   ],
   "JwtSetting": {
-    "SecurityKey": "JwtBearerSample_11231~#$%#%^2235",
     "Issuer": "HaBook", //签发者
     "Audience": "TEAMModelOS",
     "JwtClient": [
       {
         "Name": "WebApp",
+        "Project": "TEAMModelOS",
         "Exp": 86400
-      },
-      {
-        "Name": "Android",
-        "Exp": 60
-      },
-      {
-        "Name": "IOS",
-        "Exp": 60
-      },
-      {
-        "Exp": 60,
-        "Name": "WapApp"
-      },
-      {
-        "Name": "WeChat",
-        "Exp": 60
-      },
-      {
-        "Name": "MiniApp",
-        "Exp": 60
-      },
-      {
-        "Name": "RestApi",
-        "Exp": 60
-      },
-      {
-        "Name": "Other",
-        "Exp": 60
       }
     ]
   },

TEAMModelOS/appsettings.json

@@ -74,41 +74,13 @@
     }
   ],
   "JwtSetting": {
-    "SecurityKey": "JwtBearerSample_11231~#$%#%^2235",
     "Issuer": "HaBook", //签发者
     "Audience": "TEAMModelOS",
     "JwtClient": [
       {
         "Name": "WebApp",
+        "Project": "TEAMModelOS",
         "Exp": 86400
-      },
-      {
-        "Name": "Android",
-        "Exp": 60
-      },
-      {
-        "Name": "IOS",
-        "Exp": 60
-      },
-      {
-        "Exp": 60,
-        "Name": "WapApp"
-      },
-      {
-        "Name": "WeChat",
-        "Exp": 60
-      },
-      {
-        "Name": "MiniApp",
-        "Exp": 60
-      },
-      {
-        "Name": "RestApi",
-        "Exp": 60
-      },
-      {
-        "Name": "Other",
-        "Exp": 60
       }
     ]
   },