😎1、暂时移除插件PluginCore 2、代码清理
This commit is contained in:
zuohuaijun
parent
3d844a574d
commit
779bf9e268
@ -39,7 +39,7 @@
|
||||
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.2" />
|
||||
<PackageReference Include="Magicodes.IE.Pdf" Version="2.7.5.2" />
|
||||
<PackageReference Include="Magicodes.IE.Word" Version="2.7.5.2" />
|
||||
<PackageReference Include="MailKit" Version="4.10.0" />
|
||||
<PackageReference Include="MailKit" Version="4.11.0" />
|
||||
<PackageReference Include="MiniExcel" Version="1.38.0" />
|
||||
<PackageReference Include="MiniWord" Version="0.9.2" />
|
||||
<PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" />
|
||||
|
||||
@ -4,9 +4,6 @@
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
using NewLife;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace Admin.NET.Core.Service;
|
||||
|
||||
/// <summary>
|
||||
@ -171,6 +168,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
{
|
||||
return _cacheProvider.Cache.Get<T>($"{_cacheOptions.Prefix}{key}");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 批量获取缓存值（普通键值结构）🔖
|
||||
/// </summary>
|
||||
@ -183,6 +181,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
var prefixedKeys = keys.Select(k => $"{_cacheOptions.Prefix}{k}");
|
||||
return prefixedKeys.Select(k => _cacheProvider.Cache.Get<T>(k)).ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 批量设置缓存项（兼容现有键规则）❄️，方法只对雪花Id有效
|
||||
/// </summary>
|
||||
@ -302,9 +301,10 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
|
||||
// 5. 按原始顺序返回
|
||||
return idList.Select(id => resultDict.TryGetValue(id, out var item)
|
||||
? (item ==null ? null : item)
|
||||
? (item == null ? null : item)
|
||||
: null).ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 批量获取（自动加载缺失数据+缓存回填）🔁
|
||||
/// </summary>
|
||||
@ -367,13 +367,13 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
|
||||
//SetList(toCache, cacheNull ? (nullExpire ?? TimeSpan.FromMinutes(5)) : null);
|
||||
// 将默认过期时间改为null（一直存储）
|
||||
|
||||
if(toCache.Count>0) SetList(toCache, cacheNull ? nullExpire : null);
|
||||
|
||||
if (toCache.Count > 0) SetList(toCache, cacheNull ? nullExpire : null);
|
||||
}
|
||||
|
||||
// 5. 按原始顺序返回
|
||||
return idList.Select(id => resultDict.TryGetValue(id, out var item)
|
||||
? (item ==null ? null : item)
|
||||
? (item == null ? null : item)
|
||||
: null).ToList();
|
||||
}
|
||||
|
||||
@ -402,6 +402,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
|
||||
return keys.Select(k => _cacheProvider.Cache.Get<T>(k)).ToList();
|
||||
}
|
||||
|
||||
// <summary>
|
||||
/// 批量获取哈希缓存字段值（哈希结构）🔖
|
||||
/// </summary>
|
||||
@ -415,6 +416,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
var hash = GetHashMap<T>($"{_cacheOptions.Prefix}{key}");
|
||||
return fields.Select(f => hash.TryGetValue(f, out T val) ? val : default).ToList();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 删除缓存 🔖
|
||||
/// </summary>
|
||||
@ -505,7 +507,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
/// <param name="expire">过期时间，单位秒</param>
|
||||
/// <returns></returns>
|
||||
[NonAction]
|
||||
public T GetOrAdd<T>(string key, Func<string, T> callback, int expire = -1)
|
||||
public T GetOrAdd<T>(string key, Func<string, T> callback, int expire = -1)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(key)) return default;
|
||||
return _cacheProvider.Cache.GetOrAdd($"{_cacheOptions.Prefix}{key}", callback, expire);
|
||||
@ -599,6 +601,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
var hash = GetHashMap<T>(key);
|
||||
return hash.TryGetValue(field, out T value) ? value : default;
|
||||
}
|
||||
|
||||
// 新增方法：获取哈希表所有键
|
||||
public static List<string> HashGetAllKeys(string key)
|
||||
{
|
||||
@ -621,6 +624,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
// 异步批量设置哈希，目前没有，先保留扩展
|
||||
public static async Task<bool> HashSetAsync<T>(string key, Dictionary<string, T> items, TimeSpan? expiry = null)
|
||||
{
|
||||
@ -637,7 +641,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
}
|
||||
|
||||
// 异步设置过期时间
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 根据KEY获取所有HASH
|
||||
/// </summary>
|
||||
@ -695,6 +699,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
|
||||
// return hash.Search(pattern, count).ToList();
|
||||
//}
|
||||
}
|
||||
|
||||
public class CacheItem<T>
|
||||
{
|
||||
public T Value { get; set; }
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
|
||||
//
|
||||
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
|
||||
//
|
||||
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
|
||||
|
||||
namespace Admin.NET.Core.Utils;
|
||||
|
||||
public static class EnumerableExtensions
|
||||
{
|
||||
/// <summary>
|
||||
@ -25,4 +26,4 @@ public static class EnumerableExtensions
|
||||
if (batch.Count > 0)
|
||||
yield return batch;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -32,18 +32,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Admin.NET.Plugin.PaddleOCR"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Admin.NET.Plugin.WorkWeixin", "Plugins\Admin.NET.Plugin.WorkWeixin\Admin.NET.Plugin.WorkWeixin.csproj", "{12998618-A875-4580-B5B1-0CC50CE85F27}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Admin.NET.Plugin.PluginCore", "Plugins\Admin.NET.Plugin.PluginCore\Admin.NET.Plugin.PluginCore.csproj", "{953B82FB-3521-5B56-DE2C-65B8814E02DF}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PluginCore", "PluginCore", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginCore", "Plugins\PluginCore\PluginCore\PluginCore.csproj", "{D6A36A77-53EB-222C-B7E7-AA2D81F1A9B0}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginCore.AspNetCore", "Plugins\PluginCore\PluginCore.AspNetCore\PluginCore.AspNetCore.csproj", "{D66359C8-1F82-669F-A515-5A7F6A65DB8B}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginCore.IPlugins", "Plugins\PluginCore\PluginCore.IPlugins\PluginCore.IPlugins.csproj", "{9E4C9BFE-E657-F410-9283-CAE6C370F264}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginCore.IPlugins.AspNetCore", "Plugins\PluginCore\PluginCore.IPlugins.AspNetCore\PluginCore.IPlugins.AspNetCore.csproj", "{BAB9ACF0-5AEE-290C-6D33-30712B6ADF14}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
@ -94,26 +82,6 @@ Global
|
||||
{12998618-A875-4580-B5B1-0CC50CE85F27}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{12998618-A875-4580-B5B1-0CC50CE85F27}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{12998618-A875-4580-B5B1-0CC50CE85F27}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{953B82FB-3521-5B56-DE2C-65B8814E02DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{953B82FB-3521-5B56-DE2C-65B8814E02DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{953B82FB-3521-5B56-DE2C-65B8814E02DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{953B82FB-3521-5B56-DE2C-65B8814E02DF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D6A36A77-53EB-222C-B7E7-AA2D81F1A9B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D6A36A77-53EB-222C-B7E7-AA2D81F1A9B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D6A36A77-53EB-222C-B7E7-AA2D81F1A9B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D6A36A77-53EB-222C-B7E7-AA2D81F1A9B0}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{D66359C8-1F82-669F-A515-5A7F6A65DB8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{D66359C8-1F82-669F-A515-5A7F6A65DB8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{D66359C8-1F82-669F-A515-5A7F6A65DB8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{D66359C8-1F82-669F-A515-5A7F6A65DB8B}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{9E4C9BFE-E657-F410-9283-CAE6C370F264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{9E4C9BFE-E657-F410-9283-CAE6C370F264}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{9E4C9BFE-E657-F410-9283-CAE6C370F264}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{9E4C9BFE-E657-F410-9283-CAE6C370F264}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BAB9ACF0-5AEE-290C-6D33-30712B6ADF14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BAB9ACF0-5AEE-290C-6D33-30712B6ADF14}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BAB9ACF0-5AEE-290C-6D33-30712B6ADF14}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BAB9ACF0-5AEE-290C-6D33-30712B6ADF14}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
@ -126,12 +94,6 @@ Global
|
||||
{9EB9C39E-E14F-443E-9AA3-EE417ABCBC1D} = {76F70D22-8D53-468E-A3B6-1704666A1D71}
|
||||
{1B106C11-E5BF-44AB-A283-1E948A8BD8C2} = {76F70D22-8D53-468E-A3B6-1704666A1D71}
|
||||
{12998618-A875-4580-B5B1-0CC50CE85F27} = {76F70D22-8D53-468E-A3B6-1704666A1D71}
|
||||
{953B82FB-3521-5B56-DE2C-65B8814E02DF} = {76F70D22-8D53-468E-A3B6-1704666A1D71}
|
||||
{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {76F70D22-8D53-468E-A3B6-1704666A1D71}
|
||||
{D6A36A77-53EB-222C-B7E7-AA2D81F1A9B0} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
||||
{D66359C8-1F82-669F-A515-5A7F6A65DB8B} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
||||
{9E4C9BFE-E657-F410-9283-CAE6C370F264} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
||||
{BAB9ACF0-5AEE-290C-6D33-30712B6ADF14} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {5CD801D7-984A-4F5C-8FA2-211B7A5EA9F3}
|
||||
|
||||
@ -23,7 +23,6 @@
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\Admin.NET.Core\Admin.NET.Core.csproj" />
|
||||
<ProjectReference Include="..\PluginCore\PluginCore.AspNetCore\PluginCore.AspNetCore.csproj" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
"name": "admin.net.pro",
|
||||
"type": "module",
|
||||
"version": "2.4.33",
|
||||
"lastBuildTime": "2025.03.09",
|
||||
"lastBuildTime": "2025.03.10",
|
||||
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
|
||||
"author": "zuohuaijun",
|
||||
"license": "MIT",
|
||||
@ -87,7 +87,7 @@
|
||||
"@iconify/vue": "^4.3.0",
|
||||
"@plugin-web-update-notification/vite": "^2.0.0",
|
||||
"@types/lodash-es": "^4.17.12",
|
||||
"@types/node": "^20.17.23",
|
||||
"@types/node": "^20.17.24",
|
||||
"@types/nprogress": "^0.2.3",
|
||||
"@types/sortablejs": "^1.15.8",
|
||||
"@typescript-eslint/eslint-plugin": "^8.26.0",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user