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-08-01 19:53:56 +08:00
parent ecd2ee327f
commit c7715bd19e
5 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Admin.NET/Admin.NET.Application/Configuration/EventBus.json
View File

@ -8,7 +8,8 @@
"UserName": "adminnet",
"Password": "adminnet++123456",
"HostName": "127.0.0.1",
"Port": 5672
"Port": 5672,
"VirtualHost": "/"
},
"Kafka": {
}

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

@ -26,7 +26,7 @@
<PackageReference Include="AngleSharp" Version="1.3.0" />
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" Aliases="BouncyCastleV2" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" Aliases="BouncyCastleV2" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="9.0.7" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.7.106" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.7.106" />
@ -44,15 +44,15 @@
<PackageReference Include="MiniWord" Version="0.9.2" />
<PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" />
<PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.6.4" />
<PackageReference Include="NewLife.Redis" Version="6.3.2025.701" />
<PackageReference Include="NewLife.Redis" Version="6.3.2025.801" />
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="4.0.0" />
<PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
<PackageReference Include="QRCoder" Version="1.6.0" />
<PackageReference Include="RabbitMQ.Client" Version="7.1.2" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.5" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.2.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="3.11.0" />
<PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="3.13.0" />
<PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.236" />
<PackageReference Include="SqlSugar.MongoDbCore" Version="5.1.4.238" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.198" />
<PackageReference Include="SSH.NET" Version="2025.0.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.7" />
@ -74,7 +74,7 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.3.0" />
<PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.3.0" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.2.1" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.2.2" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.11" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.11" />

8
Admin.NET/Admin.NET.Web.Core/Startup.cs
View File

@ -159,10 +159,10 @@ public class Startup : AppStartup
setting.Converters.AddDateOnlyConverters(); // DateOnly
setting.Converters.AddTimeOnlyConverters(); // TimeOnly
setting.Converters.AddClayConverters(); // 粘土对象 Clay 类型序列化支持
// DateTimeOffset 反序列化异常
setting.MetadataPropertyHandling = MetadataPropertyHandling.Ignore;
setting.DateParseHandling = DateParseHandling.None;
setting.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal });
//// DateTimeOffset 反序列化异常
//setting.MetadataPropertyHandling = MetadataPropertyHandling.Ignore;
//setting.DateParseHandling = DateParseHandling.None;
//setting.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal });
}
// 增加字典Key小写处理序列化配置选项

16
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2025.07.31",
"lastBuildTime": "2025.08.01",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -20,7 +20,7 @@
"@element-plus/icons-vue": "^2.3.1",
"@logicflow/core": "^2.0.16",
"@logicflow/extension": "^2.0.21",
"@microsoft/signalr": "^8.0.7",
"@microsoft/signalr": "^9.0.6",
"@vue-office/docx": "^1.6.3",
"@vue-office/excel": "^1.7.14",
"@vue-office/pdf": "^2.0.10",
@ -50,7 +50,7 @@
"jsplumb": "^2.15.6",
"lodash-es": "^4.17.21",
"magic-string": "^0.30.17",
"md-editor-v3": "^5.8.3",
"md-editor-v3": "^5.8.4",
"mitt": "^3.0.1",
"monaco-editor": "^0.52.2",
"mqtt": "^5.14.0",
@ -82,7 +82,7 @@
"vue-router": "^4.5.1",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.8.3",
"vxe-pc-ui": "^4.8.4",
"vxe-table": "^4.15.0",
"xe-utils": "^3.7.8",
"xlsx-js-style": "^1.2.0"
@ -91,7 +91,7 @@
"@iconify/vue": "^5.0.0",
"@plugin-web-update-notification/vite": "^2.0.0",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.15.35",
"@types/node": "^22.17.0",
"@types/nprogress": "^0.2.3",
"@types/sortablejs": "^1.15.8",
"@typescript-eslint/eslint-plugin": "^8.38.0",
@ -99,16 +99,16 @@
"@vitejs/plugin-vue": "^6.0.1",
"@vitejs/plugin-vue-jsx": "^5.0.1",
"@vue/compiler-sfc": "^3.5.18",
"code-inspector-plugin": "^1.0.3",
"code-inspector-plugin": "^1.0.4",
"eslint": "^9.32.0",
"eslint-plugin-vue": "^10.3.0",
"eslint-plugin-vue": "^10.4.0",
"globals": "^16.3.0",
"less": "^4.4.0",
"prettier": "^3.6.2",
"rollup-plugin-visualizer": "^6.0.3",
"sass": "^1.89.2",
"terser": "^5.43.1",
"typescript": "^5.8.3",
"typescript": "^5.9.2",
"vite": "^7.0.6",
"vite-auto-i18n-plugin": "^1.1.6",
"vite-plugin-cdn-import": "^1.0.1",

2
Web/src/views/system/user/component/userCenter.vue
View File

@ -180,9 +180,9 @@ import OrgTree from '/@/views/system/user/component/orgTree.vue';
import CropperDialog from '/@/components/cropper/index.vue';
import VueGridLayout from 'vue-grid-layout';
import { sm2 } from 'sm-crypto-v2';
import { clearAccessTokens, getAPI } from '/@/utils/axios-utils';
import { useI18n } from 'vue-i18n';
import { clearAccessTokens, getAPI } from '/@/utils/axios-utils';
import { SysConfigApi, SysFileApi, SysUserApi } from '/@/api-services/api';
import { ChangePwdInput, SysUser, SysFile } from '/@/api-services/models';