src/DataSharing.Host/config/appsettings.Development.json

@@ -90,8 +90,8 @@
     "Province": {
       "HuiJu": "http://59.225.208.26:8001/cns-sccthj-job-test/rest/",
       "XieTong": "http://59.225.208.26:8001/cns-scxthj-rest-test/rest/",
-      "ClientIdHuiJu": "dc218a8e-94a3-4cf2-a846-9952b65a40b4",
-      "ClientSecretHuiJu": "8838050f-529c-4887-ab6c-e4c3b3209813",
+      "ClientId": "dc218a8e-94a3-4cf2-a846-9952b65a40b4",
+      "ClientSecret": "8838050f-529c-4887-ab6c-e4c3b3209813",
       "ClientIdXieTong": "admin",
       "ClientSecretXieTong": "admin",
       "MissedCallCount": 6, //未接通通话记录最多上传条数

src/DataSharing/ChannelConfiguration.cs

@@ -42,12 +42,12 @@
         /// <summary>
         /// 汇聚业务Id
         /// </summary>
-        public string ClientIdHuiJu { get; set; } = string.Empty;
+        public string ClientId { get; set; } = string.Empty;
 
         /// <summary>
         /// 汇聚业务秘钥
         /// </summary>
-        public string ClientSecretHuiJu { get; set; } = string.Empty;
+        public string ClientSecret { get; set; } = string.Empty;
 
         /// <summary>
         /// 协同业务Id

src/DataSharing/Province/ProvinceClient.cs

@@ -47,7 +47,7 @@ namespace DataSharing.Province
                 d => GetTokenAsync(baseAddress, cancellationToken).GetAwaiter().GetResult(),
                 TimeSpan.FromMinutes(28));
             //var configProvince = channelconfigManager.GetConfigurationProvince();
