Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelBI/ClientApp/src/view/index/index.vue

@@ -206,6 +206,18 @@
                   </div>
 
                 </div>
+                <div class="commonbox-versions" v-loading="loading.versions" element-loading-background="rgba(0, 0, 0, 0.2)">
+                  <div class="commonbox-versions-title">
+                    <p class="versions-title-name">自訂版</p>
+                    <p class="versions-title-num">数量：
+                      <span>{{ versionsData.custom.num }}</span>
+                    </p>
+                  </div>
+                  <div class="commonbox-versions-chart">
+                    <CommonPie :proportionData="totalArea.pie4"></CommonPie>
+                  </div>
+
+                </div>
               </div>
             </div>
             <div class="bottom-rightbox">
@@ -445,12 +457,14 @@ export default {
       basics: { num: 0, proportion: 0 },
       standard: { num: 0, proportion: 0 },
       major: { num: 0, proportion: 0 },
+      custom: { num: 0, proportion: 0 },
       evaluating:{num:0,proportion:0}
     })
     let worldversionsData = ref({
       basics: { num: 0, proportion: 0 },
       standard: { num: 0, proportion: 0 },
       major: { num: 0, proportion: 0 },
+      custom: { num: 0, proportion: 0 }
     })
     //国际站模式（避免重复加载）
     let worldState = ref(true)
