CrazyIter_Bin 2 年之前
父节点
当前提交
c01709effc

+ 4 - 4
TEAMModelOS.FunctionV4/HttpTrigger/IESHttpTrigger.cs

@@ -187,15 +187,15 @@ namespace TEAMModelOS.FunctionV4
                         {
                             if ("school".Equals(scope, StringComparison.OrdinalIgnoreCase))
                             {
-                                _coreAPIHttpService.PushNotify(ids, $"blob-space-school-notify", Constant.NotifyType_IES5_Management,
-                                new Dictionary<string, object> { { "tmdname", name }, { "schoolName", school.name }, { "percent", $"{tag}" }, { "schoolId", $"{school.id}" }, { "tmdid", idnamecode.id } },
+                                _coreAPIHttpService.PushNotify(new List<IdNameCode> { idnamecode}, $"blob-space-school-notify", Constant.NotifyType_IES5_Management,
+                                new Dictionary<string, object> { { "tmdname", idnamecode.name }, { "schoolName", school.name }, { "percent", $"{tag}" }, { "schoolId", $"{school.id}" }, { "tmdid", idnamecode.id } },
                                 $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
 
                             }
                             else
                             {
-                                _coreAPIHttpService.PushNotify(ids, $"blob-space-private-notify", Constant.NotifyType_IES5_Management,
-                                    new Dictionary<string, object> { { "tmdname", name }, { "percent", $"{tag}" }, { "tmdid", idnamecode.id } },
+                                _coreAPIHttpService.PushNotify(new List<IdNameCode> { idnamecode }, $"blob-space-private-notify", Constant.NotifyType_IES5_Management,
+                                    new Dictionary<string, object> { { "tmdname", idnamecode.name }, { "percent", $"{tag}" }, { "tmdid", idnamecode.id } },
                                     $"{Environment.GetEnvironmentVariable("Option:Location")}", _configuration, _dingDing, "");
                             }
                             blobSpaceNotify = new BlobSpaceNotify { id = idnamecode.id, tag = tag, containerName = name, scope = scope, notifyIndex = Guid.NewGuid().ToString() };

+ 2 - 2
TEAMModelOS.FunctionV4/Lang/en-us.json

@@ -26,6 +26,6 @@
   "art-template-comment5": "你在本次考核中{pointLow}等知识有待提高,希望进一步加强。",
   "art-template-subject_music": "其实音乐殿堂的门槛并没有你想的那么高,对吧?希望你继续努力能够在这里欣赏到更美丽的风景!跳动的音符充满魅力,每个人的生活都离不开音乐,加油吧,相信你在音乐中会有所收获的。",
   "art-template-subject_painting": "你敢于探素,乐于欣赏,在五彩的画笔中快乐成长,如果你再多一点耐心、仔细刻画,一定会更棒!你积极热爱美术,总是充满快乐,希望你能够坚持美术学习,永不放弃,在美术的道路上快乐地成长!",
-  "blob-space-school-notify": "Dear {schoolName} administrator {tmdname}, remind you that the remaining space of your school is less than {percent}%, please contact the sales to purchase space, for details, please log in to IES (teammodel.net ) to view. Please ignore this notification if the capacity has already been expanded.",
-  "blob-space-private-notify": "Hello, {tmdname}, remind you that the remaining space belong to your account {tmdid} is less than {percent}%. Please contact the school administrator to configure or purchase your own space. Please ignore this notification if the capacity has already been expanded."
+  "blob-space-school-notify": [ "There is not enough space left", "Dear {schoolName} administrator {tmdname}, remind you that the remaining space of your school is less than {percent}%, please contact the sales to purchase space, for details, please log in to IES (teammodel.net ) to view. Please ignore this notification if the capacity has already been expanded." ],
+  "blob-space-private-notify": [ "There is not enough space left", "Hello, {tmdname}, remind you that the remaining space belong to your account {tmdid} is less than {percent}%. Please contact the school administrator to configure or purchase your own space. Please ignore this notification if the capacity has already been expanded." ]
 }

+ 2 - 2
TEAMModelOS.FunctionV4/Lang/zh-cn.json

@@ -26,6 +26,6 @@
   "art-template-comment5": "你在本次考核中{pointLow}等知识有待提高,希望进一步加强。",
   "art-template-subject_music": "其实音乐殿堂的门槛并没有你想的那么高,对吧?希望你继续努力能够在这里欣赏到更美丽的风景!跳动的音符充满魅力,每个人的生活都离不开音乐,加油吧,相信你在音乐中会有所收获的。",
   "art-template-subject_painting": "你敢于探素,乐于欣赏,在五彩的画笔中快乐成长,如果你再多一点耐心、仔细刻画,一定会更棒!你积极热爱美术,总是充满快乐,希望你能够坚持美术学习,永不放弃,在美术的道路上快乐地成长!",
-  "blob-space-school-notify": "亲爱的{schoolName}管理员{tmdname}您好,提醒您贵校剩余空间不足{percent}%,请联系官方客服购买空间,详情请登入IES(teammodel.net)查看,如果已经扩容请忽略此通知。",
-  "blob-space-private-notify": "亲爱的{tmdname}您好,提醒您的帐号{tmdid}授权的剩余空间不足{percent}%,请联系学校管理员配置或是购买个人空间,如果已经扩容请忽略此通知。"
+  "blob-space-school-notify": [ "剩余空间不足", "亲爱的{schoolName}管理员{tmdname}您好,提醒您贵校剩余空间不足{percent}%,请联系官方客服购买空间,详情请登入IES(teammodel.net)查看,如果已经扩容请忽略此通知。" ],
+  "blob-space-private-notify": [ "剩余空间不足", "亲爱的{tmdname}您好,提醒您的帐号{tmdid}授权的剩余空间不足{percent}%,请联系学校管理员配置或是购买个人空间,如果已经扩容请忽略此通知。" ]
 }

+ 2 - 2
TEAMModelOS.FunctionV4/Lang/zh-tw.json

@@ -26,6 +26,6 @@
   "art-template-comment5": "你在本次考核中{pointLow}等知识有待提高,希望进一步加强。",
   "art-template-subject_music": "其实音乐殿堂的门槛并没有你想的那么高,对吧?希望你继续努力能够在这里欣赏到更美丽的风景!跳动的音符充满魅力,每个人的生活都离不开音乐,加油吧,相信你在音乐中会有所收获的。",
   "art-template-subject_painting": "你敢于探素,乐于欣赏,在五彩的画笔中快乐成长,如果你再多一点耐心、仔细刻画,一定会更棒!你积极热爱美术,总是充满快乐,希望你能够坚持美术学习,永不放弃,在美术的道路上快乐地成长!",
-  "blob-space-school-notify": "親愛的{schoolName}管理員{tmdname}您好,提醒您貴校剩餘空間不足{percent}%,請聯繫官方客服購買空間,詳情請登入IES(teammodel.net)查看,如果已經擴容請忽略此通知。",
-  "blob-space-private-notify": "親愛的{tmdname}您好,提醒您的帳號{tmdid}授權的剩餘空間不足{percent}%,請聯繫學校管理員配置或是購買個人空間,如果已經擴容請忽略此通知。"
+  "blob-space-school-notify": [ "剩餘空間不足", "親愛的{schoolName}管理員{tmdname}您好,提醒您貴校剩餘空間不足{percent}%,請聯繫官方客服購買空間,詳情請登入IES(teammodel.net)查看,如果已經擴容請忽略此通知。" ],
+  "blob-space-private-notify": [ "剩餘空間不足", "親愛的{tmdname}您好,提醒您的帳號{tmdid}授權的剩餘空間不足{percent}%,請聯繫學校管理員配置或是購買個人空間,如果已經擴容請忽略此通知。" ]
 }

+ 2 - 2
TEAMModelOS/Lang/en-us.json

@@ -31,8 +31,8 @@
   "art-template-comment5": "你在本次考核中{pointLow}等知识有待提高,希望进一步加强。",
   "art-template-subject_music": "其实音乐殿堂的门槛并没有你想的那么高,对吧?希望你继续努力能够在这里欣赏到更美丽的风景!跳动的音符充满魅力,每个人的生活都离不开音乐,加油吧,相信你在音乐中会有所收获的。",
   "art-template-subject_painting": "你敢于探素,乐于欣赏,在五彩的画笔中快乐成长,如果你再多一点耐心、仔细刻画,一定会更棒!你积极热爱美术,总是充满快乐,希望你能够坚持美术学习,永不放弃,在美术的道路上快乐地成长!",
-  "blob-space-school-notify": "Dear {schoolName} administrator {tmdname}, remind you that the remaining space of your school is less than {percent}%, please contact the sales to purchase space, for details, please log in to IES (teammodel.net ) to view. Please ignore this notification if the capacity has already been expanded.",
-  "blob-space-private-notify": "Hello, {tmdname}, remind you that the remaining space belong to your account {tmdid} is less than {percent}%. Please contact the school administrator to configure or purchase your own space. Please ignore this notification if the capacity has already been expanded.",
+  "blob-space-school-notify": [ "There is not enough space left", "Dear {schoolName} administrator {tmdname}, remind you that the remaining space of your school is less than {percent}%, please contact the sales to purchase space, for details, please log in to IES (teammodel.net ) to view. Please ignore this notification if the capacity has already been expanded." ],
+  "blob-space-private-notify": [ "There is not enough space left", "Hello, {tmdname}, remind you that the remaining space belong to your account {tmdid} is less than {percent}%. Please contact the school administrator to configure or purchase your own space. Please ignore this notification if the capacity has already been expanded." ],
   "notify-status": {
     "code0": "Token invalid",
     "code1": "Parameter exception",

+ 2 - 2
TEAMModelOS/Lang/zh-cn.json

@@ -31,8 +31,8 @@
   "art-template-comment5": "你在本次考核中{pointLow}等知识有待提高,希望进一步加强。",
   "art-template-subject_music": "其实音乐殿堂的门槛并没有你想的那么高,对吧?希望你继续努力能够在这里欣赏到更美丽的风景!跳动的音符充满魅力,每个人的生活都离不开音乐,加油吧,相信你在音乐中会有所收获的。",
   "art-template-subject_painting": "你敢于探素,乐于欣赏,在五彩的画笔中快乐成长,如果你再多一点耐心、仔细刻画,一定会更棒!你积极热爱美术,总是充满快乐,希望你能够坚持美术学习,永不放弃,在美术的道路上快乐地成长!",
-  "blob-space-school-notify": "亲爱的{schoolName}管理员{tmdname}您好,提醒您贵校剩余空间不足{percent}%,请联系官方客服购买空间,详情请登入IES(teammodel.cn)查看,如果已经扩容请忽略此通知。",
-  "blob-space-private-notify": "亲爱的{tmdname}您好,提醒您的帐号{tmdid}授权的剩余空间不足{percent}%,请联系学校管理员配置或是购买个人空间,如果已经扩容请忽略此通知。",
+  "blob-space-school-notify": [ "剩余空间不足", "亲爱的{schoolName}管理员{tmdname}您好,提醒您贵校剩余空间不足{percent}%,请联系官方客服购买空间,详情请登入IES(teammodel.cn)查看,如果已经扩容请忽略此通知。" ],
+  "blob-space-private-notify": [ "剩余空间不足", "亲爱的{tmdname}您好,提醒您的帐号{tmdid}授权的剩余空间不足{percent}%,请联系学校管理员配置或是购买个人空间,如果已经扩容请忽略此通知。" ],
   "notify-status": {
     "code0": "凭据失效",
     "code1": "参数异常",

+ 2 - 2
TEAMModelOS/Lang/zh-tw.json

@@ -31,8 +31,8 @@
   "art-template-comment5": "你在本次考核中{pointLow}等知识有待提高,希望进一步加强。",
   "art-template-subject_music": "其实音乐殿堂的门槛并没有你想的那么高,对吧?希望你继续努力能够在这里欣赏到更美丽的风景!跳动的音符充满魅力,每个人的生活都离不开音乐,加油吧,相信你在音乐中会有所收获的。",
   "art-template-subject_painting": "你敢于探素,乐于欣赏,在五彩的画笔中快乐成长,如果你再多一点耐心、仔细刻画,一定会更棒!你积极热爱美术,总是充满快乐,希望你能够坚持美术学习,永不放弃,在美术的道路上快乐地成长!",
-  "blob-space-school-notify": "親愛的{schoolName}管理員{tmdname}您好,提醒您貴校剩餘空間不足{percent}%,請聯繫官方客服購買空間,詳情請登入IES(teammodel.net)查看,如果已經擴容請忽略此通知。",
-  "blob-space-private-notify": "親愛的{tmdname}您好,提醒您的帳號{tmdid}授權的剩餘空間不足{percent}%,請聯繫學校管理員配置或是購買個人空間,如果已經擴容請忽略此通知。",
+  "blob-space-school-notify": [ "剩餘空間不足", "親愛的{schoolName}管理員{tmdname}您好,提醒您貴校剩餘空間不足{percent}%,請聯繫官方客服購買空間,詳情請登入IES(teammodel.net)查看,如果已經擴容請忽略此通知。" ],
+  "blob-space-private-notify": [ "剩餘空間不足", "親愛的{tmdname}您好,提醒您的帳號{tmdid}授權的剩餘空間不足{percent}%,請聯繫學校管理員配置或是購買個人空間,如果已經擴容請忽略此通知。" ],
   "notify-status": {
     "code0": "憑證失效",
     "code1": "參數異常",