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

😎优化初始化表结构

Browse Source
This commit is contained in:
zuohuaijun 2025-01-06 23:37:42 +08:00
parent eb63382891
commit 57e33bb3e9
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -49,7 +49,7 @@
<PackageReference Include="SSH.NET" Version="2024.2.0" /> <PackageReference Include="SSH.NET" Version="2024.2.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.5.1" />
<PackageReference Include="System.Net.Http" Version="4.3.4" /> <PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1156" /> <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1157" />
<PackageReference Include="UAParser" Version="3.1.47" /> <PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" /> <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup> </ItemGroup>

4
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs
View File

@ -282,7 +282,7 @@ public static class SqlSugarSetup
//SqlSugarDataExecuting.Execute(oldValue, entityInfo); //SqlSugarDataExecuting.Execute(oldValue, entityInfo);
}; };
// 超管排除其他过滤器 // 超管不受任何过滤器限制
if (App.User?.FindFirst(ClaimConst.AccountType)?.Value == ((int)AccountTypeEnum.SuperAdmin).ToString()) if (App.User?.FindFirst(ClaimConst.AccountType)?.Value == ((int)AccountTypeEnum.SuperAdmin).ToString())
return; return;
@ -398,7 +398,7 @@ public static class SqlSugarSetup
// 将不存在实体中的字段改为可空 // 将不存在实体中的字段改为可空
var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType); var entityInfo = dbProvider.EntityMaintenance.GetEntityInfo(entityType);
var dbColumnInfos = dbProvider.DbMaintenance.GetColumnInfosByTableName(entityInfo.DbTableName) ?? []; var dbColumnInfos = dbProvider.DbMaintenance.GetColumnInfosByTableName(entityInfo.DbTableName) ?? [];
foreach (var dbColumnInfo in dbColumnInfos.Where(dbColumnInfo => entityInfo.Columns.All(u => u.DbColumnName != dbColumnInfo.DbColumnName))) foreach (var dbColumnInfo in dbColumnInfos.Where(dbColumnInfo => !dbColumnInfo.IsPrimarykey && entityInfo.Columns.All(u => u.DbColumnName != dbColumnInfo.DbColumnName)))
{ {
dbColumnInfo.IsNullable = true; dbColumnInfo.IsNullable = true;
dbProvider.DbMaintenance.UpdateColumn(entityInfo.DbTableName, dbColumnInfo); dbProvider.DbMaintenance.UpdateColumn(entityInfo.DbTableName, dbColumnInfo);

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

@ -360,9 +360,8 @@ public class Startup : AppStartup
options.ConfigObject.DisplayRequestDuration = true; options.ConfigObject.DisplayRequestDuration = true;
foreach (var groupInfo in SpecificationDocumentBuilder.GetOpenApiGroups()) foreach (var groupInfo in SpecificationDocumentBuilder.GetOpenApiGroups())
{ {
// 这里因为兼容 Nginx 使用二级目录转发的情况 // 兼容 Nginx 二级目录转发的情况（配置二级域名转发，还要使用 Swagger.json 的 ServerDir 配置项）
// Nginx 配置了二级域名转发，还要使用 Swagger.json 的 ServerDir 配置项 options.SwaggerEndpoint(string.Concat("..", groupInfo.RouteTemplate.AsSpan(groupInfo.RouteTemplate.IndexOf("/swagger/"))), groupInfo.Title);
options.SwaggerEndpoint(".." + groupInfo.RouteTemplate.Substring(groupInfo.RouteTemplate.IndexOf("/swagger/")), groupInfo.Title);
} }
}); });

2
Web/package.json
View File

@ -99,7 +99,7 @@
"globals": "^15.14.0", "globals": "^15.14.0",
"less": "^4.2.1", "less": "^4.2.1",
"prettier": "^3.4.2", "prettier": "^3.4.2",
"rollup-plugin-visualizer": "^5.13.1", "rollup-plugin-visualizer": "^5.14.0",
"sass": "^1.83.1", "sass": "^1.83.1",
"terser": "^5.37.0", "terser": "^5.37.0",
"typescript": "^5.7.2", "typescript": "^5.7.2",