diff --git a/BPA.SAAS.Manage.Application/AExternalPlatform/Service/CheckService/Services/CheckServices.cs b/BPA.SAAS.Manage.Application/AExternalPlatform/Service/CheckService/Services/CheckServices.cs
index b170088..9f50be2 100644
--- a/BPA.SAAS.Manage.Application/AExternalPlatform/Service/CheckService/Services/CheckServices.cs
+++ b/BPA.SAAS.Manage.Application/AExternalPlatform/Service/CheckService/Services/CheckServices.cs
@@ -29,7 +29,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.CheckService.Ser
await CheckKey(key);
var thisSign = signStr + "&" + key;
-
+ var vvv = MD5Encryption.Encrypt(thisSign.ToUpper()).ToUpper();
if (MD5Encryption.Encrypt(thisSign.ToUpper()).ToUpper() != signMd5.ToUpper())
{
diff --git a/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Material/Services/MaterialService.cs b/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Material/Services/MaterialService.cs
index 8d261f8..567a00c 100644
--- a/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Material/Services/MaterialService.cs
+++ b/BPA.SAAS.Manage.Application/AExternalPlatform/Service/Material/Services/MaterialService.cs
@@ -139,15 +139,22 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Material.Service
///
public async Task DelMaterial(BaseRequestDto inputDto)
{
-
-
- var materialData = await SqlSugarDb.Db.Queryable().FirstAsync(x => x.Id == inputDto.DataInfo.MaterialId);
- if (materialData == null)
+ try
+ {
+ var materialData = await SqlSugarDb.Db.Queryable().FirstAsync(x => x.Id == inputDto.DataInfo.MaterialId);
+ if (materialData == null)
+ {
+ throw Oops.Oh(ErrorCodeEnum.Code1003);
+ }
+ var res = await SqlSugarDb.Db.Deleteable(materialData).ExecuteCommandAsync();
+ return res > 0;
+ }
+ catch (Exception e)
{
- throw Oops.Oh(ErrorCodeEnum.Code1003);
+ throw Oops.Oh(e.Message);
}
- var res = await SqlSugarDb.Db.Deleteable(materialData).ExecuteCommandAsync();
- return res > 0;
+
+
}
///
@@ -194,8 +201,6 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Material.Service
if (materialData == null)
{
throw Oops.Oh(ErrorCodeEnum.Code1003);
-
-
}
else
{
@@ -225,7 +230,7 @@ namespace BPA.SAAS.Manage.Application.AExternalPlatform.Service.Material.Service
catch (Exception e)
{
SqlSugarDb.Db.Ado.RollbackTran();
- throw Oops.Oh(ErrorCodeEnum.Code1001);
+ throw Oops.Oh(e.Message);
}
}
}
diff --git a/BPA.SAAS.Manage.Core/System/BPA_ThirdpartyRequestLog.cs b/BPA.SAAS.Manage.Core/System/BPA_ThirdpartyRequestLog.cs
index ca22700..8d58ef3 100644
--- a/BPA.SAAS.Manage.Core/System/BPA_ThirdpartyRequestLog.cs
+++ b/BPA.SAAS.Manage.Core/System/BPA_ThirdpartyRequestLog.cs
@@ -23,6 +23,8 @@ namespace BPA.SAAS.Manage.Core.System
public string ResultParm { get; set; }
+ public string ReauestParm { get; set; }
+
public string IP { get; set; }
}
}
diff --git a/BPA.SAAS.Manage.Web.Core/Handlers/RequestAuditFiltercs.cs b/BPA.SAAS.Manage.Web.Core/Handlers/RequestAuditFiltercs.cs
index 10d4b15..7cd7278 100644
--- a/BPA.SAAS.Manage.Web.Core/Handlers/RequestAuditFiltercs.cs
+++ b/BPA.SAAS.Manage.Web.Core/Handlers/RequestAuditFiltercs.cs
@@ -55,10 +55,12 @@ namespace BPA.SAAS.Manage.Web.Core
// 获取请求的方法
var method = actionDescriptor.MethodInfo;
+ // 获取请求参数(写入日志,需序列化成字符串后存储)
+ var parameters = context.ActionArguments;
+
if (requestUrl.ToUpper().Contains("ExternalPlatform".ToUpper()))
{
- // 获取请求参数(写入日志,需序列化成字符串后存储)
- var parameters = context.ActionArguments;
+
var key= httpRequest.Headers["key"];
var sign= httpRequest.Headers["sign"];
List proplist = new List();
@@ -84,11 +86,13 @@ namespace BPA.SAAS.Manage.Web.Core
{
await SqlSugarDb.Db.Insertable(new BPA_ThirdpartyRequestLog()
{
+ Id=Guid.NewGuid().ToString(),
CreateBy = DateTime.Now.ToString(),
GroupId = CurrentUser.GroupId,
RequestUrl = requestUrl,
ReauestMethod = httpRequest.Method,
- ResultParm = returnResult == null ? "" : JsonConvert.SerializeObject(returnResult),
+ ReauestParm= JsonConvert.SerializeObject(parameters),
+ ResultParm = !isRequestSucceed? actionContext.Exception.ToString() : JsonConvert.SerializeObject(returnResult),
IP = remoteIPv4
}).ExecuteCommandAsync();