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

😎1、暂时注释枚举转字典批量入库 2、升级依赖及其他优化

Browse Source
This commit is contained in:
zuohuaijun 2025-04-16 21:05:15 +08:00
parent 8525434149
commit 04f16ec6f5
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs
View File

@ -265,6 +265,7 @@ public class SysConfigService : IDynamicApiController, ITransient
/// 获取密码加解密公钥 /// 获取密码加解密公钥
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[DisplayName("获取密码加解密公钥")]
public string GetSmPublicKey() public string GetSmPublicKey()
{ {
return App.GetConfig<string>("Cryptogram:PublicKey", true); return App.GetConfig<string>("Cryptogram:PublicKey", true);

12
Admin.NET/Admin.NET.Core/Service/Enum/SysEnumService.cs
View File

@ -123,14 +123,14 @@ public class SysEnumService : IDynamicApiController, ITransient
var newEnumType = enumTypeList.Where(u => !updatedEnumCodes.Contains(u.TypeName)).ToList(); var newEnumType = enumTypeList.Where(u => !updatedEnumCodes.Contains(u.TypeName)).ToList();
var (newDictTypes, newDictDatas) = GetNewSysDicts(newEnumType); var (newDictTypes, newDictDatas) = GetNewSysDicts(newEnumType);
// 若是Sqlite、PostgreSQL、MySql、SqlServer、GaussDB、Kdbndp则采用批量处理 // 若是Sqlite、PostgreSQL、SqlServer、MySql、GaussDB、Kdbndp则采用批量处理
bool enableBulk = _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite bool enableBulk = _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Sqlite
|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.PostgreSQL || _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.PostgreSQL
|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.MySql || _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.SqlServer;
|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.MySqlConnector //|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.MySql
|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.SqlServer //|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.MySqlConnector
|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.GaussDB //|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.GaussDB
|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Kdbndp; //|| _db.CurrentConnectionConfig.DbType == SqlSugar.DbType.Kdbndp;
// 执行数据库操作 // 执行数据库操作
if (updatedDictTypes.Count > 0) if (updatedDictTypes.Count > 0)

2
Admin.NET/Plugins/Admin.NET.Plugin.ReZero/Admin.NET.Plugin.ReZero.csproj
View File

@ -26,7 +26,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" /> <PackageReference Include="DocumentFormat.OpenXml" Version="3.3.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.13.0" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.13.0" />
<PackageReference Include="Rezero.Api" Version="1.8.7" /> <PackageReference Include="Rezero.Api" Version="1.8.8" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
Web/index.html
View File

@ -20,6 +20,7 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
z-index: 9999; z-index: 9999;
color: #0f59a4;
} }
.loading-wrapper.hide { .loading-wrapper.hide {
@ -29,7 +30,7 @@
.loader { .loader {
width: 15px; width: 15px;
aspect-ratio: 1; aspect-ratio: 1;
background: #000; background: #0f59a4;
border-radius: 50%; border-radius: 50%;
animation: l6 1s infinite linear alternate; animation: l6 1s infinite linear alternate;
} }

10
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro", "name": "admin.net.pro",
"type": "module", "type": "module",
"version": "2.4.33", "version": "2.4.33",
"lastBuildTime": "2025.04.15", "lastBuildTime": "2025.04.16",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -77,8 +77,8 @@
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-flag-icons": "^0.0.3", "vue3-flag-icons": "^0.0.3",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.5.23", "vxe-pc-ui": "^4.5.24",
"vxe-table": "^4.13.3", "vxe-table": "^4.13.4",
"vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.7", "vxe-table-plugin-export-xlsx": "^4.0.7",
"xe-utils": "^3.7.4", "xe-utils": "^3.7.4",
@ -101,13 +101,13 @@
"eslint-plugin-vue": "^10.0.0", "eslint-plugin-vue": "^10.0.0",
"globals": "^16.0.0", "globals": "^16.0.0",
"less": "^4.3.0", "less": "^4.3.0",
"openapi-ts-request": "^1.3.1", "openapi-ts-request": "^1.3.2",
"prettier": "^3.5.3", "prettier": "^3.5.3",
"rollup-plugin-visualizer": "^5.14.0", "rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.86.3", "sass": "^1.86.3",
"terser": "^5.39.0", "terser": "^5.39.0",
"typescript": "^5.8.3", "typescript": "^5.8.3",
"vite": "^6.2.6", "vite": "^6.3.0",
"vite-plugin-cdn-import": "^1.0.1", "vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.3.3", "vite-plugin-compression2": "^1.3.3",
"vite-plugin-vue-setup-extend": "^0.4.0", "vite-plugin-vue-setup-extend": "^0.4.0",