update

TEAMModelOS.FunctionV4/HttpTrigger/ScsYxptApis.cs

@@ -152,20 +152,22 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                 {
                     foreach (var ps in config.p)
                     {
-                        parameterMap["ProjectID"] = ps.pd;
-                        parameterMap["ProjectItemID"] = ps.pid;
-                        ScsResult result = new ScsResult { bizcode = Code, title = " 5.3.1.18根据机构ID、项目ID、子项目ID返回学校列表" };
-                        result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
-                        if (result.result)
-                        {
-                            List<ScSchool> schools = result.content.ToObject<List<ScSchool>>();
-                            if (schools.IsNotEmpty())
+                        if (ps.status == 1) {
+                            parameterMap["ProjectID"] = ps.pd;
+                            parameterMap["ProjectItemID"] = ps.pid;
+                            ScsResult result = new ScsResult { bizcode = Code, title = " 5.3.1.18根据机构ID、项目ID、子项目ID返回学校列表" };
+                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            if (result.result)
                             {
-                                schools.ForEach(x => { x.ProjectID = int.Parse(ps.pd); x.ProjectItemID = int.Parse(ps.pid); });
-                                scSchools.AddRange(schools);
+                                List<ScSchool> schools = result.content.ToObject<List<ScSchool>>();
+                                if (schools.IsNotEmpty())
+                                {
+                                    //schools.ForEach(x => { x.ProjectID = int.Parse(ps.pd); x.ProjectItemID = int.Parse(ps.pid); });
+                                    scSchools.AddRange(schools);
+                                }
                             }
+                            results.Add(result);
                         }
-                        results.Add(result);
                     }
                 }
                 await response.WriteAsJsonAsync(new { data = scSchools.ToJsonString() });
@@ -207,19 +209,22 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                 {
                     foreach (var ps in config.p)
                     {
-                        parameterMap["ProjectID"] = ps.pd;
-                        parameterMap["ProjectItemID"] = ps.pid;
-                        ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.2获取学员名单" };
-                        result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
-                        if (result.result)
+                        if (ps.status == 1)
                         {
-                            List<ScTeacher> teachers = result.content.ToObject<List<ScTeacher>>();
-                            if (teachers.IsNotEmpty())
+                            parameterMap["ProjectID"] = ps.pd;
+                            parameterMap["ProjectItemID"] = ps.pid;
+                            ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.2获取学员名单" };
+                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            if (result.result)
                             {
-                                scTeachers.AddRange(teachers);
+                                List<ScTeacher> teachers = result.content.ToObject<List<ScTeacher>>();
+                                if (teachers.IsNotEmpty())
+                                {
+                                    scTeachers.AddRange(teachers);
+                                }
                             }
+                            results.Add(result);
                         }
-                        results.Add(result);
                     }
                 }
                 await response.WriteAsJsonAsync(new { data = scTeachers.ToJsonString() });
@@ -264,34 +269,42 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                 {
                     foreach (var ps in config.p)
                     {
-                        parameterMap["ProjectID"] = ps.pd;
-                        parameterMap["ProjectItemID"] = ps.pid;
-                        parameterMap["SchoolID"] = $"{schoolCode}";
-                        parameterMap["School"] = $"{schoolCode}";
-                        ScsResult result = new ScsResult { bizcode = Code, title = " 5.3.1.20获取学校设置的可选能力点" };
-                        result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
-                        if (result.result)
-                        {
-                            List<ScPDiagnosis> diagnoses = result.content.ToObject<List<ScPDiagnosis>>();
-                            if (diagnoses.IsNotEmpty())
+                        if (ps.status == 1) {
+                            parameterMap["ProjectID"] = ps.pd;
+                            parameterMap["ProjectItemID"] = ps.pid;
+                            parameterMap["SchoolID"] = $"{schoolCode}";
+                            parameterMap["School"] = $"{schoolCode}";
+                            ScsResult result = new ScsResult { bizcode = Code, title = " 5.3.1.20获取学校设置的可选能力点" };
+                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            if (result.result)
                             {
-                                projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = diagnoses, });
-                                await table.SaveOrUpdate<ScProjectDiagnosis>(new ScProjectDiagnosis {schoolCode=$"{schoolCode}",areaId= areaId,
-                                    ProjectID=int.Parse(ps.pd),
-                                    ProjectItemID=int.Parse(ps.pid),
-                                    RowKey = $"{ps.pid}-{schoolCode}", PartitionKey = "ScSchoolDiagnosis", abilityNos = diagnoses.ToJsonString() });
+                                List<ScPDiagnosis> diagnoses = result.content.ToObject<List<ScPDiagnosis>>();
+                                if (diagnoses.IsNotEmpty())
+                                {
+                                    projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = diagnoses, });
+                                    await table.SaveOrUpdate<ScProjectDiagnosis>(new ScProjectDiagnosis
+                                    {
+                                        schoolCode = $"{schoolCode}",
+                                        areaId = areaId,
+                                        ProjectID = int.Parse(ps.pd),
+                                        ProjectItemID = int.Parse(ps.pid),
+                                        RowKey = $"{ps.pid}-{schoolCode}",
+                                        PartitionKey = "ScSchoolDiagnosis",
+                                        abilityNos = diagnoses.ToJsonString()
+                                    });
+                                }
                             }
-                        }
-                        else
-                        {
-                            List<ScProjectDiagnosis> teacherDiagnoses = await table.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScSchoolDiagnosis" }, { "RowKey", $"{ps.pid}-{schoolCode}" } });
-                            if (teacherDiagnoses.IsNotEmpty())
+                            else
                             {
-                                projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = teacherDiagnoses[0].abilityNos.ToObject<List<ScPDiagnosis>>() });
+                                List<ScProjectDiagnosis> teacherDiagnoses = await table.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScSchoolDiagnosis" }, { "RowKey", $"{ps.pid}-{schoolCode}" } });
+                                if (teacherDiagnoses.IsNotEmpty())
+                                {
+                                    projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = teacherDiagnoses[0].abilityNos.ToObject<List<ScPDiagnosis>>() });
 
