From fdad75c187c06840d71ed0be14801b70577871f2 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 19 Aug 2024 18:32:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=AC=E5=A3=AB=E5=9F=BA?= =?UTF-8?q?=E8=AE=A2=E8=88=B1=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E8=AE=A2=E8=88=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Myshipping.Application/EDI/InttraEdiHelper.cs | 7 + .../Entity/BookingDeliveryRecord.cs | 11 + Myshipping.Application/Entity/BookingOrder.cs | 10 + .../BookingOrder/BookingMSKAPIService.cs | 223 +++++++++++++++++- .../BookingOrder/BookingOrderService.cs | 2 + .../Dto/BookingDeliveryRecordDto.cs | 10 + .../BookingOrder/Dto/BookingEDIMapper.cs | 4 +- .../BookingOrder/Dto/BookingOrderDto.cs | 10 + .../BookingOrder/IBookingMSKAPIService.cs | 14 ++ .../Service/BookingSlot/BookingSlotService.cs | 2 + .../Service/DataSync/Dto/BookingOrderDto.cs | 5 + .../TaskManagePlat/TaskManageBCService.cs | 7 +- Myshipping.Core/Job/MSKAPIBookingWorker.cs | 55 ----- Myshipping.Core/Myshipping.Core.xml | 19 -- Myshipping.Web.Core/applicationconfig.json | 2 +- .../Myshipping.Web.Entry.csproj | 4 + 16 files changed, 306 insertions(+), 79 deletions(-) delete mode 100644 Myshipping.Core/Job/MSKAPIBookingWorker.cs diff --git a/Myshipping.Application/EDI/InttraEdiHelper.cs b/Myshipping.Application/EDI/InttraEdiHelper.cs index fb66ba43..15e4a769 100644 --- a/Myshipping.Application/EDI/InttraEdiHelper.cs +++ b/Myshipping.Application/EDI/InttraEdiHelper.cs @@ -1352,6 +1352,13 @@ namespace Myshipping.Application.EDI r.WriteLine("NAD+FW+++" + formatEdiStr("txt", bill.WEITUO) + "'"); icount = icount + 1; + + if (InttrEdi.SENDNAME.Length > 35) + r.WriteLine("NAD+FW+" + InttrEdi.SENDCODE + ":160:86++" + InttrEdi.SENDNAME.Substring(0, 35) + "+" + InttrEdi.SENDNAME.Substring(35) + "'"); + else + r.WriteLine("NAD+FW+" + InttrEdi.SENDCODE + ":160:86++" + InttrEdi.SENDNAME + "'"); + + icount = icount + 1; } else { diff --git a/Myshipping.Application/Entity/BookingDeliveryRecord.cs b/Myshipping.Application/Entity/BookingDeliveryRecord.cs index 153077a3..37852f54 100644 --- a/Myshipping.Application/Entity/BookingDeliveryRecord.cs +++ b/Myshipping.Application/Entity/BookingDeliveryRecord.cs @@ -576,5 +576,16 @@ namespace Myshipping.Application.Entity /// 交货地定位ID /// public string PLACEDELIVERY_GEO_ID { get; set; } + + /// + /// 定时方案ID + /// + public string TIMER_PLAN_ID { get; set; } + + /// + /// 定时方案名称 + /// + public string TIMER_PLAN_NAME { get; set; } + } } diff --git a/Myshipping.Application/Entity/BookingOrder.cs b/Myshipping.Application/Entity/BookingOrder.cs index 9731a043..40b695ca 100644 --- a/Myshipping.Application/Entity/BookingOrder.cs +++ b/Myshipping.Application/Entity/BookingOrder.cs @@ -1098,5 +1098,15 @@ namespace Myshipping.Application.Entity /// 所属公司名称 /// public string SubTenantName { get; set; } + + /// + /// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// + public string BookingSlotType { get; set; } + + /// + /// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// + public string BookingSlotTypeName { get; set; } } } \ No newline at end of file diff --git a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs index ab98b71c..a9048dcc 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingMSKAPIService.cs @@ -29,6 +29,14 @@ using StackExchange.Profiling.Internal; using SqlSugar; using static Aliyun.OSS.Model.InventoryConfigurationModel; using System.Threading; +using System.Collections; +using MathNet.Numerics; +using Myshipping.Core.Entity; +using HtmlAgilityPack; +using System.Security.Cryptography; +using Myshipping.Application.ConfigOption; +using System.IO; +using System.Net.Http; namespace Myshipping.Application.Service.BookingOrder { @@ -41,6 +49,9 @@ namespace Myshipping.Application.Service.BookingOrder private readonly SqlSugarRepository _bookingDeliveryRecordRep; private readonly SqlSugarRepository _bookingDeliveryRecordCtnRep; private readonly SqlSugarRepository _bookingDeliveryRecordShipScheduleRep; + private readonly SqlSugarRepository _bookingDeliveryRecordJobRunScheduleRep; + private readonly SqlSugarRepository _djyUserMailAccount; + private readonly SqlSugarRepository _sysUserRepository; private readonly ISysCacheService _cache; private readonly IDjyWebsiteAccountConfigService _webAccountConfig; @@ -55,7 +66,8 @@ namespace Myshipping.Application.Service.BookingOrder public BookingMSKAPIService(ILogger logger, ISysCacheService cache, IDjyWebsiteAccountConfigService webAccountConfig, SqlSugarRepository bookingDeliveryRecordRep, ISysDataUserMenu sysDataUserMenuService, - SqlSugarRepository bookingDeliveryRecordCtnRep, SqlSugarRepository bookingDeliveryRecordShipScheduleRep) + SqlSugarRepository bookingDeliveryRecordCtnRep, SqlSugarRepository bookingDeliveryRecordShipScheduleRep, + SqlSugarRepository djyUserMailAccount, SqlSugarRepository bookingDeliveryRecordJobRunScheduleRep) { _logger = logger; _cache = cache; @@ -64,6 +76,8 @@ namespace Myshipping.Application.Service.BookingOrder _bookingDeliveryRecordCtnRep = bookingDeliveryRecordCtnRep; _sysDataUserMenuService = sysDataUserMenuService; _bookingDeliveryRecordShipScheduleRep = bookingDeliveryRecordShipScheduleRep; + _djyUserMailAccount = djyUserMailAccount; + _bookingDeliveryRecordJobRunScheduleRep = bookingDeliveryRecordJobRunScheduleRep; } #region 检索海运船期详情 @@ -2293,5 +2307,212 @@ namespace Myshipping.Application.Service.BookingOrder return list; } + + #region 发送马士基订舱请求 + /// + /// 发送马士基订舱请求 + /// + /// 请求订舱ID + /// 返回检索结果 + [HttpGet("/BookingMSKAPI/SendMSKBookingById")] + public async Task SendMSKBookingById(long id) + { + var model = await GetInfo(id); + + if (model != null) + { + return await InnerSendMSKBooking(model, id, false); + } + return new MSKBookingResultDto + { + succ = false, + msg = "预订舱信息不存在" + }; + } + #endregion + + #region 生成订舱订舱报告邮件并自动转发 + /// + /// 生成订舱订舱报告邮件并自动转发 + /// + /// + [HttpGet("/BookingMSKAPI/GenerateTimerReportEmail")] + public async Task GenerateTimerReportEmail() + { + DateTime nowDate = DateTime.Now; + + DateTime startDate = new DateTime(nowDate.Year, nowDate.Month, nowDate.Day); + + var runList = _bookingDeliveryRecordJobRunScheduleRep.AsQueryable().Filter(null, true) + .Where(a => a.CreatedTime >= startDate && a.IsDeleted == false && a.IS_SEND_REPORT == false).ToList(); + + + if (runList.Count > 0) + { + var idList = runList.Select(a => a.RECORD_ID).ToList(); + + var orderList = _bookingDeliveryRecordRep.AsQueryable().Filter(null, true) + .Where(a => a.IsDeleted == false && idList.Contains(a.Id)).ToList(); + + orderList.GroupBy(a => a.CreatedUserId.Value).ToList().ForEach(b => + { + var nextJobTime = DateTime.MinValue; + + var nextOrder = _bookingDeliveryRecordRep.AsQueryable().Filter(null, true) + .Where(a => a.IsDeleted == false && a.JOB_TIME != null && a.JOB_TIME.Value >= nowDate && a.CreatedUserId == b.Key).OrderBy(a=>a.JOB_TIME.Value).First(); + + if (nextOrder != null) + nextJobTime = nextOrder.JOB_TIME.Value; + + var opUser = _sysUserRepository.AsQueryable().Filter(null, true).First(a => a.Id == b.Key); + + DjyUserMailAccount publicMailAccount = _djyUserMailAccount.AsQueryable().Filter(null, true).First(x => x.TenantId == opUser.TenantId && x.ShowName == "PublicSend" + && x.SmtpPort > 0 && x.SmtpServer != null && x.SmtpServer != ""); + + if (publicMailAccount == null) + { + throw Oops.Oh($"提取公共邮箱配置失败，请在用户邮箱账号管理增加配置显示名为PublicSend或者配置个人邮箱"); + } + + string emailHtml = string.Empty; + + var currList = b.OrderBy(t=>t.SEND_TIME.Value).ToList(); + + string templatePath = App.Configuration["EmailTemplateFilePath"]; + + var opt = App.GetOptions(); + var dirAbs = opt.basePath; + if (string.IsNullOrEmpty(dirAbs)) + { + dirAbs = App.WebHostEnvironment.WebRootPath; + } + templatePath = $"{dirAbs}{templatePath}\\MSKAPITimerReportTemplate.html"; + + string baseHtml = File.ReadAllText(templatePath); + + HtmlDocument html = new HtmlDocument(); + html.LoadHtml(baseHtml); + + baseHtml = baseHtml.Replace("#ReportTime#", nowDate.ToString("yyyy-MM-dd HH:mm:ss")); + + baseHtml = baseHtml.Replace("#total#", currList.Count.ToString()); + baseHtml = baseHtml.Replace("#succ#", currList.Count(x=>x.STATUS == "SUCC").ToString()); + baseHtml = baseHtml.Replace("#failure#", currList.Count(x => x.STATUS == "FAILURE").ToString()); + + if (nextJobTime != DateTime.MinValue) + { + baseHtml = baseHtml.Replace("#NextTime#", nextJobTime.ToString("yyyy-MM-dd HH:mm")); + } + else + { + baseHtml = baseHtml.Replace("#NextTime#", ""); + } + + + var tableNode = html.DocumentNode.SelectSingleNode(".//table[@id='show-table']"); + + if (tableNode != null) + { + StringBuilder tableBuilder = new StringBuilder(); + + for (int i = 0; i < currList.Count; i++) + { + tableBuilder.Append($"{(currList[i].SEND_TIME.HasValue ? currList[i].SEND_TIME.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")}"); + tableBuilder.Append($"{currList[i].STATUS_NAME}{currList[i].BOOKING_REFERENCE}{currList[i].PLACERECEIPT}{currList[i].PLACEDELIVERY}"); + tableBuilder.Append($"{currList[i].CTN_STAT}{(currList[i].ETD.HasValue ? currList[i].ETD.Value.ToString("yyyy-MM-dd HH:mm") : "")}"); + tableBuilder.Append($"{(currList[i].TOTAL_CARGO_WEIGHT.HasValue? currList[i].TOTAL_CARGO_WEIGHT.Value.ToString():"")}{currList[i].PRICE_OWNER_REFERENCE}"); + tableBuilder.Append($"{(currList[i].IS_RECV_BC ? "1" : "")}{(currList[i].IS_RECV_BK_CANCEL ? "1" : "")}{(currList[i].JOB_TIME.HasValue ? currList[i].JOB_TIME.Value.ToString("yyyy-MM-dd HH:mm") : "")}"); + } + + //生成From Vessel的table列表 + tableNode.ChildNodes.Add(HtmlNode.CreateNode(tableBuilder.ToString())); + } + + + EmailApiUserDefinedDto emailApiUserDefinedDto = new EmailApiUserDefinedDto + { + SendTo = opUser.Email, + //CCTo = opEmail, + Title = $"马士基API定时订舱统计报告 {nowDate.ToString("yyyy-MM-dd HH:mm:ss")}", + Body = emailHtml, + Account = publicMailAccount.MailAccount?.Trim(), + Password = publicMailAccount.Password?.Trim(), + Server = publicMailAccount.SmtpServer?.Trim(), + Port = publicMailAccount.SmtpPort.HasValue ? publicMailAccount.SmtpPort.Value : 465, + UseSSL = publicMailAccount.SmtpSSL.HasValue ? publicMailAccount.SmtpSSL.Value : true, + Attaches = new List() + }; + + + List emailList = new List(); + + var emailUrl = _cache.GetAllDictData().GetAwaiter().GetResult() + .FirstOrDefault(x => x.TypeCode == "url_set" && x.Code == "email_api_url")?.Value; + + if (emailUrl == null) + _logger.LogInformation("字典未配置 url_set->email_api_url 请联系管理员"); + + emailList.Add(emailApiUserDefinedDto); + + //string strJoin = System.IO.File.ReadAllText(filePath); + + DateTime bDate = DateTime.Now; + + HttpResponseMessage res = null; + + try + { + res = emailUrl.SetBody(emailList, "application/json").PostAsync().GetAwaiter().GetResult(); + } + catch (Exception ex) + { + _logger.LogInformation($"发送邮件异常：{ex.Message}"); + } + + DateTime eDate = DateTime.Now; + TimeSpan ts = eDate.Subtract(bDate); + var timeDiff = ts.TotalMilliseconds; + + _logger.LogInformation($"发送邮件返回：{JSON.Serialize(res)}"); + + if (res != null && res.StatusCode == System.Net.HttpStatusCode.OK) + { + var userResult = res.Content.ReadAsStringAsync().GetAwaiter().GetResult(); + + var respObj = JsonConvert.DeserializeAnonymousType(userResult, new + { + Success = false, + Message = string.Empty, + Code = -9999, + }); + + if(respObj.Success) + { + var updateList = currList.Join(runList, l => l.Id, r => r.RECORD_ID, (l, r) => + { + return r; + }).ToList(); + + foreach (var update in updateList) { + update.IS_SEND_REPORT = true; + update.REPORT_TIME = DateTime.Now; + + _bookingDeliveryRecordJobRunScheduleRep.AsUpdateable(update).UpdateColumns(x => new + { + x.IS_SEND_REPORT, + x.REPORT_TIME + }).ExecuteCommand(); + }; + } + + } + + }); + + } + + return ""; + } + #endregion } } diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index 0a0b46fe..3cb9127b 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -10389,6 +10389,8 @@ namespace Myshipping.Application dto.SyncType = syncTypeEnum.ToString(); } + dto.OPERATOREMAIL = item.BookingSlotType; + List statusList = new List(); if (App.Configuration["ServiceStatusOpenAuto"] == "1") diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingDeliveryRecordDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingDeliveryRecordDto.cs index 40ad20c0..761910d8 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingDeliveryRecordDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingDeliveryRecordDto.cs @@ -481,6 +481,16 @@ namespace Myshipping.Application /// 集装箱 /// public List ctns { get; set; } + + /// + /// 定时方案ID + /// + public string TimerPlanId { get; set; } + + /// + /// 定时方案名称 + /// + public string TimerPlanName { get; set; } } public class BookingDeliveryRecordCtnDto diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs index 7e66c015..7e5013d2 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingEDIMapper.cs @@ -319,7 +319,9 @@ namespace Myshipping.Application .Map(dest => dest.isRecvBC, src => src.IS_RECV_BC) .Map(dest => dest.LstRecvBCDate, src => src.LST_RECV_BC_DATE) .Map(dest => dest.isRecvBKCancel, src => src.IS_RECV_BK_CANCEL) - .Map(dest => dest.LstRecvBKCancelDate, src => src.LST_RECV_BK_CANCEL_DATE); + .Map(dest => dest.LstRecvBKCancelDate, src => src.LST_RECV_BK_CANCEL_DATE) + .Map(dest => dest.TimerPlanId, src => src.TIMER_PLAN_ID) + .Map(dest => dest.TimerPlanName, src => src.TIMER_PLAN_NAME); diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs index 16a67fae..8d6d270a 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderDto.cs @@ -892,6 +892,16 @@ namespace Myshipping.Application /// 所属公司名称 /// public string SubTenantName { get; set; } + + /// + /// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// + public string BookingSlotType { get; set; } + + /// + /// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// + public string BookingSlotTypeName { get; set; } } /// diff --git a/Myshipping.Application/Service/BookingOrder/IBookingMSKAPIService.cs b/Myshipping.Application/Service/BookingOrder/IBookingMSKAPIService.cs index aa6a059d..600769f9 100644 --- a/Myshipping.Application/Service/BookingOrder/IBookingMSKAPIService.cs +++ b/Myshipping.Application/Service/BookingOrder/IBookingMSKAPIService.cs @@ -122,5 +122,19 @@ namespace Myshipping.Application /// /// Task> GetTimerSchemeList(); + + + /// + /// 发送马士基订舱请求 + /// + /// 请求订舱ID + /// 返回检索结果 + Task SendMSKBookingById(long id); + + /// + /// 生成订舱订舱报告邮件并自动转发 + /// + /// + Task GenerateTimerReportEmail(); } } diff --git a/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs b/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs index ad3f6e81..337194aa 100644 --- a/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs +++ b/Myshipping.Application/Service/BookingSlot/BookingSlotService.cs @@ -3219,6 +3219,8 @@ namespace Myshipping.Application PLACEDELIVERYID = bookingSlotBase.PLACEDELIVERYID, PLACERECEIPT = bookingSlotBase.PLACERECEIPT, PLACERECEIPTID = bookingSlotBase.PLACERECEIPTID, + BookingSlotType = bookingSlotBase.BOOKING_SLOT_TYPE, + BookingSlotTypeName = bookingSlotBase.BOOKING_SLOT_TYPE_NAME, ctnInputs = new List() }; diff --git a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs index 689c130b..e533b646 100644 --- a/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs +++ b/Myshipping.Application/Service/DataSync/Dto/BookingOrderDto.cs @@ -855,6 +855,11 @@ namespace Myshipping.Application.Service.DataSync.Dto /// 分单操作 /// public string SubOp { get; set; } + + /// + /// 场站备注 + /// + public string OPERATOREMAIL { get; set; } } diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs index 907982b6..4d5e6ad0 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs @@ -1558,6 +1558,9 @@ namespace Myshipping.Application }); } + bkModel.BookingSlotType = taskBCInfo.BOOKING_SLOT_TYPE; + bkModel.BookingSlotTypeName = taskBCInfo.BOOKING_SLOT_TYPE_NAME; + var bkRlt = await _bookingOrderService.Save(bkModel); id = bkRlt.Id; @@ -1965,7 +1968,7 @@ namespace Myshipping.Application _logger.LogInformation($"提取当前公共邮箱的配置完成，id={publicMailAccount.Id}"); - string emailTitle = $"Booking Confirmation : {taskBCInfo.MBL_NO}"; + string emailTitle = $"Booking Confirmation : {bookingOrderEntity.MBLNO}"; string filePath = string.Empty; @@ -1976,7 +1979,7 @@ namespace Myshipping.Application if (taskBCInfo.BUSI_TYPE == "BookingAmendment") { - emailTitle = $"【变更】Booking Amendment : {taskBCInfo.MBL_NO}"; + emailTitle = $"【变更】Booking Amendment : {bookingOrderEntity.MBLNO}"; } //读取邮件模板并填充数据 diff --git a/Myshipping.Core/Job/MSKAPIBookingWorker.cs b/Myshipping.Core/Job/MSKAPIBookingWorker.cs deleted file mode 100644 index 53f6af7b..00000000 --- a/Myshipping.Core/Job/MSKAPIBookingWorker.cs +++ /dev/null @@ -1,55 +0,0 @@ -using Furion; -using Furion.DataEncryption; -using Furion.Logging; -using Furion.TaskScheduler; -using Myshipping.Core.Const; -using Myshipping.Core.Entity; -using Myshipping.Core.Service; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Myshipping.Core.Job -{ - /// - /// 马士基API定时自动订舱 - /// - public class MSKAPIBookingWorker : ISpareTimeWorker - { - /// - /// 发送马士基API自动订舱 - /// - /// - /// - [SpareTime(60000, "MSKAPISendBooking", Description = "发送马士基API自动订舱", DoOnce = false, StartNow = true, ExecuteType = SpareTimeExecuteTypes.Serial)] - public void MSKAPISendBooking(SpareTimer timer, long count) - { - Log.Information($"UserSyncWorker {DateTime.Now}"); - - /* - 1、遍历预订舱表，查询设置了预定时间，并且时间小于等于当前时间，并且没有进入运行表的记录。 - 2、执行运行表待执行的记录。 - 3、直到执行完所有记录，才进入任务轮询。 - */ - } - - /// - /// 生成当天的发送结果统计给操作 - /// - /// - /// - [SpareTime(60000, "MSKAPIResultReportToOp", Description = "生成当天的发送结果统计给操作", DoOnce = false, StartNow = true, ExecuteType = SpareTimeExecuteTypes.Serial)] - public void MSKAPIResultReportToOp(SpareTimer timer, long count) - { - Log.Information($"UserSyncWorker {DateTime.Now}"); - - /* - 1、提取当天的MSK API订舱记录生成列表。 - 2、生成邮件正文发送给制单人邮箱 - */ - } - } -} diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index f5804de9..e611ecb6 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -6971,25 +6971,6 @@ 日志清理 - - - 马士基API定时自动订舱 - - - - - 发送马士基API自动订舱 - - - - - - - 生成当天的发送结果统计给操作 - - - - 和川用户同步 diff --git a/Myshipping.Web.Core/applicationconfig.json b/Myshipping.Web.Core/applicationconfig.json index d35c3379..81539f2d 100644 --- a/Myshipping.Web.Core/applicationconfig.json +++ b/Myshipping.Web.Core/applicationconfig.json @@ -56,7 +56,7 @@ }, "Cache": { "CacheType": "RedisCache", // RedisCache - "RedisConnectionString": "127.0.0.1:6379,password=,defaultDatabase=11" + "RedisConnectionString": "60.209.125.238:36379,password=,defaultDatabase=11" }, "SnowId": { "WorkerId": "1" // 取值范围0~63,默认1 diff --git a/Myshipping.Web.Entry/Myshipping.Web.Entry.csproj b/Myshipping.Web.Entry/Myshipping.Web.Entry.csproj index b52a76b2..841f980f 100644 --- a/Myshipping.Web.Entry/Myshipping.Web.Entry.csproj +++ b/Myshipping.Web.Entry/Myshipping.Web.Entry.csproj @@ -26,6 +26,10 @@ + + <_ContentIncludedByDefault Remove="wwwroot\EmailTemplate\MSKAPITimerReportTemplate.html" /> + + <_WebToolingArtifacts Remove="Properties\PublishProfiles\linux.pubxml" /> <_WebToolingArtifacts Remove="Properties\PublishProfiles\windows.pubxml" />