Open/U8API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
敏健 邱
2024-12-03 21:49:47 +08:00
parent 4e4316c6dc
commit d35c684d08
25 changed files with 1657 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UFIDA.U8.Framework.Api/App_Data/API_Meta.db
BIN
View File
Binary file not shown.
UFIDA.U8.Framework.Api/App_Data/U8API.xml
+106
View File
@@ -568,11 +568,25 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="T:UFIDA.U8.Framework.Api.Controllers.U8.APController">
<summary>
应收应付
</summary>
</member>
<member name="F:UFIDA.U8.Framework.Api.Controllers.U8.APController.logInfo">
<summary>
日志组件
</summary>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.APController.Save(System.String,System.String,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
应收应付单据保存接口
</summary>
<param name="cAccId"></param>
<param name="cCardNum"></param>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.APController.CloseBillSave(System.String,System.String,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
收付款单保存
@@ -598,6 +612,31 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.APController.ApNoteSave(System.String,System.String,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
票据保存
</summary>
<param name="cAccId">系统号</param>
<param name="cCardNum">单据类型编码</param>
<param name="input">报文数据</param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.APController.AP03Save(System.String,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
票据保存
</summary>
<param name="cAccId"></param>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.APController.AR03Save(System.String,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
票据保存
</summary>
<param name="cAccId"></param>
<param name="input"></param>
<returns></returns>
</member>
<member name="T:UFIDA.U8.Framework.Api.Controllers.U8.MOController">
<summary>
生产订单
@@ -745,6 +784,39 @@
<param name="input">报文数据</param>
<returns></returns>
</member>
<member name="F:UFIDA.U8.Framework.Api.Controllers.U8.STController.logInfo">
<summary>
日志组件
</summary>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.STController.Insert(System.String,System.String,System.Collections.Generic.Dictionary{System.String,System.Object},System.Boolean,System.Boolean,System.Boolean,System.String,System.Boolean)">
<summary>
新增单据
</summary>
<param name="cAccId"></param>
<param name="cCardNum"></param>
<param name="input"></param>
<param name="bCheck"></param>
<param name="bBeforCheckStock"></param>
<param name="bIsRedVouch"></param>
<param name="sAddedState"></param>
<param name="bReMote"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.Controllers.U8.STController.Update(System.String,System.String,System.Collections.Generic.Dictionary{System.String,System.Object},System.Boolean,System.Boolean,System.Boolean,System.String,System.Boolean)">
<summary>
更新单据
</summary>
<param name="cAccId"></param>
<param name="cCardNum"></param>
<param name="input"></param>
<param name="bCheck"></param>
<param name="bBeforCheckStock"></param>
<param name="bIsRedVouch"></param>
<param name="sAddedState"></param>
<param name="bUpdateNeedEas"></param>
<returns></returns>
</member>
<member name="M:UFIDA.U8.Framework.Api.WebApiApplication.CurrentDomain_AssemblyResolve(System.Object,System.ResolveEventArgs)">
<summary>
缺少程序集全局处理事件
@@ -772,6 +844,11 @@
<member name="T:UFIDA.U8.Framework.Api.Models.ListU8AccountConfigInput">
<inheritdoc />
</member>
<member name="M:UFIDA.U8.Framework.Api.Unit.AssemblyDynamicLoader.Unload">
<summary>
卸载应用程序域
</summary>
</member>
<member name="T:UFIDA.U8.Framework.Api.Unit.CommUnit">
<summary>
公共帮助类
@@ -820,5 +897,34 @@
<param name="pDate"></param>
<returns></returns>
</member>
<member name="T:UFIDA.U8.Framework.Api.Unit.RemoteLoader">
<summary>
跨域加载
</summary>
</member>
<member name="M:UFIDA.U8.Framework.Api.Unit.RemoteLoader.#ctor(UFIDA.U8.Framework.Api.ControlObject.Models.LoginParamter)">
<summary>
构造函数
</summary>
<param name="paramter">登录参数</param>
</member>
<member name="M:UFIDA.U8.Framework.Api.Unit.RemoteLoader.Save(System.String,System.Collections.Generic.Dictionary{System.String,System.Object})">
<summary>
保存
</summary>
<param name="cCardNum">单据类型编码</param>
<param name="input">数据包</param>
<returns></returns>
<exception cref="T:System.Exception"></exception>
</member>
<member name="M:UFIDA.U8.Framework.Api.Unit.RemoteLoader.Save(System.String,System.Collections.Generic.List{System.Collections.Generic.Dictionary{System.String,System.Object}})">
<summary>
批量保存
</summary>
<param name="cCardNum">单据类型编码</param>
<param name="inputs">数据包</param>
<returns></returns>
<exception cref="T:System.Exception"></exception>
</member>
</members>
</doc>
UFIDA.U8.Framework.Api/Controllers/U8/APController.cs
+153 -16
View File
@@ -12,7 +12,9 @@ using UFIDA.U8.Framework.Api.Unit;
namespace UFIDA.U8.Framework.Api.Controllers.U8
{
/// <summary>
/// 应收应付
/// </summary>
public class APController : ApiController
{
/// <summary>
@@ -22,6 +24,44 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
private static readonly MemoryCache _cache = new MemoryCache(new MemoryCacheOptions { ExpirationScanFrequency = TimeSpan.FromMinutes(10) });
/// <summary>
/// 应收应付单据保存接口
/// </summary>
/// <param name="cAccId"></param>
/// <param name="cCardNum"></param>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/AP/{cCardNum}/Save")]
[Route("api/U8/AR/{cCardNum}/Save")]
public async Task<BaseResult<dynamic>> Save(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input)
{
try
{
switch (cCardNum)
{
case "AP03":
case "AR03":
return await ApNoteSave(cAccId, cCardNum, input);
case "AP48":
case "AP49":
case "AR48":
case "AR49":
return await CloseBillSave(cAccId, cCardNum, input);
default:
throw new Exception("单据标识不正确");
}
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
return new BaseResult<dynamic> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 收付款单保存
/// </summary>
@@ -36,7 +76,19 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
{
try
{
if (!_cache.TryGetValue($"U8AP_{cAccId}", out BaseLogin baseLogin))
var subId = "";
if (cCardNum == "AR48" || cCardNum == "AR49")
{
subId = "AR";
}
if (cCardNum == "AP48" || cCardNum == "AP49")
{
subId = "AP";
}
if (!_cache.TryGetValue($"U8AP_{cAccId}_{subId}", out BaseLogin baseLogin))
{
baseLogin = new BaseLogin();
@@ -49,19 +101,9 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
baseLogin.Init(param, false);
_cache.Set($"U8AP_{cAccId}", baseLogin);
}
_cache.Clear();
var subId = "";
if (cCardNum == "AP48")
{
subId = "AR";
}
if (cCardNum == "AP49")
{
subId = "AP";
_cache.Set($"U8AP_{cAccId}_{subId}", baseLogin);
}
@@ -91,7 +133,8 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/AR/AP48/CloseBillSave")]
[Route("api/U8/AR/AP48/Save")]
[Route("api/U8/AR/AP49/Save")]
public async Task<BaseResult<dynamic>> AP48Save(string cAccId, [FromBody] Dictionary<string, object> input)
{
return await CloseBillSave(cAccId, "AP48", input);
@@ -104,11 +147,105 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/AP/AP49/CloseBillSave")]
[Route("api/U8/AP/AP49/Save")]
[Route("api/U8/AP/AP49/Save")]
public async Task<BaseResult<dynamic>> AP49Save(string cAccId, [FromBody] Dictionary<string, object> input)
{
return await CloseBillSave(cAccId, "AP49", input);
}
/// <summary>
/// 票据保存
/// </summary>
/// <param name="cAccId">系统号</param>
/// <param name="cCardNum">单据类型编码</param>
/// <param name="input">报文数据</param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/AP/{cCardNum}/ApNoteSave")]
[Route("api/U8/AR/{cCardNum}/ApNoteSave")]
public async Task<BaseResult<dynamic>> ApNoteSave(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input)
{
try
{
var subId = "";
if (cCardNum == "AR03")
{
subId = "AR";
}
if (cCardNum == "AP03")
{
subId = "AP";
}
if (!_cache.TryGetValue($"U8AP_{cAccId}_{subId}", out BaseLogin baseLogin))
{
baseLogin = new BaseLogin();
var param = await CommUnit.GetLoginParamter(cAccId);
if (param == null)
{
throw new Exception("未能加载指定系统号的登录信息");
}
param.pSubId = subId;
baseLogin.Init(param, false);
_cache.Set($"U8AP_{cAccId}_{subId}", baseLogin);
}
if (string.IsNullOrWhiteSpace(subId))
throw new Exception("单据标识不正确");
var bo = new UFAPBO();
var res = bo.ApNoteSave(baseLogin, input, subId);
return res;
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
return new BaseResult<dynamic> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 票据保存
/// </summary>
/// <param name="cAccId"></param>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/AP/AP03/Save")]
public async Task<BaseResult<dynamic>> AP03Save(string cAccId, [FromBody] Dictionary<string, object> input)
{
return await ApNoteSave(cAccId, "AP03", input);
}
/// <summary>
/// 票据保存
/// </summary>
/// <param name="cAccId"></param>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/AR/AR03/Save")]
public async Task<BaseResult<dynamic>> AR03Save(string cAccId, [FromBody] Dictionary<string, object> input)
{
return await ApNoteSave(cAccId, "AR03", input);
}
}
}
UFIDA.U8.Framework.Api/Controllers/U8/SFCController.cs
+76 -54
View File
@@ -45,7 +45,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
[Route("api/U8/SFC/MoRoutingBillSave")]
public async Task<BaseResult<string>> MoRoutingBillSave(string cAccId,string cCardNum, [FromBody] Dictionary<string, object> input)
{
var taskId = 0L;
//var taskId = 0L;
var db = CommUnit.GetDbClient();
@@ -58,48 +58,50 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
throw new Exception("当前接口不支持此类型的单据");
var runtimes = 0;
//var runtimes = 0;
var u8mTask = new SysU8MTask()
{
U8MPool = $"U8M_{cAccId}"
};
//var u8mTask = new SysU8MTask()
//{
// U8MPool = $"U8M_{cAccId}"
//};
#if !DEBUG
while (await db.Queryable<SysU8MTask>().AnyAsync())
{
if (runtimes > 20)
{
throw new Exception("当前任务队列过长");
}
//#if !DEBUG
// while (await db.Queryable<SysU8MTask>().AnyAsync())
// {
// if (runtimes > 20)
// {
// throw new Exception("当前任务队列过长");
// }
runtimes++;
// runtimes++;
await Task.Delay(100 * runtimes);
// await Task.Delay(100 * runtimes);
//u8mTask.Id = DateTime.Now.Ticks;
// //u8mTask.Id = DateTime.Now.Ticks;
if (await db.Queryable<SysU8MTask>()
.AnyAsync(a => SqlFunc.DateDiff(DateType.Minute, a.dDate, DateTime.Now) > 1))
{
await db.Deleteable<SysU8MTask>()
.Where(a => SqlFunc.DateDiff(DateType.Minute, a.dDate, DateTime.Now) > 1)
.ExecuteCommandAsync();
}
// if (await db.Queryable<SysU8MTask>()
// .AnyAsync(a => SqlFunc.DateDiff(DateType.Minute, a.dDate, DateTime.Now) > 1))
// {
// await db.Deleteable<SysU8MTask>()
// .Where(a => SqlFunc.DateDiff(DateType.Minute, a.dDate, DateTime.Now) > 1)
// .ExecuteCommandAsync();
// }
}
#endif
// }
//#endif
u8mTask.dDate = DateTime.Now;
//u8mTask.dDate = DateTime.Now;
//if (u8mTask.Id == null)
//{
// u8mTask.Id = DateTime.Now.Ticks;
//}
taskId = await db.Insertable(u8mTask).ExecuteReturnSnowflakeIdAsync();
//taskId = await db.Insertable(u8mTask).ExecuteReturnSnowflakeIdAsync();
logInfo.Debug($"开始操作,当前任务ID:{taskId}");
//var taskid = SnowFlakeSingle.Instance.NextId();
//logInfo.Debug($"开始操作,当前任务ID:{taskId}");
//if (!_cache.TryGetValue($"U8M_{cAccId}", out BaseLogin baseLogin))
//{
// _cache.Clear();
@@ -113,37 +115,57 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
throw new Exception("未能加载指定系统号的登录信息");
}
logInfo.Debug($"开始登录,当前任务ID:{taskId}");
logInfo.Debug("开始登录");
baseLogin.Init(param,true);
//_cache.Set($"U8M_{cAccId}", baseLogin);
//}
var bf = new MoRoutingBill();
logInfo.Debug($"开始保存,当前任务ID:{taskId}");
var bo = new MoRoutingBill();
BaseResult<string> res;
if (input.ContainsKey("bBatch") && Convert.ToBoolean(input["bBatch"]))
{
var inputs = input["inputs"] as List<Dictionary<string, object>> ?? $"{input["inputs"]}".ToObject<List<Dictionary<string, object>>>();
res = bf.Save(cCardNum, inputs);
res = bo.Save(cCardNum, inputs);
}
else
{
res = bf.Save(cCardNum, input);
res = bo.Save(cCardNum, input);
}
logInfo.Debug($"退出登录,当前任务ID:{taskId}");
baseLogin.ShutDown();
//loader.Unload();
if (taskId != 0)
{
await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
}
//var res= loader.Save(param, cCardNum, input);
//_cache.Set($"U8M_{cAccId}", baseLogin);
//}
//var bf = new MoRoutingBill();
logInfo.Debug($"开始保存");
//BaseResult<string> res;
//if (input.ContainsKey("bBatch") && Convert.ToBoolean(input["bBatch"]))
//{
// var inputs = input["inputs"] as List<Dictionary<string, object>> ?? $"{input["inputs"]}".ToObject<List<Dictionary<string, object>>>();
// res = bf.Save(cCardNum, inputs);
//}
//else
//{
// res = bf.Save(cCardNum, input);
//}
logInfo.Debug($"退出登录");
//baseLogin.ShutDown();
//if (taskId != 0)
//{
// await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
//}
return res;
@@ -152,21 +174,21 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
{
logInfo.Error(ex.Message, ex);
if (taskId != 0)
{
await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
}
//if (taskId != 0)
//{
// await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
//}
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
finally
{
if (taskId != 0)
{
await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
}
//if (taskId != 0)
//{
// await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
//}
baseLogin?.ShutDown();
//baseLogin?.ShutDown();
}
UFIDA.U8.Framework.Api/Controllers/U8/STController.cs
+129
View File
@@ -0,0 +1,129 @@
using log4net;
using Microsoft.Extensions.Caching.Memory;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using System.Web;
using System.Web.Http;
using UFIDA.U8.Framework.Api.ControlObject.AP;
using UFIDA.U8.Framework.Api.ControlObject.Models;
using UFIDA.U8.Framework.Api.ControlObject.ST;
using UFIDA.U8.Framework.Api.ControlObject.U8M;
using UFIDA.U8.Framework.Api.Unit;
namespace UFIDA.U8.Framework.Api.Controllers.U8
{
public class STController : ApiController
{
/// <summary>
/// 日志组件
/// </summary>
protected readonly ILog logInfo = LogManager.GetLogger("logInfo");
private static readonly MemoryCache _cache = new MemoryCache(new MemoryCacheOptions { ExpirationScanFrequency = TimeSpan.FromMinutes(10) });
/// <summary>
/// 新增单据
/// </summary>
/// <param name="cAccId"></param>
/// <param name="cCardNum"></param>
/// <param name="input"></param>
/// <param name="bCheck"></param>
/// <param name="bBeforCheckStock"></param>
/// <param name="bIsRedVouch"></param>
/// <param name="sAddedState"></param>
/// <param name="bReMote"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/ST/0411/Insert")]
public async Task<BaseResult<string>> Insert(string cAccId, string cCardNum,[FromBody] Dictionary<string, object> input, bool bCheck = true,bool bBeforCheckStock=true,bool bIsRedVouch=false,string sAddedState="",bool bReMote=false)
{
try
{
if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
{
baseLogin = new BaseLogin();
var param = await CommUnit.GetLoginParamter(cAccId);
if (param == null)
{
throw new Exception("未能加载指定系统号的登录信息");
}
baseLogin.Init(param, false);
_cache.Clear();
_cache.Set($"U8_{cAccId}", baseLogin);
}
var bo = new USERPCO();
var res =await bo.Insert(baseLogin, input, "11", bCheck, bBeforCheckStock, bIsRedVouch, sAddedState,
bReMote);
return res;
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 更新单据
/// </summary>
/// <param name="cAccId"></param>
/// <param name="cCardNum"></param>
/// <param name="input"></param>
/// <param name="bCheck"></param>
/// <param name="bBeforCheckStock"></param>
/// <param name="bIsRedVouch"></param>
/// <param name="sAddedState"></param>
/// <param name="bUpdateNeedEas"></param>
/// <returns></returns>
[HttpPost]
[Route("api/U8/ST/0411/Update")]
public async Task<BaseResult<string>> Update(string cAccId, string cCardNum, [FromBody] Dictionary<string, object> input, bool bCheck = true, bool bBeforCheckStock = true, bool bIsRedVouch = false, string sAddedState = "", bool bUpdateNeedEas = true)
{
try
{
if (!_cache.TryGetValue($"U8_{cAccId}", out BaseLogin baseLogin))
{
baseLogin = new BaseLogin();
var param = await CommUnit.GetLoginParamter(cAccId);
if (param == null)
{
throw new Exception("未能加载指定系统号的登录信息");
}
baseLogin.Init(param, false);
_cache.Clear();
_cache.Set($"U8_{cAccId}", baseLogin);
}
var bo = new USERPCO();
var res = await bo.Update(baseLogin, input, "0412", "11", bCheck, bBeforCheckStock, bIsRedVouch, sAddedState,
bUpdateNeedEas);
return res;
}
catch (Exception ex)
{
logInfo.Error(ex.Message, ex);
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
}
}
UFIDA.U8.Framework.Api/UFIDA.U8.Framework.Api.csproj
+20 -15
View File
@@ -62,8 +62,8 @@
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.17.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.17\lib\net45\log4net.dll</HintPath>
<Reference Include="log4net, Version=3.0.2.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.3.0.2\lib\net462\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -78,8 +78,8 @@
<Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Caching.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.8.0.0\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
<Reference Include="Microsoft.Extensions.Caching.Memory, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Caching.Memory.8.0.1\lib\net462\Microsoft.Extensions.Caching.Memory.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Configuration, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Configuration.8.0.0\lib\net462\Microsoft.Extensions.Configuration.dll</HintPath>
@@ -105,11 +105,11 @@
<Reference Include="Microsoft.Extensions.Configuration.UserSecrets, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Configuration.UserSecrets.8.0.0\lib\net462\Microsoft.Extensions.Configuration.UserSecrets.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Diagnostics, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Diagnostics.8.0.0\lib\net462\Microsoft.Extensions.Diagnostics.dll</HintPath>
@@ -132,11 +132,11 @@
<Reference Include="Microsoft.Extensions.Hosting.Abstractions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Hosting.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Hosting.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.8.0.0\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
<Reference Include="Microsoft.Extensions.Logging, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.8.0.1\lib\net462\Microsoft.Extensions.Logging.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Configuration, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Configuration.8.0.0\lib\net462\Microsoft.Extensions.Logging.Configuration.dll</HintPath>
@@ -286,8 +286,8 @@
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=8.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.8.0.4\lib\net462\System.Text.Json.dll</HintPath>
<Reference Include="System.Text.Json, Version=8.0.0.5, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -401,13 +401,16 @@
<Compile Include="Controllers\U8\APController.cs" />
<Compile Include="Controllers\U8\MOController.cs" />
<Compile Include="Controllers\U8\SFCController.cs" />
<Compile Include="Controllers\U8\STController.cs" />
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
<Compile Include="Models\SFCInput.cs" />
<Compile Include="Models\U8AccountConfigInput.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Unit\AssemblyDynamicLoader.cs" />
<Compile Include="Unit\CommUnit.cs" />
<Compile Include="Unit\RemoteLoader.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="App_Data\AP49.json" />
@@ -507,7 +510,9 @@
<Content Include="SwaggerUI\lib\.DS_Store" />
<Content Include="Views\System\Index.cshtml" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Folder Include="Views\ST\" />
</ItemGroup>
<ItemGroup>
<Content Include="Content\bootstrap.rtl.min.css.map" />
<Content Include="Content\bootstrap.rtl.css.map" />
UFIDA.U8.Framework.Api/Unit/AssemblyDynamicLoader.cs
+73
View File
@@ -0,0 +1,73 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Web;
using System.Web.UI.WebControls;
using UFIDA.U8.Framework.Api.ControlObject.Models;
namespace UFIDA.U8.Framework.Api.Unit
{
internal class AssemblyDynamicLoader
{
private long taskId;
private AppDomain appDomain;
private RemoteLoader remoteLoader;
internal AssemblyDynamicLoader(long taskId)
{
var basePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory,"Bin");
var binPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"U8M{taskId}");
Directory.CreateDirectory(binPath);
var setup = new AppDomainSetup
{
ApplicationName = $"U8M_{taskId}",
ApplicationBase = basePath,
PrivateBinPath = binPath,
ShadowCopyFiles = "true"
};
setup.CachePath = setup.ApplicationBase;
setup.ShadowCopyDirectories = setup.ApplicationBase;
appDomain = AppDomain.CreateDomain($"U8M_{taskId}", null, setup);
var name = Assembly.GetExecutingAssembly().GetName().FullName;
remoteLoader = (RemoteLoader)appDomain.CreateInstanceAndUnwrap(name, typeof(RemoteLoader).FullName ?? throw new InvalidOperationException());
}
internal BaseResult<string> Save(LoginParamter paramter, string cCardNum, Dictionary<string, object> input)
{
remoteLoader._paramter = paramter;
return remoteLoader.Save(cCardNum, input);
}
internal BaseResult<string> Save(LoginParamter paramter, string cCardNum, List<Dictionary<string, object>> inputs)
{
remoteLoader._paramter = paramter;
return remoteLoader.Save(cCardNum, inputs);
}
/// <summary>
/// 卸载应用程序域
/// </summary>
internal void Unload()
{
try
{
if (appDomain == null) return;
AppDomain.Unload(appDomain);
appDomain = null;
remoteLoader = null;
}
catch (CannotUnloadAppDomainException ex)
{
throw ex;
}
}
}
}
UFIDA.U8.Framework.Api/Unit/RemoteLoader.cs
+116
View File
@@ -0,0 +1,116 @@
using log4net;
using System;
using System.Collections.Generic;
using UFIDA.U8.Framework.Api.ControlObject.Models;
using UFIDA.U8.Framework.Api.ControlObject.U8M;
namespace UFIDA.U8.Framework.Api.Unit
{
/// <summary>
/// 跨域加载
/// </summary>
internal class RemoteLoader : MarshalByRefObject
{
public LoginParamter _paramter;
private readonly ILog _logInfo = LogManager.GetLogger("logInfo");
/// <summary>
/// 构造函数
/// </summary>
/// <param name="paramter">登录参数</param>
internal RemoteLoader(LoginParamter paramter)
{
_paramter = paramter;
}
/// <summary>
/// 保存
/// </summary>
/// <param name="cCardNum">单据类型编码</param>
/// <param name="input">数据包</param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
internal BaseResult<string> Save(string cCardNum, Dictionary<string, object> input)
{
try
{
IBaseBF bf;
switch (cCardNum)
{
case "FC90":
case "FC91":
case "FC92":
bf = new MoRoutingBill();
break;
default:
bf = null;
break;
}
if (bf == null)
{
throw new Exception("不支持的单据");
}
var baseLogin = new BaseLogin();
baseLogin.Init(_paramter);
return bf.Save(cCardNum, input);
}
catch (Exception ex)
{
_logInfo.Error(ex.Message, ex);
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
/// <summary>
/// 批量保存
/// </summary>
/// <param name="cCardNum">单据类型编码</param>
/// <param name="inputs">数据包</param>
/// <returns></returns>
/// <exception cref="Exception"></exception>
internal BaseResult<string> Save(string cCardNum, List<Dictionary<string, object>> inputs)
{
try
{
IBaseBF bf;
switch (cCardNum)
{
case "FC90":
case "FC91":
case "FC92":
bf = new MoRoutingBill();
break;
default:
bf = null;
break;
}
if (bf == null)
{
throw new Exception("不支持的单据");
}
var baseLogin = new BaseLogin();
baseLogin.Init(_paramter);
return bf.Save(cCardNum, inputs);
}
catch (Exception ex)
{
_logInfo.Error(ex.Message, ex);
return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
}
}
}
}
UFIDA.U8.Framework.Api/Web.config
+11 -3
View File
@@ -93,7 +93,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -105,7 +105,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -113,7 +113,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.2" newVersion="8.0.0.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Configuration.Binder" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -151,6 +151,14 @@
<assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.17.0" newVersion="2.0.17.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
UFIDA.U8.Framework.Api/packages.config
+7 -7
View File
@@ -9,7 +9,7 @@
<package id="DapperExtensions" version="1.7.0" targetFramework="net48" />
<package id="EntityFramework" version="6.5.1" targetFramework="net48" />
<package id="jQuery" version="3.7.1" targetFramework="net48" />
<package id="log4net" version="2.0.17" targetFramework="net48" />
<package id="log4net" version="3.0.2" targetFramework="net48" />
<package id="Microsoft.AspNet.Mvc" version="5.3.0" targetFramework="net48" />
<package id="Microsoft.AspNet.Mvc.zh-Hans" version="5.3.0" targetFramework="net48" />
<package id="Microsoft.AspNet.Razor" version="3.3.0" targetFramework="net48" />
@@ -32,7 +32,7 @@
<package id="Microsoft.Data.Sqlite" version="8.0.7" targetFramework="net48" />
<package id="Microsoft.Data.Sqlite.Core" version="8.0.7" targetFramework="net48" />
<package id="Microsoft.Extensions.Caching.Abstractions" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Caching.Memory" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Caching.Memory" version="8.0.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Configuration" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Configuration.Abstractions" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Configuration.Binder" version="8.0.2" targetFramework="net48" />
@@ -41,8 +41,8 @@
<package id="Microsoft.Extensions.Configuration.FileExtensions" version="8.0.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Configuration.Json" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Configuration.UserSecrets" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.DependencyInjection" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.1" targetFramework="net48" />
<package id="Microsoft.Extensions.DependencyInjection" version="8.0.1" targetFramework="net48" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net48" />
<package id="Microsoft.Extensions.Diagnostics" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Diagnostics.Abstractions" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.FileProviders.Abstractions" version="8.0.0" targetFramework="net48" />
@@ -50,8 +50,8 @@
<package id="Microsoft.Extensions.FileSystemGlobbing" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Hosting" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Hosting.Abstractions" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Logging" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Logging" version="8.0.1" targetFramework="net48" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.2" targetFramework="net48" />
<package id="Microsoft.Extensions.Logging.Configuration" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Logging.Console" version="8.0.0" targetFramework="net48" />
<package id="Microsoft.Extensions.Logging.Debug" version="8.0.0" targetFramework="net48" />
@@ -99,7 +99,7 @@
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net48" />
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48" />
<package id="System.Text.Json" version="8.0.4" targetFramework="net48" />
<package id="System.Text.Json" version="8.0.5" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
<package id="WebActivator" version="1.5.1" targetFramework="net48" />