+                                }
                             }
+                            results.Add(result);
                         }
-                        results.Add(result);
                     }
                 }
                 await response.WriteAsJsonAsync(new { data = projects.ToJsonString() });
@@ -347,29 +360,31 @@ namespace TEAMModelOS.FunctionV4.HttpTrigger
                 {
                     foreach (var ps in config.p)
                     {
-                        parameterMap["ProjectID"] = ps.pd;
-                        parameterMap["ProjectItemID"] = ps.pid;
-                        ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.19获取项目设置的可选能力点" };
-                        result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
-                        if (result.result)
-                        {
-                            List<ScPDiagnosis> diagnoses = result.content.ToObject<List<ScPDiagnosis>>();
-                            if (diagnoses.IsNotEmpty())
+                        if (ps.status==1) {
+                            parameterMap["ProjectID"] = ps.pd;
+                            parameterMap["ProjectItemID"] = ps.pid;
+                            ScsResult result = new ScsResult { bizcode = Code, title = "5.3.1.19获取项目设置的可选能力点" };
+                            result = await _thirdApisService.Post(config.url, Code, config.passKey, config.privateKey, parameterMap);
+                            if (result.result)
                             {
-                                projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = diagnoses });
-                                await table.SaveOrUpdate<ScProjectDiagnosis>(new ScProjectDiagnosis { areaId=areaId, RowKey = $"{ps.pid}", PartitionKey = "ScProjectDiagnosis", abilityNos = diagnoses.ToJsonString() });
+                                List<ScPDiagnosis> diagnoses = result.content.ToObject<List<ScPDiagnosis>>();
+                                if (diagnoses.IsNotEmpty())
+                                {
+                                    projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = diagnoses });
+                                    await table.SaveOrUpdate<ScProjectDiagnosis>(new ScProjectDiagnosis { areaId = areaId, RowKey = $"{ps.pid}", PartitionKey = "ScProjectDiagnosis", abilityNos = diagnoses.ToJsonString() });
+                                }
                             }
