diff --git a/Admin.NET/.vscode/launch.json b/Admin.NET/.vscode/launch.json
index f724a3b5..eb666037 100644
--- a/Admin.NET/.vscode/launch.json
+++ b/Admin.NET/.vscode/launch.json
@@ -5,11 +5,11 @@
"version": "0.2.0",
"configurations": [
{
- "name": "C#: Admin.NET.Web.Entry [Admin.NET.Web.Entry - net9.0]",
+ "name": "C#: Admin.NET.Web.Entry [Admin.NET.Web.Entry - net8.0]",
"type": "dotnet",
"request": "launch",
"projectPath": "${workspaceFolder}\\Admin.NET.Web.Entry\\Admin.NET.Web.Entry.csproj",
- "launchConfigurationId": "TargetFramework=net9.0;Admin.NET.Web.Entry"
+ "launchConfigurationId": "TargetFramework=net8.0;Admin.NET.Web.Entry"
}
]
}
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Application/Configuration/App.json b/Admin.NET/Admin.NET.Application/Configuration/App.json
index 51bdd580..4ded2a97 100644
--- a/Admin.NET/Admin.NET.Application/Configuration/App.json
+++ b/Admin.NET/Admin.NET.Application/Configuration/App.json
@@ -33,9 +33,9 @@
".img": "application/octet-stream"
},
"LocalizationSettings": {
- "SupportedCultures": [ "zh-CN","zh-HK","en","de","es","fi","fr","it","ja","ko","no","pl","pt","ru","zh-TW" ], // 语言列表
+ "SupportedCultures": [ "zh-CN", "zh-HK", "en", "de", "es", "fi", "fr", "it", "ja", "ko", "no", "pl", "pt", "ru", "zh-TW" ], // 语言列表
"DefaultCulture": "zh-CN", // 默认语言
- "DateTimeFormatCulture": "zh-CN", // 固定时间区域为特定时区(多语言)
+ "DateTimeFormatCulture": "zh-CN" // 固定时间区域为特定时区(多语言)
},
"CorsAccessorSettings": {
//"PolicyName": "App.Cors.Policy", // 跨域策略名称
diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
index dc45dac9..61b69b41 100644
--- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
+++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
@@ -12,6 +12,14 @@
Admin.NET 通用权限开发平台
+
+
+ true
+ PreserveNewest
+ PreserveNewest
+
+
+
@@ -20,9 +28,9 @@
-
-
-
+
+
+
@@ -36,7 +44,7 @@
-
+
@@ -75,12 +83,4 @@
-
-
- true
- PreserveNewest
- PreserveNewest
-
-
-
diff --git a/Admin.NET/Admin.NET.Core/Entity/SysMenu.cs b/Admin.NET/Admin.NET.Core/Entity/SysMenu.cs
index efdfa75f..bf084a7b 100644
--- a/Admin.NET/Admin.NET.Core/Entity/SysMenu.cs
+++ b/Admin.NET/Admin.NET.Core/Entity/SysMenu.cs
@@ -132,9 +132,13 @@ public partial class SysMenu : EntityBase
/// 国际化名称
///
[SugarColumn(IsIgnore = true, ColumnDescription = "国际化名称")]
- public string? I18nName { get {
- return String.IsNullOrEmpty(Title) ? Title : L.Text[Title];
- } }
+ public string? I18nName
+ {
+ get
+ {
+ return string.IsNullOrEmpty(Title) ? Title : L.Text[Title];
+ }
+ }
///
/// 菜单子项
diff --git a/Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput.cs b/Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput.cs
index 99033601..e20cb09f 100644
--- a/Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Menu/Dto/MenuOutput.cs
@@ -31,6 +31,11 @@ public class MenuOutput
///
public string Name { get; set; }
+ ///
+ /// 国际化名称
+ ///
+ public string? I18nName { get; set; }
+
///
/// 路由地址
///
@@ -95,11 +100,6 @@ public class MenuOutput
/// 菜单子项
///
public List Children { get; set; }
-
- ///
- /// 国际化名称
- ///
- public string? I18nName { get; set; }
}
///
diff --git a/Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs b/Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs
index 3d0208e1..af6113cd 100644
--- a/Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs
@@ -4,8 +4,6 @@
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
-using Furion.Localization;
-
namespace Admin.NET.Core.Service;
///
diff --git a/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs b/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs
index b7659189..04423fc0 100644
--- a/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/Wechat/SysWechatPayService.cs
@@ -5,7 +5,6 @@
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
using Furion.Logging.Extensions;
-using NewLife;
using Newtonsoft.Json;
namespace Admin.NET.Core.Service;
diff --git a/Admin.NET/Admin.NET.Web.Core/Startup.cs b/Admin.NET/Admin.NET.Web.Core/Startup.cs
index 7e742fa6..d8711286 100644
--- a/Admin.NET/Admin.NET.Web.Core/Startup.cs
+++ b/Admin.NET/Admin.NET.Web.Core/Startup.cs
@@ -118,6 +118,7 @@ public class Startup : AppStartup
{
options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All); // 禁止Unicode转码
});
+
// SqlSugar
services.AddSqlSugar();