yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix baseUrl和作用域

Browse Source
This commit is contained in:
liguoyang
2024-02-21 15:16:44 +08:00
parent 5b40cfbd39
commit 495c2f9897
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.ScheduledTask/SyncSapInfo/Services/IJinkoSapService.cs
View File

@@ -2,7 +2,7 @@
namespace Dlhis.ScheduledTask.SyncSapInfo.Services; namespace Dlhis.ScheduledTask.SyncSapInfo.Services;
public interface IJinkoSapService : IScopeDependency public interface IJinkoSapService : ISingletonDependency
{ {
Task<SapOrganizationResponse> GetSapOrganizationsAsync(); Task<SapOrganizationResponse> GetSapOrganizationsAsync();

9
Src/Dlhis.ScheduledTask/SyncSapInfo/Services/Implements/JinkoSapService.cs
View File

@@ -1,5 +1,4 @@
using System.Net.Http.Headers; using System.Net.Http.Headers;
using System.Net.Http;
using System.Text; using System.Text;
using Dlhis.ScheduledTask.SyncSapInfo.Dto; using Dlhis.ScheduledTask.SyncSapInfo.Dto;
using Dlhis.ScheduledTask.SyncSapInfo.Response; using Dlhis.ScheduledTask.SyncSapInfo.Response;
@@ -24,6 +23,8 @@ public class JinkoSapService : IJinkoSapService
private HttpClient GetHttpClient() private HttpClient GetHttpClient()
{ {
var httpClient = _httpClientFactory.CreateClient("jinko:sap"); 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); httpClient.Timeout = TimeSpan.FromMinutes(10);
var credentials = string.Format("{0}:{1}", "EHS_USER", "y3R1hd2h*RICAC"); var credentials = string.Format("{0}:{1}", "EHS_USER", "y3R1hd2h*RICAC");
var headerValue = Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials)); var headerValue = Convert.ToBase64String(Encoding.UTF8.GetBytes(credentials));
@@ -34,7 +35,7 @@ public class JinkoSapService : IJinkoSapService
public async Task<SapOrganizationResponse> GetSapOrganizationsAsync() public async Task<SapOrganizationResponse> GetSapOrganizationsAsync()
{ {
string apiUrl = "http://sappidap.jinkosolar.cn:51000/RESTAdapter/Rest/EHR_ORGANIZATION/"; string apiUrl = "/RESTAdapter/Rest/EHR_ORGANIZATION/";
var response = await GetHttpClient().PostAsync(apiUrl, new StringContent("{}", Encoding.UTF8, "application/json")); var response = await GetHttpClient().PostAsync(apiUrl, new StringContent("{}", Encoding.UTF8, "application/json"));
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
@@ -47,7 +48,7 @@ public class JinkoSapService : IJinkoSapService
public async Task<SapPositionResponse> GetPositionsAsync() public async Task<SapPositionResponse> GetPositionsAsync()
{ {
string apiUrl = "http://sappidap.jinkosolar.cn:51000/RESTAdapter/Rest/EHR_POSITION/"; string apiUrl = "/RESTAdapter/Rest/EHR_POSITION/";
var response = await GetHttpClient().PostAsync(apiUrl, new StringContent("{}", Encoding.UTF8, "application/json")); var response = await GetHttpClient().PostAsync(apiUrl, new StringContent("{}", Encoding.UTF8, "application/json"));
response.EnsureSuccessStatusCode(); response.EnsureSuccessStatusCode();
@@ -61,7 +62,7 @@ public class JinkoSapService : IJinkoSapService
public async Task<SapPersonResponse> GetPersonsAsync() public async Task<SapPersonResponse> GetPersonsAsync()
{ {
var apiUrl = "http://sappipap01.jinkosolar.cn:50100/RESTAdapter/Rest/EHR_PERSONNEL/"; var apiUrl = "/RESTAdapter/Rest/EHR_PERSONNEL/";
var tenantResult = await _tenantApi.GetTenantsInternalAsync(); var tenantResult = await _tenantApi.GetTenantsInternalAsync();
var tenants = tenantResult.Data; var tenants = tenantResult.Data;