yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fixed

develop
old yi 2024-03-29 22:14:59 +08:00
parent b421c0df7a
commit 7f6c0ad7fa
3 changed files with 63 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
New_College.Api/Dockerfile.original
View File

@ -1,4 +1,4 @@
FROM swr.cn-south-1.myhuaweicloud.com/mcr/aspnet:3.1-alpine FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' >/etc/timezone RUN echo 'Asia/Shanghai' >/etc/timezone
@ -32,5 +32,5 @@ RUN echo 'Asia/Shanghai' >/etc/timezone
#&& supervisord -c /etc/supervisord.conf #&& supervisord -c /etc/supervisord.conf
WORKDIR /app WORKDIR /app
COPY . . COPY . .
EXPOSE 8083 EXPOSE 8082
ENTRYPOINT ["dotnet", "New_College.Api.dll","-b","0.0.0.0"] ENTRYPOINT ["dotnet", "New_College.Api.dll","-b","0.0.0.0"]

7
New_College.Common/XiaoETong/XiaoEtongApp.cs
View File

@ -41,10 +41,15 @@ namespace New_College
/// <returns></returns> /// <returns></returns>
public static usersobject GetUsersList(UserRequest request) public static usersobject GetUsersList(UserRequest request)
{ {
var access_token = xetong_token().data.access_token; var tokeninfo = xetong_token();
if (tokeninfo.data != null)
{
var access_token = tokeninfo.data.access_token;
request.access_token = access_token; request.access_token = access_token;
var result = HttpHelper.PostApi<usersobject>(XIAOETongConfig.base_url + "xe.user.batch.get/1.0.0", request); var result = HttpHelper.PostApi<usersobject>(XIAOETongConfig.base_url + "xe.user.batch.get/1.0.0", request);
return result; return result;
} else
return null;
} }

8
New_College.Services/V_CustomerInfoServices.cs
View File

@ -424,6 +424,8 @@ namespace New_College.Services
/// <param name="info"></param> /// <param name="info"></param>
/// <returns></returns> /// <returns></returns>
private async Task<V_CustomerInfo> SyncXET(V_CustomerInfo info) private async Task<V_CustomerInfo> SyncXET(V_CustomerInfo info)
{
try
{ {
if (!string.IsNullOrWhiteSpace(info.Phone)) if (!string.IsNullOrWhiteSpace(info.Phone))
{ {
@ -476,6 +478,12 @@ namespace New_College.Services
} }
} }
}
catch (Exception exx)
{
}
return info; return info;
} }