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-10-08 03:11:42 +08:00
parent 69f0774955
commit 707e44ee1a
6 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@
<PackageReference Include="MiniWord" Version="0.9.2" /> <PackageReference Include="MiniWord" Version="0.9.2" />
<PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" /> <PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" />
<PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.6.5" /> <PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.6.5" />
<PackageReference Include="NewLife.Redis" Version="6.3.2025.801" /> <PackageReference Include="NewLife.Redis" Version="6.3.2025.1001" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" /> <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
<PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" /> <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
<PackageReference Include="QRCoder" Version="1.6.0" /> <PackageReference Include="QRCoder" Version="1.6.0" />
@ -52,7 +52,7 @@
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.2.0" /> <PackageReference Include="SixLabors.ImageSharp.Web" Version="3.2.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.12.0" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.12.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.14.0" /> <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.14.0" />
<PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.264" /> <PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.266" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.205" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.205" />
<PackageReference Include="SSH.NET" Version="2025.0.0" /> <PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.8" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.8" />

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

@ -13,7 +13,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Furion.Xunit" Version="4.9.7.128" /> <PackageReference Include="Furion.Xunit" Version="4.9.7.128" />
<PackageReference Include="Furion.Pure" Version="4.9.7.128"> <PackageReference Include="Furion.Pure" Version="4.9.7.128">
<ExcludeAssets>compile</ExcludeAssets> <ExcludeAssets>compile</ExcludeAssets>

22
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.10.01", "lastBuildTime": "2025.10.08",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -51,7 +51,7 @@
"magic-string": "^0.30.19", "magic-string": "^0.30.19",
"md-editor-v3": "^6.0.1", "md-editor-v3": "^6.0.1",
"mitt": "^3.0.1", "mitt": "^3.0.1",
"monaco-editor": "^0.53.0", "monaco-editor": "^0.54.0",
"mqtt": "^5.14.0", "mqtt": "^5.14.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"ol": "^10.6.1", "ol": "^10.6.1",
@ -65,7 +65,7 @@
"sm-crypto-v2": "^1.14.0", "sm-crypto-v2": "^1.14.0",
"sortablejs": "^1.15.6", "sortablejs": "^1.15.6",
"splitpanes": "^4.0.4", "splitpanes": "^4.0.4",
"sql-formatter": "^15.6.9", "sql-formatter": "^15.6.10",
"uuid": "^13.0.0", "uuid": "^13.0.0",
"vcrontab-3": "^3.3.22", "vcrontab-3": "^3.3.22",
"vform3-builds": "^3.0.10", "vform3-builds": "^3.0.10",
@ -90,11 +90,11 @@
"@iconify/vue": "^5.0.0", "@iconify/vue": "^5.0.0",
"@plugin-web-update-notification/vite": "^2.0.2", "@plugin-web-update-notification/vite": "^2.0.2",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^22.18.7", "@types/node": "^22.18.8",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8", "@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.45.0", "@typescript-eslint/eslint-plugin": "^8.46.0",
"@typescript-eslint/parser": "^8.45.0", "@typescript-eslint/parser": "^8.46.0",
"@vitejs/plugin-vue": "^6.0.1", "@vitejs/plugin-vue": "^6.0.1",
"@vitejs/plugin-vue-jsx": "^5.1.1", "@vitejs/plugin-vue-jsx": "^5.1.1",
"@vue/compiler-sfc": "^3.5.22", "@vue/compiler-sfc": "^3.5.22",
@ -102,16 +102,16 @@
"code-inspector-plugin": "^1.2.10", "code-inspector-plugin": "^1.2.10",
"colors": "^1.4.0", "colors": "^1.4.0",
"dotenv": "^17.2.3", "dotenv": "^17.2.3",
"eslint": "^9.36.0", "eslint": "^9.37.0",
"eslint-plugin-vue": "^10.5.0", "eslint-plugin-vue": "^10.5.0",
"globals": "^16.4.0", "globals": "^16.4.0",
"less": "^4.4.1", "less": "^4.4.2",
"prettier": "^3.6.2", "prettier": "^3.6.2",
"rollup-plugin-visualizer": "^6.0.3", "rollup-plugin-visualizer": "^6.0.4",
"sass": "^1.93.2", "sass": "^1.93.2",
"terser": "^5.44.0", "terser": "^5.44.0",
"typescript": "^5.9.2", "typescript": "^5.9.3",
"vite": "^7.1.7", "vite": "^7.1.9",
"vite-auto-i18n-plugin": "^1.1.9", "vite-auto-i18n-plugin": "^1.1.9",
"vite-plugin-cdn-import": "^1.0.1", "vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^2.2.1", "vite-plugin-compression2": "^2.2.1",

2
Web/src/layout/navBars/topBar/settings.vue
View File

@ -706,8 +706,8 @@ const onCopyConfigClick = () => {
}; };
// 一键恢复默认 // 一键恢复默认
const onResetConfigClick = () => { const onResetConfigClick = () => {
Local.clear();
Session.clear(); Session.clear();
Local.clear();
window.location.reload(); window.location.reload();
// @ts-ignore // @ts-ignore
Local.set('version', __NEXT_VERSION__); Local.set('version', __NEXT_VERSION__);

2
Web/src/layout/navBars/topBar/user.vue
View File

@ -186,8 +186,8 @@ const onLayoutSetingClick = () => {
// 下拉菜单点击时 // 下拉菜单点击时
const onHandleCommandClick = (path: string) => { const onHandleCommandClick = (path: string) => {
if (path === 'clearCache') { if (path === 'clearCache') {
Local.clear();
Session.clear(); Session.clear();
Local.clear();
window.location.reload(); window.location.reload();
} else if (path === 'lockScreen') { } else if (path === 'lockScreen') {
Local.remove('themeConfig'); Local.remove('themeConfig');

10
Web/src/views/login/component/account.vue
View File

@ -161,10 +161,12 @@ onMounted(async () => {
const accessToken = route.query.token; const accessToken = route.query.token;
if (accessToken) await saveTokenAndInitRoutes(accessToken); if (accessToken) await saveTokenAndInitRoutes(accessToken);
// // 若公钥为空则刷新页面 // 若系统配置为空则刷新页面
// if (window.__env__.VITE_SM_PUBLIC_KEY == '' || window.__env__.VITE_SM_PUBLIC_KEY == undefined) { if (themeConfig.value.captcha == undefined) {
// window.location.reload(); setTimeout(() => {
// } window.location.reload();
}, 1000);
}
// 获取登录配置 // 获取登录配置
state.secondVerEnabled = themeConfig.value.secondVer ?? false; state.secondVerEnabled = themeConfig.value.secondVer ?? false;