设置id生成为雪花函数

TEAMModelGrpc/Services/ClassroomService.cs

@@ -1,4 +1,4 @@
-using Grpc.Core;
+using Grpc.Core;
 using Grpc.Extension.Abstract;
 using Microsoft.AspNetCore.Authorization;
 using System;
@@ -41,7 +41,6 @@ namespace TEAMModelGrpc.Services
                 }
                 else
                 {
-                    classroom.id = Guid.NewGuid().ToString();
                     ClassStudent students = new ClassStudent();
                     students.code = classroom.code;
                     students.id = classroom.classroomCode;

TEAMModelGrpc/Services/HomeWorkService.cs

@@ -1,4 +1,4 @@
-using Grpc.Core;
+using Grpc.Core;
 using Grpc.Extension.Abstract;
 using Microsoft.AspNetCore.Authorization;
 using System;
@@ -45,7 +45,6 @@ namespace TEAMModelGrpc.Services
                         //评论
                         StudentComment homeWorkComment = new StudentComment
                         {
-                            commentid = Guid.NewGuid().ToString(),
                             comment = homeWorkCommentDto.comment,
                             createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds(),
                             fromId = homeWorkCommentDto.fromId,

TEAMModelOS.SDK/DI/AzureCosmos/Inner/SQLHelper.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -114,7 +114,9 @@ namespace TEAMModelOS.SDK.DI.AzureCosmos.Inner
                 return false;
             }
         }
-
+        //public static AzureCosmosQuery GetSQLJsonElement(Dictionary<string, object> dict, StringBuilder sql, string pk = null) { 
+        
+        //}
         public static AzureCosmosQuery GetSQL(Dictionary<string, object> dict, StringBuilder sql, string pk = null)
         {
             if (dict != null)

TEAMModelOS.Service/TEAMModelOS.Model.xml

@@ -491,6 +491,11 @@
             考试类型 段考 stage  联考 union 平常考 normal 其他 other
              </summary>
         </member>
+        <member name="P:TEAMModelOS.Service.Models.ExamInfo.marks">
+            <summary>
+            所有试卷阅卷状态
+            </summary>
+        </member>
         <member name="P:TEAMModelOS.Service.Models.Condition.range">
             <summary>
             评测范围 class 班级测验，年级测验 grade , 区级测验 distric

TEAMModelOS/Controllers/Core/BlobController.cs

@@ -21,8 +21,10 @@ namespace TEAMModelOS.Controllers.Core
     {
         
         private readonly AzureStorageFactory azureBlobDBRepository;
-        public BlobController(AzureStorageFactory _azureBlobDBRepository) {
+        private readonly SnowflakeId SnowflakeId;
+        public BlobController(AzureStorageFactory _azureBlobDBRepository, SnowflakeId _SnowflakeId) {
             azureBlobDBRepository = _azureBlobDBRepository;
+            SnowflakeId = _SnowflakeId;
         }
 
         /// <summary>
@@ -113,7 +115,7 @@ namespace TEAMModelOS.Controllers.Core
         public async Task<BaseResponse> UploadText(JosnRequest<string> request)
         {
             ResponseBuilder responseBuilder = new ResponseBuilder();
-            return responseBuilder.Data(await azureBlobDBRepository.UploadFileByContainer("hbcn", request.@params, "exam", Guid.NewGuid().ToString() + ".json")).build();
+            return responseBuilder.Data(await azureBlobDBRepository.UploadFileByContainer("hbcn", request.@params, "exam", SnowflakeId.NextId() + ".json")).build();
           
         }
         private static string ContainerUrlString(string sasUrl)

TEAMModelOS/Controllers/Exam/ExamController.cs

@@ -18,13 +18,15 @@ namespace TEAMModelOS.Controllers
     [ApiController]
     public class ExamController : BaseController
     {
+        private readonly SnowflakeId SnowflakeId;
         private readonly AzureCosmosFactory cosmosDBV3Repository;
         private readonly AzureServiceBusFactory _serviceBus;
-        public ExamController(AzureCosmosFactory _cosmosDBV3Repository, AzureServiceBusFactory serviceBus)
+        public ExamController(AzureCosmosFactory _cosmosDBV3Repository, AzureServiceBusFactory serviceBus, SnowflakeId _SnowflakeId)
         {
             
             cosmosDBV3Repository = _cosmosDBV3Repository;
             _serviceBus = serviceBus;
+            SnowflakeId = _SnowflakeId;
         }
 
         /// <summary>
@@ -39,7 +41,7 @@ namespace TEAMModelOS.Controllers
             
             if (string.IsNullOrEmpty(request.@params.id))
             {
-                request.@params.id = Guid.NewGuid().ToString();
+                request.@params.id = SnowflakeId.NextId()+"";
                 request.@params.status = 100;
                 // await cosmosDBV3Repository.SaveOrUpdate(request.@params);
             }
@@ -51,7 +53,7 @@ namespace TEAMModelOS.Controllers
             else if (request.@params.publish.Equals("1"))
             {
                 //设定开始时间
-                string msgId = Guid.NewGuid().ToString();
+                string msgId = SnowflakeId.NextId() + "";
                 long SequenceNumber = await _serviceBus.SendMessage<ExamInfo>(Constants.TopicName, request.@params.id, request.@params.code, request.@params.startTime, 200, msgId);
                 request.@params.sequenceNumber = SequenceNumber;
             }
@@ -62,7 +64,7 @@ namespace TEAMModelOS.Controllers
             }
             await cosmosDBV3Repository.SaveOrUpdate(request.@params);
             //设定结束时间
-            string msgEndId = Guid.NewGuid().ToString();
+            string msgEndId = SnowflakeId.NextId() + "";
             await _serviceBus.SendMessage<ExamInfo>(Constants.TopicName, request.@params.id, request.@params.code, request.@params.endTime, 300, msgEndId);
             return builder.Data(request.@params).build();
         }
@@ -323,55 +325,6 @@ namespace TEAMModelOS.Controllers
                 }
             }
             return stuAnswers;
