From 7fb913764e5f576f469d177217c2ac3ccb94773b Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 21 Feb 2024 16:25:37 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9C=BA=E6=9E=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SyncSapInfo/Job/SyncOrganizationJob.cs | 8 +++----- .../SyncSapInfo/Services/Implements/JinkoSapService.cs | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncOrganizationJob.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncOrganizationJob.cs index 593df3bd..fb5a652f 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncOrganizationJob.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Job/SyncOrganizationJob.cs @@ -28,11 +28,11 @@ public class SyncOrganizationJob if (orgResult.Org != null && orgResult.Org.Items.Count > 0) { - var modifiedOrgList = GetModifiedOrg(orgResult.Org?.Items); - await SaveOrg(modifiedOrgList); + //var modifiedOrgList = GetModifiedOrg(orgResult.Org.Items); + await SaveOrg(orgResult.Org.Items); } - var syncPositionJob = BackgroundJob.ContinueJobWith("SyncOrganizationJob", job => job.SyncPositionInfo(), JobContinuationOptions.OnlyOnSucceededState); + var syncPositionJob = BackgroundJob.Enqueue(job => job.SyncPositionInfo()); BackgroundJob.ContinueJobWith(syncPositionJob, job => job.SyncPersonInfo(), JobContinuationOptions.OnlyOnSucceededState); } @@ -49,8 +49,6 @@ public class SyncOrganizationJob private async Task SaveOrg(List modifiedOrgList) { - if (modifiedOrgList == null || modifiedOrgList.Count == 0) return; - foreach (SapOrganizationItem item in modifiedOrgList) { var department = await _dbContext.Queryable().Where(x => x.No == item.OBJID).FirstAsync(); diff --git a/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs b/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs index e1abe780..3fc2872d 100644 --- a/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs +++ b/Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs @@ -23,9 +23,9 @@ public class JinkoSapService : IJinkoSapService private HttpClient GetHttpClient() { var httpClient = _httpClientFactory.CreateClient("jinko:sap"); - //http://sappidap.jinkosolar.cn:51000 httpClient.BaseAddress = new Uri("http://sappipap01.jinkosolar.cn:50100"); httpClient.Timeout = TimeSpan.FromMinutes(10); + var credentials = string.Format("{0}:{1}", "EHS_USER", "y3R1hd2h*RICAC"); var headerValue = Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials)); httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", headerValue);