😎清理代码

This commit is contained in:
zuohuaijun 2025-04-19 01:05:36 +08:00
parent 7e773f11f2
commit 667417d789
10 changed files with 28 additions and 21 deletions

View File

@ -33,7 +33,7 @@
".img": "application/octet-stream" ".img": "application/octet-stream"
}, },
"LocalizationSettings": { "LocalizationSettings": {
"SupportedCultures": [ "zh-CN", "zh-HK", "en", "de", "es", "fi", "fr", "it", "ja", "ko", "no", "pl", "pt", "ru", "zh-TW", "id", "ms", "th","vi"], // "SupportedCultures": [ "zh-CN", "zh-HK", "en", "de", "es", "fi", "fr", "it", "ja", "ko", "no", "pl", "pt", "ru", "zh-TW", "id", "ms", "th", "vi" ], //
"DefaultCulture": "zh-CN", // "DefaultCulture": "zh-CN", //
"DateTimeFormatCulture": "zh-CN" // "DateTimeFormatCulture": "zh-CN" //
}, },

View File

@ -4,8 +4,6 @@
// //
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! // 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任!
using Admin.NET.Core.Service;
using Furion.EventBus;
using Furion.JsonSerialization; using Furion.JsonSerialization;
namespace Admin.NET.Application; namespace Admin.NET.Application;

View File

@ -40,7 +40,7 @@
<PackageReference Include="Magicodes.IE.Pdf" 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="Magicodes.IE.Word" Version="2.7.5.2" />
<PackageReference Include="MailKit" Version="4.11.0" /> <PackageReference Include="MailKit" Version="4.11.0" />
<PackageReference Include="MiniExcel" Version="1.40.0" /> <PackageReference Include="MiniExcel" Version="1.40.1" />
<PackageReference Include="MiniWord" Version="0.9.2" /> <PackageReference Include="MiniWord" Version="0.9.2" />
<PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" /> <PackageReference Include="MQTTnet.Server" Version="5.0.1.1416" />
<PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.3.9" /> <PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.3.9" />

View File