-                        }
-                        else
-                        {
-                            List<ScProjectDiagnosis> teacherDiagnoses = await table.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScProjectDiagnosis" }, { "RowKey", $"{ps.pid}" } });
-                            if (teacherDiagnoses.IsNotEmpty())
+                            else
                             {
-                                projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = teacherDiagnoses[0].abilityNos.ToObject<List<ScPDiagnosis>>() });
+                                List<ScProjectDiagnosis> teacherDiagnoses = await table.FindListByDict<ScProjectDiagnosis>(new Dictionary<string, object> { { "PartitionKey", "ScProjectDiagnosis" }, { "RowKey", $"{ps.pid}" } });
+                                if (teacherDiagnoses.IsNotEmpty())
+                                {
+                                    projects.Add(new ScsProjectDiagnosis { project = ps, diagnoses = teacherDiagnoses[0].abilityNos.ToObject<List<ScPDiagnosis>>() });
 
+                                }
                             }
+                            results.Add(result);
                         }
-                        results.Add(result);
                     }
                 }
                 await response.WriteAsJsonAsync(new { data = projects.ToJsonString() });

TEAMModelOS.SDK/DI/HttpTrigger/HttpTrigger.cs

@@ -38,7 +38,7 @@ namespace TEAMModelOS.SDK.DI
             string domain = "";
             if (location.Equals("China-Dep"))
             {
-                domain = keys[1];
+                domain = keys[0];
             }
             else if (location.Equals("China-Test"))
             {

TEAMModelOS.SDK/Models/Service/Third/Sc/ScYxptModel.cs

@@ -119,8 +119,8 @@ namespace TEAMModelOS.SDK.Models
         public string dist { get; set; }
         public string city { get; set; }
         public string areaId { get; set; }
-        public int ProjectID { get; set; }
-        public int ProjectItemID { get; set; }
+        //public int ProjectID { get; set; }
+        //public int ProjectItemID { get; set; }
     }
     
 
@@ -222,6 +222,7 @@ namespace TEAMModelOS.SDK.Models
         /// 子项目名称
         /// </summary>
         public string pit { get; set; }
