gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎1、优化下拉框组件 2、增加HMAC加密算法 3、升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2025-09-30 10:02:56 +08:00
parent c92881a1ef
commit 6108554498
5 changed files with 73 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -27,10 +27,10 @@
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.8" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.127" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.127" />
<PackageReference Include="Furion.Pure" Version="4.9.7.127" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.1.9" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.128" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.128" />
<PackageReference Include="Furion.Pure" Version="4.9.7.128" />
<PackageReference Include="Hardware.Info" Version="101.1.0" />
<PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" />
@ -39,7 +39,7 @@
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.6" />
<PackageReference Include="Magicodes.IE.Pdf" Version="2.7.6" />
<PackageReference Include="Magicodes.IE.Word" Version="2.7.6" />
<PackageReference Include="MailKit" Version="4.13.0" />
<PackageReference Include="MailKit" Version="4.14.0" />
<PackageReference Include="MiniExcel" Version="1.41.4" />
<PackageReference Include="MiniWord" Version="0.9.2" />
<PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" />
@ -50,14 +50,14 @@
<PackageReference Include="QRCoder" Version="1.6.0" />
<PackageReference Include="RabbitMQ.Client" Version="7.1.2" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.2.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.11.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.12.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.14.0" />
<PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.264" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.205" />
<PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.7" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.8" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1273" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1328" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

50
Admin.NET/Admin.NET.Core/Utils/GM/GM.cs
View File

@ -11,6 +11,7 @@ using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.Crypto.Digests;
using Org.BouncyCastle.Crypto.Engines;
using Org.BouncyCastle.Crypto.Generators;
using Org.BouncyCastle.Crypto.Macs;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Math;
using Org.BouncyCastle.Security;
@ -469,4 +470,53 @@ public class GM
Arrays.Fill(iv, (byte)0);
return iv;
}
/// <summary>
/// HMAC 加密
/// </summary>
/// <param name="key"></param>
/// <param name="srcData"></param>
/// <returns></returns>
public static byte[] Hmac(byte[] key, byte[] srcData)
{
KeyParameter keyParameter = new KeyParameter(key);
SM3Digest digest = new SM3Digest();
HMac mac = new HMac(digest);
mac.Init(keyParameter);
mac.BlockUpdate(srcData, 0, srcData.Length);
byte[] result = new byte[mac.GetMacSize()];
mac.DoFinal(result, 0);
return result;
}
/// <summary>
/// 字节数组转十六进制字符串
/// </summary>
/// <param name="bytes"></param>
/// <returns></returns>
public static string ByteArrayToHexString(byte[] bytes)
{
StringBuilder hex = new StringBuilder(bytes.Length * 2);
foreach (byte b in bytes)
{
hex.AppendFormat("{0:x2}", b);
}
return hex.ToString();
}
/// <summary>
/// 十六进制字符串转字节数组
/// </summary>
/// <param name="hex"></param>
/// <returns></returns>
public static byte[] HexStringToByteArray(string hex)
{
int length = hex.Length;
byte[] bytes = new byte[length / 2];
for (int i = 0; i < length; i += 2)
{
bytes[i / 2] = Convert.ToByte(hex.Substring(i, 2), 16);
}
return bytes;
}
}

4
Admin.NET/Admin.NET.Test/Admin.NET.Test.csproj
View File

@ -14,8 +14,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Furion.Xunit" Version="4.9.7.127" />
<PackageReference Include="Furion.Pure" Version="4.9.7.127">
<PackageReference Include="Furion.Xunit" Version="4.9.7.128" />
<PackageReference Include="Furion.Pure" Version="4.9.7.128">
<ExcludeAssets>compile</ExcludeAssets>
</PackageReference>
<PackageReference Include="xunit.assert" Version="2.9.3" />

10
Web/package.json
View File

@ -81,7 +81,7 @@
"vue-router": "^4.5.1",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.9.38",
"vxe-pc-ui": "^4.9.41",
"vxe-table": "^4.16.20",
"xe-utils": "^3.7.9",
"xlsx-js-style": "^1.2.0"
@ -90,18 +90,18 @@
"@iconify/vue": "^5.0.0",
"@plugin-web-update-notification/vite": "^2.0.2",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.18.6",
"@types/node": "^22.18.7",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.44.1",
"@typescript-eslint/parser": "^8.44.1",
"@typescript-eslint/eslint-plugin": "^8.45.0",
"@typescript-eslint/parser": "^8.45.0",
"@vitejs/plugin-vue": "^6.0.1",
"@vitejs/plugin-vue-jsx": "^5.1.1",
"@vue/compiler-sfc": "^3.5.22",
"cli-progress": "^3.12.0",
"code-inspector-plugin": "^1.2.10",
"colors": "^1.4.0",
"dotenv": "^17.2.1",
"dotenv": "^17.2.3",
"eslint": "^9.36.0",
"eslint-plugin-vue": "^10.5.0",
"globals": "^16.4.0",

6
Web/src/components/selector/pulldownSelecter.vue
View File

@ -291,12 +291,14 @@ const handleChange = (row: any) => {
// 选择器下拉框显示隐藏事件
const selectVisibleChange = (visible: boolean) => {
if (visible) {
if (!visible) return;
state.loading = true;
state.tableData.items = [];
state.tableData.total = 0;
state.tableQuery[props.keywordProp] = undefined;
handleQuery();
}
state.loading = false;
};
// 设置默认选项