-            request.BuildClientInfo(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            request.BuildClientInfo(configProvince.ClientId, configProvince.ClientSecret);
 
             //todo token失效重新获取token再次请求，返回参数缺少该状态，暂无法处理
 
@@ -126,8 +126,8 @@ namespace DataSharing.Province
                 baseAddress += "/";
 
             //获取秘钥，默认为汇聚的
-            var clientId = configProvince.ClientIdHuiJu;
-            var clientSecret = configProvince.ClientSecretHuiJu;
+            var clientId = configProvince.ClientId;
+            var clientSecret = configProvince.ClientSecret;
 
             //如果是协同的，取协同数据
             if (baseAddress == configProvince.XieTong)

src/DataSharing/Province/ProvinceService.cs

@@ -349,7 +349,7 @@ namespace DataSharing.Province
                     throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
 
                 #region 处理请求参数
-                var request = new ProvinceListRequest<SubmitCaseInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceListRequest<SubmitCaseInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 request.SetData(new List<SubmitCaseInfo>() { data });
                 var jsonData = request.ToString();
                 #endregion
@@ -386,7 +386,7 @@ namespace DataSharing.Province
                 if (!validResult.IsValid)
                     throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
                 #region 处理请求参数
-                var requestCall = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var requestCall = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 requestCall.SetData(new List<SubmitCaseRecordInfo>() { dataCall });
                 var jsonDataCall = requestCall.ToString();
                 jsonDataCall = jsonDataCall.Replace("0001-01-01 00:00:00", "");
@@ -421,7 +421,7 @@ namespace DataSharing.Province
                     throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
                 #region 处理请求参数
                 var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-                var request = new ProvinceListRequest<SubmitCaseInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceListRequest<SubmitCaseInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 request.SetData(new List<SubmitCaseInfo>() { data });
                 var jsonData = request.ToString();
                 #endregion
@@ -462,7 +462,7 @@ namespace DataSharing.Province
                     throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
                 #region 处理请求参数
                 var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-                var requestSubmitCaseInfo = new ProvinceListRequest<SubmitCaseInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var requestSubmitCaseInfo = new ProvinceListRequest<SubmitCaseInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 requestSubmitCaseInfo.SetData(new List<SubmitCaseInfo>() { submitCaseInfo });
                 var jsonDataSubmitCaseInfo = requestSubmitCaseInfo.ToString();
                 var urlSubmitCaseInfo = configProvince.HuiJu + "submit_case_info";
@@ -591,7 +591,7 @@ namespace DataSharing.Province
                 if (!validResult.IsValid)
                     throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
                 #region 处理请求参数
-                var request = new ProvinceListRequest<SubmitVisitInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceListRequest<SubmitVisitInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 request.SetData(new List<SubmitVisitInfo>() { data });
                 var jsonData = request.ToString();
                 #endregion
@@ -653,7 +653,7 @@ namespace DataSharing.Province
 
                 #region 处理请求参数--推送工单数据
 
-                var request = new ProvinceListRequest<SubmitCaseInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceListRequest<SubmitCaseInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 request.SetData(new List<SubmitCaseInfo>() { data });
                 var jsonData = request.ToString();
                 #endregion
@@ -687,7 +687,7 @@ namespace DataSharing.Province
                 if (!validResult.IsValid)
                     throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
                 #region 处理请求参数
-                var requestCall = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var requestCall = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 requestCall.SetData(new List<SubmitCaseRecordInfo>() { dataCall });
                 var jsonDataCall = requestCall.ToString();
                 jsonDataCall = jsonDataCall.Replace("0001-01-01 00:00:00", "");
@@ -734,7 +734,7 @@ namespace DataSharing.Province
                 throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(new List<SubmitCaseRecordInfo>() { data });
             var jsonData = request.ToString();
             jsonData = jsonData.Replace("0001-01-01 00:00:00", "");
@@ -797,7 +797,7 @@ namespace DataSharing.Province
                 throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(new List<SubmitCaseRecordInfo>() { data });
             var jsonData = request.ToString();
             jsonData = jsonData.Replace("0001-01-01 00:00:00", "");
@@ -859,7 +859,7 @@ namespace DataSharing.Province
                 throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceListRequest<SubmitCaseRecordInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(new List<SubmitCaseRecordInfo>() { data });
             var jsonData = request.ToString();
             jsonData = jsonData.Replace("0001-01-01 00:00:00", "");
@@ -882,7 +882,7 @@ namespace DataSharing.Province
         {
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceListRequest<SubmitCaseTotalInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceListRequest<SubmitCaseTotalInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(new List<SubmitCaseTotalInfo>() { dto });
             var jsonData = request.ToString();
             #endregion
@@ -1350,7 +1350,7 @@ namespace DataSharing.Province
             data.CategoryName = "公共服务";
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceRequest<KnowledgeInfoSendInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceRequest<KnowledgeInfoSendInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(data);
             var jsonData = request.ToString();
             #endregion
@@ -1402,7 +1402,7 @@ namespace DataSharing.Province
 
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceRequest<GetKnowledgeInfoUpdateInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceRequest<GetKnowledgeInfoUpdateInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(data);
             var jsonData = request.ToString();
             #endregion
@@ -1449,7 +1449,7 @@ namespace DataSharing.Province
             data.CategoryName = "公共服务";
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceRequest<GetKnowledgeInfoAbandonInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceRequest<GetKnowledgeInfoAbandonInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(data);
             var jsonData = request.ToString();
             #endregion
@@ -1477,7 +1477,7 @@ namespace DataSharing.Province
 
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceRequest<SendRealTimeStatusInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceRequest<SendRealTimeStatusInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(dto);
             var jsonData = request.ToString();
             #endregion
@@ -1557,7 +1557,7 @@ namespace DataSharing.Province
                     throw new UserFriendlyException(string.Join(',', validResult.Errors.Select(d => d.ErrorMessage)));
 
                 #region 处理请求参数
-                var requestSubmitCaseProcessInfo = new ProvinceListRequest<SubmitCaseProcessInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var requestSubmitCaseProcessInfo = new ProvinceListRequest<SubmitCaseProcessInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 requestSubmitCaseProcessInfo.SetData(new List<SubmitCaseProcessInfo>() { data });
                 var jsonDataSubmitCaseProcessInfo = requestSubmitCaseProcessInfo.ToString();
                 #endregion
@@ -1607,7 +1607,7 @@ namespace DataSharing.Province
 
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceListRequest<SubmitCaseResultInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceListRequest<SubmitCaseResultInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(new List<SubmitCaseResultInfo>() { data });
             var jsonData = request.ToString();
             #endregion
@@ -1794,7 +1794,7 @@ namespace DataSharing.Province
 
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceRequest<DataSharing.Share.Dtos.Province.HuiJu.SubmitCaseExtendsInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceRequest<DataSharing.Share.Dtos.Province.HuiJu.SubmitCaseExtendsInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(submitCaseExtendsInfo);
             var jsonData = request.ToString();
             #endregion
@@ -1839,7 +1839,7 @@ namespace DataSharing.Province
                 };
 
                 var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-                var request = new ProvinceRequest<GetCaseMaterialInfoModel>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceRequest<GetCaseMaterialInfoModel>(configProvince.ClientId, configProvince.ClientSecret);
                 request.SetData(materialInfo);
                 var jsonData = request.ToString();
 

src/DataSharing/Province/SendTask/TaskSendRealTimeStatusJob.cs

@@ -139,7 +139,7 @@ namespace DataSharing.Province.SendTask
 
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceRequest<SendRealTimeStatusInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceRequest<SendRealTimeStatusInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(dto);
             var jsonData = request.ToString();
             var url = configProvince.HuiJu + "sendrealtimestatus";

src/DataSharing/Province/SendTask/TaskSubmitCaseInfoJob.cs

@@ -430,7 +430,7 @@ namespace DataSharing.Province.SendTask
             if (tasks.Count != 0)
             {
                 #region 处理请求参数
-                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitCaseInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitCaseInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 List<Share.Dtos.Province.HuiJu.SubmitCaseInfo> listOrder = [];
                 #endregion
 

src/DataSharing/Province/SendTask/TaskSubmitCaseProcessJob.cs

@@ -422,7 +422,7 @@ namespace DataSharing.Province.SendTask
             if (tasks.Count != 0)
             {
                 #region 处理请求参数
-                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitCaseProcessInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitCaseProcessInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 List<Share.Dtos.Province.HuiJu.SubmitCaseProcessInfo> listOrder = [];
                 #endregion
 

src/DataSharing/Province/SendTask/TaskSubmitCaseRecordJob.cs

@@ -72,7 +72,7 @@ namespace DataSharing.Province.SendTask
             if (tasks.Count != 0)
             {
                 #region 处理请求参数
-                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitCaseRecordInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitCaseRecordInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 List<Share.Dtos.Province.HuiJu.SubmitCaseRecordInfo> listOrder = [];
                 #endregion
 

src/DataSharing/Province/SendTask/TaskSubmitCaseResultJob.cs

@@ -422,7 +422,7 @@ namespace DataSharing.Province.SendTask
             if (tasks.Count != 0)
             {
                 #region 处理请求参数
-                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitCaseResultInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitCaseResultInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 List<Share.Dtos.Province.HuiJu.SubmitCaseResultInfo> listOrder = [];
                 #endregion
 

src/DataSharing/Province/SendTask/TaskSubmitCaseTotalJob.cs

@@ -69,7 +69,7 @@ namespace DataSharing.Province.SendTask
             }
             #region 处理请求参数
             var configProvince = _channelConfigurationManager.GetConfigurationProvince();
-            var request = new ProvinceListRequest<SubmitCaseTotalInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+            var request = new ProvinceListRequest<SubmitCaseTotalInfo>(configProvince.ClientId, configProvince.ClientSecret);
             request.SetData(new List<SubmitCaseTotalInfo>() { submitCaseTotal });
             var jsonData = request.ToString();
 

src/DataSharing/Province/SendTask/TaskSubmitVisitInfoJob.cs

@@ -424,7 +424,7 @@ namespace DataSharing.Province.SendTask
             if (tasks.Count != 0)
             {
                 #region 处理请求参数
-                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitVisitInfo>(configProvince.ClientIdHuiJu, configProvince.ClientSecretHuiJu);
+                var request = new ProvinceListRequest<Share.Dtos.Province.HuiJu.SubmitVisitInfo>(configProvince.ClientId, configProvince.ClientSecret);
                 List<Share.Dtos.Province.HuiJu.SubmitVisitInfo> listOrder = [];
                 #endregion