CrazyIter před 4 roky
rodič
revize
661e49ba7e

+ 1 - 0
TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -43,5 +43,6 @@
     <PackageReference Include="Microsoft.Azure.Cosmos" Version="3.11.0" />
     <PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="2.0.0-preview" />
     <PackageReference Include="Caching.CSRedis" Version="3.5.5" />
+    <PackageReference Include="CoreSDK" Version="1.0.0" />
   </ItemGroup>
 </Project>

+ 1 - 3
TEAMModelOS/Controllers/Client/HiTeachController.cs

@@ -8,8 +8,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using TEAMModelOS.Models;
-using TEAMModelOS.SDK.Extension.DataResult.JsonRpcRequest;
-using TEAMModelOS.SDK.Extension.DataResult.JsonRpcResponse;
 using TEAMModelOS.SDK.Helper.Common.JsonHelper;
 using TEAMModelOS.SDK.Helper.Common.LogHelper;
 using TEAMModelOS.SDK.Module.AzureBlob.Configuration;
@@ -41,7 +39,7 @@ namespace TEAMModelOS.Controllers.Client
         {
             try
             {
-
+                return BadRequest();
             }
             catch (Exception ex)
             {

+ 26 - 9
TEAMModelOS/Startup.cs

@@ -31,9 +31,17 @@ using TEAMModelOS.SDK.Module.AzureCosmosDBV3;
 using TEAMModelOS.SDK.Module.AzureServiceBus;
 using TEAMModelOS.SDK.Module.AzureTable.Implements;
 using TEAMModelOS.SDK.Module.AzureTable.Interfaces;
+using TEAMModelOS.Service.Exam.Implements;
+using TEAMModelOS.Service.Exam.Interfaces;
 using TEAMModelOS.Service.Services.ChangeFeed;
+using TEAMModelOS.Service.Services.Exam.Implements;
+using TEAMModelOS.Service.Services.Exam.Interfaces;
+using TEAMModelOS.Service.Services.Implement;
+using TEAMModelOS.Service.Services.Interface;
 using TEAMModelOS.Service.Services.Learn.Implements;
 using TEAMModelOS.Service.Services.Learn.Interfaces;
+using TEAMModelOS.Service.Services.PowerPoint.Implement;
+using TEAMModelOS.Service.Services.PowerPoint.Interface;
 using VueCliMiddleware;
 
 namespace TEAMModelOS
@@ -133,15 +141,24 @@ namespace TEAMModelOS
 
 
             //全局扫描基于IBusinessService接口的实现类
-            services.Scan(scan => scan.FromApplicationDependencies()
-               .AddClasses(classes => classes.AssignableTo<IBusinessService>())
-                   .AsImplementedInterfaces()
-                   .WithScopedLifetime());
-            services.Scan(scan => scan.FromApplicationDependencies()
-               .AddClasses(classes => classes.AssignableTo<IChangeService>()).UsingRegistrationStrategy(RegistrationStrategy.Skip)
-                   .AsImplementedInterfaces()
-                  .WithSingletonLifetime());
-           // _services = services;
+            //services.Scan(scan => scan.FromApplicationDependencies()
+            //   .AddClasses(classes => classes.AssignableTo<IBusinessService>())
+            //       .AsImplementedInterfaces()
+            //       .WithScopedLifetime());
+            //services.Scan(scan => scan.FromApplicationDependencies()
+            //   .AddClasses(classes => classes.AssignableTo<IChangeService>()).UsingRegistrationStrategy(RegistrationStrategy.Skip)
+            //       .AsImplementedInterfaces()
+            //      .WithSingletonLifetime());
+            // _services = services;
+            services.AddScoped<IImportExerciseService, ImportExerciseService>();
+            services.AddScoped<IHtmlAnalyzeService, HtmlAnalyzeService>();
+            services.AddScoped<IEvaluatingService, EvaluatingService>();
+            services.AddScoped<IHtexService, HtexService>();
+            services.AddScoped<IVolumeService, VolumeService>();
+            services.AddScoped<ISyllabusService, SyllabusService>();
+            services.AddScoped<IKnowledgeService, KnowledgeService>();
+            services.AddSingleton<IChangeService, KnowledgeChangeFeed>();
+            services.AddSingleton<IChangeService, SyllabusVolumeChangeFeed>();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

+ 1 - 1
TEAMModelOS/TEAMModelOS.csproj

@@ -13,7 +13,7 @@
   <ItemGroup>
     <PackageReference Include="Bogus" Version="29.0.1" />
     <PackageReference Include="Caching.CSRedis" Version="3.5.5" />
-    <PackageReference Include="CoreSDK" Version="1.0.0" />
+   
     <PackageReference Include="CSRedisCore" Version="3.5.5" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="4.1.3" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.6" />

+ 1 - 1
TEAMModelOS/appsettings.json

@@ -12,7 +12,7 @@
     "LocationNum": "1",
     "HostName": "localhost:5001",
     "Authority": "https://login.chinacloudapi.cn/4807e9cf-87b8-4174-aa5b-e76497d7392b/v2.0", //China:"https://login.chinacloudapi.cn/4807e9cf-87b8-4174-aa5b-e76497d7392b/v2.0", //Global:"https://login.microsoftonline.com/73a2bcc5-fe99-4566-aa8a-07e7bb287df1/v2.0"
-    "Audience": "72643704-b2e7-4b26-b881-bd5865e7a7a5" //China:"72643704-b2e7-4b26-b881-bd5865e7a7a5",Global:"8768b06f-c5c5-4b0c-abfb-d7ded354626d"
+    "Audience": "72643704-b2e7-4b26-b881-bd5865e7a7a5", //China:"72643704-b2e7-4b26-b881-bd5865e7a7a5",Global:"8768b06f-c5c5-4b0c-abfb-d7ded354626d"
     "Issuer": "www.teammodel.cn",
     "JwtSecretKey": "fXO6ko/qyXeYrkecPeKdgXnuLXf9vMEtnBC9OB3s+aA=",
     "Exp": 86400,