Merge branch 'develop5.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/Controllers/Syllabus/SyllabusController.cs

@@ -161,6 +161,9 @@ namespace TEAMModelOS.Controllers
                             SyllabusService.TreeToList(syllabusTree.trees, nodes, now);
                             syllabus.children = nodes;
                             syllabusTree.auth = syllabus.auth;
+                            syllabus.codeval = !string.IsNullOrEmpty(syllabusTree.codeval) ? syllabusTree.codeval : syllabus.codeval;
+                            syllabus.volumeId = !string.IsNullOrEmpty(syllabusTree.volumeId) ? syllabusTree.volumeId : syllabus.volumeId;
+                            syllabus.scope = !string.IsNullOrEmpty(syllabusTree.scope) ? syllabusTree.scope : syllabus.scope;
                             await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "School").ReplaceItemAsync<Syllabus>(syllabus,syllabus.id, new Azure.Cosmos.PartitionKey($"Syllabus-{syllabusTree.codeval}"));
                         }
 
@@ -200,6 +203,9 @@ namespace TEAMModelOS.Controllers
                             SyllabusService.TreeToList(syllabusTree.trees, nodes, now);
                             syllabus.children = nodes;
                             syllabusTree.auth = syllabus.auth;
+                            syllabus.codeval = !string.IsNullOrEmpty(syllabusTree.codeval)? syllabusTree.codeval: syllabus.codeval;
+                            syllabus.volumeId = !string.IsNullOrEmpty(syllabusTree.volumeId) ? syllabusTree.volumeId : syllabus.volumeId;
+                            syllabus.scope = !string.IsNullOrEmpty(syllabusTree.scope) ? syllabusTree.scope : syllabus.scope;
                             await _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Teacher").UpsertItemAsync<Syllabus>(syllabus, new Azure.Cosmos.PartitionKey($"Syllabus-{syllabusTree.codeval}"));
                         }
                     }

TEAMModelOS/Controllers/Third/ScApiController.cs

@@ -157,7 +157,18 @@ namespace TEAMModelOS.Controllers
             GetTeachersListByProject.code = Code;
             GetTeachersListByProject.title = "5.3.1.2获取学员名单";
 
-            return Ok(new { GetTeachersListByProject, GetDiagnosisListByProject_V2 = GetDiagnosisListByProject_V2, GetProjectInfoByTrainComID = GetProjectInfoByTrainComID, GetSchoolList = GetSchoolList1 });
+
+            // 5.3.1.11获取跳转学员信息。用于sso单点，后端验证
+            Code = "GetSingleTeacherByProject";
+            parameterMap = new Dictionary<string, object>();
+            parameterMap.Add("TrainComID", trainComID);
+            parameterMap.Add("Pxid", "254175");
+            parameterMap.Add("Tid", "422152");
+            ScsResult GetSingleTeacherByProject = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
+            GetSingleTeacherByProject.code = Code;
+            GetSingleTeacherByProject.title = "5.3.1.11获取跳转学员信息";
+
+            return Ok(new { GetSingleTeacherByProject });
 
 
 
@@ -287,15 +298,7 @@ namespace TEAMModelOS.Controllers
             GetSchoolPlanBySchoolID.title = "5.3.1.10根据培训项目ID与学校ID获取学校方案";
 
 
-            // 5.3.1.11获取跳转学员信息。用于sso单点，后端验证
-            Code = "GetSingleTeacherByProject";
-            parameterMap = new Dictionary<string, object>();
-            parameterMap.Add("TrainComID", trainComID);
-            parameterMap.Add("Pxid", "65321");
-            parameterMap.Add("Tid", "32393");
-            ScsResult GetSingleTeacherByProject = await _scsApisService.Post(_sc_url, Code, _sc_passKey, _sc_privateKey, parameterMap);
-            GetSingleTeacherByProject.code = Code;
-            GetSingleTeacherByProject.title = "5.3.1.11获取跳转学员信息";
+           
 
             ScsResult UpdateTeacherListSituation = null;
             Dictionary<string, object> parameterContent = new Dictionary<string, object>();

TEAMModelOS/appsettings.Development.json

@@ -21,16 +21,16 @@
   },
   "Azure": {
     "Storage": {
-      //"ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelstorage;AccountKey=Yq7D4dE6cFuer2d2UZIccTA/i0c3sJ/6ITc8tNOyW+K5f+/lWw9GCos3Mxhj47PyWQgDL8YbVD63B9XcGtrMxQ==;EndpointSuffix=core.chinacloudapi.cn"
-      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelos;AccountKey=Dl04mfZ9hE9cdPVO1UtqTUQYN/kz/dD/p1nGvSq4tUu/4WhiKcNRVdY9tbe8620nPXo/RaXxs+1F9sVrWRo0bg==;EndpointSuffix=core.chinacloudapi.cn"
+      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelstorage;AccountKey=Yq7D4dE6cFuer2d2UZIccTA/i0c3sJ/6ITc8tNOyW+K5f+/lWw9GCos3Mxhj47PyWQgDL8YbVD63B9XcGtrMxQ==;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://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;"
+      //"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"
+      "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=",