合併6.0修正字串衝突

TEAMModelOS.FunctionV4/ServiceBus/ActiveTaskTopic.cs

@@ -703,7 +703,8 @@ namespace TEAMModelOS.FunctionV4.ServiceBus
                     if(chgSchSizeCnt.Equals(0) && !school.size.Equals(schoolDefaultSize))
                     {
                         school.size = schoolDefaultSize;
-                        updSchool = true;
+                        //updSchool = true; //關於學校空間初始式樣未定，目前暫定：若需要Reset空間，則先維持原空間數不更動
+                        updSchool = false;
                     }
                 }
                 //變更學校基本資料

TEAMModelOS/ClientApp/src/locale/lang/en-US/answerSheet.js

@@ -1,10 +1,10 @@
 export default {
-	sheetTip1:'答題卡製作註意事項',
-	sheetTip2:'1、主觀題作答區域編輯框可通過點擊下邊框拖拽快速調整高度。',
-	sheetTip3:'2、答題卡最多支持 7 頁，如您的內容超出，請進行相應調整，否則無法正常生成答題卡。',
-	sheetTip4:'答題卡最多支持 7 頁，請重新調整答題卡內容！',
-	sheetTip5:'當前試卷答題卡文件數據丟失，請重新生成！',
-	printA4:'Print in A4',
+	sheetTip1:'Note',
+	sheetTip2:'1. The height of subjective question answer area can be quickly adjusted by clicking and dragging on the lower border.',
+	sheetTip3:'2. The answer card supports up to 7 pages. If your content exceeds the maximum of 7 pages, please adjust accordingly, otherwise the answer card cannot be generated properly.',
+	sheetTip4:'The answer card supports up to 7 pages, please readjust the content of the card!',
+	sheetTip5: 'The data of the current exam file answer card file is lost, please regenerate it!',
+	printA4: 'Print in A4',
 	printA3:'Print in A3',
 	singleColumn:'Single Column',
 	doubleColumn:'Double Columns',

TEAMModelOS/ClientApp/src/locale/lang/en-US/cusMgt.js

@@ -101,8 +101,8 @@ export default {
     school: 'School',
     noRecord: 'No lesson records yet',
     groupTips: 'Friendly reminder：The current grouping information is of administrative grouping, teachers can go to HiTeach to define their own grouping. ',
-    noSchoolStu: 'You are not a member of the school yet, so cannot add students to the school. Self-customized list can be created and students can join by scanning the code!',
-    qrCodeLabel: '掃碼加入課程名單',
+    noSchoolStu: 'You are not a member of the school yet, so cannot add students to the school. Personal list can be created and students can join by scanning the code!',
+    qrCodeLabel: 'Scan the code to join the list',
     hasDelClass: '(This class has been deleted)',
     hasDelList: '(List has been deleted)',
     schoolType: 'In-school Account',
@@ -228,11 +228,11 @@ export default {
     notime1: 'Schedule not set yet, please',
     notime2: 'set schedule',
     notime3: 'and arrange class time',
-    listType1: 'Class List',
-    listType2: 'Self-customized List',
+    listType1: 'Admin Class',
+    listType2: 'Customized Class',
     confirmAdd: 'Confirm Add',
     cancelAdd: 'Cancel Add',
-    createList: 'Create Self-customized List',
+    createList: 'Create Customized Class',
     name: 'Name: ',
     nameHolder: 'Please enter list name...',
     nameRepeat: 'The customized class name is duplicated',
@@ -267,7 +267,7 @@ export default {
     remvStu: 'Remove Student',
     editStu: 'Set IRS number',
     goBack: 'Click to go back',
-    delListTitle: 'Delete Self-customized List',
+    delListTitle: 'Delete Customized Class',
     notSet: 'Not set',
     irsTips1: '1. Quickly set the IRS number in the order of the list;',
     irsTips2: '2. If the student already has a set IRS number, it will be reset.',
@@ -327,8 +327,8 @@ export default {
     sat: 'Saturday',
     sun: 'Sunday',
     nameListType: 'Type',
-    scClass: 'School Class',
-    customNameList: 'Self-customized List',
+    scClass: 'Admin Class',
+    customNameList: 'Customized Class',
     teaTimeWraning: 'The teacher already has courses scheduled for this time period',
     classTimeWarning: 'The class already has courses scheduled for this time period',
     teaListErr: 'There is an abnormality when checking the teacher list.',

TEAMModelOS/ClientApp/src/locale/lang/en-US/evaluation.js

@@ -96,8 +96,8 @@ export default {
 	updateTime: 'Update Time',
 	remove: 'Remove',
 	choose: 'Select',
-	isTrue: 'Correct',
-	isFalse: 'Incorrect',
+	isTrue: 'True',
+	isFalse: 'False',
 	deleteItem: 'Delete',
 	editItem: 'Edit',
 	confirm: 'Confirm',
@@ -307,7 +307,7 @@ export default {
 		objectivePie: 'Subjective/Objective Question Distribution'
 	},
 	getEmptyItems: "No data yet",
-	child: 'Question',
+	child: ' Question',
 	typePieTitle: 'Question Type Distribution Graph',
 	reImport: 'Re-import',
 	continueImport: 'Continue Preview',
@@ -348,21 +348,21 @@ export default {
 		none: 'None'
 	},
 	share: {
-		shareResource: '個人分享',
-		shareItem: '分享個人試題',
-		sharePaper: '分享個人試卷',
-		back: '返回上級',
-		checkItem: '已選試題',
-		checkPaper: '已選試卷',
-		shareTo: '分享到',
-		confirmShare: '確認分享',
-		existTip: '重復提示',
-		existTip1: '檢測到分享的以下資源',
-		existTip2: '已存在於校本庫',
-		existTip3: '繼續分享將會覆蓋校本資源，請確認您的操作',
-		ignore: '忽略上述資源的分享',
-		confirmCover: '確認覆蓋',
-		shareSuc: '分享成功',
-		shareFail: '分享失敗'
+		shareResource: 'Share',
+		shareItem: 'Questions',
+		sharePaper: 'Exam File',
+		back: 'Click to go back',
+		checkItem: 'Selected questions',
+		checkPaper: 'Selected exam files',
+		shareTo: 'Share to',
+		confirmShare: 'Confirm Sharing',
+		existTip: 'Repetition Notice',
+		existTip1: 'The following shared resources have been detected as',
+		existTip2: 'already existing in the school question bank',
+		existTip3: 'Continue sharing will replace the repeated resources, please confirm your actions',
+		ignore: 'Skip the repeated resources',
+		confirmCover: 'Confirm Replace',
+		shareSuc: 'Shared successfully',
+		shareFail: 'Failed to share'
 	}
 }

TEAMModelOS/ClientApp/src/locale/lang/en-US/learnActivity.js

@@ -270,10 +270,8 @@ export default {
         exporting: 'Exporting...',
         exportTips: 'The assessment is in progress and some students have not yet answered. Are you sure you want to export the data?',
         noQuMark: 'All questions have been graded, no unmarked questions',
-        noUpd:'暫未修改分數',
-        totalScore:'總成績',
-        delMark:'刪除批註',
-        delMarkContent:'確認刪除當前題目的批註嗎？'
+        noUpd: 'Score not modified yet',
+        totalScore: 'Total Score'
     },
 
     //SimpleAnalysis.vue
@@ -300,7 +298,7 @@ export default {
         failedNum: 'Non-Passer',
         complyCount: 'Passer Number Statistics',
         simpleErr: 'Failed to search statistical data',
-        dataErr:'評測統計數據出錯啦'
+        dataErr: 'The assessment statistical data error!'
     },
 
     mark: {

TEAMModelOS/ClientApp/src/locale/lang/en-US/studentWeb.js

@@ -181,9 +181,9 @@ export default {
     defaultRecentClass: 'Introduction to Microprocessor Basics and Applications',
     defaultClassTime: 'Wednesday 13:30-16:30 (Sections 7-9)',
     defaultClassPlace: 'F504 classroom in the fifth teaching building',
-    todaydeadlineList: 'Today deadline event reminder',
-    endsToday: "ends today at ",
-    endsTodayTime: '',
+    todaydeadlineList: 'Ends Today',
+    endsToday: "Today",
+    endsTodayTime: 'ends today at 23:59',
     addCourse: "Enter the course invitation code to join it",
     courseType: {
         success: "Join the course successfully",
@@ -435,9 +435,9 @@ export default {
     },
     exam: {
         info: {
-            total1: "共",
-            total2: "總計",
-            num: "題",
+            total1: "Total ",
+            total2: "Total Score",
+            num: " questions",
         },
         score111: "",
         examLink: 'Exam File Link',
@@ -469,7 +469,7 @@ export default {
             questions: 'questions',
             submitted: 'Submit Answer',
             submitted1: "End The Practice",
-            againPractice: "再次練習",
+            againPractice: "Practice Again",
             finish: 'Completed',
             showAns: 'Show the answer',
             hideAns: 'Hide the answer',
@@ -495,7 +495,7 @@ export default {
             conAnswer2: ', please complete the question first!',
             conAnswer: 'Continue to answer',
             okSubmit: 'Confirm to submit answers',
-            exitWrong: "Leave Incorrectly Answered Questions Practice Reminder",
+            exitWrong: "Leave Practice Reminder",
             exitWrongDe: 'The system detects that you have not yet "End practicing", if you select "OK",',
             exitWrongDes: "the current answer will not be saved, and you need to practice again next time.",
             endPractice: "End Practice Reminder",
@@ -541,7 +541,7 @@ export default {
             noAnalyse: 'No explanation yet',
             noKnowledge: 'No key concept yet',
             wrongPractice: 'Practice',
-            website: "網址",
+            website: "Website",
         },
         timeoutHint: 'The assessment has ended. Overdue will be calculated as 0 points, or wait for the teacher to allow make-ups.',
         timeoutHint1: 'The assessment has ended and system is waiting for HiTeach for data.',
@@ -557,7 +557,7 @@ export default {
         score: 'Score',
         difficulty: 'Average difficulty of questions',
         average: 'Class Average Score',
-        waiting: "等待統計分數",
+        waiting: "Waiting for the score count",
         rightNum: 'My number of correctly answered questions',
         smartComment: 'Smart Comment',
         keypoint: 'Recommended key concepts for review:',
@@ -631,15 +631,15 @@ export default {
         noScoreType: "Not graded",
         finishOk: "Graded",
         practiceType: {
-            onlyWrong: "僅練習錯題",
-            all: "練習全部",
-            haveStar: "僅練習星號題",
+            onlyWrong: "Incorrect",
+            all: "All",
+            haveStar: "Star",
         },
-        disorder: "亂序選項(選擇題)",
-        start: "開始",
+        disorder: "Random Options",
+        start: "Start",
         message: {
-            noWrong: "當前評量無錯題可進行練習！",
-            noStar: "當前評量無標星題目！",
+            noWrong: "This assessment does not have incorrectly answered questions!",
+            noStar: "This assessment does not have starred questions!",
         }
     },
     queNaire: {
@@ -682,10 +682,10 @@ export default {
         classmates: 'Classmates list',
         classmates1: 'TEAM Model List',
         classRecord: "Lesson Records",
-        examRecord: "評測清單",
-        hwRecord: "作业清單",
-        voteRecord: "投票活動",
-        surRecord: "問卷活動",
+        examRecord: "Assesment List",
+        hwRecord: "Homework List",
+        voteRecord: "Poll Activity",
+        surRecord: "Survey Activity",
         classID: 'Course Code',
         classTime: 'Class Time',
         classroom: 'Classroom',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/answerSheet.js

@@ -1,5 +1,5 @@
 export default {
-	sheetTip1:'答題卡製作註意事項',
+	sheetTip1:'答題卡製作注意事項',
 	sheetTip2:'1、主觀題作答區域編輯框可通過點擊下邊框拖拽快速調整高度。',
 	sheetTip3:'2、答題卡最多支持 7 頁，如您的內容超出，請進行相應調整，否則無法正常生成答題卡。',
 	sheetTip4:'答題卡最多支持 7 頁，請重新調整答題卡內容！',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/auth.js

@@ -8,7 +8,7 @@ export default {
     prodRecord: '產品購買記錄',
     customer: '諮詢客服',
     totalSpace: '總空間',
-    exam: '評測',
+    exam: '評量',
     vote: '投票',
     survey: '問卷',
     teachSpace: '分配給教師',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/cusMgt.js

@@ -101,7 +101,7 @@ export default {
     school: '學校',
     noRecord: '暫無課堂記錄',
     groupTips: '溫馨提示：當前分組為編制班分組，任課教師可前往HiTeach端自定義分組。 ',
-    noSchoolStu: '暫未加入學校無法新增學校學生，可以建立自定義名單，學生通過掃碼加入名單！',
+    noSchoolStu: '暫未加入學校無法新增學校學生，可以建立個人名單，學生通過掃碼加入名單！',
     qrCodeLabel: '掃碼加入課程名單',
     hasDelClass: '(此班已被刪除)',
     hasDelList: '(名單已被刪除)',
@@ -267,7 +267,7 @@ export default {
     remvStu: '移除學生',
     editStu: '設置IRS',
     goBack: '返回上級',
-    delListTitle: '刪除自定義名單',
+    delListTitle: '刪除選課班',
     notSet: '未設置',
     irsTips1: '1、按照名單順序快速設置IRS號碼；',
     irsTips2: '2、如果學生已經設置IRS號碼將被重置。 ',
@@ -317,8 +317,8 @@ export default {
     sltCusTips: '請先選擇課程',
     setCusWarning: '請設定課程',
     setTeaWarning: '請設定教師',
-    setClassWarning: '請選擇學校班級',
-    setStuListWarning: '請選擇自定義名單',
+    setClassWarning: '請選擇編制班',
+    setStuListWarning: '請選擇選課班',
     mon: '星期一',
     tue: '星期二',
     wed: '星期三',
@@ -327,8 +327,8 @@ export default {
     sat: '星期六',
     sun: '星期日',
     nameListType: '類型',
-    scClass: '學校班級',
-    customNameList: '自定義名單',
+    scClass: '編制班',
+    customNameList: '選課班',
     teaTimeWraning: '該教師此時段已有課程安排',
     classTimeWarning: '該班級此時段已有課程安排',
     teaListErr:'査詢教師名單異常',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/http.js

@@ -3,7 +3,7 @@ export default {
 	error401: '登入狀態已過期！請重新登入！',
 	error404: '未呼叫到API地址！',
 	error400:'請求異常，請稍後重試！',
-	error: '網絡異常，請稍後重試！',
+	error: '網路異常，請稍後重試！',
 	loading: '處理中',
 	error403: '授權過期或授權異常，請稍後重試！'
 }

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/jyzx.js

@@ -84,11 +84,11 @@ export default{
         queAnswer: "作答問卷",
         feedback: "問卷迴響",
         answered: "已作答",
-        exam: "評測",
-        examName: "評測名稱",
-        examDes: "評測描述",
-        examAnswer: "作答評測",
-        answerExam: "評測作答",
+        exam: "評量",
+        examName: "評量名稱",
+        examDes: "評量描述",
+        examAnswer: "作答評量",
+        answerExam: "評量作答",
         right: "答對",
         error: "答錯",
         topic: "題",
@@ -99,7 +99,7 @@ export default{
         error3: "此時不在該活動的作答時間内，無法作答",
         error4: "您不在該活動的名單中，無法作答",
         message1: "問卷未填寫完，請繼續填寫",
-        message2: "評測未作答完，請繼續作答",
+        message2: "評量未作答完，請繼續作答",
         placeholder1: "輸入您的回答内容...",
         message3: "刪除成功",
         delTitle: "研修活動已被刪除，是否刪除此條記錄？",

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/learnActivity.js

@@ -19,8 +19,8 @@ export default {
         finish: '已結束',
         endTime: '結束時間：',
         stop: '立即結束',
-        evType: '評測類型：',
-        evMode: '評測模式:',
+        evType: '評量類型：',
+        evMode: '評量模式:',
         stuCount: '施測人數：',
         nodata: '暫無評量',
         tab1: '評量數據',
@@ -49,16 +49,16 @@ export default {
         ftType: '類型：',
         ftMode: '模式：',
         search: '搜尋',
-        taskTips: '您可以發布閱卷任務，將評測作答數據分配給老師進行線上閱卷評分。',
+        taskTips: '您可以發布閱卷任務，將評量作答數據分配給老師進行線上閱卷評分。',
         editEndTime: '修改結束時間',
-        endTimeHolder: '請設置評測結束時間',
+        endTimeHolder: '請設置評量結束時間',
         updOk: '修改成功',
         updErr: '修改失敗',
-        edName: '修改評測名稱',
-        edNameHolder: '請輸入評測名稱',
+        edName: '修改評量名稱',
+        edNameHolder: '請輸入評量名稱',
         scoreStatus: '待評分',
-        scoreStatus1:'已評分',
-        hasDel: '此評測已被刪除',
+        scoreStatus1: '已評分',
+        hasDel: '此評量已被刪除',
         actionErr: '操作失敗',
         classInfoErr: '査詢班級資訊失敗',
         evListErr: '査詢評測清單失敗',
@@ -266,10 +266,10 @@ export default {
         crtRateTitle: '正確率統計',
         crtLabel: '正確',
         wrongLabel: '錯誤',
-        wrongQuTips: '評測結束後才能查看錯題統計',
+        wrongQuTips: '評量結束後才能查看錯題統計',
         exportData: '導出數據',
         exporting: '正在導出',
-        exportTips: '評測進行中，有些學生尚未作答，確認導出數據嗎？ ',
+        exportTips: '評量進行中，有些學生尚未作答，確認導出數據嗎？ ',
         noQuMark: '已完成所有題目評分，暫無未閱題目',
         noUpd:'暫未修改分數',
         totalScore:'總成績',
@@ -301,7 +301,7 @@ export default {
         failedNum: '不及格',
         complyCount: '及格人數統計',
         simpleErr: '查詢統計數據失敗',
-        dataErr:'評測統計數據出錯啦'
+        dataErr:'評量統計數據出錯啦'
     },
 
     mark: {
@@ -425,7 +425,7 @@ export default {
         markCount: '閱卷次數：',
         examSubject: '考試科目：',
         delTask: '刪除閱卷任務',
-        delTaskTips: '刪除閱卷任務後，當前評測的所有閱卷老師的閱卷任務以及閱卷數據都將被刪除，確認刪除閱卷任務嗎？ ',
+        delTaskTips: '刪除閱卷任務後，當前評量的所有閱卷老師的閱卷任務以及閱卷數據都將被刪除，確認刪除閱卷任務嗎？ ',
         distribution: '題目配分：',
         loadAll: '已加載所有數據',
 

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js

@@ -40,7 +40,7 @@ export default {
         note: "通知",
         all: "全部",
         preview: "課前預習",
-        exam: "評測",
+        exam: "評量",
         homework: "作業",
         vote: "投票",
         survey: "問卷",
@@ -181,7 +181,7 @@ export default {
     defaultRecentClass: '微處理機基礎與應用概論',
     defaultClassTime: '星期三 13:30 - 16:30 (第7-9節)',
     defaultClassPlace: '第五教學樓 F504 教室',
-    todaydeadlineList: '今日截止活動提醒 ',
+    todaydeadlineList: '今日截止活動提醒',
     endsToday: "今日",
     endsTodayTime: '截止',
     addCourse: "輸入課程邀請碼，加入課程",
@@ -618,7 +618,7 @@ export default {
         answer: '作答',
         inputAnswers: '請輸入作答結果',
         emput: '空',
-        delTitle: "評測已被刪除，是否刪除此條記錄？",
+        delTitle: "評量已被刪除，是否刪除此條記錄？",
         delOk: "刪除",
         delCancel: "取消",
         examError: "試卷存在問題，無法正常打開",
@@ -682,8 +682,8 @@ export default {
         classmates: '同學名單',
         classmates1: '醍摩豆名單',
         classRecord: "課堂記錄",
-        examRecord: "評測清單",
-        hwRecord: "作业清單",
+        examRecord: "評量清單",
+        hwRecord: "作業清單",
         voteRecord: "投票活動",
         surRecord: "問卷活動",
         classID: '課程代號',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/totalAnalysis.js

@@ -32,10 +32,10 @@ export default {
 	condition1: '關注學制',
 	condition2: '關注年級',
 	condition3: '學年期',
-	condition4: '評測類型',
-	condition5: '評測範圍',
-	condition6: '評測模式',
-	condition7: '評測學科',
+	condition4: '評量類型',
+	condition5: '評量範圍',
+	condition6: '評量模式',
+	condition7: '評量學科',
 	condition8: '發佈年份',
 	// totalIndex.vue
 	ti_title1: '基本資料統計',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/train.js

@@ -27,7 +27,7 @@ export default {
         signLabel: '現場簽到',
         hwLabel: '佈置作業',
         quLabel: '問卷反饋',
-        examLabel: '評測反饋',
+        examLabel: '評量反饋',
         hwName: '作業名稱',
         hwNameHolder: '請輸入作業名稱',
         hwDesc: '作業描述',
@@ -41,12 +41,12 @@ export default {
         quItems: '問卷題目',
         quItemsHolder: '請添加問卷題目',
         addItem: '添加題目',
-        examName: '評測名稱',
-        examNameHolder: '請輸入評測名稱',
-        examDesc: '評測描述',
-        examDescHolder: '請輸入評測描述',
-        examItem: '評測題目',
-        examItemHolder: '請添加評測題目',
+        examName: '評量名稱',
+        examNameHolder: '請輸入評量名稱',
+        examDesc: '評量描述',
+        examDescHolder: '請輸入評量描述',
+        examItem: '評量題目',
+        examItemHolder: '請添加評量題目',
         publishOk: '發布成功',
         publishErr: '發布失敗',
         publishBtn: '確認發布',
@@ -55,7 +55,7 @@ export default {
         addItemTitle: '添加題目',
         hwSet: '作業設置',
         surveySet: '問卷設置',
-        examSet: '評測設置',
+        examSet: '評量設置',
         uploadErr: '請上傳正確格式的封面圖片！ ',
         typeErr: '請選擇活動類型',
         targetErr: '請選擇活動對象',
@@ -63,8 +63,8 @@ export default {
         surveyErr: '問卷保存失敗',
         hwOk: '作業保存成功',
         hwErr: '作業保存失敗',
-        examOk: '評測保存成功',
-        examErr: '評測保存失敗',
+        examOk: '評量保存成功',
+        examErr: '評量保存失敗',
         fullInfo: '請完善資訊！ ',
         quType1: '單選題',
         quType2: '多選題',
@@ -115,7 +115,7 @@ export default {
         quLabel: '問卷反饋',
         viewDetail: '查看詳情',
         noAnswer: '暫未作答',
-        examLabel: '評測反饋',
+        examLabel: '評量反饋',
         signQrCode: '簽到碼',
         isStart: '是否開始簽到：',
         autoFresh: '定時刷新(10s)：',
@@ -127,7 +127,7 @@ export default {
         unsubmit: '未提交',
         sunmitRate: '提交率',
         quCount: '問卷統計',
-        examCount: '評測統計',
+        examCount: '評量統計',
         hasAnswer: '已作答',
         unAnswer: '未作答',
         peopleUnit: '人',
@@ -156,11 +156,11 @@ export default {
         delErr: '刪除失敗',
         saveOk: '保存成功',
         saveErr: '保存失敗',
-        examErrInfo: '評測資訊獲取失敗',
+        examErrInfo: '評量資訊獲取失敗',
         hwErrInfo: '作業資訊獲取失敗',
         hwUpdTime: '作業提交時間',
         quAsTime: '完成問卷時間',
-        examAsTime: '完成評測時間',
+        examAsTime: '完成評量時間',
         referAnswer: '參考答案',
         signNow: '立即簽到',
         signOk: '簽到成功',

TEAMModelOS/Controllers/Client/HiTeachccControlller.cs

@@ -1,3 +1,4 @@
+using Azure;
 using Azure.Cosmos;
 using Azure.Storage.Blobs.Models;
 using Azure.Storage.Sas;
@@ -19,6 +20,7 @@ using TEAMModelOS.SDK.Extension;
 
 namespace TEAMModelOS.Controllers.Client
 {
+    [Authorize(Roles = "HiTeachCC")]
     [Route("hiteachcc")]
     [ApiController]
     public class HiTeachccControlller : ControllerBase
@@ -46,7 +48,7 @@ namespace TEAMModelOS.Controllers.Client
             _option = option?.Value;
         }
 
-        //[Authorize(Roles = "HiTeachcc")]
+        //取得老師資訊
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status400BadRequest)]
         [ProducesDefaultResponseType]
@@ -61,19 +63,53 @@ namespace TEAMModelOS.Controllers.Client
                 if (!jwt.Payload.Iss.Equals("account.teammodel", StringComparison.OrdinalIgnoreCase)) return BadRequest();
                 var id = jwt.Payload.Sub;
 
-                var client = _azureCosmos.GetCosmosClient();
-                var response = await client.GetContainer(Constant.TEAMModelOS, "Teacher").ReadItemStreamAsync(id, new PartitionKey("Base"));
-                if (response.Status == 200) {
-                    var container = _azureStorage.GetBlobContainerClient(id);
-                    await container.CreateIfNotExistsAsync(PublicAccessType.None); //嘗試創建Teacher私有容器，如存在則不做任何事，保障容器一定存在
-                    var (blob_uri, blob_sas_read) = _azureStorage.GetBlobContainerSAS(id, BlobContainerSasPermissions.Read);
-                    var (blob_uri_write, blob_sas_write) = _azureStorage.GetBlobContainerSAS(id, BlobContainerSasPermissions.Write);
-                    return Ok(new { blob_uri, blob_sas_read, blob_sas_write });
-                }
-                else //無此老師
+                var container = _azureStorage.GetBlobContainerClient(id);
+                await container.CreateIfNotExistsAsync(PublicAccessType.None); //嘗試創建Teacher私有容器，如存在則不做任何事，保障容器一定存在
+                var (blob_uri, blob_sas_read) = _azureStorage.GetBlobContainerSAS(id, BlobContainerSasPermissions.Read);
+                var (blob_uri_write, blob_sas_write) = _azureStorage.GetBlobContainerSAS(id, BlobContainerSasPermissions.Write);
+                
+                return Ok(new { blob_uri, blob_sas_read, blob_sas_write });
+            }
+            catch (Exception ex)
+            {
+                //await _dingDing.SendBotMsg($"CoreAPI2，{_option.Location}，Channel/Create()\n{ex.Message}", GroupNames.醍摩豆服務運維群組);
+                return BadRequest();
+            }
+        }
+
+        //刪除Blob下Temp資料夾
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status400BadRequest)]
+        [ProducesDefaultResponseType]
+        [HttpGet("del-blob-temp")]
+        [HttpPost("del-blob-temp")]
+        public async Task<IActionResult> DelBlobTemp()
+        {
+            int error = 0;
+            string message = string.Empty;
+            try
+            {
+                string id_token = HttpContext.GetXAuth("IdToken");
+                if (string.IsNullOrEmpty(id_token)) return BadRequest();
+                var jwt = new JwtSecurityToken(id_token);
+                if (!jwt.Payload.Iss.Equals("account.teammodel", StringComparison.OrdinalIgnoreCase)) return BadRequest();
+                var id = jwt.Payload.Sub;
+
+                var container = _azureStorage.GetBlobContainerClient(id);
+                string path = $"temp/HiTeachCC/";
+                Azure.Pageable<BlobItem> blobs = container.GetBlobs(prefix: path);
+                foreach (var blobItem in blobs)
                 {
-                    return BadRequest();
+                    var blob = container.GetBlobClient(blobItem.Name);
+                    await blob.DeleteIfExistsAsync();
                 }
+                return Ok(new { error, message });
+            }
+            catch (RequestFailedException blobex)
+            {
+                error = 1;
+                message = blobex.Message;
+                return Ok(new { error, message });
             }
             catch (Exception ex)
             {