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 2024-09-23 21:42:42 +08:00
parent 7502baafad
commit 341970439a
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,9 @@
<PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" /> <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" /> <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
<PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.6" /> <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.15.6" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.11" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.12" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.11" /> <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.12" />
<PackageReference Include="Furion.Pure" Version="4.9.5.11" /> <PackageReference Include="Furion.Pure" Version="4.9.5.12" />
<PackageReference Include="Hardware.Info" Version="101.0.0" /> <PackageReference Include="Hardware.Info" Version="101.0.0" />
<PackageReference Include="Hashids.net" Version="1.7.0" /> <PackageReference Include="Hashids.net" Version="1.7.0" />
<PackageReference Include="IPTools.China" Version="1.6.0" /> <PackageReference Include="IPTools.China" Version="1.6.0" />
@ -42,7 +42,7 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.169" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.169" />
<PackageReference Include="SSH.NET" Version="2024.1.0" /> <PackageReference Include="SSH.NET" Version="2024.1.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1091" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1093" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>
@ -50,7 +50,7 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
<PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" /> <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" />
<PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" /> <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.0.8" /> <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.33" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.33" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.33" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.33" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.33" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.33" />
@ -60,7 +60,7 @@
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
<PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.2.0" /> <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.2.0" />
<PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.2.0" /> <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.2.0" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" /> <PackageReference Include="Lazy.Captcha.Core" Version="2.0.8" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.8" /> <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.8" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.8" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" /> <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.8" />

6
Admin.NET/Admin.NET.Core/Hub/OnlineUserHub.cs
View File

@ -72,9 +72,9 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
{ {
_sysCacheService.HashAdd(CacheConst.KeyUserOnline, "" + user.UserId + loginMode, user); _sysCacheService.HashAdd(CacheConst.KeyUserOnline, "" + user.UserId + loginMode, user);
} }
else // 非单用户登录则绑定用户设备信息 else // 非单用户登录则绑定用户连接Id
{ {
_sysCacheService.HashAdd(CacheConst.KeyUserOnline, user.UserId + device, user); _sysCacheService.HashAdd(CacheConst.KeyUserOnline, user.UserId + Context.ConnectionId, user);
} }
// 以租户Id进行分组 // 以租户Id进行分组
@ -116,7 +116,7 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
else else
{ {
var device = httpContext.GetClientDeviceInfo().Trim(); var device = httpContext.GetClientDeviceInfo().Trim();
_sysCacheService.HashDel<SysOnlineUser>(CacheConst.KeyUserOnline, user.UserId + device); _sysCacheService.HashDel<SysOnlineUser>(CacheConst.KeyUserOnline, user.UserId + Context.ConnectionId);
// _sysCacheService.Remove(CacheConst.KeyUserOnline + user.UserId + device); // _sysCacheService.Remove(CacheConst.KeyUserOnline + user.UserId + device);
} }

12
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": "2024.09.21", "lastBuildTime": "2024.09.23",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -46,7 +46,7 @@
"monaco-editor": "^0.52.0", "monaco-editor": "^0.52.0",
"mqtt": "^5.10.1", "mqtt": "^5.10.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"ol": "^10.1.0", "ol": "^10.2.0",
"pinia": "^2.2.2", "pinia": "^2.2.2",
"print-js": "^1.6.0", "print-js": "^1.6.0",
"push.js": "^1.0.12", "push.js": "^1.0.12",
@ -59,18 +59,18 @@
"splitpanes": "^3.1.5", "splitpanes": "^3.1.5",
"vcrontab-3": "^3.3.22", "vcrontab-3": "^3.3.22",
"vform3-builds": "^3.0.10", "vform3-builds": "^3.0.10",
"vue": "^3.5.7", "vue": "^3.5.8",
"vue-clipboard3": "^2.0.0", "vue-clipboard3": "^2.0.0",
"vue-demi": "0.14.6", "vue-demi": "0.14.6",
"vue-draggable-plus": "^0.5.3", "vue-draggable-plus": "^0.5.3",
"vue-grid-layout": "3.0.0-beta1", "vue-grid-layout": "3.0.0-beta1",
"vue-i18n": "^10.0.1", "vue-i18n": "^10.0.3",
"vue-json-pretty": "^2.4.0", "vue-json-pretty": "^2.4.0",
"vue-plugin-hiprint": "0.0.57-beta30", "vue-plugin-hiprint": "0.0.57-beta30",
"vue-router": "^4.4.5", "vue-router": "^4.4.5",
"vue-signature-pad": "^3.0.2", "vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2", "vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.1.30", "vxe-pc-ui": "^4.2.2",
"vxe-table": "^4.7.59", "vxe-table": "^4.7.59",
"vxe-table-plugin-element": "^4.0.4", "vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.5", "vxe-table-plugin-export-xlsx": "^4.0.5",
@ -88,7 +88,7 @@
"@typescript-eslint/parser": "^8.6.0", "@typescript-eslint/parser": "^8.6.0",
"@vitejs/plugin-vue": "^5.1.4", "@vitejs/plugin-vue": "^5.1.4",
"@vitejs/plugin-vue-jsx": "^4.0.1", "@vitejs/plugin-vue-jsx": "^4.0.1",
"@vue/compiler-sfc": "^3.5.7", "@vue/compiler-sfc": "^3.5.8",
"code-inspector-plugin": "^0.16.1", "code-inspector-plugin": "^0.16.1",
"eslint": "^9.11.0", "eslint": "^9.11.0",
"eslint-plugin-vue": "^9.28.0", "eslint-plugin-vue": "^9.28.0",

6
Web/src/views/system/codeGen/component/editCodeGenDialog.vue
View File

@ -141,14 +141,14 @@
<template v-slot:label> <template v-slot:label>
<div> <div>
接口模式 接口模式
<el-tooltip raw-content content="API Service 模式是自动生成前端接口请求文件，推荐此模式。不使用则是指自定义前端接口请求。" placement="top"> <el-tooltip raw-content content="接口服务模式是指根据swagger自动生成前端接口请求文件，推荐此模式。传统模式则是指手动编写接口请求并进行数据绑定。" placement="top">
<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon> <el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"><ele-QuestionFilled /></el-icon>
</el-tooltip> </el-tooltip>
</div> </div>
</template> </template>
<el-radio-group v-model="state.ruleForm.isApiService"> <el-radio-group v-model="state.ruleForm.isApiService">
<el-radio :value="true">使用API Service</el-radio> <el-radio :value="true">接口服务</el-radio>
<el-radio :value="false">不使用</el-radio> <el-radio :value="false">传统模式</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>