CrazyIter_Bin 3 years ago
parent
commit
d40db7cd57

TEAMModelOS/Filter/SecurityHeadersAttribute.cs → TEAMModelOS.SDK/Context/Attributes/Filter/SecurityHeadersAttribute.cs


TEAMModelOS/Models/Dto/ExamClassResultDto.cs → TEAMModelOS.SDK/Models/Dtos/ExamClassResultDto.cs


TEAMModelOS/Models/Dto/ExamDto.cs → TEAMModelOS.SDK/Models/Dtos/ExamDto.cs


TEAMModelOS/Models/Dto/ExamInfoDto.cs → TEAMModelOS.SDK/Models/Dtos/ExamInfoDto.cs


TEAMModelOS/Models/Dto/ExamResultDto.cs → TEAMModelOS.SDK/Models/Dtos/ExamResultDto.cs


TEAMModelOS/Models/Dto/ItemDto.cs → TEAMModelOS.SDK/Models/Dtos/ItemDto.cs


TEAMModelOS/Models/Dto/ItemInfoDto.cs → TEAMModelOS.SDK/Models/Dtos/ItemInfoDto.cs


TEAMModelOS/Models/Dto/PaperDto.cs → TEAMModelOS.SDK/Models/Dtos/PaperDto.cs


TEAMModelOS/Services/Analysis/AchievementService.cs → TEAMModelOS.SDK/Models/Service/Analysis/AchievementService.cs


+ 1 - 1
TEAMModelOS/Services/Common/AbilityService.cs

@@ -8,7 +8,7 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
 
 
-namespace TEAMModelOS.Services.Common
+namespace TEAMModelOS.SDK.Services.Common
 {
     public class AbilityService
     {

+ 0 - 1
TEAMModelOS/Services/Common/ActivityStudentService.cs

@@ -13,7 +13,6 @@ using TEAMModelOS.SDK.Models;
 using TEAMModelOS.SDK.Models.Cosmos.Common.Inner;
 using StackExchange.Redis;
 using TEAMModelOS.SDK.Models.Cosmos.Common;
-using TEAMModelOS.Controllers;
 using TEAMModelOS.Models;
 using TEAMModelOS.SDK;
 

TEAMModelOS/Services/Common/BlobService.cs → TEAMModelOS.SDK/Models/Service/Common/BlobService.cs


TEAMModelOS/Services/Common/SheetService.cs → TEAMModelOS.SDK/Models/Service/Common/SheetService.cs


TEAMModelOS/Services/Common/SyllabusService.cs → TEAMModelOS.SDK/Models/Service/Common/SyllabusService.cs


TEAMModelOS/Services/Common/TeacherService.cs → TEAMModelOS.SDK/Models/Service/Common/TeacherService.cs


+ 1 - 0
TEAMModelOS/Controllers/Research/AbilityTaskController.cs

@@ -22,6 +22,7 @@ using HTEXLib.COMM.Helpers;
 using TEAMModelOS.Filter;
 using System.ComponentModel.DataAnnotations;
 using Microsoft.AspNetCore.Authorization;
+using TEAMModelOS.SDK.Services.Common;
 
 namespace TEAMModelOS.Controllers.Research
 {

+ 0 - 113
TEAMModelOS/Properties/ServiceDependencies/teammodelos6 - Web Deploy/profile.arm.json

@@ -1,113 +0,0 @@
-{
-  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
-  "contentVersion": "1.0.0.0",
-  "metadata": {
-    "_dependencyType": "compute.appService.windows"
-  },
-  "parameters": {
-    "resourceGroupName": {
-      "type": "string",
-      "defaultValue": "TEAMModelChengdu",
-      "metadata": {
-        "description": "Name of the resource group for the resource. It is recommended to put resources under same resource group for better tracking."
-      }
-    },
-    "resourceGroupLocation": {
-      "type": "string",
-      "defaultValue": "",
-      "metadata": {
-        "description": "Location of the resource group. Resource groups could have different location than resources, however by default we use API versions from latest hybrid profile which support all locations for resource types we support."
-      }
-    },
-    "resourceName": {
-      "type": "string",
-      "defaultValue": "teammodelos6",
-      "metadata": {
-        "description": "Name of the main resource to be created by this template."
-      }
-    },
-    "resourceLocation": {
-      "type": "string",
-      "defaultValue": "[parameters('resourceGroupLocation')]",
-      "metadata": {
-        "description": "Location of the resource. By default use resource group's location, unless the resource provider is not supported there."
-      }
-    }
-  },
-  "variables": {
-    "appServicePlan_name": "[concat('Plan', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
-    "appServicePlan_ResourceId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('resourceGroupName'), '/providers/Microsoft.Web/serverFarms/', variables('appServicePlan_name'))]"
-  },
-  "resources": [
-    {
-      "type": "Microsoft.Resources/resourceGroups",
-      "name": "[parameters('resourceGroupName')]",
-      "location": "[parameters('resourceGroupLocation')]",
-      "apiVersion": "2019-10-01"
-    },
-    {
-      "type": "Microsoft.Resources/deployments",
-      "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
-      "resourceGroup": "[parameters('resourceGroupName')]",
-      "apiVersion": "2019-10-01",
-      "dependsOn": [
-        "[parameters('resourceGroupName')]"
-      ],
-      "properties": {
-        "mode": "Incremental",
-        "template": {
-          "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
-          "contentVersion": "1.0.0.0",
-          "resources": [
-            {
-              "location": "[parameters('resourceLocation')]",
-              "name": "[parameters('resourceName')]",
-              "type": "Microsoft.Web/sites",
-              "apiVersion": "2015-08-01",
-              "tags": {
-                "[concat('hidden-related:', variables('appServicePlan_ResourceId'))]": "empty"
-              },
-              "dependsOn": [
-                "[variables('appServicePlan_ResourceId')]"
-              ],
-              "kind": "app",
-              "properties": {
-                "name": "[parameters('resourceName')]",
-                "kind": "app",
-                "httpsOnly": true,
-                "reserved": false,
-                "serverFarmId": "[variables('appServicePlan_ResourceId')]",
-                "siteConfig": {
-                  "metadata": [
-                    {
-                      "name": "CURRENT_STACK",
-                      "value": "dotnetcore"
-                    }
-                  ]
-                }
-              },
-              "identity": {
-                "type": "SystemAssigned"
-              }
-            },
-            {
-              "location": "[parameters('resourceLocation')]",
-              "name": "[variables('appServicePlan_name')]",
-              "type": "Microsoft.Web/serverFarms",
-              "apiVersion": "2015-08-01",
-              "sku": {
-                "name": "S1",
-                "tier": "Standard",
-                "family": "S",
-                "size": "S1"
-              },
-              "properties": {
-                "name": "[variables('appServicePlan_name')]"
-              }
-            }
-          ]
-        }
-      }
-    }
-  ]
-}

+ 0 - 7
TEAMModelOS/TEAMModelOS.csproj

@@ -3,13 +3,6 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="Services\Evaluation\**" />
-    <Content Remove="Services\Evaluation\**" />
-    <EmbeddedResource Remove="Services\Evaluation\**" />
-    <None Remove="Services\Evaluation\**" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Caching.CSRedis" Version="3.6.80" />
     <PackageReference Include="CHTCHSConv" Version="1.0.0" />