From 7d3133c79d2f8485c1ccaf286ef01f2a66825680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E6=95=8F=E5=81=A5?= Date: Tue, 10 Dec 2024 09:03:59 +0800 Subject: [PATCH] 1 --- .../Entity/SysU8AccountConfig.cs | 6 + .../UFIDA.U8.Framework.Api.Common.csproj | 12 +- UFIDA.U8.Framework.Api.Common/packages.config | 6 +- .../AP/UFAPBO.cs | 74 +++--- .../Common/APARHelper.cs | 17 +- .../Common/CommonHelper.cs | 234 +++++++++-------- .../{Models => Entity}/BaseResult.cs | 2 +- .../{Models => Entity}/LoginParamter.cs | 2 +- .../{Models => Entity}/StatusEnum.cs | 3 +- .../{Models => Entity}/SysU8AccountConfig.cs | 2 +- .../ST/USERPCO.cs | 6 +- .../U8M/BaseLogin.cs | 4 +- .../U8M/IBaseBF.cs | 2 +- .../U8M/MOrder.cs | 5 +- .../U8M/MoRoutingBill.cs | 2 +- .../U8M/StandardBom.cs | 2 +- ...FIDA.U8.Framework.Api.ControlObject.csproj | 48 +--- .../app.config | 4 + .../packages.config | 8 +- UFIDA.U8.Framework.Api.Tests/App.config | 18 +- .../ILLink.Descriptors.LibraryBuild.xml | 8 + .../UFIDA.U8.Framework.Api.Tests.csproj | 93 +++---- UFIDA.U8.Framework.Api.Tests/packages.config | 36 +-- UFIDA.U8.Framework.Api/App_Data/U8API.xml | 28 ++- .../Controllers/CommonController.cs | 2 +- .../Controllers/U8/APController.cs | 2 +- .../Controllers/U8/DPController.cs | 110 ++++++++ .../Controllers/U8/SFCController.cs | 7 +- .../Controllers/U8/STController.cs | 2 +- .../ILLink.Descriptors.LibraryBuild.xml | 8 + .../Models/U8AccountConfigInput.cs | 2 +- .../UFIDA.U8.Framework.Api.csproj | 235 +++++++++--------- .../Unit/AssemblyDynamicLoader.cs | 2 +- UFIDA.U8.Framework.Api/Unit/CommUnit.cs | 2 +- UFIDA.U8.Framework.Api/Unit/RemoteLoader.cs | 2 +- UFIDA.U8.Framework.Api/Web.config | 48 ++-- UFIDA.U8.Framework.Api/packages.config | 124 ++++----- 37 files changed, 678 insertions(+), 490 deletions(-) rename UFIDA.U8.Framework.Api.ControlObject/{Models => Entity}/BaseResult.cs (84%) rename UFIDA.U8.Framework.Api.ControlObject/{Models => Entity}/LoginParamter.cs (96%) rename UFIDA.U8.Framework.Api.ControlObject/{Models => Entity}/StatusEnum.cs (90%) rename UFIDA.U8.Framework.Api.ControlObject/{Models => Entity}/SysU8AccountConfig.cs (96%) create mode 100644 UFIDA.U8.Framework.Api.Tests/ILLink/ILLink.Descriptors.LibraryBuild.xml create mode 100644 UFIDA.U8.Framework.Api/Controllers/U8/DPController.cs create mode 100644 UFIDA.U8.Framework.Api/ILLink/ILLink.Descriptors.LibraryBuild.xml diff --git a/UFIDA.U8.Framework.Api.Common/Entity/SysU8AccountConfig.cs b/UFIDA.U8.Framework.Api.Common/Entity/SysU8AccountConfig.cs index 932adeb..9f3bc0d 100644 --- a/UFIDA.U8.Framework.Api.Common/Entity/SysU8AccountConfig.cs +++ b/UFIDA.U8.Framework.Api.Common/Entity/SysU8AccountConfig.cs @@ -68,6 +68,12 @@ namespace UFIDA.U8.Framework.Api.Common.Entity [SugarColumn(ColumnDescription = "状态")] public virtual StatusEnum Status { get; set; } = StatusEnum.Enable; + /// + /// 是否外部登录 + /// + [SugarColumn(ColumnDescription = "是否外部登录")] + public virtual bool bOutLogin { get; set; } = false; + /// /// 备注 /// diff --git a/UFIDA.U8.Framework.Api.Common/UFIDA.U8.Framework.Api.Common.csproj b/UFIDA.U8.Framework.Api.Common/UFIDA.U8.Framework.Api.Common.csproj index c524159..6e08b52 100644 --- a/UFIDA.U8.Framework.Api.Common/UFIDA.U8.Framework.Api.Common.csproj +++ b/UFIDA.U8.Framework.Api.Common/UFIDA.U8.Framework.Api.Common.csproj @@ -34,19 +34,21 @@ - ..\packages\BouncyCastle.Cryptography.2.4.0\lib\net461\BouncyCastle.Cryptography.dll + ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll - - ..\packages\log4net.2.0.17\lib\net45\log4net.dll + + ..\packages\log4net.3.0.3\lib\net462\log4net.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\packages\SqlSugar.5.1.4.166\lib\SqlSugar.dll + + ..\packages\SqlSugar.5.1.4.170\lib\SqlSugar.dll + + diff --git a/UFIDA.U8.Framework.Api.Common/packages.config b/UFIDA.U8.Framework.Api.Common/packages.config index c1ae9e6..21de1d6 100644 --- a/UFIDA.U8.Framework.Api.Common/packages.config +++ b/UFIDA.U8.Framework.Api.Common/packages.config @@ -1,7 +1,7 @@  - - + + - + \ No newline at end of file diff --git a/UFIDA.U8.Framework.Api.ControlObject/AP/UFAPBO.cs b/UFIDA.U8.Framework.Api.ControlObject/AP/UFAPBO.cs index e144fce..b811bbc 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/AP/UFAPBO.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/AP/UFAPBO.cs @@ -3,10 +3,8 @@ using System; using System.Collections.Generic; using ADODB; using MSXML2; -using NoteManageAR; using UFIDA.U8.Framework.Api.ControlObject.Common; -using UFIDA.U8.Framework.Api.ControlObject.Json; -using UFIDA.U8.Framework.Api.ControlObject.Models; +using UFIDA.U8.Framework.Api.ControlObject.Entity; using UFIDA.U8.Framework.Api.ControlObject.U8M; // ReSharper disable IdentifierTypo @@ -153,41 +151,41 @@ namespace UFIDA.U8.Framework.Api.ControlObject.AP if (cSubId == "AR") { - var pub = "NoteManageAR.clsPub".GetComObject(); + //var pub = "NoteManageAR.clsPub".GetComObject(); - pub.main(m_Login); + //pub.main(m_Login); - var ar = "NoteManageAR.Voucher".GetComObject(); + //var ar = "NoteManageAR.Voucher".GetComObject(); - ar.Init(m_Login, pub.RepSys, pub.RepManager); + //ar.Init(m_Login, pub.RepSys, pub.RepManager); - var da = new VoucherDataClass(); + //var da = new VoucherDataClass(); - var apar = new APARHelper(da); + //var apar = new APARHelper(da); - ar.m_bStartFlag = false; - ar.bLastYearBill = false; - ar.m_strCardNum = "RP02"; - ar.m_strVoucherType = "50"; - ar.m_strVoucherDirect = pub.strNoteDirect; + //ar.m_bStartFlag = false; + //ar.bLastYearBill = false; + //ar.m_strCardNum = "RP02"; + //ar.m_strVoucherType = "50"; + //ar.m_strVoucherDirect = pub.strNoteDirect; - //ar.bUpdateiAmount = true; - //ar.NotExec = true; - //ar.NotExec = true; - ar.objPub = pub; + ////ar.bUpdateiAmount = true; + ////ar.NotExec = true; + ////ar.NotExec = true; + //ar.objPub = pub; - apar.SetValue(dictionary); + //apar.SetValue(dictionary); - ar.m_strVoucherID = da.CVouchId; - ar.m_VoucherHead = domHead; - ar.OneVoucherData = da; + //ar.m_strVoucherID = da.CVouchId; + //ar.m_VoucherHead = domHead; + //ar.OneVoucherData = da; - ar.bNeedBillClosed = true; + //ar.bNeedBillClosed = true; //da.cVouchTypeName = "银行承兑汇票"; //da.cPayBillBank = "华夏银行股份有限公司深圳分行营业部"; @@ -203,28 +201,28 @@ namespace UFIDA.U8.Framework.Api.ControlObject.AP //msg = ""; - if (!ar.NoteCheck(da, ref msg)) - { - throw new Exception(msg); - } - msg = ""; + //if (!ar.NoteCheck(da, ref msg)) + //{ + // throw new Exception(msg); + //} + //msg = ""; - if (!ar.NoteSave(da, ref msg)) - { - throw new Exception(msg); - } + //if (!ar.NoteSave(da, ref msg)) + //{ + // throw new Exception(msg); + //} - //ar.re + ////ar.re - //var bo = "UFAPBO.clsApNote".GetComObject(); - var apPub = "NoteManageAR.PZ_Proc".GetComObject(); + ////var bo = "UFAPBO.clsApNote".GetComObject(); + //var apPub = "NoteManageAR.PZ_Proc".GetComObject(); - apPub.objPub = pub; + //apPub.objPub = pub; - var aa=apPub.ProcSign("9A"); + //var aa=apPub.ProcSign("9A"); - var bb = pub.cNoteCancelNo; + //var bb = pub.cNoteCancelNo; //var m_conn = new Connection(); diff --git a/UFIDA.U8.Framework.Api.ControlObject/Common/APARHelper.cs b/UFIDA.U8.Framework.Api.ControlObject/Common/APARHelper.cs index 15447d5..847b3be 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/Common/APARHelper.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/Common/APARHelper.cs @@ -5,22 +5,21 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; -using NoteManageAR; namespace UFIDA.U8.Framework.Api.ControlObject.Common { public class APARHelper { protected readonly ILog logInfo = LogManager.GetLogger("logInfo"); - private readonly VoucherData _vd; + //private readonly VoucherData _vd; private readonly PropertyInfo[] _props; - public APARHelper(VoucherDataClass vd) - { - _vd = vd; - var tp = vd.GetType(); - _props = tp.GetProperties(); - } + //public APARHelper(VoucherDataClass vd) + //{ + // _vd = vd; + // var tp = vd.GetType(); + // _props = tp.GetProperties(); + //} public void SetValue(Dictionary dictionary) { @@ -33,7 +32,7 @@ namespace UFIDA.U8.Framework.Api.ControlObject.Common { var prop = _props.First(a => string.Equals(a.Name, key, StringComparison.OrdinalIgnoreCase)); - prop.SetPropValue(_vd, dictionary[key]); + //prop.SetPropValue(_vd, dictionary[key]); } } } diff --git a/UFIDA.U8.Framework.Api.ControlObject/Common/CommonHelper.cs b/UFIDA.U8.Framework.Api.ControlObject/Common/CommonHelper.cs index cf5a9c4..81acf8b 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/Common/CommonHelper.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/Common/CommonHelper.cs @@ -1,10 +1,11 @@ using System; using System.Collections.Generic; using System.Reflection; +using System.Security.Cryptography; +using System.Text; using GetComObj; using MSXML2; using Newtonsoft.Json.Linq; -using NoteManageAR; using UFIDA.U8.Framework.Api.ControlObject.Json; namespace UFIDA.U8.Framework.Api.ControlObject.Common @@ -69,121 +70,121 @@ namespace UFIDA.U8.Framework.Api.ControlObject.Common } } - public static void SetPropValue(this PropertyInfo prop, VoucherData obj, object value) - { - if (prop.PropertyType == typeof(string)) - { - prop.SetValue(obj, value); - return; - } + //public static void SetPropValue(this PropertyInfo prop, VoucherData obj, object value) + //{ + // if (prop.PropertyType == typeof(string)) + // { + // prop.SetValue(obj, value); + // return; + // } - if (prop.PropertyType == typeof(DateTime)) - { - prop.SetValue(obj, DateTime.Parse($"{value}")); - return; - } + // if (prop.PropertyType == typeof(DateTime)) + // { + // prop.SetValue(obj, DateTime.Parse($"{value}")); + // return; + // } - if (prop.PropertyType == typeof(byte)) - { - prop.SetValue(obj, byte.Parse($"{value}")); - return; - } + // if (prop.PropertyType == typeof(byte)) + // { + // prop.SetValue(obj, byte.Parse($"{value}")); + // return; + // } - if (prop.PropertyType == typeof(int)) - { - prop.SetValue(obj, int.Parse($"{value}")); - return; - } + // if (prop.PropertyType == typeof(int)) + // { + // prop.SetValue(obj, int.Parse($"{value}")); + // return; + // } - if (prop.PropertyType == typeof(long)) - { - prop.SetValue(obj, long.Parse($"{value}")); - return; - } + // if (prop.PropertyType == typeof(long)) + // { + // prop.SetValue(obj, long.Parse($"{value}")); + // return; + // } - if (prop.PropertyType == typeof(decimal)) - { - prop.SetValue(obj, decimal.Parse($"{value}")); - return; - } + // if (prop.PropertyType == typeof(decimal)) + // { + // prop.SetValue(obj, decimal.Parse($"{value}")); + // return; + // } - if (prop.PropertyType == typeof(double)) - { - prop.SetValue(obj, double.Parse($"{value}")); - return; - } + // if (prop.PropertyType == typeof(double)) + // { + // prop.SetValue(obj, double.Parse($"{value}")); + // return; + // } - if (prop.PropertyType == typeof(float)) - { - prop.SetValue(obj, float.Parse($"{value}")); - return; - } + // if (prop.PropertyType == typeof(float)) + // { + // prop.SetValue(obj, float.Parse($"{value}")); + // return; + // } - if (prop.PropertyType == typeof(short)) - { - prop.SetValue(obj, short.Parse($"{value}")); - return; - } + // if (prop.PropertyType == typeof(short)) + // { + // prop.SetValue(obj, short.Parse($"{value}")); + // return; + // } - //if (prop.PropertyType == typeof(object)) - //{ - // switch (prop.Name) - // { - // case "cDefine1": - // obj.set_cDefine1($"{value}"); - // break; - // case "cDefine2": - // obj.set_cDefine2($"{value}"); - // break; - // case "cDefine3": - // obj.set_cDefine3($"{value}"); - // break; - // case "cDefine4": - // obj.set_cDefine4(DateTime.Parse($"{value}")); - // break; - // case "cDefine5": - // obj.set_cDefine5(int.Parse($"{value}")); - // break; - // case "cDefine6": - // obj.set_cDefine6(DateTime.Parse($"{value}")); - // break; - // case "cDefine7": - // obj.set_cDefine7(float.Parse($"{value}")); - // break; - // case "cDefine8": - // obj.set_cDefine8($"{value}"); - // break; - // case "cDefine9": - // obj.set_cDefine9($"{value}"); - // break; - // case "cDefine10": - // obj.set_cDefine10($"{value}"); - // break; - // case "cDefine11": - // obj.set_cDefine11($"{value}"); - // break; - // case "cDefine12": - // obj.set_cDefine12($"{value}"); - // break; - // case "cDefine13": - // obj.set_cDefine13($"{value}"); - // break; - // case "cDefine14": - // obj.set_cDefine14($"{value}"); - // break; - // case "cDefine15": - // obj.set_cDefine15(int.Parse($"{value}")); - // break; - // case "cDefine16": - // obj.set_cDefine16(float.Parse($"{value}")); - // break; - // default: - // prop.SetValue(obj, $"{value}"); - // break; + // //if (prop.PropertyType == typeof(object)) + // //{ + // // switch (prop.Name) + // // { + // // case "cDefine1": + // // obj.set_cDefine1($"{value}"); + // // break; + // // case "cDefine2": + // // obj.set_cDefine2($"{value}"); + // // break; + // // case "cDefine3": + // // obj.set_cDefine3($"{value}"); + // // break; + // // case "cDefine4": + // // obj.set_cDefine4(DateTime.Parse($"{value}")); + // // break; + // // case "cDefine5": + // // obj.set_cDefine5(int.Parse($"{value}")); + // // break; + // // case "cDefine6": + // // obj.set_cDefine6(DateTime.Parse($"{value}")); + // // break; + // // case "cDefine7": + // // obj.set_cDefine7(float.Parse($"{value}")); + // // break; + // // case "cDefine8": + // // obj.set_cDefine8($"{value}"); + // // break; + // // case "cDefine9": + // // obj.set_cDefine9($"{value}"); + // // break; + // // case "cDefine10": + // // obj.set_cDefine10($"{value}"); + // // break; + // // case "cDefine11": + // // obj.set_cDefine11($"{value}"); + // // break; + // // case "cDefine12": + // // obj.set_cDefine12($"{value}"); + // // break; + // // case "cDefine13": + // // obj.set_cDefine13($"{value}"); + // // break; + // // case "cDefine14": + // // obj.set_cDefine14($"{value}"); + // // break; + // // case "cDefine15": + // // obj.set_cDefine15(int.Parse($"{value}")); + // // break; + // // case "cDefine16": + // // obj.set_cDefine16(float.Parse($"{value}")); + // // break; + // // default: + // // prop.SetValue(obj, $"{value}"); + // // break; - // } - //} - } + // // } + // //} + //} public static IXMLDOMDocument2 ToDocument2(this Dictionary dictionary,IXMLDOMDocument2 domDocument2=null) { @@ -292,5 +293,26 @@ namespace UFIDA.U8.Framework.Api.ControlObject.Common return obj; } + + public static string U8Encrypt(string input) + { + var rethash = ""; + + var hash = SHA1.Create(); + + var encoder = new ASCIIEncoding(); + + var combined = encoder.GetBytes(input); + + hash.ComputeHash(combined); + + rethash = Convert.ToBase64String(hash.Hash); + + if (string.IsNullOrWhiteSpace(rethash)) + return rethash; + + + return rethash + (char)3; + } } } diff --git a/UFIDA.U8.Framework.Api.ControlObject/Models/BaseResult.cs b/UFIDA.U8.Framework.Api.ControlObject/Entity/BaseResult.cs similarity index 84% rename from UFIDA.U8.Framework.Api.ControlObject/Models/BaseResult.cs rename to UFIDA.U8.Framework.Api.ControlObject/Entity/BaseResult.cs index eebb588..dea254d 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/Models/BaseResult.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/Entity/BaseResult.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace UFIDA.U8.Framework.Api.ControlObject.Models +namespace UFIDA.U8.Framework.Api.ControlObject.Entity { public class BaseResult { diff --git a/UFIDA.U8.Framework.Api.ControlObject/Models/LoginParamter.cs b/UFIDA.U8.Framework.Api.ControlObject/Entity/LoginParamter.cs similarity index 96% rename from UFIDA.U8.Framework.Api.ControlObject/Models/LoginParamter.cs rename to UFIDA.U8.Framework.Api.ControlObject/Entity/LoginParamter.cs index daeeaf3..2d34fd6 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/Models/LoginParamter.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/Entity/LoginParamter.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace UFIDA.U8.Framework.Api.ControlObject.Models +namespace UFIDA.U8.Framework.Api.ControlObject.Entity { /// /// U8登录参数 diff --git a/UFIDA.U8.Framework.Api.ControlObject/Models/StatusEnum.cs b/UFIDA.U8.Framework.Api.ControlObject/Entity/StatusEnum.cs similarity index 90% rename from UFIDA.U8.Framework.Api.ControlObject/Models/StatusEnum.cs rename to UFIDA.U8.Framework.Api.ControlObject/Entity/StatusEnum.cs index 8b019db..0702c69 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/Models/StatusEnum.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/Entity/StatusEnum.cs @@ -5,7 +5,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace UFIDA.U8.Framework.Api.ControlObject.Models +namespace UFIDA.U8.Framework.Api.ControlObject.Entity + { /// /// 通用状态枚举 diff --git a/UFIDA.U8.Framework.Api.ControlObject/Models/SysU8AccountConfig.cs b/UFIDA.U8.Framework.Api.ControlObject/Entity/SysU8AccountConfig.cs similarity index 96% rename from UFIDA.U8.Framework.Api.ControlObject/Models/SysU8AccountConfig.cs rename to UFIDA.U8.Framework.Api.ControlObject/Entity/SysU8AccountConfig.cs index 126646b..66a6fe1 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/Models/SysU8AccountConfig.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/Entity/SysU8AccountConfig.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace UFIDA.U8.Framework.Api.ControlObject.Models +namespace UFIDA.U8.Framework.Api.ControlObject.Entity { public class SysU8AccountConfig { diff --git a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs index 0b5b68e..955670e 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/ST/USERPCO.cs @@ -1,16 +1,12 @@ using log4net; using MSXML2; -using NoteManageAR; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; using UFIDA.U8.Framework.Api.ControlObject.Common; +using UFIDA.U8.Framework.Api.ControlObject.Entity; using UFIDA.U8.Framework.Api.ControlObject.Json; -using UFIDA.U8.Framework.Api.ControlObject.Models; using UFIDA.U8.Framework.Api.ControlObject.U8M; -using UFSoft.U8.SF.BE; namespace UFIDA.U8.Framework.Api.ControlObject.ST { diff --git a/UFIDA.U8.Framework.Api.ControlObject/U8M/BaseLogin.cs b/UFIDA.U8.Framework.Api.ControlObject/U8M/BaseLogin.cs index 0ef72ec..71869c1 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/U8M/BaseLogin.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/U8M/BaseLogin.cs @@ -1,7 +1,7 @@ using System; using ADODB; using log4net; -using UFIDA.U8.Framework.Api.ControlObject.Models; +using UFIDA.U8.Framework.Api.ControlObject.Entity; using UFSoft.U8.Framework.ContextSrv; using UFSoft.U8.Framework.Login.UI; using UFSoft.U8.Framework.LoginContext; @@ -30,6 +30,8 @@ namespace UFIDA.U8.Framework.Api.ControlObject.U8M public Connection Connection; + public string userToken => _vbLogin.userToken; + /// /// 初始化生产制造上下文 /// diff --git a/UFIDA.U8.Framework.Api.ControlObject/U8M/IBaseBF.cs b/UFIDA.U8.Framework.Api.ControlObject/U8M/IBaseBF.cs index 29acd5a..c3f0251 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/U8M/IBaseBF.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/U8M/IBaseBF.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using UFIDA.U8.Framework.Api.ControlObject.Models; +using UFIDA.U8.Framework.Api.ControlObject.Entity; namespace UFIDA.U8.Framework.Api.ControlObject.U8M { diff --git a/UFIDA.U8.Framework.Api.ControlObject/U8M/MOrder.cs b/UFIDA.U8.Framework.Api.ControlObject/U8M/MOrder.cs index 7a4e098..61d514a 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/U8M/MOrder.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/U8M/MOrder.cs @@ -2,12 +2,9 @@ using System; using System.Collections; using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using UFIDA.U8.Framework.Api.ControlObject.Common; +using UFIDA.U8.Framework.Api.ControlObject.Entity; using UFIDA.U8.Framework.Api.ControlObject.Json; -using UFIDA.U8.Framework.Api.ControlObject.Models; using UFSoft.U8.Framework.ContextSrv; using UFSoft.U8.U8M.BFDispatcher; using UFSoft.U8.U8M.Common; diff --git a/UFIDA.U8.Framework.Api.ControlObject/U8M/MoRoutingBill.cs b/UFIDA.U8.Framework.Api.ControlObject/U8M/MoRoutingBill.cs index cda97e0..5fc9802 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/U8M/MoRoutingBill.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/U8M/MoRoutingBill.cs @@ -7,8 +7,8 @@ using System.Linq; using System.Linq.Expressions; using System.Reflection; using UFIDA.U8.Framework.Api.ControlObject.Common; +using UFIDA.U8.Framework.Api.ControlObject.Entity; using UFIDA.U8.Framework.Api.ControlObject.Json; -using UFIDA.U8.Framework.Api.ControlObject.Models; using UFSoft.U8.Framework.BizBase; using UFSoft.U8.Framework.ContextSrv; using UFSoft.U8.U8M.BFDispatcher; diff --git a/UFIDA.U8.Framework.Api.ControlObject/U8M/StandardBom.cs b/UFIDA.U8.Framework.Api.ControlObject/U8M/StandardBom.cs index 22f4ae4..9c0fa59 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/U8M/StandardBom.cs +++ b/UFIDA.U8.Framework.Api.ControlObject/U8M/StandardBom.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using UFIDA.U8.Framework.Api.ControlObject.Common; using UFIDA.U8.Framework.Api.ControlObject.Json; -using UFIDA.U8.Framework.Api.ControlObject.Models; +using UFIDA.U8.Framework.Api.ControlObject.Entity; using UFSoft.U8.Framework.BizBase; using UFSoft.U8.Framework.ContextSrv; using UFSoft.U8.U8M.BFDispatcher; diff --git a/UFIDA.U8.Framework.Api.ControlObject/UFIDA.U8.Framework.Api.ControlObject.csproj b/UFIDA.U8.Framework.Api.ControlObject/UFIDA.U8.Framework.Api.ControlObject.csproj index 4ddbc71..943e335 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/UFIDA.U8.Framework.Api.ControlObject.csproj +++ b/UFIDA.U8.Framework.Api.ControlObject/UFIDA.U8.Framework.Api.ControlObject.csproj @@ -37,14 +37,6 @@ True D:\U8SOFT\Interop\ADODB.dll - - D:\U8SOFT\COBat\Interop.ADOX.dll - True - - - D:\U8SOFT\COBat\Interop.DAO.dll - True - D:\U8SOFT\Interop\Interop.GetComObj.dll True @@ -53,10 +45,6 @@ D:\U8SOFT\Interop\Interop.MSXML2.dll True - - D:\U8SOFT\COBat\Interop.NoteManageAR.dll - False - D:\U8SOFT\Interop\Interop.U8ColumnSet.dll True @@ -78,23 +66,11 @@ D:\U8SOFT\Interop\Interop.UFGeneralFilterPub.dll True - - D:\U8SOFT\COBat\Interop.UfHeronReport.dll - True + + ..\packages\log4net.3.0.3\lib\net462\log4net.dll - - D:\U8SOFT\COBat\Interop.UFRPPub.dll - True - - - D:\U8SOFT\COBat\Interop.USDbKit.dll - True - - - ..\packages\log4net.2.0.17\lib\net45\log4net.dll - - - ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -105,11 +81,11 @@ - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll @@ -206,10 +182,10 @@ - - - - + + + + diff --git a/UFIDA.U8.Framework.Api.ControlObject/app.config b/UFIDA.U8.Framework.Api.ControlObject/app.config index 1696df6..a50b8e3 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/app.config +++ b/UFIDA.U8.Framework.Api.ControlObject/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/UFIDA.U8.Framework.Api.ControlObject/packages.config b/UFIDA.U8.Framework.Api.ControlObject/packages.config index 8ed6ba4..6f016c3 100644 --- a/UFIDA.U8.Framework.Api.ControlObject/packages.config +++ b/UFIDA.U8.Framework.Api.ControlObject/packages.config @@ -1,8 +1,8 @@  - - + + - - + + \ No newline at end of file diff --git a/UFIDA.U8.Framework.Api.Tests/App.config b/UFIDA.U8.Framework.Api.Tests/App.config index 7518474..1c7dcde 100644 --- a/UFIDA.U8.Framework.Api.Tests/App.config +++ b/UFIDA.U8.Framework.Api.Tests/App.config @@ -31,7 +31,7 @@ - + @@ -39,7 +39,7 @@ - + @@ -99,15 +99,15 @@ - + - + - + @@ -121,6 +121,14 @@ + + + + + + + + diff --git a/UFIDA.U8.Framework.Api.Tests/ILLink/ILLink.Descriptors.LibraryBuild.xml b/UFIDA.U8.Framework.Api.Tests/ILLink/ILLink.Descriptors.LibraryBuild.xml new file mode 100644 index 0000000..a42d7f0 --- /dev/null +++ b/UFIDA.U8.Framework.Api.Tests/ILLink/ILLink.Descriptors.LibraryBuild.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/UFIDA.U8.Framework.Api.Tests/UFIDA.U8.Framework.Api.Tests.csproj b/UFIDA.U8.Framework.Api.Tests/UFIDA.U8.Framework.Api.Tests.csproj index 0d60643..6c0418c 100644 --- a/UFIDA.U8.Framework.Api.Tests/UFIDA.U8.Framework.Api.Tests.csproj +++ b/UFIDA.U8.Framework.Api.Tests/UFIDA.U8.Framework.Api.Tests.csproj @@ -1,8 +1,8 @@  - - - - + + + + Debug AnyCPU @@ -43,79 +43,79 @@ ..\packages\Microsoft.ApplicationInsights.2.22.0\lib\net46\Microsoft.ApplicationInsights.dll - - ..\packages\Microsoft.Testing.Extensions.Telemetry.1.3.1\lib\netstandard2.0\Microsoft.Testing.Extensions.Telemetry.dll + + ..\packages\Microsoft.Testing.Extensions.Telemetry.1.4.3\lib\netstandard2.0\Microsoft.Testing.Extensions.Telemetry.dll - - ..\packages\Microsoft.Testing.Extensions.TrxReport.Abstractions.1.3.1\lib\netstandard2.0\Microsoft.Testing.Extensions.TrxReport.Abstractions.dll + + ..\packages\Microsoft.Testing.Extensions.TrxReport.Abstractions.1.4.3\lib\netstandard2.0\Microsoft.Testing.Extensions.TrxReport.Abstractions.dll - - ..\packages\Microsoft.Testing.Extensions.VSTestBridge.1.3.1\lib\netstandard2.0\Microsoft.Testing.Extensions.VSTestBridge.dll + + ..\packages\Microsoft.Testing.Extensions.VSTestBridge.1.4.3\lib\netstandard2.0\Microsoft.Testing.Extensions.VSTestBridge.dll - - ..\packages\Microsoft.Testing.Platform.1.3.1\lib\netstandard2.0\Microsoft.Testing.Platform.dll + + ..\packages\Microsoft.Testing.Platform.1.4.3\lib\netstandard2.0\Microsoft.Testing.Platform.dll - - ..\packages\Microsoft.Testing.Platform.MSBuild.1.3.1\lib\netstandard2.0\Microsoft.Testing.Platform.MSBuild.dll + + ..\packages\Microsoft.Testing.Platform.MSBuild.1.4.3\lib\netstandard2.0\Microsoft.Testing.Platform.MSBuild.dll - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.TestPlatform.CoreUtilities.dll + ..\packages\Microsoft.TestPlatform.ObjectModel.17.12.0\lib\net462\Microsoft.TestPlatform.CoreUtilities.dll - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.TestPlatform.PlatformAbstractions.dll + ..\packages\Microsoft.TestPlatform.ObjectModel.17.12.0\lib\net462\Microsoft.TestPlatform.PlatformAbstractions.dll - ..\packages\Microsoft.TestPlatform.ObjectModel.17.10.0\lib\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll + ..\packages\Microsoft.TestPlatform.ObjectModel.17.12.0\lib\net462\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll - ..\packages\MSTest.TestFramework.3.5.0\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll + ..\packages\MSTest.TestFramework.3.6.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - ..\packages\MSTest.TestFramework.3.5.0\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll + ..\packages\MSTest.TestFramework.3.6.3\lib\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll + ..\packages\Newtonsoft.Json.Bson.1.0.3\lib\net45\Newtonsoft.Json.Bson.dll - - ..\packages\NuGet.Frameworks.6.10.1\lib\net472\NuGet.Frameworks.dll + + ..\packages\NuGet.Frameworks.6.12.1\lib\net472\NuGet.Frameworks.dll - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - ..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll - - ..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.9.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll ..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Reflection.Metadata.8.0.0\lib\net462\System.Reflection.Metadata.dll + + ..\packages\System.Reflection.Metadata.9.0.0\lib\net462\System.Reflection.Metadata.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll @@ -171,6 +171,7 @@ + @@ -186,15 +187,15 @@ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - - - - - - + + + + + + - - + + + + + + diff --git a/UFIDA.U8.Framework.Api/Models/U8AccountConfigInput.cs b/UFIDA.U8.Framework.Api/Models/U8AccountConfigInput.cs index 6812f06..ca260ad 100644 --- a/UFIDA.U8.Framework.Api/Models/U8AccountConfigInput.cs +++ b/UFIDA.U8.Framework.Api/Models/U8AccountConfigInput.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; -using UFIDA.U8.Framework.Api.ControlObject.Models; +using UFIDA.U8.Framework.Api.ControlObject.Entity; namespace UFIDA.U8.Framework.Api.Models { diff --git a/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj b/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj index f00c923..3aaf57b 100644 --- a/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj +++ b/UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj @@ -47,6 +47,9 @@ 4 + + ..\packages\Autofac.8.1.1\lib\netstandard2.0\Autofac.dll + ..\packages\Dapper.2.1.35\lib\net461\Dapper.dll @@ -62,153 +65,156 @@ ..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll - - ..\packages\log4net.3.0.2\lib\net462\log4net.dll + + ..\packages\log4net.3.0.3\lib\net462\log4net.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Microsoft.Bcl.TimeProvider.9.0.0\lib\net462\Microsoft.Bcl.TimeProvider.dll ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - ..\packages\Microsoft.Data.Sqlite.Core.8.0.7\lib\netstandard2.0\Microsoft.Data.Sqlite.dll + + ..\packages\Microsoft.Data.Sqlite.Core.9.0.0\lib\netstandard2.0\Microsoft.Data.Sqlite.dll - - ..\packages\Microsoft.Extensions.Caching.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll + + ..\packages\Microsoft.Extensions.Caching.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll - - ..\packages\Microsoft.Extensions.Caching.Memory.8.0.1\lib\net462\Microsoft.Extensions.Caching.Memory.dll + + ..\packages\Microsoft.Extensions.Caching.Memory.9.0.0\lib\net462\Microsoft.Extensions.Caching.Memory.dll - - ..\packages\Microsoft.Extensions.Configuration.8.0.0\lib\net462\Microsoft.Extensions.Configuration.dll + + ..\packages\Microsoft.Extensions.Configuration.9.0.0\lib\net462\Microsoft.Extensions.Configuration.dll - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll - - ..\packages\Microsoft.Extensions.Configuration.Binder.8.0.2\lib\net462\Microsoft.Extensions.Configuration.Binder.dll + + ..\packages\Microsoft.Extensions.Configuration.Binder.9.0.0\lib\net462\Microsoft.Extensions.Configuration.Binder.dll - - ..\packages\Microsoft.Extensions.Configuration.CommandLine.8.0.0\lib\net462\Microsoft.Extensions.Configuration.CommandLine.dll + + ..\packages\Microsoft.Extensions.Configuration.CommandLine.9.0.0\lib\net462\Microsoft.Extensions.Configuration.CommandLine.dll - - ..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.8.0.0\lib\net462\Microsoft.Extensions.Configuration.EnvironmentVariables.dll + + ..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.9.0.0\lib\net462\Microsoft.Extensions.Configuration.EnvironmentVariables.dll - - ..\packages\Microsoft.Extensions.Configuration.FileExtensions.8.0.1\lib\net462\Microsoft.Extensions.Configuration.FileExtensions.dll + + ..\packages\Microsoft.Extensions.Configuration.FileExtensions.9.0.0\lib\net462\Microsoft.Extensions.Configuration.FileExtensions.dll - - ..\packages\Microsoft.Extensions.Configuration.Json.8.0.0\lib\net462\Microsoft.Extensions.Configuration.Json.dll + + ..\packages\Microsoft.Extensions.Configuration.Json.9.0.0\lib\net462\Microsoft.Extensions.Configuration.Json.dll - - ..\packages\Microsoft.Extensions.Configuration.UserSecrets.8.0.0\lib\net462\Microsoft.Extensions.Configuration.UserSecrets.dll + + ..\packages\Microsoft.Extensions.Configuration.UserSecrets.9.0.0\lib\net462\Microsoft.Extensions.Configuration.UserSecrets.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.9.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\packages\Microsoft.Extensions.Diagnostics.8.0.0\lib\net462\Microsoft.Extensions.Diagnostics.dll + + ..\packages\Microsoft.Extensions.Diagnostics.9.0.0\lib\net462\Microsoft.Extensions.Diagnostics.dll - - ..\packages\Microsoft.Extensions.Diagnostics.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Diagnostics.Abstractions.dll + + ..\packages\Microsoft.Extensions.Diagnostics.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.Diagnostics.Abstractions.dll - - ..\packages\Microsoft.Extensions.FileProviders.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll + + ..\packages\Microsoft.Extensions.FileProviders.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll - - ..\packages\Microsoft.Extensions.FileProviders.Physical.8.0.0\lib\net462\Microsoft.Extensions.FileProviders.Physical.dll + + ..\packages\Microsoft.Extensions.FileProviders.Physical.9.0.0\lib\net462\Microsoft.Extensions.FileProviders.Physical.dll - - ..\packages\Microsoft.Extensions.FileSystemGlobbing.8.0.0\lib\net462\Microsoft.Extensions.FileSystemGlobbing.dll + + ..\packages\Microsoft.Extensions.FileSystemGlobbing.9.0.0\lib\net462\Microsoft.Extensions.FileSystemGlobbing.dll - - ..\packages\Microsoft.Extensions.Hosting.8.0.0\lib\net462\Microsoft.Extensions.Hosting.dll + + ..\packages\Microsoft.Extensions.Hosting.9.0.0\lib\net462\Microsoft.Extensions.Hosting.dll - - ..\packages\Microsoft.Extensions.Hosting.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Hosting.Abstractions.dll + + ..\packages\Microsoft.Extensions.Hosting.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.Hosting.Abstractions.dll - - ..\packages\Microsoft.Extensions.Logging.8.0.1\lib\net462\Microsoft.Extensions.Logging.dll + + ..\packages\Microsoft.Extensions.Logging.9.0.0\lib\net462\Microsoft.Extensions.Logging.dll - - ..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll + + ..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.0\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Extensions.Logging.Configuration.8.0.0\lib\net462\Microsoft.Extensions.Logging.Configuration.dll + + ..\packages\Microsoft.Extensions.Logging.Configuration.9.0.0\lib\net462\Microsoft.Extensions.Logging.Configuration.dll - - ..\packages\Microsoft.Extensions.Logging.Console.8.0.0\lib\net462\Microsoft.Extensions.Logging.Console.dll + + ..\packages\Microsoft.Extensions.Logging.Console.9.0.0\lib\net462\Microsoft.Extensions.Logging.Console.dll - - ..\packages\Microsoft.Extensions.Logging.Debug.8.0.0\lib\net462\Microsoft.Extensions.Logging.Debug.dll + + ..\packages\Microsoft.Extensions.Logging.Debug.9.0.0\lib\net462\Microsoft.Extensions.Logging.Debug.dll - - ..\packages\Microsoft.Extensions.Logging.EventLog.8.0.0\lib\net462\Microsoft.Extensions.Logging.EventLog.dll + + ..\packages\Microsoft.Extensions.Logging.EventLog.9.0.0\lib\net462\Microsoft.Extensions.Logging.EventLog.dll - - ..\packages\Microsoft.Extensions.Logging.EventSource.8.0.0\lib\net462\Microsoft.Extensions.Logging.EventSource.dll + + ..\packages\Microsoft.Extensions.Logging.EventSource.9.0.0\lib\net462\Microsoft.Extensions.Logging.EventSource.dll - - ..\packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll + + ..\packages\Microsoft.Extensions.Options.9.0.0\lib\net462\Microsoft.Extensions.Options.dll - - ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.8.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll + + ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.9.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll - - ..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll + + ..\packages\Microsoft.Extensions.Primitives.9.0.0\lib\net462\Microsoft.Extensions.Primitives.dll - - ..\packages\Microsoft.IdentityModel.Abstractions.8.0.1\lib\net472\Microsoft.IdentityModel.Abstractions.dll + + ..\packages\Microsoft.IdentityModel.Abstractions.8.2.1\lib\net472\Microsoft.IdentityModel.Abstractions.dll - - ..\packages\Microsoft.IdentityModel.JsonWebTokens.8.0.1\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll + + ..\packages\Microsoft.IdentityModel.JsonWebTokens.8.2.1\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll - - ..\packages\Microsoft.IdentityModel.Logging.8.0.1\lib\net472\Microsoft.IdentityModel.Logging.dll + + ..\packages\Microsoft.IdentityModel.Logging.8.2.1\lib\net472\Microsoft.IdentityModel.Logging.dll - - ..\packages\Microsoft.IdentityModel.Tokens.8.0.1\lib\net472\Microsoft.IdentityModel.Tokens.dll + + ..\packages\Microsoft.IdentityModel.Tokens.8.2.1\lib\net472\Microsoft.IdentityModel.Tokens.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - ..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll + ..\packages\Newtonsoft.Json.Bson.1.0.3\lib\net45\Newtonsoft.Json.Bson.dll - ..\packages\Oracle.ManagedDataAccess.23.5.0\lib\net472\Oracle.ManagedDataAccess.dll + ..\packages\Oracle.ManagedDataAccess.23.6.1\lib\net472\Oracle.ManagedDataAccess.dll ..\packages\Slapper.AutoMapper.2.0.5\lib\net47\Slapper.dll - - ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.1.8\lib\net461\SQLitePCLRaw.batteries_v2.dll + + ..\packages\SQLitePCLRaw.bundle_e_sqlite3.2.1.10\lib\net461\SQLitePCLRaw.batteries_v2.dll - - ..\packages\SQLitePCLRaw.core.2.1.8\lib\netstandard2.0\SQLitePCLRaw.core.dll + + ..\packages\SQLitePCLRaw.core.2.1.10\lib\netstandard2.0\SQLitePCLRaw.core.dll - - ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.1.8\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll + + ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.1.10\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll - - ..\packages\SqlSugar.5.1.4.166\lib\SqlSugar.dll + + ..\packages\SqlSugar.5.1.4.170\lib\SqlSugar.dll ..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll - - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - ..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll + + ..\packages\System.Configuration.ConfigurationManager.9.0.0\lib\net462\System.Configuration.ConfigurationManager.dll @@ -216,32 +222,35 @@ True True - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.118.0\lib\net46\System.Data.SQLite.dll + + ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll - - ..\packages\System.Data.SQLite.EF6.1.0.118.0\lib\net46\System.Data.SQLite.EF6.dll + + ..\packages\System.Data.SQLite.EF6.1.0.119.0\lib\net46\System.Data.SQLite.EF6.dll - - ..\packages\System.Data.SQLite.Linq.1.0.118.0\lib\net46\System.Data.SQLite.Linq.dll + + ..\packages\System.Data.SQLite.Linq.1.0.119.0\lib\net46\System.Data.SQLite.Linq.dll - - ..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.9.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll - - ..\packages\System.Formats.Asn1.8.0.1\lib\net462\System.Formats.Asn1.dll + + ..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll - - ..\packages\System.IdentityModel.Tokens.Jwt.8.0.1\lib\net472\System.IdentityModel.Tokens.Jwt.dll + + ..\packages\System.IdentityModel.Tokens.Jwt.8.2.1\lib\net472\System.IdentityModel.Tokens.Jwt.dll ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll True True - - ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll + + ..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll + + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll @@ -252,16 +261,16 @@ ..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll ..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll True True - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll @@ -283,14 +292,14 @@ True True - - ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -399,6 +408,7 @@ + @@ -437,6 +447,7 @@ + @@ -584,12 +595,12 @@ 这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。 - + - +