@@ -1297,6 +1311,7 @@ export default {
       pie1: {},
       pie2: {},
       pie3: {},
+      pie4: {},
       sizePie: {
         legend: {
           orient: 'vertical',
@@ -1983,6 +1998,7 @@ export default {
       pie1: {},
       pie2: {},
       pie3: {},
+      pie4: {},
       sizePie: {
         legend: {
           orient: 'vertical',
@@ -2325,24 +2341,18 @@ export default {
       await proxy.$api.getVersions(datas).then((res) => {
         if (res.state === 200) {
           let schoolList = res.scEdCnt
-          let basicsData = []; let standardData = []; let majorData = [];
-          //基础版
-          schoolList.forEach((x) => {
-            // x.scale === 0 && x.size < 300 ? basicsData.push(x) : ''
-            // x.scale >= 500 && x.size >= 300 ? standardData.push(x) : x.size > 100 && (!x.service.includes('YMPCVCIM') && !x.service.includes('VLY6J6N6') && !x.service.includes('VABAJ6NV')) ? standardData.push(x) : ''
-            // x.service.includes('YMPCVCIM') || x.service.includes('VLY6J6N6') || x.service.includes('VABAJ6NV') ? majorData.push(x) : ''
-            x.service.includes('YPXSJ6NJ') && x.service.includes('B6V5J6NP') ? majorData.push(x) :
-            x.service.includes('YMPCVCIM') ?  standardData.push(x) :basicsData.push(x)
-          })
-          console.log(basicsData, standardData, majorData, 7777777)
-          if (siteValue.value === 'china') {
-            versionsData.value.basics.num = basicsData.length
-            versionsData.value.basics.proportion = ((basicsData.length / schoolList.length) * 100).toFixed(1)
-            versionsData.value.standard.num = standardData.length
-            versionsData.value.standard.proportion = ((standardData.length / schoolList.length) * 100).toFixed(1)
-            versionsData.value.major.num = majorData.length
-            versionsData.value.major.proportion = ((majorData.length / schoolList.length) * 100).toFixed(1)
-            console.log(versionsData.value.standard.proportion, standardData.length, schoolList.length, '占比')
+          
+          if (siteValue.value === 'china') {          
+            versionsData.value.basics.num = res.beCnt;
+            versionsData.value.basics.proportion = ((res.beCnt / schoolList.length) * 100).toFixed(1)
+            versionsData.value.standard.num = res.seCnt
+            versionsData.value.standard.proportion = ((res.seCnt / schoolList.length) * 100).toFixed(1)
+            versionsData.value.major.num = res.peCnt
+            versionsData.value.major.proportion = ((res.peCnt / schoolList.length) * 100).toFixed(1)
+            versionsData.value.custom.num = res.cuCnt
+            versionsData.value.custom.proportion = ((res.cuCnt / schoolList.length) * 100).toFixed(1)
+            
+            console.log(versionsData.value.standard.proportion, res.seCnt, schoolList.length, '占比')
             let dataBasics = {
               title: {
                 text: '{a|' + versionsData.value.basics.proportion + '}{c|%}' + '\n' + '基础版占比',
@@ -2592,16 +2602,103 @@ export default {
                 },
               ],
             }
+            let dataCustom = {
+              title: {
+                text: '{a|' + versionsData.value.custom.proportion + '}{c|%}' + '\n' + '自訂版占比',
+                x: 'center',
+                y: 'center',
+                textStyle: {
+                  rich: {
+                    a: {
+                      fontSize: 16,
+                      color: '#4bf3f9',
+                      fontWeight: 'bold',
+                    },
+                    c: {
+                      fontSize: 16,
+                      color: '#4bf3f9',
+                      fontWeight: 'normal',
+                    },
+                  },
+                  color: '#fff',
+                  fontSize: 14,
+                },
+              },
+              series: [
+                //外环
+                {
+                  name: '',
+                  type: 'pie',
+                  radius: ['70%', '50%'],
+                  silent: true,
+                  clockwise: true,
+                  startAngle: 90,
+                  z: 0,
+                  zlevel: 0,
+                  label: {
+                    normal: {
+                      position: 'center',
+                    },
+                  },
+                  data: [
+                    {
+                      value: versionsData.value.custom.proportion,
+                      name: '',
+                      itemStyle: {
+                        normal: {
+                          //外环发光
+                          borderWidth: 0.5,
+                          shadowBlur: 20,
+                          borderColor: '#4bf3f9',
+                          shadowColor: '#9bfeff',
+                          color: {
+                            // 圆环的颜色
+                            colorStops: [
+                              {
+                                offset: 0,
+                                color: '#4bf3f9', // 0% 处的颜色
+                              },
+                              {
+                                offset: 1,
+                                color: '#4bf3f9', // 100% 处的颜色
+                              },
+                            ],
+                          },
+                        },
+                      },
+                    },
+                    {
+                      value: 100 - 78,
+                      name: '',
+                      label: {
+                        normal: {
+                          show: false,
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: '#6a89cc',
+                        },
+                      },
+                    },
+                  ],
+                },
+              ],
+            }
             totalArea.value.pie1 = dataBasics
             totalArea.value.pie2 = dataStandard
             totalArea.value.pie3 = dataMajor
-          } else if (siteValue.value === 'international') {
-            worldversionsData.value.basics.num = basicsData.length
-            worldversionsData.value.basics.proportion = ((basicsData.length / schoolList.length).toFixed(2)) * 100
-            worldversionsData.value.standard.num = standardData.length
-            worldversionsData.value.standard.proportion = parseInt(((standardData.length / schoolList.length).toFixed(2)) * 100)
-            worldversionsData.value.major.num = majorData.length
-            worldversionsData.value.major.proportion = ((majorData.length / schoolList.length).toFixed(2)) * 100
+            totalArea.value.pie4 = dataCustom
+          } else if (siteValue.value === 'international') {           
+            worldversionsData.value.basics.num = res.beCnt;
+            worldversionsData.value.basics.proportion = ((res.beCnt / schoolList.length).toFixed(2)) * 100
+            worldversionsData.value.standard.num = res.seCnt
+            worldversionsData.value.standard.proportion = parseInt(((res.seCnt / schoolList.length).toFixed(2)) * 100)
+            worldversionsData.value.major.num = res.peCnt
+            worldversionsData.value.major.proportion = ((res.peCnt / schoolList.length).toFixed(2)) * 100
+            worldversionsData.value.custom.num = res.cuCnt
+            worldversionsData.value.custom.proportion = ((res.cuCnt / schoolList.length).toFixed(2)) * 100
+
             let dataBasics = {
               title: {
                 text: '{a|' + worldversionsData.value.basics.proportion + '}{c|%}' + '\n' + '基础版占比',
@@ -2851,9 +2948,93 @@ export default {
                 },
               ],
             }
+            let dataCustom = {
+              title: {
+                text: '{a|' + worldversionsData.value.custom.proportion + '}{c|%}' + '\n' + '基础版占比',
+                x: 'center',
+                y: 'center',
+                textStyle: {
+                  rich: {
+                    a: {
+                      fontSize: 16,
+                      color: '#4bf3f9',
+                      fontWeight: 'bold',
+                    },
+                    c: {
+                      fontSize: 16,
+                      color: '#4bf3f9',
+                      fontWeight: 'normal',
+                    },
+                  },
+                  color: '#fff',
+                  fontSize: 14,
+                },
+              },
+              series: [
+                //外环
+                {
+                  name: '',
+                  type: 'pie',
+                  radius: ['70%', '50%'],
+                  silent: true,
+                  clockwise: true,
+                  startAngle: 90,
+                  z: 0,
+                  zlevel: 0,
+                  label: {
+                    normal: {
+                      position: 'center',
+                    },
+                  },
+                  data: [
+                    {
+                      value: worldversionsData.value.custom.proportion,
+                      name: '',
+                      itemStyle: {
+                        normal: {
+                          //外环发光
+                          borderWidth: 0.5,
+                          shadowBlur: 20,
+                          borderColor: '#4bf3f9',
+                          shadowColor: '#9bfeff',
+                          color: {
+                            // 圆环的颜色
+                            colorStops: [
+                              {
+                                offset: 0,
+                                color: '#4bf3f9', // 0% 处的颜色
+                              },
+                              {
+                                offset: 1,
+                                color: '#4bf3f9', // 100% 处的颜色
+                              },
+                            ],
+                          },
+                        },
+                      },
+                    },
+                    {
+                      value: 100 - 78,
+                      name: '',
+                      label: {
+                        normal: {
+                          show: false,
+                        },
+                      },
+                      itemStyle: {
+                        normal: {
+                          color: '#6a89cc',
+                        },
+                      },
+                    },
+                  ],
+                },
+              ],
+            }
             worldtotalArea.value.pie1 = dataBasics
             worldtotalArea.value.pie2 = dataStandard
             worldtotalArea.value.pie3 = dataMajor
+            worldtotalArea.value.pie4 = dataCustom
           }
           loading.value.versions = false
         }
@@ -3912,7 +4093,7 @@ export default {
 }
 
 .commonbox-versions {
-  width: 32%;
+  width: 24%;
   height: 100%;
   border: 1px solid #ccc;
   padding: 1%;

TEAMModelBI/ClientApp/src/view/schoolServe/school.vue

@@ -1503,58 +1503,31 @@ export default {
         ElMessage.error('API异常，规模版本排序失败')
       })
     }
-    //版本筛选变化 
-    // ※版本判定：1.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM)=「標準版」 
-    //           2.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM) + 五育看板(YPXSJ6NJ) =「專業版」
+  // ※版本判定：1.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM)=「標準版」 
+    //           2.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM) + 五育看板(YPXSJ6NJ) =「專業版」  
     function versionsEstimate (val) {
       console.log(shouldFilter.value)
       let arrState = shouldFilter.value
       let marjorArr = []; let standardArr = []; let basicsArr = []; let customArr = [];
+      debugger;
       // debugger;
-      // arrState.major ? originalData.value.forEach((item) => { (item.edition == null || item.edition.scaleVersion == null || item.edition.scaleVersion == "") && item.service.includes('IPDYZYLC') && item.service.includes('YMPCVCIM') && item.service.includes('YPXSJ6NJ') ? marjorArr.push(item) : '' }) : ''
-      // arrState.standard ? originalData.value.forEach((item) => { (item.edition == null || item.edition.scaleVersion == null || item.edition.scaleVersion == "") && item.service.includes('IPDYZYLC') && item.service.includes('YMPCVCIM') && (!item.service.includes('YPXSJ6NJ')) ? standardArr.push(item) : '' }) : ''
-      // arrState.basics ? originalData.value.forEach((item) => { (item.edition == null || item.edition.scaleVersion == null || item.edition.scaleVersion == "") && !item.service.includes('IPDYZYLC') && !item.service.includes('YMPCVCIM') ? basicsArr.push(item) : '' }) : ''
-      // arrState.custom ? originalData.value.forEach((item) => { item.edition !== null && item.edition.scaleVersion !== null && item.edition.scaleVersion !== "" ? customArr.push(item) : '' }) : ''
-      // 專業版
-      arrState.major ? originalData.value.forEach((item) => { 
-        //debugger;
-        let scaleVersionbool = false
-        if(item.edition !== null){
-          if(item.edition.scaleVersion !== null && item.edition.scaleVersion !== ""){
-            scaleVersionbool = true;
-          }              
-        }
-        if(!scaleVersionbool){ item.service.includes('YPXSJ6NJ') && item.service.includes('B6V5J6NP') ? marjorArr.push(item) : ''; }       
-        }) : ''
-        // 標準版
-      arrState.standard ? originalData.value.forEach((item) => {
-        let scaleVersionbool = false
-        if(item.edition !== null){
-          if(item.edition.scaleVersion !== null && item.edition.scaleVersion !== ""){
-            scaleVersionbool = true;
-          }              
-        }
-        if(!scaleVersionbool){ item.service.includes('YMPCVCIM') && (!item.service.includes('YPXSJ6NJ') && !item.service.includes('B6V5J6NP'))  ? standardArr.push(item) : ''  }       
-        }) : '';
-        // 基礎版
-      arrState.basics ? originalData.value.forEach((item) => {         
-         let scaleVersionbool = false
-        if(item.edition !== null){
-          if(item.edition.scaleVersion !== null && item.edition.scaleVersion !== ""){
-            scaleVersionbool = true;
-          }              
-        }
-        if(!scaleVersionbool){ !item.service.includes('YMPCVCIM') && !item.service.includes('YPXSJ6NJ') && !item.service.includes('B6V5J6NP') ? basicsArr.push(item) : '' ; }     
-         }) : ''
-        // 自訂版
-      arrState.custom ? originalData.value.forEach((item) => {                 
-        if(item.edition !== null){
-          if(item.edition.scaleVersion !== null && item.edition.scaleVersion !== ""){
-            customArr.push(item)
-          }              
-        }        
-         }) : ''
-      
+       // 專業版
+       arrState.major ? originalData.value.forEach((item) => {
+         (item.edition == null || item.edition.scaleVersion == null || item.edition.scaleVersion == "") 
+         && item.service.includes('IPDYZYLC') && item.service.includes('YMPCVCIM') && item.service.includes('YPXSJ6NJ') 
+         ? marjorArr.push(item) : '' }) : ''
+       // 標準版
+       arrState.standard ? originalData.value.forEach((item) => { 
+        (item.edition == null || item.edition.scaleVersion == null || item.edition.scaleVersion == "") 
+        && item.service.includes('IPDYZYLC') && item.service.includes('YMPCVCIM') && (!item.service.includes('YPXSJ6NJ')) ? standardArr.push(item) : '' }) : ''
+       // 基礎版
+       arrState.basics ? originalData.value.forEach((item) => { 
+        (item.edition == null || item.edition.scaleVersion == null || item.edition.scaleVersion == "") 
+        && !item.service.includes('IPDYZYLC') && !item.service.includes('YMPCVCIM') ? basicsArr.push(item) : '' }) : ''
+       // 自訂版
+       arrState.custom ? originalData.value.forEach((item) => { 
+        item.edition !== null && item.edition.scaleVersion !== null && item.edition.scaleVersion !== "" ? customArr.push(item) : '' }) : ''           
+
       let versionArr = [...marjorArr, ...standardArr, ...basicsArr, ...customArr]
       console.log(versionArr, '合并结果')
       tableData.value = versionArr

TEAMModelBI/Controllers/BIHome/OnLineController.cs

@@ -409,64 +409,57 @@ namespace TEAMModelBI.Controllers.BIHome
             int beCnt = 0; //基础班
             int seCnt = 0; //标准版
             int peCnt = 0; //专业版
+            int cuCnt = 0; //自訂版
 
             List<RecScEd> scEdCnt = new();
-            var ScSql = $"select c.id,c.name,c.size,c.scale from c";
-            await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<RecScEd>(queryText: ScSql, requestOptions:new QueryRequestOptions() { PartitionKey= new PartitionKey("Base")}))
+         
+
+            var ScSql = $"select c.id,c.name,c.size,c.scale, c.edition, c.service from c";
+            await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<RecScEd>(queryText: ScSql, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("BIRel") }))
             {
                 scEdCnt.Add(item);
             }
-
-            //scEdCnt.ForEach(async scProCnt =>
-            //{
-            //    var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(scProCnt.id, new PartitionKey("ProductSum"));
-            //    if (response.Status == 200)
-            //    {
-            //        using var json = await JsonDocument.ParseAsync(response.ContentStream);
-            //        SchoolProductSum ScProductSum = json.ToObject<SchoolProductSum>();
-            //        //scProCnt.serial = ScProductSum.serial.Count();
-            //        //scProCnt.service = ScProductSum.service.Count();
-            //        //scProCnt.hard = ScProductSum.hard.Count();
-            //        List<string> pSeriCnt = ScProductSum.serial.Select(s=> s.prodCode).ToList();
-            //        List<string> pServCnt = ScProductSum.service.Select(s=>s.prodCode).ToList();
-            //        List<string> pHardCnt = ScProductSum.hard.Select(s=>s.prodCode).ToList();
-            //        scProCnt.serial = pSeriCnt;
-            //        scProCnt.service = pServCnt;
-            //        scProCnt.hard = pHardCnt;
-            //        if (scProCnt.scale >= 500 && (pSeriCnt.Count > 0 || pServCnt.Count > 0 || pHardCnt.Count > 0)) peCnt += 1;
-            //    }
-
-            //    if (scProCnt.scale >= 500 && scProCnt.serial.Count == 0 && scProCnt.service.Count == 0 && scProCnt.hard.Count == 0) seCnt += 1;
-            //    if (scProCnt.scale == 0) beCnt += 1;
-            //});
+            
+            await foreach (var item in cosmosClient.GetContainer("TEAMModelOS", "School").GetItemQueryIterator<RecScEd>(queryText: ScSql, requestOptions: new QueryRequestOptions() { PartitionKey = new PartitionKey("VirtualBase") }))
+            {
+                scEdCnt.Add(item);
+            }          
 
             foreach (var item in scEdCnt)
             {
-                var response = await cosmosClient.GetContainer("TEAMModelOS", "School").ReadItemStreamAsync(item.id, new PartitionKey("ProductSum"));
-                if (response.Status == 200)
+                bool isHaveScaleVersion = false;
+
+                if (item.edition != null)
                 {
-                    using var json = await JsonDocument.ParseAsync(response.ContentStream);
-                    SchoolProductSum ScProductSum = json.ToObject<SchoolProductSum>();
-                    //scProCnt.serial = ScProductSum.serial.Count();
-                    //scProCnt.service = ScProductSum.service.Count();
-                    //scProCnt.hard = ScProductSum.hard.Count();
-                    List<string> pSeriCnt = ScProductSum.serial.Select(s => s.prodCode).ToList();
-                    List<string> pServCnt = ScProductSum.service.Select(s => s.prodCode).ToList();
-                    List<string> pHardCnt = ScProductSum.hard.Select(s => s.prodCode).ToList();
-                    item.serial = pSeriCnt;
-                    item.service = pServCnt;
-                    item.hard = pHardCnt;
-                    if (item.scale >= 500 && (pSeriCnt.Count > 0 || pServCnt.Count > 0 || pHardCnt.Count > 0)) peCnt += 1;
+                    if (!string.IsNullOrWhiteSpace(item.edition.scaleVersion))
+                    {
+                        isHaveScaleVersion = true;
+                    }
                 }
-
-                if (item.scale >= 500 && item.serial.Count == 0 && item.service.Count == 0 && item.hard.Count == 0) seCnt += 1;
-                if (item.scale == 0) beCnt += 1;
+                // ※版本判定：1.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM)=「標準版」 
+                //           2.學校管理(IPDYZYLC) + 學情分析(YMPCVCIM) + 五育看板(YPXSJ6NJ) =「專業版」
+                bool isIP = item.service.Exists(t => t == "IPDYZYLC");
+                bool isYM = item.service.Exists(t => t == "YMPCVCIM");
+                bool isYP = item.service.Exists(t => t == "YPXSJ6NJ");
+                if (isHaveScaleVersion)
+                {  // 自訂版
+                    cuCnt += 1; 
+                }
+                else if (isIP && isYM && isYP)
+                {  // 專業版
+                    peCnt += 1;
+                }
+                else if (isIP && isYM && !isYP)
+                {  // 標準版
+                    seCnt += 1; 
+                }
+                else 
+                {  // 基礎版
+                    beCnt += 1;
+                }                           
             }
 
-
-
-
-            return Ok(new { state = 200, beCnt, seCnt, peCnt, scEdCnt });
+            return Ok(new { state = 200, beCnt, seCnt, peCnt, cuCnt, scEdCnt });
         }
 
         /// <summary>
@@ -481,6 +474,8 @@ namespace TEAMModelBI.Controllers.BIHome
             public List<string> serial { get; set; } = new List<string>();//软体
             public List<string> service { get; set; } = new List<string>(); //服务
             public List<string> hard { get; set; } = new List<string>(); //硬体
+
+            public Edition edition { get; set; }
         }
 
         /// <summary>

TEAMModelOS/appsettings.Development.json

@@ -22,48 +22,48 @@
   },
   "Azure": {
     // 测试站数据库
-    "Storage": {
-      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodeltest;AccountKey=O2W2vadCqexDxWO+px+QK7y1sHwsYj8f/WwKLdOdG5RwHgW/Dupz9dDUb4c1gi6ojzQaRpFUeAAmOu4N9E+37A==;EndpointSuffix=core.chinacloudapi.cn"
-    },
-    "Cosmos": {
-      "ConnectionString": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;"
-    },
-    "Redis": {
-      "ConnectionString": "52.130.252.100:6379,password=habook,ssl=false,abortConnect=False,writeBuffer=10240"
-    },
-    "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"
-    },
-    "SignalR": {
-      "ConnectionString": "Endpoint=https://channel.service.signalr.net;AccessKey=KrblW06tuA4a/GyqRPDU0ynFFmAWxbAvyJihHclSXbQ=;Version=1.0;"
-    }
-    // 正式站数据库
     //"Storage": {
-    //  "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelos;AccountKey=Dl04mfZ9hE9cdPVO1UtqTUQYN/kz/dD/p1nGvSq4tUu/4WhiKcNRVdY9tbe8620nPXo/RaXxs+1F9sVrWRo0bg==;EndpointSuffix=core.chinacloudapi.cn"
+    //  "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodeltest;AccountKey=O2W2vadCqexDxWO+px+QK7y1sHwsYj8f/WwKLdOdG5RwHgW/Dupz9dDUb4c1gi6ojzQaRpFUeAAmOu4N9E+37A==;EndpointSuffix=core.chinacloudapi.cn"
     //},
     //"Cosmos": {
-    //  "ConnectionString": "AccountEndpoint=https://teammodelos.documents.azure.cn:443/;AccountKey=clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==;"
+    //  "ConnectionString": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;"
     //},
     //"Redis": {
-    //  "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"
     //},
     //"ServiceBus": {
-    //  "ConnectionString": "Endpoint=sb://coreiotservicebuscnpro.servicebus.chinacloudapi.cn/;SharedAccessKeyName=TEAMModelOS;SharedAccessKey=llRPBMDJG9w1Nnifj+pGhV0g4H2REcq0PjvX2qqpcOg=",
-    //  "ActiveTask": "active-task",
-    //  "ItemCondQueue": "itemcond",
-    //  "GenPdfQueue": "genpdf"
+    //  "ConnectionString": "Endpoint=sb://teammodelos.servicebus.chinacloudapi.cn/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=Sy4h4EQ8zP+7w/lOLi1X3tGord/7ShFHimHs1vC50Dc=",
+    //  "ActiveTask": "dep-active-task",
+    //  "ItemCondQueue": "dep-itemcond",
+    //  "GenPdfQueue": "dep-genpdf"
     //},
     //"SignalR": {
-    //  "ConnectionString": "Endpoint=https://channel.signalr.azure.cn;AccessKey=AtcB7JYFNUbUXb1rGxa3PVksQ2X5YSv3JOHZR9J88tw=;Version=1.0;"
-    //},
-    //"Speech": {
-    //  "SubscriptionKey": "a4f5f4e2e2e54c6e8b0a4a0b4a0a4a0b",
-    //  "Region": "chinanorth3",
-    //  "Endpoint": "https://chinanorth3.api.cognitive.azure.cn/sts/v1.0/issuetoken"
+    //  "ConnectionString": "Endpoint=https://channel.service.signalr.net;AccessKey=KrblW06tuA4a/GyqRPDU0ynFFmAWxbAvyJihHclSXbQ=;Version=1.0;"
     //}
+    // 正式站数据库
+    "Storage": {
+      "ConnectionString": "DefaultEndpointsProtocol=https;AccountName=teammodelos;AccountKey=Dl04mfZ9hE9cdPVO1UtqTUQYN/kz/dD/p1nGvSq4tUu/4WhiKcNRVdY9tbe8620nPXo/RaXxs+1F9sVrWRo0bg==;EndpointSuffix=core.chinacloudapi.cn"
+    },
+    "Cosmos": {
+      "ConnectionString": "AccountEndpoint=https://teammodelos.documents.azure.cn:443/;AccountKey=clF73GwPECfP1lKZTCvs8gLMMyCZig1HODFbhDUsarsAURO7TcOjVz6ZFfPqr1HzYrfjCXpMuVD5TlEG5bFGGg==;"
+    },
+    "Redis": {
+      "ConnectionString": "CoreRedisCN.redis.cache.chinacloudapi.cn:6380,password=LyJWP1ORJdv+poXWofAF97lhCEQPg1wXWqvtzXGXQuE=,ssl=True,abortConnect=False"
+    },
+    "ServiceBus": {
+      "ConnectionString": "Endpoint=sb://coreiotservicebuscnpro.servicebus.chinacloudapi.cn/;SharedAccessKeyName=TEAMModelOS;SharedAccessKey=llRPBMDJG9w1Nnifj+pGhV0g4H2REcq0PjvX2qqpcOg=",
+      "ActiveTask": "active-task",
+      "ItemCondQueue": "itemcond",
+      "GenPdfQueue": "genpdf"
+    },
+    "SignalR": {
+      "ConnectionString": "Endpoint=https://channel.signalr.azure.cn;AccessKey=AtcB7JYFNUbUXb1rGxa3PVksQ2X5YSv3JOHZR9J88tw=;Version=1.0;"
+    },
+    "Speech": {
+      "SubscriptionKey": "a4f5f4e2e2e54c6e8b0a4a0b4a0a4a0b",
+      "Region": "chinanorth3",
+      "Endpoint": "https://chinanorth3.api.cognitive.azure.cn/sts/v1.0/issuetoken"
+    }
   },
   "HaBookAuth": {
     "CoreId": {