@ -47,7 +47,7 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
loginMode = loginMode == 0 ? LoginModeEnum.PC : loginMode; // 默认PC登录模式 loginMode = loginMode == 0 ? LoginModeEnum.PC : loginMode; // 默认PC登录模式
var device = httpContext.GetClientDeviceInfo().Trim(); var device = httpContext.GetClientDeviceInfo().Trim();
var ipAddress = httpContext.Request.Headers["X-Forwarded-For"].FirstOrDefault(); var ipAddress = httpContext.Request.Headers["X-Forwarded-For"].FirstOrDefault();
var user = new SysOnlineUser var user = new SysOnlineUser
{ {
ConnectionId = Context.ConnectionId, ConnectionId = Context.ConnectionId,

View File

@ -29,6 +29,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
/// 获取数据表列(实体属性)集合 /// 获取数据表列(实体属性)集合
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[DisplayName("获取数据表列(实体属性)集合")]
public List<ColumnOuput> GetColumnList([FromQuery] AddCodeGenInput input) public List<ColumnOuput> GetColumnList([FromQuery] AddCodeGenInput input)
{ {
return GetColumnList(input.TableName, input.ConfigId); return GetColumnList(input.TableName, input.ConfigId);
@ -40,6 +41,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
/// <param name="EntityName"></param> /// <param name="EntityName"></param>
/// <param name="ConfigId"></param> /// <param name="ConfigId"></param>
/// <returns></returns> /// <returns></returns>
[DisplayName("获取数据表列(实体属性)集合")]
public List<ColumnOuput> GetColumnList(string EntityName, string ConfigId) public List<ColumnOuput> GetColumnList(string EntityName, string ConfigId)
{ {
var entityType = GetEntityInfos().GetAwaiter().GetResult().FirstOrDefault(u => u.EntityName == EntityName); var entityType = GetEntityInfos().GetAwaiter().GetResult().FirstOrDefault(u => u.EntityName == EntityName);
@ -105,6 +107,7 @@ public class SysCodeGenConfigService : IDynamicApiController, ITransient
/// </summary> /// </summary>
/// <param name="excludeSysTable">是否排除带SysTable属性的表</param> /// <param name="excludeSysTable">是否排除带SysTable属性的表</param>
/// <returns></returns> /// <returns></returns>
[DisplayName("获取库表信息")]
public async Task<IEnumerable<EntityInfo>> GetEntityInfos(bool excludeSysTable = false) public async Task<IEnumerable<EntityInfo>> GetEntityInfos(bool excludeSysTable = false)
{ {
var types = new List<Type>(); var types = new List<Type>();

View File

@ -291,6 +291,7 @@ public class SysCommonService : IDynamicApiController, ITransient
/// <param name="code">区划编码</param> /// <param name="code">区划编码</param>
/// <param name="level">级数从当前code所在级别往下级数</param> /// <param name="level">级数从当前code所在级别往下级数</param>
/// <returns></returns> /// <returns></returns>
[DisplayName("从 china.sqlite 中获取区划数据")]
public async Task GetRegionTree(string code, int level) public async Task GetRegionTree(string code, int level)
{ {
level = level > 5 ? 5 : level; level = level > 5 ? 5 : level;

View File

@ -296,14 +296,17 @@ public class SysDatabaseService : IDynamicApiController, ITransient
/// <param name="Position"></param> /// <param name="Position"></param>
/// <param name="BaseClassName"></param> /// <param name="BaseClassName"></param>
/// <returns></returns> /// <returns></returns>
[DisplayName("创建实体文件内容")]
public string GenerateEntity(string ConfigId, string TableName, string Position, string BaseClassName) public string GenerateEntity(string ConfigId, string TableName, string Position, string BaseClassName)
{ {
var input = new CreateEntityInput(); var input = new CreateEntityInput
input.TableName = TableName; {
input.EntityName = TableName.ToFirstLetterUpperCase(); TableName = TableName,
input.ConfigId = ConfigId; EntityName = TableName.ToFirstLetterUpperCase(),
input.Position = string.IsNullOrWhiteSpace(Position) ? "Admin.NET.Application" : Position; ConfigId = ConfigId,
input.BaseClassName = string.IsNullOrWhiteSpace(BaseClassName) ? "EntityBaseId" : BaseClassName; Position = string.IsNullOrWhiteSpace(Position) ? "Admin.NET.Application" : Position,
BaseClassName = string.IsNullOrWhiteSpace(BaseClassName) ? "EntityBaseId" : BaseClassName
};
return GenerateEntity(input); return GenerateEntity(input);
} }
@ -312,6 +315,7 @@ public class SysDatabaseService : IDynamicApiController, ITransient
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[DisplayName("创建实体文件内容")]
public string GenerateEntity(CreateEntityInput input) public string GenerateEntity(CreateEntityInput input)
{ {
var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId.ToString() == input.ConfigId); var config = App.GetOptions<DbConnectionOptions>().ConnectionConfigs.FirstOrDefault(u => u.ConfigId.ToString() == input.ConfigId);

View File

@ -37,10 +37,10 @@ public class SysOpenAccessService : IDynamicApiController, ITransient
public GenerateSignatureOutput GenerateSignature(GenerateSignatureInput input) public GenerateSignatureOutput GenerateSignature(GenerateSignatureInput input)
{ {
// 时间戳 // 时间戳
if (input.Timestamp == 0) if (input.Timestamp == 0)
input.Timestamp = DateTimeUtil.ToUnixTimestampByMilliseconds(DateTime.Now); input.Timestamp = DateTimeUtil.ToUnixTimestampByMilliseconds(DateTime.Now);
// 密钥 // 密钥
var appSecretByte = Encoding.UTF8.GetBytes(input.AccessSecret); var appSecretByte = Encoding.UTF8.GetBytes(input.AccessSecret);
// 拼接参数 // 拼接参数

View File

@ -160,7 +160,7 @@ public class SysWxOpenService : IDynamicApiController, ITransient
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[AllowAnonymous] [AllowAnonymous]
[HttpPost] [DisplayName("设置小程序用户昵称"), HttpPost]
public async Task SetNickName(SetNickNameInput input) public async Task SetNickName(SetNickNameInput input)
{ {
var wxUser = await _sysOAuthUserRep.GetFirstAsync(u => u.OpenId == input.OpenId); var wxUser = await _sysOAuthUserRep.GetFirstAsync(u => u.OpenId == input.OpenId);
@ -178,6 +178,7 @@ public class SysWxOpenService : IDynamicApiController, ITransient
/// <param name="openid"></param> /// <param name="openid"></param>
/// <returns></returns> /// <returns></returns>
[AllowAnonymous] [AllowAnonymous]
[DisplayName("获取小程序用户信息")]
public async Task<dynamic> GetUserInfo(string openid) public async Task<dynamic> GetUserInfo(string openid)
{ {
var wxUser = await _sysOAuthUserRep.GetFirstAsync(u => u.OpenId == openid); var wxUser = await _sysOAuthUserRep.GetFirstAsync(u => u.OpenId == openid);

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": "2025.04.17", "lastBuildTime": "2025.04.19",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架", "description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun", "author": "zuohuaijun",
"license": "MIT", "license": "MIT",
@ -19,8 +19,8 @@
}, },
"dependencies": { "dependencies": {
"@element-plus/icons-vue": "^2.3.1", "@element-plus/icons-vue": "^2.3.1",
"@logicflow/core": "^2.0.12", "@logicflow/core": "^2.0.13",
"@logicflow/extension": "^2.0.16", "@logicflow/extension": "^2.0.17",
"@microsoft/signalr": "^8.0.7", "@microsoft/signalr": "^8.0.7",
"@vue-office/docx": "^1.6.2", "@vue-office/docx": "^1.6.2",
"@vue-office/excel": "^1.7.14", "@vue-office/excel": "^1.7.14",
@ -37,7 +37,7 @@
"echarts": "^5.6.0", "echarts": "^5.6.0",
"echarts-gl": "^2.0.9", "echarts-gl": "^2.0.9",
"echarts-wordcloud": "^2.1.0", "echarts-wordcloud": "^2.1.0",
"element-plus": "^2.9.7", "element-plus": "^2.9.8",
"exceljs": "^4.4.0", "exceljs": "^4.4.0",
"ezuikit-js": "^8.1.9-beta.3", "ezuikit-js": "^8.1.9-beta.3",
"gcoord": "^1.0.7", "gcoord": "^1.0.7",
@ -96,7 +96,7 @@
"@vitejs/plugin-vue": "^5.2.3", "@vitejs/plugin-vue": "^5.2.3",
"@vitejs/plugin-vue-jsx": "^4.1.2", "@vitejs/plugin-vue-jsx": "^4.1.2",
"@vue/compiler-sfc": "^3.5.13", "@vue/compiler-sfc": "^3.5.13",
"code-inspector-plugin": "^0.20.9", "code-inspector-plugin": "^0.20.10",
"eslint": "^9.24.0", "eslint": "^9.24.0",
"eslint-plugin-vue": "^10.0.0", "eslint-plugin-vue": "^10.0.0",
"globals": "^16.0.0", "globals": "^16.0.0",
@ -107,7 +107,7 @@
"sass": "^1.86.3", "sass": "^1.86.3",
"terser": "^5.39.0", "terser": "^5.39.0",
"typescript": "^5.8.3", "typescript": "^5.8.3",
"vite": "^6.3.1", "vite": "^6.3.2",
"vite-plugin-cdn-import": "^1.0.1", "vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.3.3", "vite-plugin-compression2": "^1.3.3",
"vite-plugin-vue-setup-extend": "^0.4.0", "vite-plugin-vue-setup-extend": "^0.4.0",