优化链接秘钥配置

TEAMModelBI/Controllers/DingDingStruc/SystemConfigController.cs

@@ -250,7 +250,7 @@ namespace TEAMModelBI.Controllers.DingDingStruc
         }
 
         /// <summary>
-        /// 获取当前应用的
+        /// 获取所有的应用链接秘钥，以及当前应用链接秘钥
         /// </summary>
         /// <param name="jsonElement"></param>
         /// <returns></returns>
@@ -282,21 +282,31 @@ namespace TEAMModelBI.Controllers.DingDingStruc
                 return Ok(new { state = 200, allConfigs, currentSysConfig });
             }
             else {
-                currentSysConfig.site = currentSite;
-                currentSysConfig.nickName = currentSite;
+                currentSysConfig = new SysConfig();
+                currentSysConfig.site = $"{currentSite}";
+                currentSysConfig.nickName = $"{currentSite}";
                 currentSysConfig.proDeptId = long.Parse(_configuration["CustomParam:proDeptId"]);
 
-                currentSysConfig.clientKey.clientID = _configuration["HaBookAuth:CoreService:clientID"];
-                currentSysConfig.clientKey.clientSecret = _configuration["HaBookAuth:CoreService:clientSecret"];
+                currentSysConfig.clientKey = new()
+                {
+                    clientID = _configuration["HaBookAuth:CoreService:clientID"],
+                    clientSecret = _configuration["HaBookAuth:CoreService:clientSecret"]
+                };
 
-                currentSysConfig.dDAuth.agentId = _configuration["DingDingAuth:Agentld"];
-                currentSysConfig.dDAuth.appKey = _configuration["DingDingAuth:appKey"];
-                currentSysConfig.dDAuth.appSecret = _configuration["DingDingAuth:appSecret"];
+                currentSysConfig.dDAuth = new()
+                {
+                    agentId = _configuration["DingDingAuth:Agentld"],
+                    appKey = _configuration["DingDingAuth:appKey"],
+                    appSecret = _configuration["DingDingAuth:appSecret"]
+                };
 
-                currentSysConfig.azureClient.storage = _configuration["Azure:Storage:ConnectionString"];
-                currentSysConfig.azureClient.cosmos = _configuration["Azure:Cosmos:ConnectionString"];
-                currentSysConfig.azureClient.redis = _configuration["Azure:Redis:ConnectionString"];
-                currentSysConfig.azureClient.servicBus = _configuration["Azure:ServiceBus:ConnectionString"];
+                currentSysConfig.azureClient = new()
+                {
+                    storage = _configuration["Azure:Storage:ConnectionString"],
+                    cosmos = _configuration["Azure:Cosmos:ConnectionString"],
+                    redis = _configuration["Azure:Redis:ConnectionString"],
+                    servicBus = _configuration["Azure:ServiceBus:ConnectionString"]
+                };
 
                 return Ok(new { state = 201, allConfigs, currentSysConfig }); 
             }

TEAMModelBI/JsonFile/SystemConfig.json

@@ -1,27 +1,27 @@
 [
   {
-    "site": "Chins",
-    "nickName": "正式站",
-    "proDeptId": 13456,
+    "site": "China-Dep",
+    "nickName": "BI-测试站",
+    "proDeptId": 67690917,
     "clientKey": {
-      "clientID": "021251",
-      "clientSecret": "200005463678"
+      "clientID": "c7317f88-7cea-4e48-ac57-a16071f7b884",
+      "clientSecret": "kguxh:V.PLmxBdaI@jnrTrDSth]A3346"
     },
     "dDAuth": {
-      "agentId": "12300456",
-      "appKey": "32001",
-      "appSecret": "12300456"
+      "agentId": "1290158212",
+      "appKey": "dingrucgsnt8p13rfbgd",
+      "appSecret": "Gyx_N57yZslhQOAhAPlvmCwOp_qTm1DScKbd5OoOE0URAW4eViYA2Sk_ZxKb-8WG"
     },
     "azureClient": {
-      "storage": "0000",
-      "cosmos": "1234005",
-      "redis": "224005",
-      "servicBus": "12300455"
+      "storage": "DefaultEndpointsProtocol=https;AccountName=teammodelstorage;AccountKey=Yq7D4dE6cFuer2d2UZIccTA/i0c3sJ/6ITc8tNOyW+K5f+/lWw9GCos3Mxhj47PyWQgDL8YbVD63B9XcGtrMxQ==;EndpointSuffix=core.chinacloudapi.cn",
+      "cosmos": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;",
+      "redis": "52.130.252.100:6379,password=habook,ssl=false,abortConnect=False,writeBuffer=10240",
+      "servicBus": "Endpoint=sb://teammodelos.servicebus.chinacloudapi.cn/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=Sy4h4EQ8zP+7w/lOLi1X3tGord/7ShFHimHs1vC50Dc="
     }
   },
   {
-    "site": "Chins-214",
-    "nickName": "正式站-214",
+    "site": "Chins",
+    "nickName": "测试站",
     "proDeptId": 13456,
     "clientKey": {
       "clientID": "021251",
@@ -38,25 +38,5 @@
       "redis": "224005",
       "servicBus": "12300455"
     }
-  },
-  {
-    "site": "China-Dep",
-    "nickName": "测试站",
-    "proDeptId": 67690917,
-    "clientKey": {
-      "clientID": "c7317f88-7cea-4e48-ac57-a16071f7b884",
-      "clientSecret": "kguxh:V.PLmxBdaI@jnrTrDSth]A3346"
-    },
-    "dDAuth": {
-      "agentId": null,
-      "appKey": "dingrucgsnt8p13rfbgd",
-      "appSecret": "Gyx_N57yZslhQOAhAPlvmCwOp_qTm1DScKbd5OoOE0URAW4eViYA2Sk_ZxKb-8WG"
-    },
-    "azureClient": {
-      "storage": "DefaultEndpointsProtocol=https;AccountName=teammodelstorage;AccountKey=Yq7D4dE6cFuer2d2UZIccTA/i0c3sJ/6ITc8tNOyW+K5f+/lWw9GCos3Mxhj47PyWQgDL8YbVD63B9XcGtrMxQ==;EndpointSuffix=core.chinacloudapi.cn",
-      "cosmos": "AccountEndpoint=https://cdhabookdep-free.documents.azure.cn:443/;AccountKey=JTUVk92Gjsx17L0xqxn0X4wX2thDPMKiw4daeTyV1HzPb6JmBeHdtFY1MF1jdctW1ofgzqkDMFOtcqS46by31A==;",
-      "redis": "52.130.252.100:6379,password=habook,ssl=false,abortConnect=False,writeBuffer=10240",
-      "servicBus": "Endpoint=sb://teammodelos.servicebus.chinacloudapi.cn/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=Sy4h4EQ8zP+7w/lOLi1X3tGord/7ShFHimHs1vC50Dc="
-    }
   }
 ]