Merge branch 'develop' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into develop

TEAMModelBI/Controllers/BICommon/BICouponController.cs

@@ -61,7 +61,7 @@ namespace TEAMModelBI.Controllers.BICommon
                 string url = "https://api2.teammodel.net";
                 if (request.srvAdr == "China") url = "https://api2.teammodel.cn";
                 
-                string AccessToken = await getCoreAccessToken();
+                string AccessToken = await getCoreAccessToken(request.srvAdr);
                 var client = _http.CreateClient();
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
                 HttpResponseMessage response = await client.PostAsJsonAsync($"{url}/Service/GenerateCoupon", request);
@@ -96,10 +96,11 @@ namespace TEAMModelBI.Controllers.BICommon
         {
             try
             {
-                //string url = _configuration.GetValue<string>("HaBookAuth:CoreAPI");
-                string url = "https://api2.teammodel.net";
-                if (request.srvAdr == "China") url = "https://api2.teammodel.cn";
-                string AccessToken = await getCoreAccessToken();
+                string HaBookAuthString = (_option.Location.Contains("Global") && request.srvAdr.Equals("China")) ? "HaBookAuthCN" : "HaBookAuth";
+                //string url = "https://api2.teammodel.net";
+                //if (request.srvAdr == "China") url = "https://api2.teammodel.cn";
+                string url = _configuration.GetValue<string>($"{HaBookAuthString}:CoreAPI");
+                string AccessToken = await getCoreAccessToken(request.srvAdr);
                 var client = _http.CreateClient();
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
                 HttpResponseMessage response = await client.PostAsJsonAsync($"{url}/Service/CouponConsolidation", request);
@@ -129,10 +130,11 @@ namespace TEAMModelBI.Controllers.BICommon
         {
             try
             {
-                //string url = _configuration.GetValue<string>("HaBookAuth:CoreAPI");
-                string url = "https://api2.teammodel.net";
-                if (request.srvAdr == "China") url = "https://api2.teammodel.cn";
-                string AccessToken = await getCoreAccessToken();
+                string HaBookAuthString = (_option.Location.Contains("Global") && request.srvAdr.Equals("China")) ? "HaBookAuthCN" : "HaBookAuth";
+                //string url = "https://api2.teammodel.net";
+                //if (request.srvAdr == "China") url = "https://api2.teammodel.cn";
+                string url = _configuration.GetValue<string>($"{HaBookAuthString}:CoreAPI");
+                string AccessToken = await getCoreAccessToken(request.srvAdr);
                 var client = _http.CreateClient();
                 client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", AccessToken);
                 HttpResponseMessage response = await client.PostAsJsonAsync($"{url}/Service/PushNotify", request);
@@ -151,15 +153,16 @@ namespace TEAMModelBI.Controllers.BICommon
             }
         }
 
-        private async Task<string> getCoreAccessToken()
+        private async Task<string> getCoreAccessToken(string srvAdr)
         {
             string AccessToken = "";
             try
             {
-                string Url = _configuration.GetValue<string>("HaBookAuth:CoreAPI") + "/oauth2/token";
+                string HaBookAuthString = (_option.Location.Contains("Global") && srvAdr.Equals("China")) ? "HaBookAuthCN" : "HaBookAuth"; //GL站點 => 可取得GL、CN兩站點設定資料  CN站點 => 只取自身站點資料
+                string Url = _configuration.GetValue<string>($"{HaBookAuthString}:CoreAPI") + "/oauth2/token";
                 string GrantType = "device";
-                string ClientID = _configuration.GetValue<string>("HaBookAuth:CoreService:clientID");
-                string Secret = _configuration.GetValue<string>("HaBookAuth:CoreService:clientSecret");
+                string ClientID = _configuration.GetValue<string>($"{HaBookAuthString}:CoreService:clientID");
+                string Secret = _configuration.GetValue<string>($"{HaBookAuthString}:CoreService:clientSecret");
                 var content = new { grant_type = GrantType, client_id = ClientID, client_secret = Secret };
                 var response = await _http.CreateClient().PostAsJsonAsync($"{Url}", content);
                 if (response.IsSuccessStatusCode)

TEAMModelBI/appsettings.Development.json

@@ -65,7 +65,6 @@
     "CoreId": {
       "userinfo": "https://api2.teammodel.net/Oauth2/GetUserInfos"
     },
-    "Account": "https://account.teammodel.cn",
     "CoreAPI": "https://api2.teammodel.net",
     "CoreBBAPI": "https://bb-rc.teammodel.net",
     "CoreService": {

TEAMModelOS.Extension/IES.Exam/IES.ExamViews/src/view/student/ActivityAnswer.vue

@@ -343,6 +343,7 @@
 
 <script>
 import AudioRecorder from './AudioRecorder.vue';
+import { Loading } from 'element-ui'
 // import Compose from './ComposePaper.vue';
 export default {
     components: {

TEAMModelOS.Extension/IES.Exam/IES.ExamViews/src/view/student/ActivityInfo.vue

@@ -88,6 +88,7 @@
 <script>
 import {jwtDecode} from 'jwt-decode'
 import ZhiYinView from './ZhiYinView.vue'
+import { Loading } from 'element-ui'
 
 export default {
     components: {

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseExerciseList.vue

@@ -409,7 +409,8 @@
 				answerModal: false,
 				curEditType: "",
 				editSumaryModal: false,
-				curSummary: ""
+				curSummary: "",
+				currentExerciseIndex: 0
 			};
 		},
 		methods: {
@@ -587,6 +588,7 @@
 				if(this.isChangePaper) {
 					this.curTypeItems = arr;
 					this.currentExercise = item;
+					this.currentExerciseIndex = index
 					this.editAnsScoreModal = true;
 				} else {
 					this.currentExerciseIndex = this.exerciseList.indexOf(item); // 清单列表下的index