+        public int status { get; set; }=1;
     }
     public class ScsResult
     {

TEAMModelOS.SDK/Models/Service/Third/ThirdService.cs

@@ -122,7 +122,14 @@ namespace TEAMModelOS.SDK.Models
                                 string groupId = Guid.NewGuid().ToString();
                                 if (scTeachers.IsNotEmpty())
                                 {
-                                    groupName = scTeachers[0].TeacherXK;
+                                    if (scBind.pid.Equals("1249"))
+                                    {
+                                        groupName =$"第三批教师-{scTeachers[0].TeacherXK}";
+                                    }
+                                    else { 
+                                    
+                                    }
+                                    
                                     nickname = scTeachers[0].TeacherName;
                                     if (!string.IsNullOrEmpty(groupName))
                                     {

TEAMModelOS/Controllers/Third/Sc/ScController.cs

@@ -573,7 +573,7 @@ namespace TEAMModelOS.Controllers
                     string enurl = $"status=5&param={HttpUtility.UrlEncode(new { scsso.Pxid, scsso.tid }.ToJsonString(), Encoding.UTF8)}";
                     return Redirect(rurl.Append($"?{enurl}").ToString());
                 }
-                string setsql = $"select  value(c) from c where contains(c.accessConfig,'{ scTeachers[0].ProjectID}') and contains(c.accessConfig,'{ scTeachers[0].ProjectItemID}')  and contains(c.accessConfig,'scsyxpt') ";
+                string setsql = $"select  value(c) from c where and c.id ='{scTeachers[0].areaId}' contains(c.accessConfig,'{ scTeachers[0].ProjectID}') and contains(c.accessConfig,'{ scTeachers[0].ProjectItemID}')  and contains(c.accessConfig,'scsyxpt') ";
                 AreaSetting setting = null;
                 await foreach (var item in _azureCosmos.GetCosmosClient().GetContainer(Constant.TEAMModelOS, "Normal").GetItemQueryIterator<AreaSetting>(queryText: setsql,
                     requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey($"AreaSetting") }))

TEAMModelOS/Controllers/Third/Sc/ScDataInitController.cs

@@ -197,46 +197,57 @@ namespace TEAMModelOS.Controllers.Third
             var ScSchools = await table.FindListByDict<ScSchool>(new Dictionary<string, object>() { { "PartitionKey", "ScSchool" }, { "areaId", $"{areaId}" } });
             Dictionary<string, object> dict = new Dictionary<string, object> { { "accessConfig", $"{accessConfig}" }, { "areaId", $"{areaId}" } };
             (int status, string json) = await _httpTrigger.RequestHttpTrigger(dict, _option.Location, "GetTeachersListByProject");
+            ///
             var teachers = json.ToObject<List<ScTeacher>>(new JsonSerializerOptions { PropertyNameCaseInsensitive = false });
-            //未保存在数据库的。
+            // 处理省平台后补的教师，教师的学校不在当前区的学校列表中。
+            teachers.RemoveAll(x => !ScSchools.Select(z => z.schoolid).Contains(x.SchoolID));
             var a = teachers.Select(x => $"{x.TID}").ToList();
             var s = ScTeachers.Select(y => $"{ y.TID}").ToList();
+            //未保存在数据库的。
             var asin = a.Except(s).ToList();
             #region 省平台获取到最新的教师，并添加到Table中。
             var adds = teachers.FindAll(x => asin.Contains($"{x.TID}"));
+
             var addTeachers = ScTeachers.FindAll(x => adds.Select(y => $"{ y.PXID}").Contains($"{x.RowKey}"));
             if (addTeachers.IsNotEmpty())
             {
-                //省平台更新的
+                //省平台教师替换的。
                 addTeachers.ForEach(x =>
                 {
                     var tt = teachers.Find(z => x.RowKey.Equals($"{z.PXID}"));
-                    if (tt != null)
+                    var school = ScSchools.Find(s => s.schoolid == x.SchoolID);
+                    if (school != null)
                     {
-                        x.status = 1;
-                        x.TID = tt.TID;
-                        x.TeacherName = tt.TeacherName;
-                        x.SchoolID = tt.SchoolID;
-                        x.SchoolName = tt.SchoolName;
-                        x.ProjectID = tt.ProjectID;
-                        x.ProjectItemID = tt.ProjectItemID;
-                        x.ProjectItemTitle = tt.ProjectItemTitle;
-                        x.ProjectTitle = tt.ProjectTitle;
-                        x.CityID = tt.CityID;
-                        x.DistrictID = tt.DistrictID;
-                        x.CityName = tt.CityName;
-                        x.DisName = tt.DisName;
-                        x.Account = tt.Account;
-                        x.TeacherXK = tt.TeacherXK;
-                        x.TeacherXD = tt.TeacherXD;
-                        x.Mobile = x.Mobile;
-                        x.Email = tt.Email;
-                        x.areaId = $"{areaId}";
-                        x.PartitionKey = "ScTeacher";
-                        x.tmdid = null;
-                        var school = ScSchools.Find(s => s.schoolid == x.SchoolID);
-                        x.schoolCode = school?.schoolCode;
+                        if (tt != null)
+                        {
+                            x.status = 1;
+                            x.TID = tt.TID;
+                            x.TeacherName = tt.TeacherName;
+                            x.SchoolID = tt.SchoolID;
+                            x.SchoolName = tt.SchoolName;
+                            x.ProjectID = tt.ProjectID;
+                            x.ProjectItemID = tt.ProjectItemID;
+                            x.ProjectItemTitle = tt.ProjectItemTitle;
+                            x.ProjectTitle = tt.ProjectTitle;
+                            x.CityID = tt.CityID;
+                            x.DistrictID = tt.DistrictID;
+                            x.CityName = tt.CityName;
+                            x.DisName = tt.DisName;
+                            x.Account = tt.Account;
+                            x.TeacherXK = tt.TeacherXK;
+                            x.TeacherXD = tt.TeacherXD;
+                            x.Mobile = x.Mobile;
+                            x.Email = tt.Email;
+                            x.areaId = $"{areaId}";
+                            x.PartitionKey = "ScTeacher";
+                            x.tmdid = null;
+                            x.schoolCode = school?.schoolCode;
+                        }
                     }
+                    else { 
+
+                    }
+                    
                 });
                 addTeachers = await table.SaveOrUpdateAll(addTeachers);
             }
@@ -344,7 +355,7 @@ namespace TEAMModelOS.Controllers.Third
               });
             if (updateTch.IsNotEmpty())
             {
-                await table.SaveOrUpdateAll(updateTch);
+               // await table.SaveOrUpdateAll(updateTch);
             }
             return Ok(new { addTeachers, update = updateTch.Select(x => new { x.areaId, x.PXID, x.TID, x.TeacherName, x.tmdid, x.SchoolName, x.DisName }), ScTeachers });
         }
