diff --git a/Admin.NET/Admin.NET.Application/Configuration/MessageQueue.json b/Admin.NET/Admin.NET.Application/Configuration/MessageQueue.json
index 2ffaf4d8..01ef556a 100644
--- a/Admin.NET/Admin.NET.Application/Configuration/MessageQueue.json
+++ b/Admin.NET/Admin.NET.Application/Configuration/MessageQueue.json
@@ -16,8 +16,8 @@
"VirtualHost": "/"
},
- //RabbitMQ消费者配置
+ // RabbitMQ 消费者配置
"RabbitMqConsumerOptions": {
- "ConsumerCount": 1 // 消费者数量,多消费者实现多线程消费队列
+ "ConsumerCount": 1 // 消费者数量,多消费者实现多线程消费队列
}
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Application/Startup.cs b/Admin.NET/Admin.NET.Application/Startup.cs
index 6c0cb259..893badf5 100644
--- a/Admin.NET/Admin.NET.Application/Startup.cs
+++ b/Admin.NET/Admin.NET.Application/Startup.cs
@@ -4,11 +4,9 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-using Admin.NET.Core;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;
-using NewLife.Reflection;
namespace Admin.NET.Application;
diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index c2428e39..238e1045 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -27,7 +27,7 @@
-
+
diff --git a/Admin.NET/Admin.NET.Core/Logging/HttpLoggingHandler.cs b/Admin.NET/Admin.NET.Core/Logging/HttpLoggingHandler.cs
index 5099ee23..07513bae 100644
--- a/Admin.NET/Admin.NET.Core/Logging/HttpLoggingHandler.cs
+++ b/Admin.NET/Admin.NET.Core/Logging/HttpLoggingHandler.cs
@@ -4,8 +4,6 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-using System.Net.Http.Headers;
-
namespace Admin.NET.Core;
///
diff --git a/Admin.NET/Admin.NET.Core/RabbitMQ/RabbitMqConsumerOptions.cs b/Admin.NET/Admin.NET.Core/RabbitMQ/RabbitMqConsumerOptions.cs
index 788c8199..b9c515ca 100644
--- a/Admin.NET/Admin.NET.Core/RabbitMQ/RabbitMqConsumerOptions.cs
+++ b/Admin.NET/Admin.NET.Core/RabbitMQ/RabbitMqConsumerOptions.cs
@@ -7,7 +7,7 @@
namespace Admin.NET.Core;
///
-/// RabbitMQ消费者配置
+/// RabbitMQ 消费者配置
///
public class RabbitMqConsumerOptions : IConfigurableOptions
{
diff --git a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
index 0394d3df..a4e88ed1 100644
--- a/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
@@ -339,17 +339,16 @@ public class SysAuthService : IDynamicApiController, ITransient
};
}
- /////
- ///// 获取刷新Token 🔖
- /////
- /////
- /////
- //[DisplayName("获取刷新Token")]
- //public string GetRefreshToken([FromQuery] string accessToken)
- //{
- // var refreshTokenExpire = _sysConfigService.GetRefreshTokenExpire().GetAwaiter().GetResult();
- // return JWTEncryption.GenerateRefreshToken(accessToken, refreshTokenExpire);
- //}
+ ///
+ /// 刷新Token
+ ///
+ ///
+ [NonAction]
+ public async Task RefreshToken(long userId)
+ {
+ var user = await _sysUserRep.AsQueryable().IgnoreTenant().Includes(u => u.SysOrg).FirstAsync(u => u.Id == userId);
+ await CreateToken(user);
+ }
///
/// 退出系统 🔖
@@ -440,15 +439,4 @@ public class SysAuthService : IDynamicApiController, ITransient
return 401;
}
}
-
- ///
- /// 刷新token
- ///
- ///
- [NonAction]
- public async Task RefreshToken(long userId)
- {
- var user = await _sysUserRep.AsQueryable().IgnoreTenant().Includes(u => u.SysOrg).FirstAsync(u => u.Id == userId);
- await CreateToken(user);
- }
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Service/Log/Dto/LogHttpOutput.cs b/Admin.NET/Admin.NET.Core/Service/Log/Dto/LogHttpOutput.cs
index 70ac82dd..402d1dd2 100644
--- a/Admin.NET/Admin.NET.Core/Service/Log/Dto/LogHttpOutput.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Log/Dto/LogHttpOutput.cs
@@ -110,7 +110,6 @@ public class PageLogHttpOutput
/// 创建用户
///
public string CreateUserName { get; set; }
-
}
///
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/GlobalUsings.cs b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/GlobalUsings.cs
index 8442a677..15cf2dec 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/GlobalUsings.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/GlobalUsings.cs
@@ -8,11 +8,6 @@ global using Admin.NET.Core;
global using Admin.NET.Core.Service;
global using Furion;
global using Furion.DependencyInjection;
-global using Furion.EventBus;
global using Furion.HttpRemote;
-global using Lazy.Captcha.Core;
-global using Microsoft.AspNetCore.Http;
-global using Microsoft.AspNetCore.Mvc;
global using Newtonsoft.Json;
-global using System.ComponentModel.DataAnnotations;
-global using System.Text.Json.Serialization;
\ No newline at end of file
+global using System.ComponentModel.DataAnnotations;
\ No newline at end of file
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Chat/WorkWxAppChatService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Chat/WorkWxAppChatService.cs
index 977ecf00..d805bb20 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Chat/WorkWxAppChatService.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Chat/WorkWxAppChatService.cs
@@ -4,7 +4,6 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-
namespace Admin.NET.Plugin.WorkWeixin;
///
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Dept/WorkWxDeptService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Dept/WorkWxDeptService.cs
index a2f462d0..17a7e7ba 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Dept/WorkWxDeptService.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Dept/WorkWxDeptService.cs
@@ -4,7 +4,6 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-
namespace Admin.NET.Plugin.WorkWeixin;
///
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Tag/WorkWxTagService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Tag/WorkWxTagService.cs
index 41d98b2c..e1c803ca 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Tag/WorkWxTagService.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/Tag/WorkWxTagService.cs
@@ -4,7 +4,6 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-
namespace Admin.NET.Plugin.WorkWeixin;
///
@@ -39,7 +38,7 @@ public class WorkWxTagService(WorkWxBaseService baseService) : ITransient
///
public async Task Delete(long id)
{
- return await baseService.SendAsync(new(){ TagId = id });
+ return await baseService.SendAsync(new() { TagId = id });
}
///
@@ -49,7 +48,7 @@ public class WorkWxTagService(WorkWxBaseService baseService) : ITransient
///
public async Task Get(long id)
{
- return await baseService.SendAsync(new(){ TagId = id });
+ return await baseService.SendAsync(new() { TagId = id });
}
///
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/Dto/UserWorkWxOutput.cs b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/Dto/UserWorkWxOutput.cs
index c2552fe2..d5359841 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/Dto/UserWorkWxOutput.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/Dto/UserWorkWxOutput.cs
@@ -786,7 +786,7 @@ public class JoinQrcodeWorkWxOutput : BaseWorkWxOutput
{
get
{
- if (string.IsNullOrEmpty(JoinQrcode))return null;
+ if (string.IsNullOrEmpty(JoinQrcode)) return null;
var match = Regex.Match(JoinQrcode, @"qr_size=(\d)");
return match.Success ? int.Parse(match.Groups[1].Value) : null;
}
diff --git a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/WorkWxUserService.cs b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/WorkWxUserService.cs
index c125b3f1..e32c928b 100644
--- a/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/WorkWxUserService.cs
+++ b/Admin.NET/Plugins/Admin.NET.Plugin.WorkWeixin/Service/User/WorkWxUserService.cs
@@ -4,7 +4,6 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-
namespace Admin.NET.Plugin.WorkWeixin;
///
@@ -150,7 +149,7 @@ public class WorkWxUserService(WorkWxBaseService baseService) : ITransient
///
public async Task GetUserIdByEmail(string email, int? emailType = 1)
{
- return await baseService.SendAsync(new(){ Email = email, EmailType = emailType });
+ return await baseService.SendAsync(new() { Email = email, EmailType = emailType });
}
///
@@ -161,6 +160,6 @@ public class WorkWxUserService(WorkWxBaseService baseService) : ITransient
///
public async Task GetUserIdList(string cursor = null, int? limit = 20)
{
- return await baseService.SendAsync(new(){ Cursor = cursor, Limit = limit });
+ return await baseService.SendAsync(new() { Cursor = cursor, Limit = limit });
}
}
\ No newline at end of file
diff --git a/Web/package.json b/Web/package.json
index e45dd432..5d3b85aa 100644
--- a/Web/package.json
+++ b/Web/package.json
@@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
- "lastBuildTime": "2025.08.28",
+ "lastBuildTime": "2025.08.30",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@@ -81,8 +81,8 @@
"vue-router": "^4.5.1",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
- "vxe-pc-ui": "^4.9.6",
- "vxe-table": "^4.16.1",
+ "vxe-pc-ui": "^4.9.8",
+ "vxe-table": "^4.16.2",
"xe-utils": "^3.7.8",
"xlsx-js-style": "^1.2.0"
},
@@ -114,7 +114,7 @@
"vite": "^7.1.3",
"vite-auto-i18n-plugin": "^1.1.7",
"vite-plugin-cdn-import": "^1.0.1",
- "vite-plugin-compression2": "^2.2.0",
+ "vite-plugin-compression2": "^2.2.1",
"vite-plugin-vue-setup-extend": "^0.4.0",
"vue-eslint-parser": "^10.2.0"
},
diff --git a/Web/src/components/sysDict/sysDict.vue b/Web/src/components/sysDict/sysDict.vue
index 8de32116..26494cdd 100644
--- a/Web/src/components/sysDict/sysDict.vue
+++ b/Web/src/components/sysDict/sysDict.vue
@@ -65,10 +65,10 @@ interface MutexConfig {
const MultipleModel = {
Array: 'array',
Comma: 'comma',
-} as const
+} as const;
// 多选值模式枚举类型
-type MultipleModelType = typeof MultipleModel[keyof typeof MultipleModel];
+type MultipleModelType = (typeof MultipleModel)[keyof typeof MultipleModel];
/**
* 检查是否为合法的渲染类型
@@ -94,7 +94,7 @@ function isMultipleModel(value: any): value is MultipleModelType {