-        }
-        /// <summary>
-        /// 生成题目
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [HttpPost("Gen")]
-        public  BaseResponse  Gen(JosnRequest<List<ItemInfo>> request)
-        {
-            ResponseBuilder builder = ResponseBuilder.custom();
-            List<string> poins = new List<string>();
-            for (int i = 0; i < 30; i++)
-            {
-                poins.Add(Guid.NewGuid().ToString());
-            }
-            Random rangdomRed = new Random();
-            // Single单选，Multiple多选，Judge判断，Complete填空，Subjective问答，Compose综合
-            List<string> types = new List<string>() { "Single", "Multiple", "Judge", "Complete", "Subjective", "Compose" };
-            List<string> field = new List<string>() { "应用", "综合", "理解", "评鉴", "知识" };
-            foreach (ItemInfo item in request.@params)
-            {
-                
-                item.subjectCode = "Subject_Chinese";
-                item.periodCode = "period_2";
-                item.type = types.OrderBy(x => Guid.NewGuid()).First();
-                item.points = new List<string>() { poins.OrderBy(x => Guid.NewGuid()).First() };
-                item.level = rangdomRed.Next(1, 5);
-                item.field = field.OrderBy(x => Guid.NewGuid()).First();
-            }
-            return builder.Data(request.@params).build();
-        }
-
-
-
-        List<string> pins = new List<string>() {
-            "5a569451-d7b6-4bc5-85dc-4c97ba593090", "97752929-bee6-458e-b5ae-af16ee73a1e9",
-            "b32dcb15-9f13-4e8f-9f65-80e55e3b257d", "5160a86b-2d44-466f-bd82-ed08148f6607",
-            "9e6a3b59-bdeb-4b21-90ec-903ef9847864", "6d1f223d-a84e-4fab-b015-fe1c4298834b",
-            "72571322-43d9-4777-b3b1-a6a5a4bf4e10", "bf4707a6-f541-46b9-85b2-82aa6077ba27",
-            "9dd91708-be01-4947-850c-77b88e7cf2ad", "24d9f39f-906a-4ca6-bc4f-8f9307d51d5a",
-            "4acee7e2-434c-4257-9331-8c42fba14a3b", "170125f4-4cfc-40eb-aae4-7a82840a6297",
-            "6b14df14-17ae-4f47-a1e4-16738268feba", "a9c1ada9-232f-4993-bf63-3c279e5ecaac",
-            "4ff7b031-a45c-4b02-921e-933be73bb38a", "a96ebded-aeb0-42c8-ab90-8b1ab8a4a489",
-            "e3564799-3b9a-4b5d-a904-f09565f98890", "64b4326f-1f76-4c7c-8fb7-5940894e2205",
-            "4e43d507-8af1-4b21-b09e-7fe8533104e8", "25032d80-b88c-42c1-8ffd-1a30815859aa",
-            "b1baff75-fdf9-4020-acfb-af6497017f4b", "c6e8bdaf-9738-48f6-bd7f-5bc6d6444684",
-            "d75000f7-168a-4521-b056-780ef38114cc", "f6c768e8-12ea-445c-8df1-750736294a80",
-            "5ac2805d-b31d-44a3-9058-1239d5557270", "49512c48-f38a-452e-8bb9-170728cb271e",
-            "57088641-14d1-498d-ae8e-61627e0d8e4a", "2222f52f-cc3f-4ac3-96b8-638078455f64",
-            "1687d096-4d58-4828-97de-d31e23784b36", "45ae3d97-cd76-4c53-a821-e220367eb2c2" };
+        } 
     }
 }

