From a9efa6458257c769779de24565af7e49f9e920bd Mon Sep 17 00:00:00 2001 From: wet <1034391973@qq.com> Date: Thu, 19 May 2022 16:53:10 +0800 Subject: [PATCH] ams --- .../Authentication/TokenProvider.cs | 2 +- ams/Djy.Common/Common.xml | 6 +- ams/Djy.Common/DapperDBBase.cs | 4 +- ams/Djy.Common/DjyService/ApiBase.cs | 4 +- ams/Djy.Common/DjyService/DbContext.cs | 4 +- ams/Djy.Common/DjyService/DjyTools.cs | 20 +- ams/Djy.Common/DjyService/DjyUserService.cs | 4 +- ams/Djy.Common/Entity/ReturnResult.cs | 2 +- ams/Djy.Common/Entity/WebConfig.cs | 4 + ams/Djy.Common/Extentions/ListExtension.cs | 6 +- ams/Djy.Common/Tools/Email/MailSendHelp.cs | 10 +- ams/Djy.Common/Tools/Redis.cs | 4 +- ams/Djy.Common/Tools/Tools.cs | 8 +- ams/Djy.Common/Tools/UpLoad/UploadQiniu.cs | 2 +- ams/Djy.Common/sysOptionConfig.cs | 6 +- ams/djy.IService/Ams/IAmsService.cs | 5 + ams/djy.Model/Ams/AMS_Cntrno.cs | 3 - ams/djy.Model/AmsDto/MasterBillInfoDto.cs | 184 ++++++++++++++++++ ams/djy.Service/Ams/AmsService.cs | 105 +++++++++- .../Controllers/AMS/AmsController.cs | 37 +++- .../PublishProfiles/FolderProfile.pubxml.user | 4 +- ams/djy.WebApi/Startup.cs | 16 +- 22 files changed, 376 insertions(+), 64 deletions(-) create mode 100644 ams/djy.Model/AmsDto/MasterBillInfoDto.cs diff --git a/ams/Djy.Common/Authentication/TokenProvider.cs b/ams/Djy.Common/Authentication/TokenProvider.cs index 91cffed..05042ed 100644 --- a/ams/Djy.Common/Authentication/TokenProvider.cs +++ b/ams/Djy.Common/Authentication/TokenProvider.cs @@ -16,7 +16,7 @@ namespace Common.Authentication public class TokenProvider { private JwtTokenProviderOptions _jwtoptions; - private WebConfig _webconfig = sysOptionConfig.YsWebconfig; + private WebConfig _webconfig = sysOptionConfig.Webconfig; public TokenProvider() { diff --git a/ams/Djy.Common/Common.xml b/ams/Djy.Common/Common.xml index ff31916..3b07d78 100644 --- a/ams/Djy.Common/Common.xml +++ b/ams/Djy.Common/Common.xml @@ -3145,7 +3145,7 @@ - 脏字过滤拓展 ys自定义 脏字字典默认读取配置 sysoptionconfig.yswebconfig.filtearray + 脏字过滤拓展 ys自定义 脏字字典默认读取配置 sysoptionconfig.Webconfig.filtearray @@ -5164,7 +5164,7 @@ 系统静态配置 - + 系统基础配置来于系统json配置文件 @@ -5832,7 +5832,7 @@ - Redis 地址 默认使用 sysOptionConfig.YsWebconfig.Redis 配置信息的 + Redis 地址 默认使用 sysOptionConfig.Webconfig.Redis 配置信息的 diff --git a/ams/Djy.Common/DapperDBBase.cs b/ams/Djy.Common/DapperDBBase.cs index 066db4d..a1bd3e1 100644 --- a/ams/Djy.Common/DapperDBBase.cs +++ b/ams/Djy.Common/DapperDBBase.cs @@ -24,7 +24,7 @@ namespace Common public DapperDBBase() { - sqlConnection = sysOptionConfig.YsWebconfig.DapperDbString; + sqlConnection = sysOptionConfig.Webconfig.DapperDbString; } /// /// @@ -34,7 +34,7 @@ namespace Common { if (string.IsNullOrEmpty(sqlConnection)) - sqlConnection = sysOptionConfig.YsWebconfig.DapperDbString; + sqlConnection = sysOptionConfig.Webconfig.DapperDbString; IDbConnection conn = new SqlConnection(sqlConnection); conn.Open(); return conn; diff --git a/ams/Djy.Common/DjyService/ApiBase.cs b/ams/Djy.Common/DjyService/ApiBase.cs index 4e361aa..a1fb9cb 100644 --- a/ams/Djy.Common/DjyService/ApiBase.cs +++ b/ams/Djy.Common/DjyService/ApiBase.cs @@ -155,7 +155,7 @@ namespace Common.DjyService RetrunData.IsPower = false; } - //if (sysOptionConfig.YsWebconfig.IsDev) + //if (sysOptionConfig.Webconfig.IsDev) //{ // RetrunData.UserId = null; // RetrunData.CompayId =null; @@ -237,7 +237,7 @@ namespace Common.DjyService /// protected static string _DecryptDES(string value) { - return SafeTools.DecryptDES(value, sysOptionConfig.YsWebconfig.DesKey); + return SafeTools.DecryptDES(value, sysOptionConfig.Webconfig.DesKey); } #endregion } diff --git a/ams/Djy.Common/DjyService/DbContext.cs b/ams/Djy.Common/DjyService/DbContext.cs index dd88fb4..9b089c4 100644 --- a/ams/Djy.Common/DjyService/DbContext.cs +++ b/ams/Djy.Common/DjyService/DbContext.cs @@ -49,7 +49,7 @@ namespace Common.DjyService /// /// RedisDB /// - public static RedisClient DbRedis = new RedisClient(string.Format("{0}", sysOptionConfig.YsWebconfig.Redis)); + public static RedisClient DbRedis = new RedisClient(string.Format("{0}", sysOptionConfig.Webconfig.Redis)); /// /// 数据库连接池初始化 @@ -57,7 +57,7 @@ namespace Common.DjyService /// public static bool DbBusInit() { - foreach (var item in sysOptionConfig.YsWebconfig.DataConnList) + foreach (var item in sysOptionConfig.Webconfig.DataConnList) { if (item.SysKey == DbList.Logsdb)//日志库允许自动更新表结构 diff --git a/ams/Djy.Common/DjyService/DjyTools.cs b/ams/Djy.Common/DjyService/DjyTools.cs index bfbdc73..f6bb2ea 100644 --- a/ams/Djy.Common/DjyService/DjyTools.cs +++ b/ams/Djy.Common/DjyService/DjyTools.cs @@ -114,7 +114,7 @@ namespace Common.DjyService } else { - mailBodyEntity.SenderAddress = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_SendAccess"]; + mailBodyEntity.SenderAddress = sysOptionConfig.Webconfig.ConfigList["sys.Email_SendAccess"]; } } @@ -125,10 +125,10 @@ namespace Common.DjyService MailConfig = new SendServerConfigurationEntity { - SmtpHost = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_SmtpHost"], - SmtpPort = int.Parse(sysOptionConfig.YsWebconfig.ConfigList["sys.Email_SmtpPort"]), - SenderAccount = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_LoginName"], - SenderPassword = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_Password"], + SmtpHost = sysOptionConfig.Webconfig.ConfigList["sys.Email_SmtpHost"], + SmtpPort = int.Parse(sysOptionConfig.Webconfig.ConfigList["sys.Email_SmtpPort"]), + SenderAccount = sysOptionConfig.Webconfig.ConfigList["sys.Email_LoginName"], + SenderPassword = sysOptionConfig.Webconfig.ConfigList["sys.Email_Password"], IsSsl = false }; } @@ -186,16 +186,16 @@ namespace Common.DjyService //} //else { - mailBodyEntity.SenderAddress = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_SendAccess"]; + mailBodyEntity.SenderAddress = sysOptionConfig.Webconfig.ConfigList["sys.Email_SendAccess"]; } } var sendServerConfiguration = new SendServerConfigurationEntity { - SmtpHost = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_SmtpHost"], - SmtpPort = int.Parse(sysOptionConfig.YsWebconfig.ConfigList["sys.Email_SmtpPort"]), - SenderAccount = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_LoginName"], - SenderPassword = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_Password"], + SmtpHost = sysOptionConfig.Webconfig.ConfigList["sys.Email_SmtpHost"], + SmtpPort = int.Parse(sysOptionConfig.Webconfig.ConfigList["sys.Email_SmtpPort"]), + SenderAccount = sysOptionConfig.Webconfig.ConfigList["sys.Email_LoginName"], + SenderPassword = sysOptionConfig.Webconfig.ConfigList["sys.Email_Password"], IsSsl = false }; diff --git a/ams/Djy.Common/DjyService/DjyUserService.cs b/ams/Djy.Common/DjyService/DjyUserService.cs index 630742a..56786e2 100644 --- a/ams/Djy.Common/DjyService/DjyUserService.cs +++ b/ams/Djy.Common/DjyService/DjyUserService.cs @@ -33,7 +33,7 @@ namespace Common.DjyService user = DbBus.Get(DbList.djyolddb).Select().Where(w => w.GID == usergid).ToOne(); if (user != null) { - DjyTools.RedisSet("UserInfo_" + usergid, user, sysOptionConfig.YsWebconfig.cache_time); + DjyTools.RedisSet("UserInfo_" + usergid, user, sysOptionConfig.Webconfig.cache_time); } } rs.Data = user; @@ -97,7 +97,7 @@ namespace Common.DjyService list = DbBus.Get(DbList.djyolddb).Ado.Query(strSql.ToString()); - DjyTools.RedisSet(rkey,list, sysOptionConfig.YsWebconfig.cache_time); + DjyTools.RedisSet(rkey,list, sysOptionConfig.Webconfig.cache_time); } if (Dto.KeyName.IsNotNull()) { diff --git a/ams/Djy.Common/Entity/ReturnResult.cs b/ams/Djy.Common/Entity/ReturnResult.cs index 74243fe..f254ca9 100644 --- a/ams/Djy.Common/Entity/ReturnResult.cs +++ b/ams/Djy.Common/Entity/ReturnResult.cs @@ -40,7 +40,7 @@ namespace Common - private string[] _strFilterArray = sysOptionConfig.YsWebconfig.FilteArray; + private string[] _strFilterArray = sysOptionConfig.Webconfig.FilteArray; /// /// 脏字过滤 diff --git a/ams/Djy.Common/Entity/WebConfig.cs b/ams/Djy.Common/Entity/WebConfig.cs index 44d51c8..8c21f8b 100644 --- a/ams/Djy.Common/Entity/WebConfig.cs +++ b/ams/Djy.Common/Entity/WebConfig.cs @@ -116,6 +116,10 @@ namespace Common.Entity public string DapperDbString { get; set; } + + + public string requesterDea { get; set; } + #region jwt认证配置 /// /// jwt发行者 diff --git a/ams/Djy.Common/Extentions/ListExtension.cs b/ams/Djy.Common/Extentions/ListExtension.cs index 0e07929..1081c68 100644 --- a/ams/Djy.Common/Extentions/ListExtension.cs +++ b/ams/Djy.Common/Extentions/ListExtension.cs @@ -24,11 +24,11 @@ namespace Common.Extensions /// public static T StrFilter(this IFilterData Value, string[] strFilterArray = null) { - return StrFilteFun.FilterCode(Value.Data, strFilterArray == null ? sysOptionConfig.YsWebconfig.FilteArray : strFilterArray); + return StrFilteFun.FilterCode(Value.Data, strFilterArray == null ? sysOptionConfig.Webconfig.FilteArray : strFilterArray); } /// - /// 脏字过滤拓展 ys自定义 脏字字典默认读取配置 sysoptionconfig.yswebconfig.filtearray + /// 脏字过滤拓展 ys自定义 脏字字典默认读取配置 sysoptionconfig.Webconfig.filtearray /// /// /// @@ -36,7 +36,7 @@ namespace Common.Extensions /// public static T StrFilter(this T Value, string[] strFilterArray = null) { - var rt = strFilterArray == null ? sysOptionConfig.YsWebconfig.FilteArray : strFilterArray; + var rt = strFilterArray == null ? sysOptionConfig.Webconfig.FilteArray : strFilterArray; return StrFilteFun.FilterCode(Value,rt); } diff --git a/ams/Djy.Common/Tools/Email/MailSendHelp.cs b/ams/Djy.Common/Tools/Email/MailSendHelp.cs index d613e47..dc47800 100644 --- a/ams/Djy.Common/Tools/Email/MailSendHelp.cs +++ b/ams/Djy.Common/Tools/Email/MailSendHelp.cs @@ -26,16 +26,16 @@ namespace Common.Tools.Email } if (mailBodyEntity.SenderAddress.IsNull()) - mailBodyEntity.SenderAddress = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_SendAccess"]; + mailBodyEntity.SenderAddress = sysOptionConfig.Webconfig.ConfigList["sys.Email_SendAccess"]; if (sendServerConfiguration == null) {//读取默认配置 sendServerConfiguration = new SendServerConfigurationEntity { - SmtpHost = sysOptionConfig.YsWebconfig.ConfigList["sys.Email_SmtpHost"], - SmtpPort =int.Parse( sysOptionConfig.YsWebconfig.ConfigList["sys.Email_SmtpPort"]), - SenderAccount=sysOptionConfig.YsWebconfig.ConfigList["sys,Email_LoginName"], - SenderPassword=sysOptionConfig.YsWebconfig.ConfigList["sys.Email_Password"], + SmtpHost = sysOptionConfig.Webconfig.ConfigList["sys.Email_SmtpHost"], + SmtpPort =int.Parse( sysOptionConfig.Webconfig.ConfigList["sys.Email_SmtpPort"]), + SenderAccount=sysOptionConfig.Webconfig.ConfigList["sys,Email_LoginName"], + SenderPassword=sysOptionConfig.Webconfig.ConfigList["sys.Email_Password"], IsSsl=false }; diff --git a/ams/Djy.Common/Tools/Redis.cs b/ams/Djy.Common/Tools/Redis.cs index 64264c8..e02a73f 100644 --- a/ams/Djy.Common/Tools/Redis.cs +++ b/ams/Djy.Common/Tools/Redis.cs @@ -13,9 +13,9 @@ namespace Common.Tools /// public class YsRedisHelp { - private static string _RedisContext = sysOptionConfig.YsWebconfig.Redis; + private static string _RedisContext = sysOptionConfig.Webconfig.Redis; /// - /// Redis 地址 默认使用 sysOptionConfig.YsWebconfig.Redis 配置信息的 + /// Redis 地址 默认使用 sysOptionConfig.Webconfig.Redis 配置信息的 /// public static string RedisContext { set { _RedisContext = value; diff --git a/ams/Djy.Common/Tools/Tools.cs b/ams/Djy.Common/Tools/Tools.cs index b8601c9..df18f02 100644 --- a/ams/Djy.Common/Tools/Tools.cs +++ b/ams/Djy.Common/Tools/Tools.cs @@ -39,7 +39,7 @@ namespace Common.Tools /// public static async Task> ServerWarnMessageErr(string Message) { - return await ServerWarnMessage(new WarnMessageDto { Message = Message,DingUrl=sysOptionConfig.YsWebconfig.ServerWarnApiUrlErr }); + return await ServerWarnMessage(new WarnMessageDto { Message = Message,DingUrl=sysOptionConfig.Webconfig.ServerWarnApiUrlErr }); } /// @@ -59,15 +59,15 @@ namespace Common.Tools } if (Dto.DingUrl.IsNull()) { - Dto.DingUrl = sysOptionConfig.YsWebconfig.ServerWarnApiUrl; + Dto.DingUrl = sysOptionConfig.Webconfig.ServerWarnApiUrl; } if (Dto.KeyTag.IsNull()) { - Dto.KeyTag= "[" + sysOptionConfig.YsWebconfig.ServerWarnKey + "]"; + Dto.KeyTag= "[" + sysOptionConfig.Webconfig.ServerWarnKey + "]"; } if (Dto.Title.IsNull()) { - Dto.Title = sysOptionConfig.YsWebconfig.WebName; + Dto.Title = sysOptionConfig.Webconfig.WebName; } if (Dto.DingUrl.IsNotNull()) { diff --git a/ams/Djy.Common/Tools/UpLoad/UploadQiniu.cs b/ams/Djy.Common/Tools/UpLoad/UploadQiniu.cs index d1e773d..eeebabc 100644 --- a/ams/Djy.Common/Tools/UpLoad/UploadQiniu.cs +++ b/ams/Djy.Common/Tools/UpLoad/UploadQiniu.cs @@ -19,7 +19,7 @@ namespace Common.Tools.UpLoad private Config qiniuconfig = new Config { Zone = Zone.ZONE_CN_East };//上传的部分配置 public UploadQiniu() { - _QnConfig =sysOptionConfig.YsQiniuconfig; + _QnConfig =sysOptionConfig.Qiniuconfig; } /// diff --git a/ams/Djy.Common/sysOptionConfig.cs b/ams/Djy.Common/sysOptionConfig.cs index 95e759f..03efca3 100644 --- a/ams/Djy.Common/sysOptionConfig.cs +++ b/ams/Djy.Common/sysOptionConfig.cs @@ -19,18 +19,18 @@ namespace Common /// /// 系统基础配置来于系统json配置文件 /// - public static WebConfig YsWebconfig { get; set; } = new WebConfig(); + public static WebConfig Webconfig { get; set; } = new WebConfig(); /// /// 微信配置 /// - public static WeixinConfig YsWeixinConfig { get; set; } = new WeixinConfig(); + public static WeixinConfig WeixinConfig { get; set; } = new WeixinConfig(); /// /// 七牛云存储配置 /// - public static QiniuConfig YsQiniuconfig { get; set; } = new QiniuConfig(); + public static QiniuConfig Qiniuconfig { get; set; } = new QiniuConfig(); /// /// jwt身份认证发行者实体属性 /// diff --git a/ams/djy.IService/Ams/IAmsService.cs b/ams/djy.IService/Ams/IAmsService.cs index 72a7eba..6db9063 100644 --- a/ams/djy.IService/Ams/IAmsService.cs +++ b/ams/djy.IService/Ams/IAmsService.cs @@ -45,5 +45,10 @@ namespace djy.Paas.IService List GetKINDPKGS(); List GetDangerousGoods(); + + + + + Response SendDE(string Gid, string userid); } } diff --git a/ams/djy.Model/Ams/AMS_Cntrno.cs b/ams/djy.Model/Ams/AMS_Cntrno.cs index 1ab678a..c7fa1be 100644 --- a/ams/djy.Model/Ams/AMS_Cntrno.cs +++ b/ams/djy.Model/Ams/AMS_Cntrno.cs @@ -8,9 +8,6 @@ namespace djy.Model.Ams [JsonObject(MemberSerialization.OptIn), Table(Name = "AMS_Cntrno", DisableSyncStructure = true)] public class AMS_Cntrno { - - - public AMS_Cntrno() { this.IsDel = false; diff --git a/ams/djy.Model/AmsDto/MasterBillInfoDto.cs b/ams/djy.Model/AmsDto/MasterBillInfoDto.cs new file mode 100644 index 0000000..2be731f --- /dev/null +++ b/ams/djy.Model/AmsDto/MasterBillInfoDto.cs @@ -0,0 +1,184 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace djy.Model.AmsDto +{ + public class masterBillInfo + { + + public string masterBillNo { get; set; } + + public string shipCompany { get; set; } + + public string vessel { get; set; } + + public string voyage { get; set; } + + public string requesterDea { get; set; } + + public string consignmentType { get; set; } + + public string loadHarbour { get; set; } + + public string loadHarbourCode { get; set; } + + public string dischargeHarbour { get; set; } + + public string dischargeHarbourCode { get; set; } + + public string lastForeignHarbour { get; set; } + + public string lastForeignHarbourCode { get; set; } + + public string loadDate { get; set; } + + public string estimatedArrivalTime { get; set; } + + public string filingType { get; set; } + } + + public class InsertListItem + { + /// + /// + /// + public string enProductName { get; set; } + /// + /// + /// + public string containerNo { get; set; } + /// + /// + /// + public string containerType { get; set; } + /// + /// + /// + public string sealNo { get; set; } + /// + /// + /// + public string digit { get; set; } + /// + /// + /// + public string grossWeight { get; set; } + /// + /// + /// + public string volume { get; set; } + /// + /// + /// + public string packing { get; set; } + /// + /// + /// + public string packingCode { get; set; } + /// + /// + /// + public string shippingMark { get; set; } + /// + /// + /// + public string unCode { get; set; } + /// + /// + /// + public string dangerGrade { get; set; } + } + + public class CtnInfo + { + /// + /// + /// + public List insertList { get; set; } + } + + public class HouseBillInfoListItem + { + /// + /// + /// + public string businessId { get; set; } + /// + /// + /// + public string houseBillNo { get; set; } + /// + /// + /// + public string sendAddress { get; set; } + /// + /// + /// + public string sendName { get; set; } + /// + /// + /// + public string sendCity { get; set; } + /// + /// + /// + public string sendCountry { get; set; } + /// + /// + /// + public string sendCountryCode { get; set; } + /// + /// + /// + public string receiveAddress { get; set; } + /// + /// + /// + public string receiveName { get; set; } + /// + /// + /// + public string receiveCity { get; set; } + /// + /// + /// + public string receiveCountry { get; set; } + /// + /// + /// + public string receiveCountryCode { get; set; } + /// + /// + /// + public string notifyAddress { get; set; } + /// + /// + /// + public string notifyName { get; set; } + /// + /// + /// + public string notifyCity { get; set; } + /// + /// + /// + public string notifyCountry { get; set; } + /// + /// + /// + public string notifyCountryCode { get; set; } + /// + /// + /// + public CtnInfo ctnInfo { get; set; } + } + + public class MasterBillInfoDto + { + public masterBillInfo masterBillInfo { get; set; } + public List houseBillInfoList { get; set; } + } +} diff --git a/ams/djy.Service/Ams/AmsService.cs b/ams/djy.Service/Ams/AmsService.cs index 489c44f..6d74fde 100644 --- a/ams/djy.Service/Ams/AmsService.cs +++ b/ams/djy.Service/Ams/AmsService.cs @@ -16,6 +16,8 @@ using Common.DJYModel; using System.Transactions; using Dapper.Contrib.Extensions; using Common.Utilities; +using Newtonsoft.Json; + namespace djy.Service.Ams { /// @@ -27,18 +29,19 @@ namespace djy.Service.Ams { var result = new TableData(); var user = DbBus.Get(DbList.djydb).Select().Where(w => w.GID == userid).ToOne(); - var dto = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel == false || x.IsDel == null&&x.CompID==user.CompId).WhereIf(req.MBLNO != null, x => x.MBLNO == req.MBLNO); + var dto = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null)&&x.CompID==user.CompId).WhereIf(req.MBLNO != null, x => x.MBLNO == req.MBLNO); result.count = dto.ToList().Count(); var list= dto.Page(req.Page,req.Limit).ToList(); - if (list != null) { + if (list != null) + { foreach (var item in list) { - var hodto = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel == false || x.IsDel == null && x.PID == item.GID).ToList(); + var hodto = DbBus.Get(DbList.AMSCenter).Select().Where(x =>( x.IsDel == false || x.IsDel == null) && x.PID == item.GID).ToList(); item.HouseDto = hodto; if (hodto!=null) { foreach (var it in hodto) { - var cnt = DbBus.Get(DbList.AMSCenter).Select().Where(x => x.IsDel == false || x.IsDel == null && x.HID == it.GID).ToList(); + var cnt = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null )&& x.HID == it.GID).ToList(); it.CntrnoDto = cnt; } } @@ -141,7 +144,6 @@ namespace djy.Service.Ams } }); } - } public List GetCountry() @@ -209,5 +211,98 @@ namespace djy.Service.Ams throw; } } + + public Response SendDE(string Gid,string userid) + { + var result = new Response(); + try { + if (Gid.IsNull()) { + result.Code = 500; + result.Message = "请传入相关业务id!"; + return result; + } + string[] id = Gid.Split(','); + foreach (string oid in id) + { + if (oid != "") + { + MasterBillInfoDto dto = new MasterBillInfoDto(); + masterBillInfo masterBillInfo = new masterBillInfo(); + var user = DbBus.Get(DbList.djydb).Select().Where(w => w.GID == userid).ToOne(); + var master = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.CompID == user.CompId&&x.GID==oid).ToOne(); + + masterBillInfo.masterBillNo = master.MBLNO; + masterBillInfo.shipCompany = master.CARRIERID; + masterBillInfo.vessel = master.VESSEL; + masterBillInfo.voyage = master.VOYNO; + masterBillInfo.requesterDea = sysOptionConfig.Webconfig.requesterDea; + masterBillInfo.consignmentType = master.ConsignmentType; + masterBillInfo.loadHarbour = master.LoadingPort; + masterBillInfo.loadHarbourCode = master.LoadingPortCode; + masterBillInfo.dischargeHarbour = master.PORTDISCHARGE; + masterBillInfo.dischargeHarbourCode = master.PORTDISCHARGECode; + masterBillInfo.lastForeignHarbour = master.LastNoUsPort; + masterBillInfo.lastForeignHarbourCode = master.LastNoUsPortCode; + masterBillInfo.loadDate = master.ETA.ToString("yyyy-MM-dd hh:mm:ss"); + masterBillInfo.estimatedArrivalTime = master.ETD.ToString("yyyy-MM-dd hh:mm:ss"); + masterBillInfo.filingType = master.ShippingType; + dto.masterBillInfo = masterBillInfo; + var hodto = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.PID == master.GID).ToList(); + List houseBillInfoListItems = new List(); + foreach (var item in hodto) + { + HouseBillInfoListItem houseinfo = new HouseBillInfoListItem(); + houseinfo.businessId = item.GID; + houseinfo.houseBillNo = item.HBLNo; + houseinfo.sendAddress = item.SHIPPERADDR; + houseinfo.sendName = item.SHIPPERNAME; + houseinfo.sendCity = item.SHIPPERCity; + houseinfo.sendCountry = item.SHIPPERCountry; + houseinfo.sendCountryCode = item.SHIPPERCountryCode; + houseinfo.receiveAddress = item.CONSIGNEEDADDR; + houseinfo.receiveName = item.CONSIGNEEName; + houseinfo.receiveCity = item.CONSIGNEECity; + houseinfo.receiveCountry = item.CONSIGNEECountry; + houseinfo.receiveCountryCode = item.CONSIGNEECountryCode; + houseinfo.notifyAddress = item.NOTIFYPARTYADDR; + houseinfo.notifyName = item.NOTIFYPARTYNAME; + houseinfo.notifyCity = item.NOTIFYPARTYCity; + houseinfo.notifyCountry = item.NOTIFYPARTYCountry; + houseinfo.notifyCountryCode = item.NOTIFYPARTYCountryCode; + var cnt = DbBus.Get(DbList.AMSCenter).Select().Where(x => (x.IsDel == false || x.IsDel == null) && x.HID == item.GID).ToList(); + CtnInfo CtnInfo = new CtnInfo(); + List list = new List(); + foreach (var it in cnt) + { + InsertListItem insertList = new InsertListItem(); + insertList.enProductName = it.ProductName; + insertList.containerNo = it.CNTRNO; + insertList.sealNo = it.SEALNO; + insertList.digit = it.PKGS.ToString(); + insertList.grossWeight = it.KGS.ToString(); + insertList.volume = it.CBM.ToString(); + insertList.packing = it.KINDPKGS; + insertList.packingCode = it.KINDPKGSCode; + insertList.shippingMark = it.MARKS; + insertList.unCode = it.DUNNO; + insertList.dangerGrade = it.DangerGrade; + list.Add(insertList); + } + CtnInfo.insertList = list; + houseinfo.ctnInfo = CtnInfo; + houseBillInfoListItems.Add(houseinfo); + } + dto.houseBillInfoList = houseBillInfoListItems; + var data = JsonConvert.SerializeObject(dto).ToBase64(); + } + } + } + catch (Exception e) { + + result.Code = 500; + result.Message = e.InnerException?.Message ?? e.Message; + } + return result; + } } } diff --git a/ams/djy.WebApi/Controllers/AMS/AmsController.cs b/ams/djy.WebApi/Controllers/AMS/AmsController.cs index 50a27a5..7e2c6b3 100644 --- a/ams/djy.WebApi/Controllers/AMS/AmsController.cs +++ b/ams/djy.WebApi/Controllers/AMS/AmsController.cs @@ -89,8 +89,6 @@ namespace djy_AmsApi.Controllers return result; } - - /// /// 下拉获取船公司 /// @@ -154,8 +152,6 @@ namespace djy_AmsApi.Controllers return result; } - - /// /// 下拉获取危品等级及 CODE /// @@ -175,6 +171,37 @@ namespace djy_AmsApi.Controllers } return result; } + + + + [HttpGet("Send")] + public Response Send(string ids) + { + var result = new Response(); + //if (GetLoginId == null) + //{ + // var result = new Response(); + // result.Code = 401; + // result.Message = "登录过期，请重新登录！"; + // return result; + //} + try + { + + ser.SendDE(ids, "d85fd590-d9f6-4410-93a1-f6fac77b606e"); + + } + catch (Exception ex) + { + result.Code = 500; + result.Message = ex.InnerException?.Message ?? ex.Message; + } + + return result; + } + + + } } - + diff --git a/ams/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/ams/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 0bbf048..dbbaeb4 100644 --- a/ams/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/ams/djy.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - <_PublishTargetUrl>E:\whm\赵工代码\djypaas\djyweb_djyPaasApi\bin\publish\net5 - True|2022-02-07T01:32:52.8608715Z;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00;True|2022-01-29T11:46:45.8432136+08:00;True|2022-01-29T11:20:54.2763765+08:00;True|2022-01-29T11:16:23.0172880+08:00;True|2022-01-29T11:06:15.3648999+08:00;True|2022-01-29T11:00:39.8926536+08:00;True|2022-01-28T14:35:21.7742884+08:00;True|2022-01-28T13:44:47.5005402+08:00;True|2021-12-20T11:12:24.1869686+08:00;True|2021-11-26T12:47:48.5784236+08:00;True|2021-11-25T10:09:49.9433864+08:00;True|2021-11-25T09:37:00.6093292+08:00;True|2021-11-25T09:05:31.9387896+08:00;True|2021-11-24T10:06:36.4353299+08:00;True|2021-11-24T10:05:50.0214052+08:00;True|2021-11-24T10:04:55.3930475+08:00;True|2021-11-24T09:54:45.9711710+08:00;True|2021-11-19T17:28:36.8788911+08:00;True|2021-11-11T11:47:53.2238106+08:00;True|2021-10-25T16:41:53.9980026+08:00;True|2021-10-25T16:30:28.1828641+08:00;True|2021-10-25T16:18:43.4003442+08:00;True|2021-10-25T11:56:15.6402921+08:00;True|2021-10-25T11:40:19.5447536+08:00;True|2021-10-25T10:07:48.9805552+08:00;True|2021-10-25T10:04:10.8948265+08:00;True|2021-10-25T09:48:27.3849674+08:00;True|2021-09-29T11:49:51.8683715+08:00;True|2021-09-28T18:32:55.3507925+08:00;True|2021-09-28T18:29:53.9063524+08:00;True|2021-09-28T18:28:36.1979045+08:00;True|2021-09-28T18:27:14.0693618+08:00;True|2021-09-28T12:04:26.3279007+08:00;True|2021-09-28T12:04:10.3945227+08:00;True|2021-09-28T12:03:10.3904100+08:00;True|2021-09-28T11:37:45.0482277+08:00;True|2021-09-28T11:37:12.9467611+08:00;True|2021-09-28T11:35:18.4356807+08:00;True|2021-09-28T11:34:57.5857798+08:00;True|2021-09-28T11:32:07.3952665+08:00;True|2021-09-28T11:31:56.0472675+08:00;True|2021-09-28T11:02:58.7231551+08:00;True|2021-09-28T11:02:24.3314587+08:00;True|2021-09-23T10:33:17.0585227+08:00;True|2021-09-23T10:15:28.5669869+08:00;True|2021-09-22T15:38:36.5949208+08:00;True|2021-09-22T15:37:14.3895150+08:00;True|2021-09-22T15:15:34.1096071+08:00;True|2021-09-22T13:54:04.9092004+08:00;True|2021-09-22T13:51:07.7860433+08:00;True|2021-09-22T13:48:44.1657158+08:00;True|2021-09-22T11:43:23.7675767+08:00;True|2021-09-22T11:39:57.8811307+08:00;True|2021-09-18T17:11:25.8244671+08:00;True|2021-09-18T17:06:57.9615641+08:00;True|2021-09-18T17:06:27.6770090+08:00;True|2021-09-18T15:15:53.6048918+08:00;True|2021-09-18T14:05:32.7398801+08:00;True|2021-09-16T10:50:15.9251386+08:00;True|2021-09-15T14:09:16.0943324+08:00;True|2021-09-15T10:14:47.4423584+08:00;True|2021-09-15T08:59:36.2816348+08:00;True|2021-09-15T08:59:06.0659025+08:00;True|2021-09-14T16:16:01.0927088+08:00;True|2021-09-14T16:05:19.1942230+08:00;True|2021-09-14T15:56:11.9210800+08:00;True|2021-09-14T15:06:22.7913220+08:00;True|2021-09-14T15:02:08.6994309+08:00;True|2021-09-14T13:57:46.5374369+08:00;True|2021-09-03T15:41:55.9346782+08:00;True|2021-09-03T14:42:08.7177144+08:00;True|2021-09-03T14:25:48.3478060+08:00;True|2021-09-01T18:44:04.0108700+08:00;True|2021-09-01T18:29:53.7998254+08:00;True|2021-08-30T18:06:55.0497033+08:00;True|2021-08-30T18:05:30.1878833+08:00;True|2021-08-30T18:01:08.9396673+08:00;True|2021-08-20T16:46:58.8334271+08:00;True|2021-08-20T15:58:15.4685932+08:00;False|2021-08-20T15:57:22.6334777+08:00;True|2021-08-19T09:18:27.4937232+08:00;True|2021-08-18T14:00:51.0789209+08:00;True|2021-08-18T12:49:18.9240148+08:00;True|2021-08-16T19:19:07.4882488+08:00;True|2021-08-16T17:54:03.7980648+08:00;True|2021-08-16T16:42:04.5036000+08:00;True|2021-08-16T16:34:59.3318167+08:00;True|2021-08-16T11:44:06.5450427+08:00;True|2021-08-16T09:39:05.2269990+08:00;True|2021-08-16T09:27:38.2430627+08:00;True|2021-08-16T09:16:32.6871475+08:00;True|2021-08-13T19:05:35.8370416+08:00;True|2021-08-13T17:37:25.5802853+08:00;True|2021-08-13T17:19:17.4059649+08:00;False|2021-08-13T17:15:48.5087232+08:00;True|2021-08-03T16:16:57.5039704+08:00;True|2021-08-03T09:47:15.4422559+08:00;True|2021-08-02T18:03:46.8174207+08:00;True|2021-07-30T18:44:35.7871199+08:00;True|2021-07-30T11:56:15.2793678+08:00;True|2021-07-29T18:16:47.5908488+08:00;True|2021-07-27T19:01:17.3686282+08:00;True|2021-07-27T18:53:15.0096926+08:00;True|2021-07-27T18:21:21.7175389+08:00;True|2021-07-27T18:13:49.7948790+08:00;True|2021-07-27T15:41:28.0096005+08:00;True|2021-07-27T15:17:36.9980637+08:00;True|2021-07-27T15:00:16.3453962+08:00;True|2021-07-27T08:56:31.1152011+08:00;True|2021-07-26T19:39:19.4764644+08:00;True|2021-07-26T16:14:02.0306423+08:00;True|2021-07-26T08:58:05.0743979+08:00;True|2021-07-23T13:52:17.7908297+08:00;True|2021-07-22T15:35:55.8011208+08:00;True|2021-07-22T14:48:57.5607768+08:00;False|2021-07-22T14:46:59.2433604+08:00;True|2021-07-22T11:53:54.1815531+08:00;True|2021-07-22T11:47:55.9402157+08:00;True|2021-07-21T17:07:47.1098636+08:00;False|2021-07-21T17:06:01.8301878+08:00;True|2021-07-21T12:07:33.5528978+08:00;True|2021-07-21T11:58:52.3976494+08:00;True|2021-07-21T11:54:08.4158872+08:00;True|2021-07-21T11:50:06.2472143+08:00;True|2021-07-21T11:36:39.1133844+08:00;True|2021-07-21T11:21:03.0114228+08:00;True|2021-07-21T11:18:17.4408786+08:00;True|2021-07-21T10:36:21.3639256+08:00;True|2021-07-21T10:07:08.7305964+08:00;True|2021-07-21T09:15:25.7452420+08:00;True|2021-07-20T18:30:40.6112889+08:00;True|2021-07-20T18:19:51.3604733+08:00;True|2021-07-20T18:19:32.7342667+08:00;True|2021-07-20T15:49:05.7588163+08:00;True|2021-07-20T11:16:36.9920165+08:00;True|2021-07-20T09:44:44.0514460+08:00;True|2021-07-20T09:38:33.2960380+08:00;True|2021-07-20T09:36:37.6588464+08:00;True|2021-07-19T10:56:12.4079564+08:00;True|2021-07-19T10:54:45.8280558+08:00;True|2021-07-19T09:22:28.3909171+08:00;True|2021-07-16T18:36:35.6023867+08:00;True|2021-07-16T18:16:03.6796336+08:00;True|2021-07-16T18:08:01.0416747+08:00;True|2021-07-16T17:57:30.6066695+08:00;True|2021-07-16T17:53:21.4597207+08:00;True|2021-07-16T16:35:59.3213603+08:00;True|2021-07-16T16:26:27.6700635+08:00;True|2021-07-16T16:14:06.0024712+08:00;True|2021-07-16T15:32:54.4613453+08:00;True|2021-07-16T15:05:27.8158189+08:00;True|2021-07-16T14:24:16.8232207+08:00;True|2021-07-16T14:09:34.4110570+08:00;True|2021-07-16T12:37:38.3718561+08:00;True|2021-07-16T12:34:42.0446442+08:00;True|2021-07-16T12:09:30.6811084+08:00;True|2021-07-16T12:08:25.1323321+08:00;True|2021-07-15T18:21:09.4741333+08:00;True|2021-07-15T16:00:04.2330144+08:00;True|2021-07-15T11:17:10.9557567+08:00;True|2021-07-14T16:23:40.5181594+08:00;True|2021-07-14T16:20:17.1233426+08:00;True|2021-07-14T16:14:59.1470836+08:00;True|2021-07-14T16:04:46.2399479+08:00;True|2021-07-14T16:02:19.2650977+08:00;True|2021-07-13T15:46:35.5148940+08:00;True|2021-07-13T15:19:02.2519981+08:00;True|2021-07-13T15:06:14.1118861+08:00;True|2021-07-13T08:58:19.1590599+08:00;True|2021-07-13T08:58:02.1765233+08:00;True|2021-07-12T19:57:37.5791996+08:00;True|2021-07-12T19:01:26.0226530+08:00;True|2021-07-12T19:00:58.5459964+08:00;True|2021-07-12T18:44:06.2988883+08:00;True|2021-07-12T18:42:53.2208871+08:00;True|2021-07-12T16:20:02.9452975+08:00;True|2021-07-12T16:08:35.4631966+08:00;True|2021-07-12T14:21:19.4579351+08:00;True|2021-07-12T11:59:33.7004439+08:00;True|2021-07-12T10:42:00.9669489+08:00;True|2021-07-09T19:30:48.0460644+08:00;True|2021-07-09T18:56:41.4058881+08:00;True|2021-07-09T18:48:49.6854447+08:00;True|2021-07-09T15:16:44.5457439+08:00;True|2021-07-09T11:42:41.8415232+08:00;False|2021-07-09T11:40:00.5492386+08:00;False|2021-07-09T11:39:47.8261898+08:00;False|2021-07-09T11:39:33.3491518+08:00;True|2021-07-07T18:07:21.3143487+08:00;True|2021-07-07T15:01:52.9270647+08:00;True|2021-07-07T14:57:08.5489994+08:00;True|2021-07-06T15:06:16.9591979+08:00;True|2021-07-06T14:49:44.5144609+08:00;True|2021-07-06T14:41:18.7434877+08:00;True|2021-07-05T18:14:49.0355170+08:00;True|2021-07-05T17:43:08.5712295+08:00;True|2021-07-05T15:47:49.2646754+08:00;True|2021-07-05T11:44:22.5364665+08:00;True|2021-07-05T11:42:03.9579692+08:00;False|2021-07-05T11:41:25.1128083+08:00;True|2021-07-05T11:24:21.1980971+08:00;False|2021-07-05T11:23:17.8024383+08:00;False|2021-07-05T11:22:05.3202914+08:00;False|2021-07-05T11:21:19.3955865+08:00;False|2021-07-05T11:20:46.2006683+08:00;False|2021-07-05T11:12:11.6354737+08:00;True|2021-06-30T16:41:14.2427073+08:00;True|2021-06-30T09:49:43.7585140+08:00;True|2021-06-30T09:38:56.6589900+08:00;True|2021-06-29T15:04:19.4269383+08:00;True|2021-06-29T12:03:02.6003063+08:00;True|2021-06-29T11:59:29.0700912+08:00;True|2021-06-28T19:07:09.6344096+08:00;True|2021-06-28T18:40:56.7729973+08:00;True|2021-06-28T15:07:08.4410491+08:00;True|2021-06-28T15:01:58.1985895+08:00;True|2021-06-28T14:59:46.0509356+08:00;True|2021-06-28T14:53:19.9543052+08:00;True|2021-06-28T14:01:43.2331532+08:00;True|2021-06-25T20:06:38.3250887+08:00;True|2021-06-25T20:05:04.4749130+08:00;True|2021-06-25T20:00:36.7519744+08:00;True|2021-06-25T19:51:29.4909627+08:00;True|2021-06-25T19:49:11.1186471+08:00;True|2021-06-25T19:41:20.5774902+08:00;True|2021-06-25T19:25:44.8011997+08:00;True|2021-06-25T19:12:31.3024305+08:00;True|2021-06-25T19:00:53.4604237+08:00;True|2021-06-25T17:14:22.1867284+08:00;True|2021-06-25T11:51:31.9760987+08:00;True|2021-06-18T15:38:24.8438063+08:00;True|2021-06-17T17:48:16.2507386+08:00;True|2021-06-17T15:27:53.5271385+08:00;True|2021-06-17T14:22:48.1153668+08:00;True|2021-06-16T19:48:54.7395044+08:00;True|2021-06-16T17:46:27.6970936+08:00;True|2021-06-16T17:17:24.5541236+08:00;True|2021-06-12T12:29:11.0670257+08:00;True|2021-06-12T12:13:31.2396353+08:00;True|2021-06-11T20:49:45.8770378+08:00;True|2021-06-11T20:23:35.7345560+08:00;True|2021-06-11T20:10:34.6841746+08:00;True|2021-06-11T20:10:03.8188681+08:00;True|2021-06-11T19:54:05.8278261+08:00;True|2021-06-11T17:54:42.9490044+08:00;True|2021-06-11T17:21:11.7650645+08:00;True|2021-06-11T14:37:24.6531937+08:00;True|2021-06-11T13:42:56.5964775+08:00;True|2021-06-09T12:00:10.0628981+08:00;True|2021-06-09T11:40:36.5754943+08:00;True|2021-06-09T09:14:44.6821751+08:00;True|2021-06-09T09:09:06.9619894+08:00;True|2021-06-07T15:56:56.1351876+08:00;True|2021-06-04T15:14:19.9115059+08:00;True|2021-06-03T17:08:00.6172894+08:00;True|2021-06-03T16:52:05.7356810+08:00;True|2021-06-02T16:13:58.0861859+08:00;True|2021-06-02T16:02:42.0530308+08:00;True|2021-06-02T15:22:59.6255771+08:00;True|2021-06-02T15:13:14.3872212+08:00;True|2021-06-02T13:41:58.0923978+08:00;True|2021-06-02T12:01:40.6200715+08:00;True|2021-06-02T11:55:28.3783673+08:00;True|2021-06-02T11:44:50.4444826+08:00;True|2021-06-02T10:42:05.4504772+08:00;True|2021-06-02T10:40:09.3183688+08:00;True|2021-06-02T10:33:30.9956248+08:00;True|2021-06-01T17:18:04.5340203+08:00;True|2021-06-01T16:01:46.7042467+08:00;True|2021-05-27T15:20:22.1172399+08:00;True|2021-05-27T15:17:25.6282240+08:00;True|2021-05-27T11:23:40.5666700+08:00;True|2021-05-27T11:21:37.4615006+08:00;True|2021-05-26T17:26:09.4150803+08:00;True|2021-05-26T15:56:52.3078548+08:00;True|2021-05-26T12:57:05.6791683+08:00;True|2021-05-26T12:52:55.8456216+08:00;True|2021-05-26T11:52:41.4381234+08:00;True|2021-05-26T10:34:25.1039767+08:00;True|2021-05-25T19:32:45.7536080+08:00;True|2021-05-25T18:57:00.2219334+08:00;True|2021-05-22T19:11:40.6386209+08:00;True|2021-05-22T18:55:54.6950603+08:00;True|2021-05-22T18:52:33.5496260+08:00;True|2021-05-22T18:48:02.8228681+08:00;True|2021-05-22T18:38:35.5427549+08:00;True|2021-05-22T18:29:15.3183375+08:00;True|2021-05-21T16:15:36.2915123+08:00;True|2021-05-20T18:42:10.9502323+08:00;True|2021-05-20T18:29:26.7676948+08:00;True|2021-05-20T12:52:08.9040949+08:00;True|2021-05-18T19:49:14.7589560+08:00;True|2021-05-18T19:45:41.1975778+08:00;True|2021-05-18T17:38:58.7822846+08:00;True|2021-05-18T17:30:55.4408386+08:00;True|2021-05-18T09:59:19.5593712+08:00;True|2021-05-18T09:52:52.2737127+08:00;True|2021-05-18T09:48:53.4093961+08:00;True|2021-05-17T12:45:44.7496366+08:00;True|2021-05-14T15:49:09.7552422+08:00;True|2021-05-12T17:43:57.0007037+08:00;True|2021-05-11T17:56:20.6718351+08:00;True|2021-05-11T09:52:46.7771715+08:00;True|2021-05-11T09:47:59.6677252+08:00;True|2021-05-10T09:20:34.8483836+08:00;True|2021-05-10T09:16:38.9532357+08:00;True|2021-05-08T17:57:58.2859048+08:00;True|2021-05-08T17:42:05.9061123+08:00;True|2021-05-08T15:00:07.8150611+08:00;True|2021-05-08T14:48:31.1810990+08:00;True|2021-05-08T14:44:13.5496714+08:00;True|2021-05-08T14:13:09.0831985+08:00;True|2021-05-08T10:27:05.6731164+08:00;True|2021-05-08T09:40:07.1174765+08:00;True|2021-05-07T17:56:52.4453307+08:00;True|2021-05-07T17:49:29.1426131+08:00;True|2021-05-07T17:48:04.4944047+08:00;True|2021-05-07T11:54:39.3160848+08:00;True|2021-05-07T11:37:44.2078463+08:00;True|2021-05-06T10:15:44.3077632+08:00;False|2021-05-06T09:44:48.6087607+08:00;True|2021-04-30T14:05:04.0635812+08:00;True|2021-04-29T18:12:49.4946496+08:00;True|2021-04-29T18:05:11.3555826+08:00;True|2021-04-29T13:28:14.4016136+08:00;True|2021-04-29T09:49:29.4028858+08:00;True|2021-04-29T09:42:24.9605195+08:00;True|2021-04-29T08:49:42.0809708+08:00;True|2021-04-28T18:20:44.6736811+08:00;True|2021-04-28T16:17:15.1341398+08:00;True|2021-04-28T16:11:29.3588969+08:00;True|2021-04-28T16:07:14.3371000+08:00;True|2021-04-28T15:57:30.5126332+08:00;True|2021-04-28T15:38:50.3339247+08:00;True|2021-04-28T15:34:00.1137165+08:00;True|2021-04-26T18:28:09.2009690+08:00;True|2021-04-26T18:27:09.0671228+08:00;True|2021-04-26T17:37:50.3470017+08:00;True|2021-04-26T16:39:26.1331794+08:00;True|2021-04-26T16:37:55.0874184+08:00;True|2021-04-26T15:00:51.7607134+08:00;True|2021-04-26T13:57:19.6127526+08:00;True|2021-04-26T13:50:31.1704563+08:00;True|2021-04-26T13:26:56.4316438+08:00;True|2021-04-26T13:25:20.3680008+08:00;True|2021-04-26T12:14:01.1219655+08:00;True|2021-04-25T14:17:57.1985553+08:00;True|2021-04-25T09:17:34.5110190+08:00;True|2021-04-23T18:24:24.7539026+08:00;True|2021-04-23T15:11:34.0534044+08:00;True|2021-04-23T15:02:02.8339117+08:00;True|2021-04-23T14:57:30.5567589+08:00;True|2021-04-23T14:06:54.1317500+08:00;True|2021-04-22T17:56:05.1027452+08:00;True|2021-04-22T17:38:24.8160777+08:00;True|2021-04-22T17:04:15.4424275+08:00;True|2021-04-22T14:57:45.6592871+08:00;True|2021-04-22T10:57:56.9824541+08:00;True|2021-04-22T10:10:28.7976942+08:00;True|2021-04-22T09:06:01.1618269+08:00;True|2021-04-22T09:04:39.3001346+08:00;True|2021-04-22T09:03:11.8192098+08:00;True|2021-04-22T09:00:04.8625119+08:00;True|2021-04-21T14:53:13.1270439+08:00;True|2021-04-21T14:22:45.4885992+08:00;True|2021-04-21T12:53:06.1357977+08:00;True|2021-04-21T11:39:19.8279739+08:00;True|2021-04-21T11:27:05.2539879+08:00;True|2021-04-21T11:13:04.9842347+08:00;True|2021-04-21T09:50:20.8545149+08:00;True|2021-04-21T08:57:13.9684906+08:00;True|2021-04-21T08:56:26.6122006+08:00;True|2021-04-20T18:41:54.1939781+08:00;True|2021-04-20T10:42:00.8315845+08:00;True|2021-04-20T10:13:24.3801430+08:00;True|2021-04-20T09:09:27.5545063+08:00;True|2021-04-19T18:14:00.9901563+08:00;True|2021-04-19T16:34:00.7300768+08:00;True|2021-04-19T11:30:55.5776214+08:00;True|2021-04-16T15:35:34.4897823+08:00;True|2021-04-16T15:30:17.9854672+08:00;True|2021-04-16T13:30:55.9691229+08:00;True|2021-04-16T11:41:21.4250764+08:00;True|2021-04-16T10:16:53.9487848+08:00;True|2021-04-15T18:09:42.7678653+08:00;True|2021-04-15T15:32:44.3465906+08:00;True|2021-04-15T15:18:29.9058483+08:00; + <_PublishTargetUrl>F:\DJY.AMS\ams\djy.WebApi\bin\publish\net5 + True|2022-05-18T01:06:11.5118231Z;True|2022-05-17T16:08:22.9679914+08:00;True|2022-02-07T09:32:52.8608715+08:00;True|2022-01-29T15:30:35.5581322+08:00;True|2022-01-29T15:13:03.4191677+08:00;True|2022-01-29T14:52:16.3700211+08:00;True|2022-01-29T14:48:59.8000767+08:00;True|2022-01-29T14:45:14.4545309+08:00;True|2022-01-29T14:38:57.6540259+08:00;True|2022-01-29T13:36:16.2370205+08:00;True|2022-01-29T11:46:45.8432136+08:00;True|2022-01-29T11:20:54.2763765+08:00;True|2022-01-29T11:16:23.0172880+08:00;True|2022-01-29T11:06:15.3648999+08:00;True|2022-01-29T11:00:39.8926536+08:00;True|2022-01-28T14:35:21.7742884+08:00;True|2022-01-28T13:44:47.5005402+08:00;True|2021-12-20T11:12:24.1869686+08:00;True|2021-11-26T12:47:48.5784236+08:00;True|2021-11-25T10:09:49.9433864+08:00;True|2021-11-25T09:37:00.6093292+08:00;True|2021-11-25T09:05:31.9387896+08:00;True|2021-11-24T10:06:36.4353299+08:00;True|2021-11-24T10:05:50.0214052+08:00;True|2021-11-24T10:04:55.3930475+08:00;True|2021-11-24T09:54:45.9711710+08:00;True|2021-11-19T17:28:36.8788911+08:00;True|2021-11-11T11:47:53.2238106+08:00;True|2021-10-25T16:41:53.9980026+08:00;True|2021-10-25T16:30:28.1828641+08:00;True|2021-10-25T16:18:43.4003442+08:00;True|2021-10-25T11:56:15.6402921+08:00;True|2021-10-25T11:40:19.5447536+08:00;True|2021-10-25T10:07:48.9805552+08:00;True|2021-10-25T10:04:10.8948265+08:00;True|2021-10-25T09:48:27.3849674+08:00;True|2021-09-29T11:49:51.8683715+08:00;True|2021-09-28T18:32:55.3507925+08:00;True|2021-09-28T18:29:53.9063524+08:00;True|2021-09-28T18:28:36.1979045+08:00;True|2021-09-28T18:27:14.0693618+08:00;True|2021-09-28T12:04:26.3279007+08:00;True|2021-09-28T12:04:10.3945227+08:00;True|2021-09-28T12:03:10.3904100+08:00;True|2021-09-28T11:37:45.0482277+08:00;True|2021-09-28T11:37:12.9467611+08:00;True|2021-09-28T11:35:18.4356807+08:00;True|2021-09-28T11:34:57.5857798+08:00;True|2021-09-28T11:32:07.3952665+08:00;True|2021-09-28T11:31:56.0472675+08:00;True|2021-09-28T11:02:58.7231551+08:00;True|2021-09-28T11:02:24.3314587+08:00;True|2021-09-23T10:33:17.0585227+08:00;True|2021-09-23T10:15:28.5669869+08:00;True|2021-09-22T15:38:36.5949208+08:00;True|2021-09-22T15:37:14.3895150+08:00;True|2021-09-22T15:15:34.1096071+08:00;True|2021-09-22T13:54:04.9092004+08:00;True|2021-09-22T13:51:07.7860433+08:00;True|2021-09-22T13:48:44.1657158+08:00;True|2021-09-22T11:43:23.7675767+08:00;True|2021-09-22T11:39:57.8811307+08:00;True|2021-09-18T17:11:25.8244671+08:00;True|2021-09-18T17:06:57.9615641+08:00;True|2021-09-18T17:06:27.6770090+08:00;True|2021-09-18T15:15:53.6048918+08:00;True|2021-09-18T14:05:32.7398801+08:00;True|2021-09-16T10:50:15.9251386+08:00;True|2021-09-15T14:09:16.0943324+08:00;True|2021-09-15T10:14:47.4423584+08:00;True|2021-09-15T08:59:36.2816348+08:00;True|2021-09-15T08:59:06.0659025+08:00;True|2021-09-14T16:16:01.0927088+08:00;True|2021-09-14T16:05:19.1942230+08:00;True|2021-09-14T15:56:11.9210800+08:00;True|2021-09-14T15:06:22.7913220+08:00;True|2021-09-14T15:02:08.6994309+08:00;True|2021-09-14T13:57:46.5374369+08:00;True|2021-09-03T15:41:55.9346782+08:00;True|2021-09-03T14:42:08.7177144+08:00;True|2021-09-03T14:25:48.3478060+08:00;True|2021-09-01T18:44:04.0108700+08:00;True|2021-09-01T18:29:53.7998254+08:00;True|2021-08-30T18:06:55.0497033+08:00;True|2021-08-30T18:05:30.1878833+08:00;True|2021-08-30T18:01:08.9396673+08:00;True|2021-08-20T16:46:58.8334271+08:00;True|2021-08-20T15:58:15.4685932+08:00;False|2021-08-20T15:57:22.6334777+08:00;True|2021-08-19T09:18:27.4937232+08:00;True|2021-08-18T14:00:51.0789209+08:00;True|2021-08-18T12:49:18.9240148+08:00;True|2021-08-16T19:19:07.4882488+08:00;True|2021-08-16T17:54:03.7980648+08:00;True|2021-08-16T16:42:04.5036000+08:00;True|2021-08-16T16:34:59.3318167+08:00;True|2021-08-16T11:44:06.5450427+08:00;True|2021-08-16T09:39:05.2269990+08:00;True|2021-08-16T09:27:38.2430627+08:00;True|2021-08-16T09:16:32.6871475+08:00;True|2021-08-13T19:05:35.8370416+08:00;True|2021-08-13T17:37:25.5802853+08:00;True|2021-08-13T17:19:17.4059649+08:00;False|2021-08-13T17:15:48.5087232+08:00;True|2021-08-03T16:16:57.5039704+08:00;True|2021-08-03T09:47:15.4422559+08:00;True|2021-08-02T18:03:46.8174207+08:00;True|2021-07-30T18:44:35.7871199+08:00;True|2021-07-30T11:56:15.2793678+08:00;True|2021-07-29T18:16:47.5908488+08:00;True|2021-07-27T19:01:17.3686282+08:00;True|2021-07-27T18:53:15.0096926+08:00;True|2021-07-27T18:21:21.7175389+08:00;True|2021-07-27T18:13:49.7948790+08:00;True|2021-07-27T15:41:28.0096005+08:00;True|2021-07-27T15:17:36.9980637+08:00;True|2021-07-27T15:00:16.3453962+08:00;True|2021-07-27T08:56:31.1152011+08:00;True|2021-07-26T19:39:19.4764644+08:00;True|2021-07-26T16:14:02.0306423+08:00;True|2021-07-26T08:58:05.0743979+08:00;True|2021-07-23T13:52:17.7908297+08:00;True|2021-07-22T15:35:55.8011208+08:00;True|2021-07-22T14:48:57.5607768+08:00;False|2021-07-22T14:46:59.2433604+08:00;True|2021-07-22T11:53:54.1815531+08:00;True|2021-07-22T11:47:55.9402157+08:00;True|2021-07-21T17:07:47.1098636+08:00;False|2021-07-21T17:06:01.8301878+08:00;True|2021-07-21T12:07:33.5528978+08:00;True|2021-07-21T11:58:52.3976494+08:00;True|2021-07-21T11:54:08.4158872+08:00;True|2021-07-21T11:50:06.2472143+08:00;True|2021-07-21T11:36:39.1133844+08:00;True|2021-07-21T11:21:03.0114228+08:00;True|2021-07-21T11:18:17.4408786+08:00;True|2021-07-21T10:36:21.3639256+08:00;True|2021-07-21T10:07:08.7305964+08:00;True|2021-07-21T09:15:25.7452420+08:00;True|2021-07-20T18:30:40.6112889+08:00;True|2021-07-20T18:19:51.3604733+08:00;True|2021-07-20T18:19:32.7342667+08:00;True|2021-07-20T15:49:05.7588163+08:00;True|2021-07-20T11:16:36.9920165+08:00;True|2021-07-20T09:44:44.0514460+08:00;True|2021-07-20T09:38:33.2960380+08:00;True|2021-07-20T09:36:37.6588464+08:00;True|2021-07-19T10:56:12.4079564+08:00;True|2021-07-19T10:54:45.8280558+08:00;True|2021-07-19T09:22:28.3909171+08:00;True|2021-07-16T18:36:35.6023867+08:00;True|2021-07-16T18:16:03.6796336+08:00;True|2021-07-16T18:08:01.0416747+08:00;True|2021-07-16T17:57:30.6066695+08:00;True|2021-07-16T17:53:21.4597207+08:00;True|2021-07-16T16:35:59.3213603+08:00;True|2021-07-16T16:26:27.6700635+08:00;True|2021-07-16T16:14:06.0024712+08:00;True|2021-07-16T15:32:54.4613453+08:00;True|2021-07-16T15:05:27.8158189+08:00;True|2021-07-16T14:24:16.8232207+08:00;True|2021-07-16T14:09:34.4110570+08:00;True|2021-07-16T12:37:38.3718561+08:00;True|2021-07-16T12:34:42.0446442+08:00;True|2021-07-16T12:09:30.6811084+08:00;True|2021-07-16T12:08:25.1323321+08:00;True|2021-07-15T18:21:09.4741333+08:00;True|2021-07-15T16:00:04.2330144+08:00;True|2021-07-15T11:17:10.9557567+08:00;True|2021-07-14T16:23:40.5181594+08:00;True|2021-07-14T16:20:17.1233426+08:00;True|2021-07-14T16:14:59.1470836+08:00;True|2021-07-14T16:04:46.2399479+08:00;True|2021-07-14T16:02:19.2650977+08:00;True|2021-07-13T15:46:35.5148940+08:00;True|2021-07-13T15:19:02.2519981+08:00;True|2021-07-13T15:06:14.1118861+08:00;True|2021-07-13T08:58:19.1590599+08:00;True|2021-07-13T08:58:02.1765233+08:00;True|2021-07-12T19:57:37.5791996+08:00;True|2021-07-12T19:01:26.0226530+08:00;True|2021-07-12T19:00:58.5459964+08:00;True|2021-07-12T18:44:06.2988883+08:00;True|2021-07-12T18:42:53.2208871+08:00;True|2021-07-12T16:20:02.9452975+08:00;True|2021-07-12T16:08:35.4631966+08:00;True|2021-07-12T14:21:19.4579351+08:00;True|2021-07-12T11:59:33.7004439+08:00;True|2021-07-12T10:42:00.9669489+08:00;True|2021-07-09T19:30:48.0460644+08:00;True|2021-07-09T18:56:41.4058881+08:00;True|2021-07-09T18:48:49.6854447+08:00;True|2021-07-09T15:16:44.5457439+08:00;True|2021-07-09T11:42:41.8415232+08:00;False|2021-07-09T11:40:00.5492386+08:00;False|2021-07-09T11:39:47.8261898+08:00;False|2021-07-09T11:39:33.3491518+08:00;True|2021-07-07T18:07:21.3143487+08:00;True|2021-07-07T15:01:52.9270647+08:00;True|2021-07-07T14:57:08.5489994+08:00;True|2021-07-06T15:06:16.9591979+08:00;True|2021-07-06T14:49:44.5144609+08:00;True|2021-07-06T14:41:18.7434877+08:00;True|2021-07-05T18:14:49.0355170+08:00;True|2021-07-05T17:43:08.5712295+08:00;True|2021-07-05T15:47:49.2646754+08:00;True|2021-07-05T11:44:22.5364665+08:00;True|2021-07-05T11:42:03.9579692+08:00;False|2021-07-05T11:41:25.1128083+08:00;True|2021-07-05T11:24:21.1980971+08:00;False|2021-07-05T11:23:17.8024383+08:00;False|2021-07-05T11:22:05.3202914+08:00;False|2021-07-05T11:21:19.3955865+08:00;False|2021-07-05T11:20:46.2006683+08:00;False|2021-07-05T11:12:11.6354737+08:00;True|2021-06-30T16:41:14.2427073+08:00;True|2021-06-30T09:49:43.7585140+08:00;True|2021-06-30T09:38:56.6589900+08:00;True|2021-06-29T15:04:19.4269383+08:00;True|2021-06-29T12:03:02.6003063+08:00;True|2021-06-29T11:59:29.0700912+08:00;True|2021-06-28T19:07:09.6344096+08:00;True|2021-06-28T18:40:56.7729973+08:00;True|2021-06-28T15:07:08.4410491+08:00;True|2021-06-28T15:01:58.1985895+08:00;True|2021-06-28T14:59:46.0509356+08:00;True|2021-06-28T14:53:19.9543052+08:00;True|2021-06-28T14:01:43.2331532+08:00;True|2021-06-25T20:06:38.3250887+08:00;True|2021-06-25T20:05:04.4749130+08:00;True|2021-06-25T20:00:36.7519744+08:00;True|2021-06-25T19:51:29.4909627+08:00;True|2021-06-25T19:49:11.1186471+08:00;True|2021-06-25T19:41:20.5774902+08:00;True|2021-06-25T19:25:44.8011997+08:00;True|2021-06-25T19:12:31.3024305+08:00;True|2021-06-25T19:00:53.4604237+08:00;True|2021-06-25T17:14:22.1867284+08:00;True|2021-06-25T11:51:31.9760987+08:00;True|2021-06-18T15:38:24.8438063+08:00;True|2021-06-17T17:48:16.2507386+08:00;True|2021-06-17T15:27:53.5271385+08:00;True|2021-06-17T14:22:48.1153668+08:00;True|2021-06-16T19:48:54.7395044+08:00;True|2021-06-16T17:46:27.6970936+08:00;True|2021-06-16T17:17:24.5541236+08:00;True|2021-06-12T12:29:11.0670257+08:00;True|2021-06-12T12:13:31.2396353+08:00;True|2021-06-11T20:49:45.8770378+08:00;True|2021-06-11T20:23:35.7345560+08:00;True|2021-06-11T20:10:34.6841746+08:00;True|2021-06-11T20:10:03.8188681+08:00;True|2021-06-11T19:54:05.8278261+08:00;True|2021-06-11T17:54:42.9490044+08:00;True|2021-06-11T17:21:11.7650645+08:00;True|2021-06-11T14:37:24.6531937+08:00;True|2021-06-11T13:42:56.5964775+08:00;True|2021-06-09T12:00:10.0628981+08:00;True|2021-06-09T11:40:36.5754943+08:00;True|2021-06-09T09:14:44.6821751+08:00;True|2021-06-09T09:09:06.9619894+08:00;True|2021-06-07T15:56:56.1351876+08:00;True|2021-06-04T15:14:19.9115059+08:00;True|2021-06-03T17:08:00.6172894+08:00;True|2021-06-03T16:52:05.7356810+08:00;True|2021-06-02T16:13:58.0861859+08:00;True|2021-06-02T16:02:42.0530308+08:00;True|2021-06-02T15:22:59.6255771+08:00;True|2021-06-02T15:13:14.3872212+08:00;True|2021-06-02T13:41:58.0923978+08:00;True|2021-06-02T12:01:40.6200715+08:00;True|2021-06-02T11:55:28.3783673+08:00;True|2021-06-02T11:44:50.4444826+08:00;True|2021-06-02T10:42:05.4504772+08:00;True|2021-06-02T10:40:09.3183688+08:00;True|2021-06-02T10:33:30.9956248+08:00;True|2021-06-01T17:18:04.5340203+08:00;True|2021-06-01T16:01:46.7042467+08:00;True|2021-05-27T15:20:22.1172399+08:00;True|2021-05-27T15:17:25.6282240+08:00;True|2021-05-27T11:23:40.5666700+08:00;True|2021-05-27T11:21:37.4615006+08:00;True|2021-05-26T17:26:09.4150803+08:00;True|2021-05-26T15:56:52.3078548+08:00;True|2021-05-26T12:57:05.6791683+08:00;True|2021-05-26T12:52:55.8456216+08:00;True|2021-05-26T11:52:41.4381234+08:00;True|2021-05-26T10:34:25.1039767+08:00;True|2021-05-25T19:32:45.7536080+08:00;True|2021-05-25T18:57:00.2219334+08:00;True|2021-05-22T19:11:40.6386209+08:00;True|2021-05-22T18:55:54.6950603+08:00;True|2021-05-22T18:52:33.5496260+08:00;True|2021-05-22T18:48:02.8228681+08:00;True|2021-05-22T18:38:35.5427549+08:00;True|2021-05-22T18:29:15.3183375+08:00;True|2021-05-21T16:15:36.2915123+08:00;True|2021-05-20T18:42:10.9502323+08:00;True|2021-05-20T18:29:26.7676948+08:00;True|2021-05-20T12:52:08.9040949+08:00;True|2021-05-18T19:49:14.7589560+08:00;True|2021-05-18T19:45:41.1975778+08:00;True|2021-05-18T17:38:58.7822846+08:00;True|2021-05-18T17:30:55.4408386+08:00;True|2021-05-18T09:59:19.5593712+08:00;True|2021-05-18T09:52:52.2737127+08:00;True|2021-05-18T09:48:53.4093961+08:00;True|2021-05-17T12:45:44.7496366+08:00;True|2021-05-14T15:49:09.7552422+08:00;True|2021-05-12T17:43:57.0007037+08:00;True|2021-05-11T17:56:20.6718351+08:00;True|2021-05-11T09:52:46.7771715+08:00;True|2021-05-11T09:47:59.6677252+08:00;True|2021-05-10T09:20:34.8483836+08:00;True|2021-05-10T09:16:38.9532357+08:00;True|2021-05-08T17:57:58.2859048+08:00;True|2021-05-08T17:42:05.9061123+08:00;True|2021-05-08T15:00:07.8150611+08:00;True|2021-05-08T14:48:31.1810990+08:00;True|2021-05-08T14:44:13.5496714+08:00;True|2021-05-08T14:13:09.0831985+08:00;True|2021-05-08T10:27:05.6731164+08:00;True|2021-05-08T09:40:07.1174765+08:00;True|2021-05-07T17:56:52.4453307+08:00;True|2021-05-07T17:49:29.1426131+08:00;True|2021-05-07T17:48:04.4944047+08:00;True|2021-05-07T11:54:39.3160848+08:00;True|2021-05-07T11:37:44.2078463+08:00;True|2021-05-06T10:15:44.3077632+08:00;False|2021-05-06T09:44:48.6087607+08:00;True|2021-04-30T14:05:04.0635812+08:00;True|2021-04-29T18:12:49.4946496+08:00;True|2021-04-29T18:05:11.3555826+08:00;True|2021-04-29T13:28:14.4016136+08:00;True|2021-04-29T09:49:29.4028858+08:00;True|2021-04-29T09:42:24.9605195+08:00;True|2021-04-29T08:49:42.0809708+08:00;True|2021-04-28T18:20:44.6736811+08:00;True|2021-04-28T16:17:15.1341398+08:00;True|2021-04-28T16:11:29.3588969+08:00;True|2021-04-28T16:07:14.3371000+08:00;True|2021-04-28T15:57:30.5126332+08:00;True|2021-04-28T15:38:50.3339247+08:00;True|2021-04-28T15:34:00.1137165+08:00;True|2021-04-26T18:28:09.2009690+08:00;True|2021-04-26T18:27:09.0671228+08:00;True|2021-04-26T17:37:50.3470017+08:00;True|2021-04-26T16:39:26.1331794+08:00;True|2021-04-26T16:37:55.0874184+08:00;True|2021-04-26T15:00:51.7607134+08:00;True|2021-04-26T13:57:19.6127526+08:00;True|2021-04-26T13:50:31.1704563+08:00;True|2021-04-26T13:26:56.4316438+08:00;True|2021-04-26T13:25:20.3680008+08:00;True|2021-04-26T12:14:01.1219655+08:00;True|2021-04-25T14:17:57.1985553+08:00;True|2021-04-25T09:17:34.5110190+08:00;True|2021-04-23T18:24:24.7539026+08:00;True|2021-04-23T15:11:34.0534044+08:00;True|2021-04-23T15:02:02.8339117+08:00;True|2021-04-23T14:57:30.5567589+08:00;True|2021-04-23T14:06:54.1317500+08:00;True|2021-04-22T17:56:05.1027452+08:00;True|2021-04-22T17:38:24.8160777+08:00;True|2021-04-22T17:04:15.4424275+08:00;True|2021-04-22T14:57:45.6592871+08:00;True|2021-04-22T10:57:56.9824541+08:00;True|2021-04-22T10:10:28.7976942+08:00;True|2021-04-22T09:06:01.1618269+08:00;True|2021-04-22T09:04:39.3001346+08:00;True|2021-04-22T09:03:11.8192098+08:00;True|2021-04-22T09:00:04.8625119+08:00;True|2021-04-21T14:53:13.1270439+08:00;True|2021-04-21T14:22:45.4885992+08:00;True|2021-04-21T12:53:06.1357977+08:00;True|2021-04-21T11:39:19.8279739+08:00;True|2021-04-21T11:27:05.2539879+08:00;True|2021-04-21T11:13:04.9842347+08:00;True|2021-04-21T09:50:20.8545149+08:00;True|2021-04-21T08:57:13.9684906+08:00;True|2021-04-21T08:56:26.6122006+08:00;True|2021-04-20T18:41:54.1939781+08:00;True|2021-04-20T10:42:00.8315845+08:00;True|2021-04-20T10:13:24.3801430+08:00;True|2021-04-20T09:09:27.5545063+08:00;True|2021-04-19T18:14:00.9901563+08:00;True|2021-04-19T16:34:00.7300768+08:00;True|2021-04-19T11:30:55.5776214+08:00;True|2021-04-16T15:35:34.4897823+08:00;True|2021-04-16T15:30:17.9854672+08:00;True|2021-04-16T13:30:55.9691229+08:00;True|2021-04-16T11:41:21.4250764+08:00;True|2021-04-16T10:16:53.9487848+08:00;True|2021-04-15T18:09:42.7678653+08:00;True|2021-04-15T15:32:44.3465906+08:00;True|2021-04-15T15:18:29.9058483+08:00; \ No newline at end of file diff --git a/ams/djy.WebApi/Startup.cs b/ams/djy.WebApi/Startup.cs index 7ece54b..8794e5f 100644 --- a/ams/djy.WebApi/Startup.cs +++ b/ams/djy.WebApi/Startup.cs @@ -46,11 +46,11 @@ namespace djy_AmsApi //ȡϢ - Configuration.Bind("WebConfig", sysOptionConfig.YsWebconfig); + Configuration.Bind("WebConfig", sysOptionConfig.Webconfig); sysOptionConfig._Configuration = Configuration; services.AddAuthentication("Bearer").AddJwtBearer("Bearer",option=> { - option.Authority = sysOptionConfig.YsWebconfig.IdentServerUrl;//ȨURlַ + option.Authority = sysOptionConfig.Webconfig.IdentServerUrl;//ȨURlַ option.RequireHttpsMetadata = false;//Ƿʹhttps option.TokenValidationParameters = new Microsoft.IdentityModel.Tokens.TokenValidationParameters { ValidateAudience = false }; @@ -76,26 +76,26 @@ namespace djy_AmsApi // services.AddHangfire(config => { - config.UseRedisStorage(sysOptionConfig.YsWebconfig.Redis, new Hangfire.Redis.RedisStorageOptions { Prefix = "hf_"+sysOptionConfig.YsWebconfig.WebName,InvisibilityTimeout=TimeSpan.FromHours(1) }); + config.UseRedisStorage(sysOptionConfig.Webconfig.Redis, new Hangfire.Redis.RedisStorageOptions { Prefix = "hf_"+sysOptionConfig.Webconfig.WebName,InvisibilityTimeout=TimeSpan.FromHours(1) }); }); services.AddHangfireServer(); //CAP Ϣ - if (sysOptionConfig.YsWebconfig.Rbmq_Host.IsNotNull()) + if (sysOptionConfig.Webconfig.Rbmq_Host.IsNotNull()) { services.AddCap(x => { - x.UseSqlServer(sysOptionConfig.YsWebconfig.Rbmq_Sqlhost); + x.UseSqlServer(sysOptionConfig.Webconfig.Rbmq_Sqlhost); x.UseRabbitMQ(options => { - var _host = sysOptionConfig.YsWebconfig.Rbmq_Host.Split(':'); + var _host = sysOptionConfig.Webconfig.Rbmq_Host.Split(':'); options.HostName = _host[0]; if (_host.Length == 2) { options.Port = int.Parse(_host[1]); } - options.UserName = sysOptionConfig.YsWebconfig.Rbmq_UserName; - options.Password = sysOptionConfig.YsWebconfig.Rbmq_Password; + options.UserName = sysOptionConfig.Webconfig.Rbmq_UserName; + options.Password = sysOptionConfig.Webconfig.Rbmq_Password; }); x.UseDashboard(); });