update .

TEAMModelBI/Lang/en-us.json

@@ -1,4 +1,4 @@
-{
+{
   "request_school": [ "Apply to join school", "{tmdname}({tmdid}) applying to join {schoolName}." ],
   "invite_school": [ "Invite to join school", "{schoolName} has invited you to join." ],
   "remove_school": [ "Remove from school", "{schoolName} removed you from the school's teacher list." ],
@@ -15,6 +15,6 @@
   "scan-join_school": [ "Join school notice", "{tmdname} join school, {schoolName}, via QRcode scanning" ],
   "submitanswer-school_homework": [ "Homework submission notice", "{tmdname} of {schoolName} has submitted a homework({homeworkName})" ],
   "submitanswer-private_homework": [ "Homework submission notice", "{tmdname} has submitted a homework({homeworkName})" ],
-  "expire-school_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonRecordName}, on {schoolName} will expire at {expireTime}" ],
-  "expire-private_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonRecordName} will expire at {expireTime}" ]
+  "expire-school_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonName}, on {schoolName} will expire at {expireTime}" ],
+  "expire-private_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonName} will expire at {expireTime}" ]
 }

TEAMModelBI/Lang/zh-cn.json

@@ -1,4 +1,4 @@
-{
+{
   "request_school": [ "申请加入学校通知", "{tmdname}({tmdid})申请加入{schoolName}。" ],
   "invite_school": [ "邀请加入学校通知", "{schoolName}邀请您加入学校。" ],
   "remove_school": [ "从学校移除通知", "{schoolName}将您从学校教师名单中移除。" ],
@@ -15,6 +15,6 @@
   "scan-join_school": [ "扫码加入学校通知", "{tmdname}扫码加入学校，学校名称：{schoolName}" ],
   "submitanswer-school_homework": [ "作业提交通知", "{schoolName}的{tmdname}已提交作业,作业名称({homeworkName})"],
   "submitanswer-private_homework": [ "作业提交通知", "{tmdname}已提交作业,作业名称({homeworkName})" ],
-  "expire-school_lessonRecord": [ "课例到期通知", "您在{schoolName}的课例将在{expireTime}到期，课例名称：{lessonRecordName}" ],
-  "expire-private_lessonRecord": [ "课例到期通知", "您的课例将在{expireTime}到期，课例名称：{lessonRecordName}" ]
+  "expire-school_lessonRecord": [ "课例到期通知", "您在{schoolName}的课例将在{expireTime}到期，课例名称：{lessonName}" ],
+  "expire-private_lessonRecord": [ "课例到期通知", "您的课例将在{expireTime}到期，课例名称：{lessonName}" ]
 }

TEAMModelBI/Lang/zh-tw.json

@@ -1,4 +1,4 @@
-{
+{
   "request_school": [ "申請加入學校通知", "{tmdname}({tmdid})申請加入{schoolName}。" ],
   "invite_school": [ "邀請加入學校通知", "{schoolName}邀請您加入學校。" ],
   "remove_school": [ "從學校移除通知", "{schoolName}將您從學校教師名單中移除。" ],
@@ -15,6 +15,6 @@
   "scan-join_school": [ "掃碼加入學校通知", "{tmdname}掃碼加入學校，學校名稱：{schoolName}" ],
   "submitanswer-school_homework": [ "作業提交通知", "{schoolName}的{tmdname}已提交作業,作業名稱({homeworkName})" ],
   "submitanswer-private_homework": [ "作業提交通知", "{tmdname}已提交作業,作業名稱({homeworkName})" ],
-  "expire-school_lessonRecord": [ "課例到期通知", "您在{schoolName}的課例將在{expireTime}到期，課例名稱：{lessonRecordName}" ],
-  "expire-private_lessonRecord": [ "課例到期通知", "您的課例將在{expireTime}到期，課例名稱：{lessonRecordName}" ]
+  "expire-school_lessonRecord": [ "課例到期通知", "您在{schoolName}的課例將在{expireTime}到期，課例名稱：{lessonName}" ],
+  "expire-private_lessonRecord": [ "課例到期通知", "您的課例將在{expireTime}到期，課例名稱：{lessonName}" ]
 }

TEAMModelOS.FunctionV4/Lang/en-us.json

@@ -1,4 +1,4 @@
-{
+{
   "request_school": [ "Apply to join school", "{tmdname}({tmdid}) applying to join {schoolName}." ],
   "invite_school": [ "Invite to join school", "{schoolName} has invited you to join." ],
   "remove_school": [ "Remove from school", "{schoolName} removed you from the school's teacher list." ],
@@ -15,6 +15,6 @@
   "scan-join_school": [ "Join school notice", "{tmdname} join school, {schoolName}, via QRcode scanning" ],
   "submitanswer-school_homework": [ "Homework submission notice", "{tmdname} of {schoolName} has submitted a homework({homeworkName})" ],
   "submitanswer-private_homework": [ "Homework submission notice", "{tmdname} has submitted a homework({homeworkName})" ],
-  "expire-school_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonRecordName}, on {schoolName} will expire at {expireTime}" ],
-  "expire-private_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonRecordName} will expire at {expireTime}" ]
+  "expire-school_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonName}, on {schoolName} will expire at {expireTime}" ],
+  "expire-private_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonName} will expire at {expireTime}" ]
 }

