gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style: 代码整理和界面优化

Browse Source
This commit is contained in:
许俊杰 2025-03-20 22:26:43 +08:00
parent c08ca7d857
commit 7baf348f4f
10 changed files with 12 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Admin.NET/Admin.NET.Application/SeedData/SysTenantSeedData.cs
View File

@ -19,6 +19,7 @@ public class SysTenantSeedData : ISqlSugarEntitySeedData<SysTenant>
public IEnumerable<SysTenant> HasData()
{
var defaultDbConfig = App.GetOptions<DbConnectionOptions>().ConnectionConfigs[0];
var userAdmin = new SysUserSeedData().HasData().ToList().First(u => u.Account == "admin");
return
[
@ -26,7 +27,7 @@ public class SysTenantSeedData : ISqlSugarEntitySeedData<SysTenant>
{
Id=SqlSugarConst.DefaultTenantId,
OrgId=SqlSugarConst.DefaultTenantId,
UserId=1300000000111,
UserId=userAdmin.Id,
Host="gitee.com",
TenantType=TenantTypeEnum.Id,
DbType=defaultDbConfig.DbType,

5
Admin.NET/Admin.NET.Core/Const/ConfigConst.cs
View File

@ -126,11 +126,6 @@ public class ConfigConst
/// </summary>
public const string SysDefaultGroup = "Default";
/// <summary>
/// WebConfig 分组
/// </summary>
public const string SysWebConfigGroup = "WebConfig";
/// <summary>
/// 系统图标
/// </summary>

43
Admin.NET/Admin.NET.Core/Option/CryptogramOptions.cs
View File

@ -1,43 +0,0 @@
// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。
//
// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。
//
// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！
namespace Admin.NET.Core;
/// <summary>
/// 密码配置选项
/// </summary>
public sealed class CryptogramOptions : IConfigurableOptions
{
/// <summary>
/// 是否开启密码强度验证
/// </summary>
public bool StrongPassword { get; set; }
/// <summary>
/// 密码强度验证正则表达式
/// </summary>
public string PasswordStrengthValidation { get; set; }
/// <summary>
/// 密码强度验证提示
/// </summary>
public string PasswordStrengthValidationMsg { get; set; }
/// <summary>
/// 密码类型
/// </summary>
public string CryptoType { get; set; }
/// <summary>
/// 公钥
/// </summary>
public string PublicKey { get; set; }
/// <summary>
/// 私钥
/// </summary>
public string PrivateKey { get; set; }
}

2
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs
View File

@ -31,7 +31,6 @@ public class SysConfigService : IDynamicApiController, ITransient
public async Task<SqlSugarPagedList<SysConfig>> Page(PageConfigInput input)
{
return await _sysConfigRep.AsQueryable()
.Where(u => u.GroupCode != ConfigConst.SysWebConfigGroup || u.GroupCode == null) // 不显示 WebConfig 分组
.WhereIF(!string.IsNullOrWhiteSpace(input.Name?.Trim()), u => u.Name.Contains(input.Name))
.WhereIF(!string.IsNullOrWhiteSpace(input.Code?.Trim()), u => u.Code.Contains(input.Code))
.WhereIF(!string.IsNullOrWhiteSpace(input.GroupCode?.Trim()), u => u.GroupCode.Equals(input.GroupCode))
@ -215,7 +214,6 @@ public class SysConfigService : IDynamicApiController, ITransient
public async Task<List<string>> GetGroupList()
{
return await _sysConfigRep.AsQueryable()
.Where(u => u.GroupCode != ConfigConst.SysWebConfigGroup || u.GroupCode == null) // 不显示 WebConfig 分组
.GroupBy(u => u.GroupCode)
.Select(u => u.GroupCode).ToListAsync();
}

2
Admin.NET/Admin.NET.Core/Service/Config/SysTenantConfigService.cs
View File

@ -31,7 +31,6 @@ public class SysConfigTenantService : IDynamicApiController, ITransient
public async Task<SqlSugarPagedList<SysConfigTenant>> Page(PageConfigTenantInput input)
{
return await _sysConfigRep.AsQueryable()
.Where(u => u.GroupCode != ConfigConst.SysWebConfigGroup || u.GroupCode == null) // 不显示 WebConfig 分组
.WhereIF(!string.IsNullOrWhiteSpace(input.Name?.Trim()), u => u.Name.Contains(input.Name))
.WhereIF(!string.IsNullOrWhiteSpace(input.Code?.Trim()), u => u.Code.Contains(input.Code))
.WhereIF(!string.IsNullOrWhiteSpace(input.GroupCode?.Trim()), u => u.GroupCode.Equals(input.GroupCode))
@ -215,7 +214,6 @@ public class SysConfigTenantService : IDynamicApiController, ITransient
public async Task<List<string>> GetGroupList()
{
return await _sysConfigRep.AsQueryable()
.Where(u => u.GroupCode != ConfigConst.SysWebConfigGroup || u.GroupCode == null) // 不显示 WebConfig 分组
.GroupBy(u => u.GroupCode)
.Select(u => u.GroupCode).ToListAsync();
}

6
Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs
View File

@ -195,7 +195,7 @@ public class SysUserService : IDynamicApiController, ITransient
if (isOpenAccessUser) throw Oops.Oh(ErrorCodeEnum.D1030);
// 设置账号Token黑名单
await SetUserBalckList(user, StatusEnum.Disable);
await SetUserBlackList(user, StatusEnum.Disable);
await _sysUserRep.DeleteAsync(user);
@ -256,7 +256,7 @@ public class SysUserService : IDynamicApiController, ITransient
throw Oops.Oh(ErrorCodeEnum.D3005);
// 设置账号Token黑名单
await SetUserBalckList(user, input.Status);
await SetUserBlackList(user, input.Status);
user.Status = input.Status;
var rows = await _sysUserRep.AsUpdateable(user).UpdateColumns(u => new { u.Status }).ExecuteCommandAsync();
@ -274,7 +274,7 @@ public class SysUserService : IDynamicApiController, ITransient
/// <param name="status"></param>
/// <returns></returns>
[NonAction]
private async Task SetUserBalckList(SysUser user, StatusEnum status)
private async Task SetUserBlackList(SysUser user, StatusEnum status)
{
// 禁用账号则增加黑名单，启用账号则移除黑名单
var sysCacheService = App.GetRequiredService<SysCacheService>();

1
Admin.NET/Admin.NET.Web.Core/ProjectOptions.cs
View File

@ -34,7 +34,6 @@ public static class ProjectOptions
services.AddConfigurableOptions<APIJSONOptions>();
services.AddConfigurableOptions<EmailOptions>();
services.AddConfigurableOptions<OAuthOptions>();
services.AddConfigurableOptions<CryptogramOptions>();
services.AddConfigurableOptions<SMSOptions>();
services.AddConfigurableOptions<EventBusOptions>();
services.AddConfigurableOptions<AlipayOptions>();

14
Admin.NET/Admin.NET.Web.Core/Startup.cs
View File

@ -62,7 +62,7 @@ public class Startup : AppStartup
return Task.CompletedTask;
}
};
}).AddSignatureAuthentication(options => // 添加 Signature 身份验证
}).AddSignatureAuthentication(options => // 添加 Signature 身份验证
{
options.Events = SysOpenAccessService.GetSignatureAuthenticationEventImpl();
});
@ -106,7 +106,6 @@ public class Startup : AppStartup
// setting.DateParseHandling = DateParseHandling.None; // 解决DateTimeOffset异常
// setting.Converters.Add(new IsoDateTimeConverter { DateTimeStyles = DateTimeStyles.AssumeUniversal }); // 解决DateTimeOffset异常
}
;
services.AddControllersWithViews()
.AddAppLocalization(settings => { services.AddJsonLocalization(options => options.ResourcesPath = settings.ResourcesPath); }) // 集成第三方多语言配置
@ -183,10 +182,7 @@ public class Startup : AppStartup
HostName = eventBusOpt.RabbitMQ.HostName,
Port = eventBusOpt.RabbitMQ.Port
}, "adminnet_eventsource_queue", 3000);
options.ReplaceStorerOrFallback(serviceProvider =>
{
return rbmqEventSourceStorer;
});
options.ReplaceStorerOrFallback(serviceProvider => { return rbmqEventSourceStorer; });
}
});
@ -245,7 +241,7 @@ public class Startup : AppStartup
"application/xhtml+xml",
"application/atom+xml",
"image/svg+xml"
]);
]);
});
// 注册虚拟文件系统服务
@ -322,7 +318,7 @@ public class Startup : AppStartup
{
FileProvider = new PhysicalFileProvider(Path.Combine(env.ContentRootPath, "wwwroot")),
// RequestPath = "/static",
ServeUnknownFileTypes = true, // 允许服务未知文件类型，以便能处理.dll这种非默认的静态文件类型
ServeUnknownFileTypes = true, // 允许服务未知文件类型，以便能处理.dll这种非默认的静态文件类型
// DefaultContentType = "application/octet-stream" // 为未知文件类型设置一个通用的内容类型
DefaultContentType = value
});
@ -385,7 +381,7 @@ public class Startup : AppStartup
// 任务调度看板
app.UseScheduleUI(options =>
{
options.RequestPath = "/schedule"; // 必须以 / 开头且不以 / 结尾
options.RequestPath = "/schedule"; // 必须以 / 开头且不以 / 结尾
options.DisableOnProduction = true; // 生产环境关闭
options.DisplayEmptyTriggerJobs = true; // 是否显示空作业触发器的作业
options.DisplayHead = false; // 是否显示页头

0
Admin.NET/Plugins/Admin.NET.Plugin.GoView/Util/GoViewResultProvider.cs → Admin.NET/Plugins/Admin.NET.Plugin.GoView/Utils/GoViewResultProvider.cs
View File

4
Web/src/components/selector/userSelectorDialog.vue
View File

@ -56,7 +56,7 @@
</el-col>
<el-col :span="6">
<p class="tip">已选中列表</p>
<el-table ref="selectedTable" :data="checkedUsersList" border style="height: 60vh">
<el-table ref="selectedTable" :data="checkedUsersList" border class="boxHeight">
<el-table-column label="操作" width="60" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<div @click="handleRemove(scope.row)" style="border: 1px dashed red">
@ -225,7 +225,7 @@ const closeDialog = () => {
}
.boxHeight {
height: 60vh;
height: calc(100% - 40px);
overflow-y: scroll;
overflow-x: hidden;
}