@@ -362,6 +373,7 @@ namespace TEAMModelOS.Controllers.Third
             if (!request.TryGetProperty("areaId", out JsonElement areaId)) return BadRequest();
             if (!request.TryGetProperty("city", out JsonElement city)) return BadRequest();
             if (!request.TryGetProperty("dist", out JsonElement dist)) return BadRequest();
+
             List<ScSchool> schools = null;
             List<ScSchool> matchSchools = null;
             int status = -1; string json = null;
@@ -408,11 +420,11 @@ namespace TEAMModelOS.Controllers.Third
                     }
                     else
                     {
-                        return Ok(new { unmatch = ignore, schools = schools.Select(x => new { x.schoolname, x.schoolCode, x.schoolid, x.ProjectID, x.ProjectItemID }) });
+                        return Ok(new { unmatch = ignore, schools = schools.Select(x => new { x.schoolname, x.schoolCode, x.schoolid }) });
                     }
                 }
             }
-            return Ok(new { schools = schools.Select(x => new { x.schoolname, x.schoolCode, x.schoolid, x.ProjectID, x.ProjectItemID }) });
+            return Ok(new { schools = schools.Select(x => new { x.schoolname, x.schoolCode, x.schoolid }) });
         }
         /// <summary>
         /// 2. 处理 省平台最新的教师以及 反向更新没有绑定醍摩豆id 的账号。
@@ -488,16 +500,17 @@ namespace TEAMModelOS.Controllers.Third
                     }
                     else
                     {
-                        return Ok(new { unmatch = ignore, schools = schools.Select(x => new { x.schoolname, x.schoolCode, x.schoolid, x.ProjectID, x.ProjectItemID }) });
+                        return Ok(new { unmatch = ignore, schools = schools.Select(x => new { x.schoolname, x.schoolCode, x.schoolid }) });
                     }
                 }
 
-                //数据校验
+                //数据校验,拉取所有学校的 
                 tbschools = await table.FindListByDict<ScSchool>(new Dictionary<string, object>() { { "PartitionKey", "ScSchool" }, { "areaId", $"{areaId}" } });
                 if (tbschools.IsNotEmpty())
                 {
 
                     var a = tbschools.Select(y => $"{y.RowKey}").ToList();
+                    //不存在的schoolid 才会进行新增操作，如果schoolid已经有。就不再操作
                     saveschools = schools.Where(x => !a.Exists(z => z.Equals($"{x.schoolid}"))).ToList();
                     List<SchoolData> schoolDatas = new();
                     saveschools.ForEach(x =>
@@ -534,7 +547,9 @@ namespace TEAMModelOS.Controllers.Third
                             x.dist = $"{dist}";
                         }
                     });
+                    //同时移除没有生成的schoolCode的
                     saveschools.RemoveAll(x => string.IsNullOrEmpty(x.schoolCode));
+
                     saveschools.RemoveAll(x => tbschools.FindAll(z => !string.IsNullOrEmpty(z.schoolCode)).Exists(y => y.schoolCode.Equals(x.schoolCode)));
                     saveschools = await table.SaveAll(saveschools);
                 }

TEAMModelOS/Controllers/Third/Sc/ScDataPushController.cs

@@ -1041,8 +1041,8 @@ namespace TEAMModelOS.Controllers
             List<PushData> datas = new List<PushData>();
             Dictionary<string, object> parameterContent53123 = new Dictionary<string, object>();
             parameterContent53123.Add("TrainComID", config.trainComID);
-            parameterContent53123.Add("ProjectID", config.p.First().pd);
-            parameterContent53123.Add("ProjectItemID", config.p.First().pid);
+            parameterContent53123.Add("ProjectID", config.p.Where(x=>x.status==1).First().pd);
+            parameterContent53123.Add("ProjectItemID", config.p.Where(x => x.status == 1).First().pid);
             parameterContent53123.Add("PXID", $"{sc.PXID}");
             parameterContent53123.Add("TID", $"{sc.TID}");
             ScsResult GetDiagnosisResultByPXIDCommand = await _thirdApisService.Post(config.url, "GetDiagnosisResultByPXIDCommand", config.passKey, config.privateKey, parameterContent53123);

TEAMModelOS/appsettings.Development.json

@@ -21,22 +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==;"
     },
     "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": {