Browse Source

锁定具体代码

master
wtp 2 years ago
parent
commit
94d5c86e0c
  1. 3
      src/Znyc.Dispatching.Application/Order/Services/OrderService.cs
  2. 9
      src/Znyc.Dispatching.Core/Util/MiniProgramUtil.cs

3
src/Znyc.Dispatching.Application/Order/Services/OrderService.cs

@ -499,7 +499,7 @@ namespace Znyc.Dispatching.Application
} }
constructionId = assign.ConstructionId; constructionId = assign.ConstructionId;
//施工单位是否存在,不存在新增,返回工程信息 //施工单位是否存在,不存在新增,返回工程信息
if (assign.ConstructionName.IsNotEmptyOrNull()) if (assign.ConstructionName.Trim().IsNotEmptyOrNull())
{ {
constructionId = await GetConstructionId(assign.ConstructionId, assign.ConstructionName); constructionId = await GetConstructionId(assign.ConstructionId, assign.ConstructionName);
} }
@ -1525,7 +1525,6 @@ namespace Znyc.Dispatching.Application
await ReceiveAsync(id); await ReceiveAsync(id);
} }
} }
var orderOutput = new OrderOutput(); var orderOutput = new OrderOutput();

9
src/Znyc.Dispatching.Core/Util/MiniProgramUtil.cs

@ -37,6 +37,8 @@ namespace Znyc.Dispatching.Core.Util
private static string BasicAESDecrypt(string encryptedDataStr, string session_key, string iv) private static string BasicAESDecrypt(string encryptedDataStr, string session_key, string iv)
{ {
try
{
var databyte = System.Text.Encoding.Default.GetBytes(encryptedDataStr); var databyte = System.Text.Encoding.Default.GetBytes(encryptedDataStr);
// 16进制转换成byte // 16进制转换成byte
var encryptedData = Convert.FromBase64String(encryptedDataStr.Replace(" ", "")); var encryptedData = Convert.FromBase64String(encryptedDataStr.Replace(" ", ""));
@ -52,6 +54,13 @@ namespace Znyc.Dispatching.Core.Util
var result = Encoding.Default.GetString(finalBlock); var result = Encoding.Default.GetString(finalBlock);
return result; return result;
} }
catch (Exception ex)
{
throw new Exception(ex.Message);
}
}
public static byte[] GetByteArray(string shex) public static byte[] GetByteArray(string shex)

Loading…
Cancel
Save