TEAMModelOS/Controllers/Exam/ImportExerciseController.cs

@@ -91,9 +91,10 @@ namespace TEAMModelOS.Controllers
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             bool flag = request.@params.TryGetValue("htmlString", out object htmlString);
+            bool flagLang = request.@params.TryGetValue("lang", out object lang);
             if (flag && htmlString != null && !string.IsNullOrEmpty(htmlString.ToString()))
             {
-                LangConfig langConfig= langConfigs.Where(x => x.Lang == request.lang).FirstOrDefault();
+                LangConfig langConfig= langConfigs.Where(x => x.Lang == lang.ToString()).FirstOrDefault();
                 HtmlAnalyzeService htmlAnalyzeService = new HtmlAnalyzeService(langConfig);
                 List<Service.Models.ItemInfo> exercises = htmlAnalyzeService.AnalyzeWordAsync(htmlString.ToString());
                 return builder.Data(exercises).build();
@@ -113,9 +114,10 @@ namespace TEAMModelOS.Controllers
         {
             ResponseBuilder builder = ResponseBuilder.custom();
             bool flag = request.@params.TryGetValue("htmlString", out object htmlString);
+            bool flagLang = request.@params.TryGetValue("lang", out object lang);
             if (flag && htmlString != null && !string.IsNullOrEmpty(htmlString.ToString()))
             {
-                LangConfig langConfig = langConfigs.Where(x => x.Lang == request.lang).FirstOrDefault();
+                LangConfig langConfig = langConfigs.Where(x => x.Lang == lang.ToString()).FirstOrDefault();
                 HtmlAnalyzeService htmlAnalyzeService = new HtmlAnalyzeService(langConfig);
                 Htex exercises = await HtexService.AnalyzeHtmlToHtex(azureBlobDBRepository, htmlString.ToString(), request.lang, htmlAnalyzeService);
                 return builder.Data(exercises).build();

TEAMModelOS/Controllers/Exam/PaperController.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,10 +13,12 @@ namespace TEAMModelOS.Controllers
     [ApiController]
     public class PaperController: BaseController
     {
+        private SnowflakeId SnowflakeId;
         private readonly AzureCosmosFactory cosmosDBV3Repository;
-        public PaperController(AzureCosmosFactory _cosmosDBV3Repository)
+        public PaperController(AzureCosmosFactory _cosmosDBV3Repository, SnowflakeId _SnowflakeId)
         {
             cosmosDBV3Repository = _cosmosDBV3Repository;
+            SnowflakeId = _SnowflakeId;
         }
         /// <summary>
         /// 删除
@@ -83,7 +85,7 @@ namespace TEAMModelOS.Controllers
             ResponseBuilder builder = ResponseBuilder.custom();
             if (string.IsNullOrEmpty(request.@params.id))
             {
-                request.@params.id = Guid.NewGuid().ToString(); 
+                request.@params.id = SnowflakeId.NextId() + ""; 
                 request.@params.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
                 await cosmosDBV3Repository.SaveOrUpdate(request.@params);
             }

TEAMModelOS/Controllers/Syllabus/ItemInfoController.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,10 +14,12 @@ namespace TEAMModelOS.Controllers
     [ApiController]
     public class ItemInfoController : BaseController
     {
+        private SnowflakeId SnowflakeId;
         private readonly AzureCosmosFactory cosmosDBV3Repository;
-        public ItemInfoController(AzureCosmosFactory _cosmosDBV3Repository)
+        public ItemInfoController(AzureCosmosFactory _cosmosDBV3Repository ,SnowflakeId _SnowflakeId)
         {
             cosmosDBV3Repository = _cosmosDBV3Repository;
+            SnowflakeId = _SnowflakeId;
         }
 
         /// <summary>
@@ -33,7 +35,7 @@ namespace TEAMModelOS.Controllers
             request.@params.ForEach(x => {
               
                 if (string.IsNullOrEmpty(x.id)) {
-                    x.id = Guid.NewGuid().ToString();
+                    x.id = SnowflakeId.NextId()+"";
                 };
                 x.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
             });
@@ -48,7 +50,7 @@ namespace TEAMModelOS.Controllers
              
             if (string.IsNullOrEmpty(request.@params.id))
             {
-            request.@params.id = Guid.NewGuid().ToString();
+                request.@params.id = SnowflakeId.NextId() + "";
             };
             request.@params.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
             return builder.Data(await cosmosDBV3Repository.SaveOrUpdate(request.@params)).build();

TEAMModelOS/Controllers/Syllabus/ResourceController.cs

@@ -18,11 +18,12 @@ namespace TEAMModelOS.Controllers
     {
         private AzureStorageFactory _table;
         private AzureCosmosFactory _cosmos;
-        
-        public ResourceController(AzureStorageFactory table, AzureCosmosFactory cosmos)
+        private SnowflakeId SnowflakeId;
+        public ResourceController(AzureStorageFactory table, AzureCosmosFactory cosmos, SnowflakeId _SnowflakeId)
         {
             _table = table;
             _cosmos = cosmos;
+            SnowflakeId = _SnowflakeId;
         }
 
         /// <summary>
@@ -41,7 +42,7 @@ namespace TEAMModelOS.Controllers
                 {
                     if (item.id == null)
                     {
-                        item.id = Guid.NewGuid().ToString(); //item.sha1Code + "-" + item.extension + "-" + item.size;
+                        item.id = SnowflakeId.NextId()+""; //item.sha1Code + "-" + item.extension + "-" + item.size;
                         
                     }
                 }

TEAMModelOS/Controllers/Task/HomeworkController.cs

@@ -28,13 +28,15 @@ namespace TEAMModelOS.Controllers.Learn
     [ApiController]
     public class HomeworkController : ControllerBase
     {
+        private SnowflakeId SnowflakeId;
         private readonly AzureCosmosFactory _cosmos;
        
         private readonly AzureServiceBusFactory _serviceBus;
-        public HomeworkController(AzureCosmosFactory cosmos , AzureServiceBusFactory serviceBus  )
+        public HomeworkController(AzureCosmosFactory cosmos , AzureServiceBusFactory serviceBus , SnowflakeId _SnowflakeId)
         {
             _cosmos = cosmos;
             _serviceBus = serviceBus;
+            SnowflakeId = _SnowflakeId;
         }
 
 
@@ -97,7 +99,7 @@ namespace TEAMModelOS.Controllers.Learn
             if (string.IsNullOrEmpty(request.@params.homeWork.id))
 
             {
-                request.@params.homeWork.id = Guid.NewGuid().ToString();
+                request.@params.homeWork.id = SnowflakeId.NextId()+"";
                 request.@params.homeWork.status = 100;
                 request.@params.reset = true;
                 request.@params.homeWork.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds();
@@ -113,7 +115,7 @@ namespace TEAMModelOS.Controllers.Learn
             {
                 //TimerWork<HomeWork>(request.@params.homeWork.startTime,new Dictionary<string, object> { { "id", request.@params.homeWork.id } });
                 //设定开始时间
-                string msgId = Guid.NewGuid().ToString();
+                string msgId = SnowflakeId.NextId() + "";
                 long SequenceNumber =  await _serviceBus.SendMessage<Homework>(Constants.TopicName, request.@params.homeWork.id, request.@params.homeWork.code, request.@params.homeWork.startTime,200, msgId);
                 request.@params.homeWork.sequenceNumber = SequenceNumber;
 
@@ -131,7 +133,7 @@ namespace TEAMModelOS.Controllers.Learn
             Homework homeWork = await _cosmos.SaveOrUpdate<Homework>(request.@params.homeWork);
 
             //设定结束时间
-            string msgEndId = Guid.NewGuid().ToString();
+            string msgEndId = SnowflakeId.NextId() + "";
             await _serviceBus.SendMessage<Homework>(Constants.TopicName, request.@params.homeWork.id, request.@params.homeWork.code, request.@params.homeWork.endTime,300, msgEndId);
             //_timerWorkService.TimerWork<Homework>(request.@params.homeWork.endTime, 300, new Dictionary<string, object> { { "id", request.@params.homeWork.id } });
             //清除作业
@@ -311,7 +313,7 @@ namespace TEAMModelOS.Controllers.Learn
                         //评论
                         StudentComment homeWorkComment = new StudentComment
                         {
-                            commentid = Guid.NewGuid().ToString(),
+                            commentid = SnowflakeId.NextId() + "",
                             comment = request.@params.comment,
                             createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds(),
                             fromId = request.@params.fromId,

TEAMModelOS/Controllers/Task/LearnController.cs

@@ -22,10 +22,12 @@ namespace TEAMModelOS.Controllers.Learn
     [ApiController]
     public class LearnController: BaseController
     {
+        private SnowflakeId SnowflakeId;
         private readonly AzureCosmosFactory cosmosDBV3Repository;
         private readonly AzureServiceBusFactory _serviceBus;
-        public LearnController(AzureCosmosFactory _cosmosDBV3Repository, AzureServiceBusFactory serviceBus)
+        public LearnController(AzureCosmosFactory _cosmosDBV3Repository, AzureServiceBusFactory serviceBus, SnowflakeId _SnowflakeId)
         {
+            SnowflakeId = _SnowflakeId;
             _serviceBus = serviceBus;
             cosmosDBV3Repository = _cosmosDBV3Repository;
         }
@@ -45,7 +47,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             if (request.@params.endTime > 0) {
                 //设定结束时间
-                string msgEndId = Guid.NewGuid().ToString();
+                string msgEndId = SnowflakeId.NextId()+"";
                 await _serviceBus.SendMessage<LearnTask>(Constants.TopicName, request.@params.id, request.@params.code, request.@params.endTime, 300, msgEndId);
             }
             await cosmosDBV3Repository.Save(request.@params);
@@ -94,7 +96,7 @@ namespace TEAMModelOS.Controllers.Learn
             ResponseBuilder builder = ResponseBuilder.custom();
             if (string.IsNullOrEmpty(request.@params.id))
             {
-                request.@params.id = Guid.NewGuid().ToString();
+                request.@params.id = SnowflakeId.NextId() + "";
                 request.@params.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
                 await cosmosDBV3Repository.Save(request.@params);
             }
@@ -148,7 +150,7 @@ namespace TEAMModelOS.Controllers.Learn
 
             if (string.IsNullOrEmpty(request.@params.id))
             {
-                request.@params.id = Guid.NewGuid().ToString();
+                request.@params.id = SnowflakeId.NextId() + "";
                 request.@params.createTime = new DateTimeOffset(DateTime.UtcNow).ToUnixTimeMilliseconds();
                 await cosmosDBV3Repository.Save<LearnProcess>(request.@params);
             }
@@ -207,7 +209,7 @@ namespace TEAMModelOS.Controllers.Learn
                 {
                     if (string.IsNullOrEmpty(x.id))
                     {
-                     ///   x.id = new Guid().ToString();
+                     
                     }
                 });
                 List<LearnRecord> leanProcesses = await cosmosDBV3Repository.SaveOrUpdateAll<LearnRecord>(request.@params);

TEAMModelOS/Controllers/Task/SurveyController.cs

@@ -22,10 +22,11 @@ namespace TEAMModelOS.Controllers
     public class SurveyController : BaseController
     {
         private readonly AzureCosmosFactory azureCosmosDBV3Repository;
- 
+        private SnowflakeId SnowflakeId;
         private readonly AzureServiceBusFactory _serviceBus;
-        public SurveyController(AzureCosmosFactory _azureCosmosDBV3Repository, AzureServiceBusFactory serviceBus)
+        public SurveyController(AzureCosmosFactory _azureCosmosDBV3Repository, AzureServiceBusFactory serviceBus, SnowflakeId _SnowflakeId)
         {
+            SnowflakeId= _SnowflakeId;
             //  _timerWorkService = timerWorkService;
             _serviceBus = serviceBus;
               azureCosmosDBV3Repository = _azureCosmosDBV3Repository;
@@ -43,7 +44,7 @@ namespace TEAMModelOS.Controllers
             //新增
             if (string.IsNullOrEmpty(request.@params.survey.id))
             {
-                request.@params.survey.id = Guid.NewGuid().ToString();
+                request.@params.survey.id = SnowflakeId.NextId()+"";
                 request.@params.survey.status = 100;
             }
             if (request.@params.survey.publishModel.Equals("0"))
@@ -54,7 +55,7 @@ namespace TEAMModelOS.Controllers
             else if (request.@params.survey.publishModel.Equals("1"))
             {
 
-                string msgId = Guid.NewGuid().ToString();
+                string msgId = SnowflakeId.NextId() + "";
                 long SequenceNumber = await _serviceBus.SendMessage<Survey>(Constants.TopicName, request.@params.survey.id, request.@params.survey.code, request.@params.survey.startTime, 200, msgId);
                 request.@params.survey.sequenceNumber = SequenceNumber;
 
@@ -65,7 +66,7 @@ namespace TEAMModelOS.Controllers
             Survey homeWork = await azureCosmosDBV3Repository.SaveOrUpdate<Survey>(request.@params.survey);
 
             //设定结束时间
-            string msgEndId = Guid.NewGuid().ToString();
+            string msgEndId = SnowflakeId.NextId() + "";
             await _serviceBus.SendMessage<Survey>(Constants.TopicName, request.@params.survey.id, request.@params.survey.code, request.@params.survey.endTime, 300, msgEndId);
 
             //清除作业

TEAMModelOS/JsonFile/Core/LangConfig.json

@@ -1,7 +1,7 @@
 [
   {
     "Lang": "zh-CN",
-    "Name": "中国大陆",
+    "Name": "大陆",
     "Alias": "简体中文",
     "Item": {
       "Type": {
@@ -64,17 +64,17 @@
   },
   {
     "Lang": "zh-HK",
-    "Name": "中國香港",
+    "Name": "香港",
     "Alias": "繁體中文"
   },
   {
     "Lang": "zh-MO",
-    "Name": "中國澳門",
+    "Name": "澳門",
     "Alias": "繁體中文"
   },
   {
     "Lang": "zh-TW",
-    "Name": "中國台灣",
+    "Name": "台灣",
     "Alias": "繁體中文"
   }
 ]

TEAMModelOS/Startup.cs

@@ -32,6 +32,7 @@ namespace TEAMModelOS
 {
     public class Startup
     {
+        readonly string MyAllowSpecificOrigins = "_myAllowSpecificOrigins";
         //private IServiceCollection _services;
         public Startup(IConfiguration configuration, IWebHostEnvironment env)
         {
@@ -76,7 +77,20 @@ namespace TEAMModelOS
                         await Task.FromResult(0);
                     };
                 });
-            
+            //設定跨域請求
+            services.AddCors(options =>
+            {
+                options.AddPolicy(MyAllowSpecificOrigins,
+                builder =>
+                {
+                    builder.WithOrigins("http://teammodelos-test.chinacloudsites.cn",
+                                        "https://www.teammodel.cn", "https://localhost:5001",
+                                        "http://localhost:5000", "http://localhost:64524",
+                                        "https://localhost:44341")
+                    .AllowAnyHeader()
+                    .AllowAnyMethod();
+                });
+            });
             services.AddAzureStorage(Configuration.GetValue<string>("Azure:Starage:ConnectionString"));            
             services.AddAzureRedis( Configuration.GetValue<string>("Azure:Redis:ConnectionString"));            
             services.AddAzureCosmos(Configuration.GetValue<string>("Azure:Cosmos:ConnectionString"));
@@ -120,7 +134,7 @@ namespace TEAMModelOS
             //app.UseSpaStaticFiles(); //使用中間件不開
             app.UseRouting();
 
-            //app.UseCors(MyAllowSpecificOrigins); //使用跨域設定
+            app.UseCors(MyAllowSpecificOrigins); //使用跨域設定
             //app.UseHttpsRedirection(); //開發中暫時關掉
             //如果应用使用身份验证/授权功能（如 AuthorizePage 或 [Authorize]），请将对 UseAuthentication 和 UseAuthorization的
             //调用放在之后、UseRouting 和 UseCors，但在 UseEndpoints之前