TEAMModelOS.FunctionV4/Lang/zh-cn.json

@@ -1,4 +1,4 @@
-{
+{
   "request_school": [ "申请加入学校通知", "{tmdname}({tmdid})申请加入{schoolName}。" ],
   "invite_school": [ "邀请加入学校通知", "{schoolName}邀请您加入学校。" ],
   "remove_school": [ "从学校移除通知", "{schoolName}将您从学校教师名单中移除。" ],
@@ -15,6 +15,6 @@
   "scan-join_school": [ "扫码加入学校通知", "{tmdname}扫码加入学校，学校名称：{schoolName}" ],
   "submitanswer-school_homework": [ "作业提交通知", "{schoolName}的{tmdname}已提交作业,作业名称({homeworkName})"],
   "submitanswer-private_homework": [ "作业提交通知", "{tmdname}已提交作业,作业名称({homeworkName})" ],
-  "expire-school_lessonRecord": [ "课例到期通知", "您在{schoolName}的课例将在{expireTime}到期，课例名称：{lessonRecordName}" ],
-  "expire-private_lessonRecord": [ "课例到期通知", "您的课例将在{expireTime}到期，课例名称：{lessonRecordName}" ]
+  "expire-school_lessonRecord": [ "课例到期通知", "您在{schoolName}的课例将在{expireTime}到期，课例名称：{lessonName}" ],
+  "expire-private_lessonRecord": [ "课例到期通知", "您的课例将在{expireTime}到期，课例名称：{lessonName}" ]
 }

TEAMModelOS.FunctionV4/Lang/zh-tw.json

@@ -1,4 +1,4 @@
-{
+{
   "request_school": [ "申請加入學校通知", "{tmdname}({tmdid})申請加入{schoolName}。" ],
   "invite_school": [ "邀請加入學校通知", "{schoolName}邀請您加入學校。" ],
   "remove_school": [ "從學校移除通知", "{schoolName}將您從學校教師名單中移除。" ],
@@ -15,6 +15,6 @@
   "scan-join_school": [ "掃碼加入學校通知", "{tmdname}掃碼加入學校，學校名稱：{schoolName}" ],
   "submitanswer-school_homework": [ "作業提交通知", "{schoolName}的{tmdname}已提交作業,作業名稱({homeworkName})" ],
   "submitanswer-private_homework": [ "作業提交通知", "{tmdname}已提交作業,作業名稱({homeworkName})" ],
-  "expire-school_lessonRecord": [ "課例到期通知", "您在{schoolName}的課例將在{expireTime}到期，課例名稱：{lessonRecordName}" ],
-  "expire-private_lessonRecord": [ "課例到期通知", "您的課例將在{expireTime}到期，課例名稱：{lessonRecordName}" ]
+  "expire-school_lessonRecord": [ "課例到期通知", "您在{schoolName}的課例將在{expireTime}到期，課例名稱：{lessonName}" ],
+  "expire-private_lessonRecord": [ "課例到期通知", "您的課例將在{expireTime}到期，課例名稱：{lessonName}" ]
 }

TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -1691,9 +1691,9 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                                                     var clientSecret = _configuration.GetValue<string>("HaBookAuth:CoreService:clientSecret");
                                                     var location = $"{Environment.GetEnvironmentVariable("Option:Location")}";
                                                     await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //站内发送消息
-                                                   
+                                                    string expireTime= DateTimeOffset.FromUnixTimeMilliseconds(lessonRecordExpire.expire).ToString("yyyy-MM-dd HH:mm:ss");
                                                     _coreAPIHttpService.PushNotify(new List<IdNameCode> { new IdNameCode { id = teacher.id, name = teacher.name, code = teacher.lang } }, "expire-private_lessonRecord", Constant.NotifyType_IES5_Course,
-                                                                 new Dictionary<string, object> { { "tmdname", teacher.name }, { "tmdid", teacher.name }, { "lessonId", lessonRecordExpire.id }, { "lessonName", lessonRecordExpire. name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
+                                                                 new Dictionary<string, object> { { "tmdname", teacher.name }, { "tmdid", teacher.name }, { "expireTime", expireTime }, { "lessonId", lessonRecordExpire.id }, { "lessonName", lessonRecordExpire. name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
                                                     var table = _azureStorage.GetCloudTableClient().GetTableReference("ChangeRecord");
                                                     List<ChangeRecord> records = await table.FindListByDict<ChangeRecord>(new Dictionary<string, object>() { { "RowKey", lessonRecordExpire.id } });
                                                     if (records.Count <= 0)
@@ -1857,8 +1857,9 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                 await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //站内发送消息
 
                 Teacher targetTeacher = await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemAsync<Teacher>($"{tmdid}", new PartitionKey($"Base"));
+                string expireTime = DateTimeOffset.FromUnixTimeMilliseconds(long.Parse($"{expire}")).ToString("yyyy-MM-dd HH:mm:ss");
                 _coreAPIHttpService.PushNotify(new List<IdNameCode> { new IdNameCode { id = targetTeacher.id, name = targetTeacher.name, code = targetTeacher.lang } }, "expire-private_lessonRecord", Constant.NotifyType_IES5_Course,
-                             new Dictionary<string, object> { { "tmdname", tmdname }, { "tmdid",tmdid}, { "lessonId", id }, { "lessonName",name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
+                             new Dictionary<string, object> { { "tmdname", tmdname }, { "tmdid",tmdid}, { "lessonId", id }, { "expireTime", expireTime }, { "lessonName",name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
             }
             catch (Exception ex)
             {

TEAMModelOS.SDK/Models/Service/LessonService.cs

@@ -636,11 +636,11 @@ namespace TEAMModelOS.SDK.Models.Service
                     var clientSecret = _configuration.GetValue<string>("HaBookAuth:CoreService:clientSecret");
                     var location = $"{Environment.GetEnvironmentVariable("Option:Location")}";
                     await _notificationService.SendNotification(clientID, clientSecret, location, url, notification); //站内发送消息
-
+                    string expireTime = DateTimeOffset.FromUnixTimeMilliseconds(lessonRecord.expire).ToString("yyyy-MM-dd HH:mm:ss");
                     Teacher targetTeacher = await client.GetContainer(Constant.TEAMModelOS, Constant.Teacher).ReadItemAsync<Teacher>($"{tmdid}", new PartitionKey($"Base"));
                     _coreAPIHttpService.PushNotify(new List<IdNameCode> { new IdNameCode { id = targetTeacher.id, name = targetTeacher.name, code = targetTeacher.lang } }, "expire-school_lessonRecord", Constant.NotifyType_IES5_Course,
                                  new Dictionary<string, object> { { "tmdid", teacher.id }, { "tmdname", teacher.name }, { "schoolName", schoolBase.name }, 
-                                     { "schoolId", $"{school}" },{ "lessonId",lessonRecord.id },{ "lessonName",lessonRecord.name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
+                                     { "schoolId", $"{school}" },{ "lessonId",lessonRecord.id }, { "expireTime", expireTime },{ "lessonName",lessonRecord.name } }, $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
                     var table = _azureStorage.GetCloudTableClient().GetTableReference("ChangeRecord");
                     List<ChangeRecord> records = await table.FindListByDict<ChangeRecord>(new Dictionary<string, object>() { { "RowKey", lessonRecord.id } });
                     if (records.Count <= 0)

TEAMModelOS/Lang/en-us.json

@@ -1,4 +1,4 @@
-{
+{
   "request_school": [ "Apply to join school", "{tmdname}({tmdid}) applying to join {schoolName}." ],
   "invite_school": [ "Invite to join school", "{schoolName} has invited you to join." ],
   "remove_school": [ "Remove from school", "{schoolName} removed you from the school's teacher list." ],
@@ -15,6 +15,6 @@
   "scan-join_school": [ "Join school notice", "{tmdname} join school, {schoolName}, via QRcode scanning" ],
   "submitanswer-school_homework": [ "Homework submission notice", "{tmdname} of {schoolName} has submitted a homework({homeworkName})" ],
   "submitanswer-private_homework": [ "Homework submission notice", "{tmdname} has submitted a homework({homeworkName})" ],
-  "expire-school_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonRecordName}, on {schoolName} will expire at {expireTime}" ],
-  "expire-private_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonRecordName} will expire at {expireTime}" ]
+  "expire-school_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonName}, on {schoolName} will expire at {expireTime}" ],
+  "expire-private_lessonRecord": [ "Lesson record expiration notice", "Your lesson record, {lessonName} will expire at {expireTime}" ]
 }

TEAMModelOS/Lang/zh-cn.json

@@ -1,4 +1,4 @@
-{
+{
   "request_school": [ "申请加入学校通知", "{tmdname}({tmdid})申请加入{schoolName}。" ],
   "invite_school": [ "邀请加入学校通知", "{schoolName}邀请您加入学校。" ],
   "remove_school": [ "从学校移除通知", "{schoolName}将您从学校教师名单中移除。" ],
@@ -15,6 +15,6 @@
   "scan-join_school": [ "扫码加入学校通知", "{tmdname}扫码加入学校，学校名称：{schoolName}" ],
   "submitanswer-school_homework": [ "作业提交通知", "{schoolName}的{tmdname}已提交作业,作业名称({homeworkName})"],
   "submitanswer-private_homework": [ "作业提交通知", "{tmdname}已提交作业,作业名称({homeworkName})" ],
-  "expire-school_lessonRecord": [ "课例到期通知", "您在{schoolName}的课例将在{expireTime}到期，课例名称：{lessonRecordName}" ],
-  "expire-private_lessonRecord": [ "课例到期通知", "您的课例将在{expireTime}到期，课例名称：{lessonRecordName}" ]
+  "expire-school_lessonRecord": [ "课例到期通知", "您在{schoolName}的课例将在{expireTime}到期，课例名称：{lessonName}" ],
+  "expire-private_lessonRecord": [ "课例到期通知", "您的课例将在{expireTime}到期，课例名称：{lessonName}" ]
 }

TEAMModelOS/Lang/zh-tw.json

@@ -1,4 +1,4 @@
-{
+{
   "request_school": [ "申請加入學校通知", "{tmdname}({tmdid})申請加入{schoolName}。" ],
   "invite_school": [ "邀請加入學校通知", "{schoolName}邀請您加入學校。" ],
   "remove_school": [ "從學校移除通知", "{schoolName}將您從學校教師名單中移除。" ],
@@ -15,6 +15,6 @@
   "scan-join_school": [ "掃碼加入學校通知", "{tmdname}掃碼加入學校，學校名稱：{schoolName}" ],
   "submitanswer-school_homework": [ "作業提交通知", "{schoolName}的{tmdname}已提交作業,作業名稱({homeworkName})" ],
   "submitanswer-private_homework": [ "作業提交通知", "{tmdname}已提交作業,作業名稱({homeworkName})" ],
-  "expire-school_lessonRecord": [ "課例到期通知", "您在{schoolName}的課例將在{expireTime}到期，課例名稱：{lessonRecordName}" ],
-  "expire-private_lessonRecord": [ "課例到期通知", "您的課例將在{expireTime}到期，課例名稱：{lessonRecordName}" ]
+  "expire-school_lessonRecord": [ "課例到期通知", "您在{schoolName}的課例將在{expireTime}到期，課例名稱：{lessonName}" ],
+  "expire-private_lessonRecord": [ "課例到期通知", "您的課例將在{expireTime}到期，課例名稱：{lessonName}" ]
 }

TEAMModelOS/appsettings.Development.json

@@ -21,23 +21,22 @@
   },
   "Azure": {
     "Storage": {
-      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodeltest;AccountKey=O2W2vadCqexDxWO+px+QK7y1sHwsYj8f/WwKLdOdG5RwHgW/Dupz9dDUb4c1gi6ojzQaRpFUeAAmOu4N9E+37A==;EndpointSuffix=core.chinacloudapi.cn"
+      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelos;AccountKey=Dl04mfZ9hE9cdPVO1UtqTUQYN/kz/dD/p1nGvSq4tUu/4WhiKcNRVdY9tbe8620nPXo/RaXxs+1F9sVrWRo0bg==;EndpointSuffix=core.chinacloudapi.cn"
     },
     "Cosmos": {
-      "ConnectionString": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;"
-      //"ConnectionString": "AccountEndpoint=https://teammodelos.documents.azure.cn:443/;AccountKey=clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==;"
+      "ConnectionString": "AccountEndpoint=https://teammodelos.documents.azure.cn:443/;AccountKey=clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==;"
     },
     "Redis": {
-      "ConnectionString": "52.130.252.100:6379,password=habook,ssl=false,abortConnect=False,writeBuffer=10240"
+      "ConnectionString": "CoreRedisCN.redis.cache.chinacloudapi.cn:6380,password=LyJWP1ORJdv+poXWofAF97lhCEQPg1wXWqvtzXGXQuE=,ssl=True,abortConnect=False"
     },
     "ServiceBus": {
-      "ConnectionString": "Endpoint=sb://teammodelos.servicebus.chinacloudapi.cn/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=Sy4h4EQ8zP+7w/lOLi1X3tGord/7ShFHimHs1vC50Dc=",
-      "ActiveTask": "dep-active-task",
-      "ItemCondQueue": "dep-itemcond",
-      "GenPdfQueue": "dep-genpdf"
+      "ConnectionString": "Endpoint=sb://coreiotservicebuscnpro.servicebus.chinacloudapi.cn/;SharedAccessKeyName=TEAMModelOS;SharedAccessKey=llRPBMDJG9w1Nnifj+pGhV0g4H2REcq0PjvX2qqpcOg=",
+      "ActiveTask": "active-task",
+      "ItemCondQueue": "itemcond",
+      "GenPdfQueue": "genpdf"
     },
     "SignalR": {
-      "ConnectionString": "Endpoint=https://channel.service.signalr.net;AccessKey=KrblW06tuA4a/GyqRPDU0ynFFmAWxbAvyJihHclSXbQ=;Version=1.0;"
+      "ConnectionString": "Endpoint=https://channel.signalr.azure.cn;AccessKey=AtcB7JYFNUbUXb1rGxa3PVksQ2X5YSv3JOHZR9J88tw=;Version=1.0;"
     }
   },
   "HaBookAuth": {