ewide/zsxt_nbzs_h5
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update 修改所有dilon

Browse Source
This commit is contained in:
188633308
2021-04-25 15:00:17 +08:00
parent c300dec039
commit 7c40825850
19 changed files with 1415 additions and 1415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Api/Ewide.Core/Dilon.Core.xml
View File

@@ -1499,13 +1499,13 @@
<summary>
任务名称
</summary>
<example>dilon</example>
<example>ewide</example>
</member>
<member name="P:Ewide.Core.SysTimer.JobGroup">
<summary>
任务分组
</summary>
<example>dilon</example>
<example>ewide</example>
</member>
<member name="P:Ewide.Core.SysTimer.BeginTime">
<summary>
@@ -6080,13 +6080,13 @@
<summary>
任务名称
</summary>
<example>dilon</example>
<example>ewide</example>
</member>
<member name="P:Ewide.Core.Service.JobInput.JobGroup">
<summary>
任务分组
</summary>
<example>dilon</example>
<example>ewide</example>
</member>
<member name="P:Ewide.Core.Service.JobInput.BeginTime">
<summary>

4
Api/Ewide.Core/Entity/SysTimer.cs
View File

@@ -15,14 +15,14 @@ namespace Ewide.Core
/// <summary>
/// 任务名称
/// </summary>
/// <example>dilon</example>
/// <example>ewide</example>
[Comment("任务名称")]
public string JobName { get; set; }
/// <summary>
/// 任务分组
/// </summary>
/// <example>dilon</example>
/// <example>ewide</example>
[Comment("任务分组")]
public string JobGroup { get; set; }

4
Api/Ewide.Core/Ewide.Core.csproj
View File

@@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<NoWarn>1701;1702;1591</NoWarn>
<DocumentationFile>Dilon.Core.xml</DocumentationFile>
<DocumentationFile>Ewide.Core.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
@@ -19,7 +19,7 @@
</ItemGroup>
<ItemGroup>
<None Remove="Dilon.Core.xml" />
<None Remove="Ewide.Core.xml" />
</ItemGroup>
<ItemGroup>

2552
Api/Ewide.Core/Ewide.Core.xml
View File

File diff suppressed because it is too large Load Diff

2
Api/Ewide.Core/SeedData/SysTenantSeedData.cs
View File

@@ -17,7 +17,7 @@ namespace Ewide.Core
Name = "默认租户",
Host = "localhost:5566",
CreatedTime = DateTime.Parse("2021-04-03 00:00:00"),
Connection = "Data Source=./Dilon.db",
Connection = "Data Source=./Ewide.db",
Email = "zuohuaijun@163.com",
Phone = "18020030720"
}, // 142307070918780

2
Api/Ewide.Core/Service/CodeGen/CodeGenService.cs
View File

@@ -322,7 +322,7 @@ namespace Ewide.Core.Service.CodeGen
/// <returns></returns>
private List<string> GetTargetPathList(SysCodeGen input)
{
var backendPath = new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName + @"\Dilon.Application\Service\" + input.TableName + @"\";
var backendPath = new DirectoryInfo(App.WebHostEnvironment.ContentRootPath).Parent.FullName + @"\Ewide.Application\Service\" + input.TableName + @"\";
var servicePath = backendPath + input.TableName + "Service.cs";
var iservicePath = backendPath + "I" + input.TableName + "Service.cs";
var inputPath = backendPath + @"Dto\" + input.TableName + "Input.cs";

2
Api/Ewide.Core/Service/OAuth/SysOauthService.cs
View File

@@ -31,7 +31,7 @@ namespace Ewide.Core.Service.OAuth
[HttpGet("oauth/wechat")]
public Task WechatLogin()
{
_httpContext.Response.Redirect(_wechatOAuth.GetAuthorizeUrl("Dilon"));
_httpContext.Response.Redirect(_wechatOAuth.GetAuthorizeUrl("Ewide"));
return Task.CompletedTask;
}

4
Api/Ewide.Core/Service/Timer/Dto/JobInput.cs
View File

@@ -12,13 +12,13 @@ namespace Ewide.Core.Service
/// <summary>
/// 任务名称
/// </summary>
/// <example>dilon</example>
/// <example>ewide</example>
public string JobName { get; set; }
/// <summary>
/// 任务分组
/// </summary>
/// <example>dilon</example>
/// <example>ewide</example>
public string JobGroup { get; set; }
/// <summary>

6
Api/Ewide.Core/applicationconfig.json
View File

@@ -1,6 +1,6 @@
{
"SpecificationDocumentSettings": {
"DocumentTitle": "Dilon",
"DocumentTitle": "Ewide",
"DocExpansionState": "None",
"GroupOpenApiInfos": [
{
@@ -15,9 +15,9 @@
"ValidateIssuerSigningKey": true, // 是否验证密钥，bool 类型，默认true
"IssuerSigningKey": "3c1cbc3f546eda35168c3aa3cb91780fbe703f0996c6d123ea96dc85c70bbc0a", // 密钥，string 类型，必须是复杂密钥，长度大于16
"ValidateIssuer": true, // 是否验证签发方，bool 类型，默认true
"ValidIssuer": "dilon", // 签发方，string 类型
"ValidIssuer": "ewide", // 签发方，string 类型
"ValidateAudience": true, // 是否验证签收方，bool 类型，默认true
"ValidAudience": "dilon", // 签收方，string 类型
"ValidAudience": "ewide", // 签收方，string 类型
"ValidateLifetime": true, // 是否验证过期时间，bool 类型，默认true，建议true
"ExpiredTime": 1440, // 过期时间，long 类型，单位分钟，默认20分钟
"ClockSkew": 5 // 过期时间容错值，long 类型，单位秒，默认5秒

112
Api/Ewide.Database.Migrations/Migrations/20210423073632_Init.Designer.cs generated
View File

@@ -19,7 +19,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasAnnotation("Relational:MaxIdentifierLength", 64)
.HasAnnotation("ProductVersion", "5.0.5");
modelBuilder.Entity("Dilon.Application.CodeGenTest", b =>
modelBuilder.Entity("Ewide.Application.CodeGenTest", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -79,7 +79,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("代码生成业务");
});
modelBuilder.Entity("Dilon.Core.SysApp", b =>
modelBuilder.Entity("Ewide.Core.SysApp", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -193,7 +193,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysCodeGen", b =>
modelBuilder.Entity("Ewide.Core.SysCodeGen", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -261,7 +261,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("代码生成表");
});
modelBuilder.Entity("Dilon.Core.SysCodeGenConfig", b =>
modelBuilder.Entity("Ewide.Core.SysCodeGenConfig", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -365,7 +365,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("代码生成字段配置表");
});
modelBuilder.Entity("Dilon.Core.SysConfig", b =>
modelBuilder.Entity("Ewide.Core.SysConfig", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -835,7 +835,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysDictData", b =>
modelBuilder.Entity("Ewide.Core.SysDictData", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -1974,7 +1974,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysDictType", b =>
modelBuilder.Entity("Ewide.Core.SysDictType", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -2260,7 +2260,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysEmp", b =>
modelBuilder.Entity("Ewide.Core.SysEmp", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -2309,7 +2309,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysEmpExtOrgPos", b =>
modelBuilder.Entity("Ewide.Core.SysEmpExtOrgPos", b =>
{
b.Property<long>("SysEmpId")
.HasColumnType("bigint")
@@ -2367,7 +2367,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysEmpPos", b =>
modelBuilder.Entity("Ewide.Core.SysEmpPos", b =>
{
b.Property<long>("SysEmpId")
.HasColumnType("bigint")
@@ -2409,7 +2409,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysFile", b =>
modelBuilder.Entity("Ewide.Core.SysFile", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -2485,7 +2485,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("文件信息表");
});
modelBuilder.Entity("Dilon.Core.SysLogAudit", b =>
modelBuilder.Entity("Ewide.Core.SysLogAudit", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -2531,7 +2531,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("审计日志表");
});
modelBuilder.Entity("Dilon.Core.SysLogOp", b =>
modelBuilder.Entity("Ewide.Core.SysLogOp", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -2613,7 +2613,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("操作日志表");
});
modelBuilder.Entity("Dilon.Core.SysLogVis", b =>
modelBuilder.Entity("Ewide.Core.SysLogVis", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -2667,7 +2667,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("访问日志表");
});
modelBuilder.Entity("Dilon.Core.SysMenu", b =>
modelBuilder.Entity("Ewide.Core.SysMenu", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5418,7 +5418,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysNotice", b =>
modelBuilder.Entity("Ewide.Core.SysNotice", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5502,7 +5502,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("通知公告表");
});
modelBuilder.Entity("Dilon.Core.SysNoticeUser", b =>
modelBuilder.Entity("Ewide.Core.SysNoticeUser", b =>
{
b.Property<long>("NoticeId")
.HasColumnType("bigint")
@@ -5526,7 +5526,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("通知公告用户表");
});
modelBuilder.Entity("Dilon.Core.SysOauthUser", b =>
modelBuilder.Entity("Ewide.Core.SysOauthUser", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5618,7 +5618,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("Oauth登录用户表");
});
modelBuilder.Entity("Dilon.Core.SysOrg", b =>
modelBuilder.Entity("Ewide.Core.SysOrg", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5796,7 +5796,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysPos", b =>
modelBuilder.Entity("Ewide.Core.SysPos", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5902,7 +5902,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysRole", b =>
modelBuilder.Entity("Ewide.Core.SysRole", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5994,7 +5994,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysRoleDataScope", b =>
modelBuilder.Entity("Ewide.Core.SysRoleDataScope", b =>
{
b.Property<long>("SysRoleId")
.HasColumnType("bigint")
@@ -6014,7 +6014,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("角色数据范围表");
});
modelBuilder.Entity("Dilon.Core.SysRoleMenu", b =>
modelBuilder.Entity("Ewide.Core.SysRoleMenu", b =>
{
b.Property<long>("SysRoleId")
.HasColumnType("bigint")
@@ -6034,7 +6034,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("角色菜单表");
});
modelBuilder.Entity("Dilon.Core.SysTenant", b =>
modelBuilder.Entity("Ewide.Core.SysTenant", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -6106,7 +6106,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("租户表");
});
modelBuilder.Entity("Dilon.Core.SysTimer", b =>
modelBuilder.Entity("Ewide.Core.SysTimer", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -6216,7 +6216,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysUser", b =>
modelBuilder.Entity("Ewide.Core.SysUser", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -6369,7 +6369,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysUserDataScope", b =>
modelBuilder.Entity("Ewide.Core.SysUserDataScope", b =>
{
b.Property<long>("SysUserId")
.HasColumnType("bigint")
@@ -6389,7 +6389,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("用户数据范围表");
});
modelBuilder.Entity("Dilon.Core.SysUserRole", b =>
modelBuilder.Entity("Ewide.Core.SysUserRole", b =>
{
b.Property<long>("SysUserId")
.HasColumnType("bigint")
@@ -6409,9 +6409,9 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("用户角色表");
});
modelBuilder.Entity("Dilon.Core.SysDictData", b =>
modelBuilder.Entity("Ewide.Core.SysDictData", b =>
{
b.HasOne("Dilon.Core.SysDictType", "SysDictType")
b.HasOne("Ewide.Core.SysDictType", "SysDictType")
.WithMany("SysDictDatas")
.HasForeignKey("TypeId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6420,21 +6420,21 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysDictType");
});
modelBuilder.Entity("Dilon.Core.SysEmpExtOrgPos", b =>
modelBuilder.Entity("Ewide.Core.SysEmpExtOrgPos", b =>
{
b.HasOne("Dilon.Core.SysEmp", "SysEmp")
b.HasOne("Ewide.Core.SysEmp", "SysEmp")
.WithMany()
.HasForeignKey("SysEmpId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysOrg", "SysOrg")
b.HasOne("Ewide.Core.SysOrg", "SysOrg")
.WithMany()
.HasForeignKey("SysOrgId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysPos", "SysPos")
b.HasOne("Ewide.Core.SysPos", "SysPos")
.WithMany()
.HasForeignKey("SysPosId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6447,15 +6447,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysPos");
});
modelBuilder.Entity("Dilon.Core.SysEmpPos", b =>
modelBuilder.Entity("Ewide.Core.SysEmpPos", b =>
{
b.HasOne("Dilon.Core.SysEmp", "SysEmp")
b.HasOne("Ewide.Core.SysEmp", "SysEmp")
.WithMany("SysEmpPos")
.HasForeignKey("SysEmpId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysPos", "SysPos")
b.HasOne("Ewide.Core.SysPos", "SysPos")
.WithMany("SysEmpPos")
.HasForeignKey("SysPosId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6466,15 +6466,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysPos");
});
modelBuilder.Entity("Dilon.Core.SysRoleDataScope", b =>
modelBuilder.Entity("Ewide.Core.SysRoleDataScope", b =>
{
b.HasOne("Dilon.Core.SysOrg", "SysOrg")
b.HasOne("Ewide.Core.SysOrg", "SysOrg")
.WithMany("SysRoleDataScopes")
.HasForeignKey("SysOrgId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysRole", "SysRole")
b.HasOne("Ewide.Core.SysRole", "SysRole")
.WithMany("SysRoleDataScopes")
.HasForeignKey("SysRoleId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6485,15 +6485,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysRole");
});
modelBuilder.Entity("Dilon.Core.SysRoleMenu", b =>
modelBuilder.Entity("Ewide.Core.SysRoleMenu", b =>
{
b.HasOne("Dilon.Core.SysMenu", "SysMenu")
b.HasOne("Ewide.Core.SysMenu", "SysMenu")
.WithMany("SysRoleMenus")
.HasForeignKey("SysMenuId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysRole", "SysRole")
b.HasOne("Ewide.Core.SysRole", "SysRole")
.WithMany("SysRoleMenus")
.HasForeignKey("SysRoleId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6504,15 +6504,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysRole");
});
modelBuilder.Entity("Dilon.Core.SysUserDataScope", b =>
modelBuilder.Entity("Ewide.Core.SysUserDataScope", b =>
{
b.HasOne("Dilon.Core.SysOrg", "SysOrg")
b.HasOne("Ewide.Core.SysOrg", "SysOrg")
.WithMany("SysUserDataScopes")
.HasForeignKey("SysOrgId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysUser", "SysUser")
b.HasOne("Ewide.Core.SysUser", "SysUser")
.WithMany("SysUserDataScopes")
.HasForeignKey("SysUserId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6523,15 +6523,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysUser");
});
modelBuilder.Entity("Dilon.Core.SysUserRole", b =>
modelBuilder.Entity("Ewide.Core.SysUserRole", b =>
{
b.HasOne("Dilon.Core.SysRole", "SysRole")
b.HasOne("Ewide.Core.SysRole", "SysRole")
.WithMany("SysUserRoles")
.HasForeignKey("SysRoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysUser", "SysUser")
b.HasOne("Ewide.Core.SysUser", "SysUser")
.WithMany("SysUserRoles")
.HasForeignKey("SysUserId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6542,34 +6542,34 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysUser");
});
modelBuilder.Entity("Dilon.Core.SysDictType", b =>
modelBuilder.Entity("Ewide.Core.SysDictType", b =>
{
b.Navigation("SysDictDatas");
});
modelBuilder.Entity("Dilon.Core.SysEmp", b =>
modelBuilder.Entity("Ewide.Core.SysEmp", b =>
{
b.Navigation("SysEmpPos");
});
modelBuilder.Entity("Dilon.Core.SysMenu", b =>
modelBuilder.Entity("Ewide.Core.SysMenu", b =>
{
b.Navigation("SysRoleMenus");
});
modelBuilder.Entity("Dilon.Core.SysOrg", b =>
modelBuilder.Entity("Ewide.Core.SysOrg", b =>
{
b.Navigation("SysRoleDataScopes");
b.Navigation("SysUserDataScopes");
});
modelBuilder.Entity("Dilon.Core.SysPos", b =>
modelBuilder.Entity("Ewide.Core.SysPos", b =>
{
b.Navigation("SysEmpPos");
});
modelBuilder.Entity("Dilon.Core.SysRole", b =>
modelBuilder.Entity("Ewide.Core.SysRole", b =>
{
b.Navigation("SysRoleDataScopes");
@@ -6578,7 +6578,7 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysUserRoles");
});
modelBuilder.Entity("Dilon.Core.SysUser", b =>
modelBuilder.Entity("Ewide.Core.SysUser", b =>
{
b.Navigation("SysUserDataScopes");

112
Api/Ewide.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs
View File

@@ -17,7 +17,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasAnnotation("Relational:MaxIdentifierLength", 64)
.HasAnnotation("ProductVersion", "5.0.5");
modelBuilder.Entity("Dilon.Application.CodeGenTest", b =>
modelBuilder.Entity("Ewide.Application.CodeGenTest", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -77,7 +77,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("代码生成业务");
});
modelBuilder.Entity("Dilon.Core.SysApp", b =>
modelBuilder.Entity("Ewide.Core.SysApp", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -191,7 +191,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysCodeGen", b =>
modelBuilder.Entity("Ewide.Core.SysCodeGen", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -259,7 +259,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("代码生成表");
});
modelBuilder.Entity("Dilon.Core.SysCodeGenConfig", b =>
modelBuilder.Entity("Ewide.Core.SysCodeGenConfig", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -363,7 +363,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("代码生成字段配置表");
});
modelBuilder.Entity("Dilon.Core.SysConfig", b =>
modelBuilder.Entity("Ewide.Core.SysConfig", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -833,7 +833,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysDictData", b =>
modelBuilder.Entity("Ewide.Core.SysDictData", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -1972,7 +1972,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysDictType", b =>
modelBuilder.Entity("Ewide.Core.SysDictType", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -2258,7 +2258,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysEmp", b =>
modelBuilder.Entity("Ewide.Core.SysEmp", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -2307,7 +2307,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysEmpExtOrgPos", b =>
modelBuilder.Entity("Ewide.Core.SysEmpExtOrgPos", b =>
{
b.Property<long>("SysEmpId")
.HasColumnType("bigint")
@@ -2365,7 +2365,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysEmpPos", b =>
modelBuilder.Entity("Ewide.Core.SysEmpPos", b =>
{
b.Property<long>("SysEmpId")
.HasColumnType("bigint")
@@ -2407,7 +2407,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysFile", b =>
modelBuilder.Entity("Ewide.Core.SysFile", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -2483,7 +2483,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("文件信息表");
});
modelBuilder.Entity("Dilon.Core.SysLogAudit", b =>
modelBuilder.Entity("Ewide.Core.SysLogAudit", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -2529,7 +2529,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("审计日志表");
});
modelBuilder.Entity("Dilon.Core.SysLogOp", b =>
modelBuilder.Entity("Ewide.Core.SysLogOp", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -2611,7 +2611,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("操作日志表");
});
modelBuilder.Entity("Dilon.Core.SysLogVis", b =>
modelBuilder.Entity("Ewide.Core.SysLogVis", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
@@ -2665,7 +2665,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("访问日志表");
});
modelBuilder.Entity("Dilon.Core.SysMenu", b =>
modelBuilder.Entity("Ewide.Core.SysMenu", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5416,7 +5416,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysNotice", b =>
modelBuilder.Entity("Ewide.Core.SysNotice", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5500,7 +5500,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("通知公告表");
});
modelBuilder.Entity("Dilon.Core.SysNoticeUser", b =>
modelBuilder.Entity("Ewide.Core.SysNoticeUser", b =>
{
b.Property<long>("NoticeId")
.HasColumnType("bigint")
@@ -5524,7 +5524,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("通知公告用户表");
});
modelBuilder.Entity("Dilon.Core.SysOauthUser", b =>
modelBuilder.Entity("Ewide.Core.SysOauthUser", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5616,7 +5616,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("Oauth登录用户表");
});
modelBuilder.Entity("Dilon.Core.SysOrg", b =>
modelBuilder.Entity("Ewide.Core.SysOrg", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5794,7 +5794,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysPos", b =>
modelBuilder.Entity("Ewide.Core.SysPos", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5900,7 +5900,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysRole", b =>
modelBuilder.Entity("Ewide.Core.SysRole", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -5992,7 +5992,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysRoleDataScope", b =>
modelBuilder.Entity("Ewide.Core.SysRoleDataScope", b =>
{
b.Property<long>("SysRoleId")
.HasColumnType("bigint")
@@ -6012,7 +6012,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("角色数据范围表");
});
modelBuilder.Entity("Dilon.Core.SysRoleMenu", b =>
modelBuilder.Entity("Ewide.Core.SysRoleMenu", b =>
{
b.Property<long>("SysRoleId")
.HasColumnType("bigint")
@@ -6032,7 +6032,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("角色菜单表");
});
modelBuilder.Entity("Dilon.Core.SysTenant", b =>
modelBuilder.Entity("Ewide.Core.SysTenant", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -6104,7 +6104,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("租户表");
});
modelBuilder.Entity("Dilon.Core.SysTimer", b =>
modelBuilder.Entity("Ewide.Core.SysTimer", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -6214,7 +6214,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysUser", b =>
modelBuilder.Entity("Ewide.Core.SysUser", b =>
{
b.Property<long>("Id")
.HasColumnType("bigint")
@@ -6367,7 +6367,7 @@ namespace Ewide.Database.Migrations.Migrations
});
});
modelBuilder.Entity("Dilon.Core.SysUserDataScope", b =>
modelBuilder.Entity("Ewide.Core.SysUserDataScope", b =>
{
b.Property<long>("SysUserId")
.HasColumnType("bigint")
@@ -6387,7 +6387,7 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("用户数据范围表");
});
modelBuilder.Entity("Dilon.Core.SysUserRole", b =>
modelBuilder.Entity("Ewide.Core.SysUserRole", b =>
{
b.Property<long>("SysUserId")
.HasColumnType("bigint")
@@ -6407,9 +6407,9 @@ namespace Ewide.Database.Migrations.Migrations
.HasComment("用户角色表");
});
modelBuilder.Entity("Dilon.Core.SysDictData", b =>
modelBuilder.Entity("Ewide.Core.SysDictData", b =>
{
b.HasOne("Dilon.Core.SysDictType", "SysDictType")
b.HasOne("Ewide.Core.SysDictType", "SysDictType")
.WithMany("SysDictDatas")
.HasForeignKey("TypeId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6418,21 +6418,21 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysDictType");
});
modelBuilder.Entity("Dilon.Core.SysEmpExtOrgPos", b =>
modelBuilder.Entity("Ewide.Core.SysEmpExtOrgPos", b =>
{
b.HasOne("Dilon.Core.SysEmp", "SysEmp")
b.HasOne("Ewide.Core.SysEmp", "SysEmp")
.WithMany()
.HasForeignKey("SysEmpId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysOrg", "SysOrg")
b.HasOne("Ewide.Core.SysOrg", "SysOrg")
.WithMany()
.HasForeignKey("SysOrgId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysPos", "SysPos")
b.HasOne("Ewide.Core.SysPos", "SysPos")
.WithMany()
.HasForeignKey("SysPosId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6445,15 +6445,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysPos");
});
modelBuilder.Entity("Dilon.Core.SysEmpPos", b =>
modelBuilder.Entity("Ewide.Core.SysEmpPos", b =>
{
b.HasOne("Dilon.Core.SysEmp", "SysEmp")
b.HasOne("Ewide.Core.SysEmp", "SysEmp")
.WithMany("SysEmpPos")
.HasForeignKey("SysEmpId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysPos", "SysPos")
b.HasOne("Ewide.Core.SysPos", "SysPos")
.WithMany("SysEmpPos")
.HasForeignKey("SysPosId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6464,15 +6464,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysPos");
});
modelBuilder.Entity("Dilon.Core.SysRoleDataScope", b =>
modelBuilder.Entity("Ewide.Core.SysRoleDataScope", b =>
{
b.HasOne("Dilon.Core.SysOrg", "SysOrg")
b.HasOne("Ewide.Core.SysOrg", "SysOrg")
.WithMany("SysRoleDataScopes")
.HasForeignKey("SysOrgId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysRole", "SysRole")
b.HasOne("Ewide.Core.SysRole", "SysRole")
.WithMany("SysRoleDataScopes")
.HasForeignKey("SysRoleId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6483,15 +6483,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysRole");
});
modelBuilder.Entity("Dilon.Core.SysRoleMenu", b =>
modelBuilder.Entity("Ewide.Core.SysRoleMenu", b =>
{
b.HasOne("Dilon.Core.SysMenu", "SysMenu")
b.HasOne("Ewide.Core.SysMenu", "SysMenu")
.WithMany("SysRoleMenus")
.HasForeignKey("SysMenuId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysRole", "SysRole")
b.HasOne("Ewide.Core.SysRole", "SysRole")
.WithMany("SysRoleMenus")
.HasForeignKey("SysRoleId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6502,15 +6502,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysRole");
});
modelBuilder.Entity("Dilon.Core.SysUserDataScope", b =>
modelBuilder.Entity("Ewide.Core.SysUserDataScope", b =>
{
b.HasOne("Dilon.Core.SysOrg", "SysOrg")
b.HasOne("Ewide.Core.SysOrg", "SysOrg")
.WithMany("SysUserDataScopes")
.HasForeignKey("SysOrgId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysUser", "SysUser")
b.HasOne("Ewide.Core.SysUser", "SysUser")
.WithMany("SysUserDataScopes")
.HasForeignKey("SysUserId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6521,15 +6521,15 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysUser");
});
modelBuilder.Entity("Dilon.Core.SysUserRole", b =>
modelBuilder.Entity("Ewide.Core.SysUserRole", b =>
{
b.HasOne("Dilon.Core.SysRole", "SysRole")
b.HasOne("Ewide.Core.SysRole", "SysRole")
.WithMany("SysUserRoles")
.HasForeignKey("SysRoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Dilon.Core.SysUser", "SysUser")
b.HasOne("Ewide.Core.SysUser", "SysUser")
.WithMany("SysUserRoles")
.HasForeignKey("SysUserId")
.OnDelete(DeleteBehavior.Cascade)
@@ -6540,34 +6540,34 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysUser");
});
modelBuilder.Entity("Dilon.Core.SysDictType", b =>
modelBuilder.Entity("Ewide.Core.SysDictType", b =>
{
b.Navigation("SysDictDatas");
});
modelBuilder.Entity("Dilon.Core.SysEmp", b =>
modelBuilder.Entity("Ewide.Core.SysEmp", b =>
{
b.Navigation("SysEmpPos");
});
modelBuilder.Entity("Dilon.Core.SysMenu", b =>
modelBuilder.Entity("Ewide.Core.SysMenu", b =>
{
b.Navigation("SysRoleMenus");
});
modelBuilder.Entity("Dilon.Core.SysOrg", b =>
modelBuilder.Entity("Ewide.Core.SysOrg", b =>
{
b.Navigation("SysRoleDataScopes");
b.Navigation("SysUserDataScopes");
});
modelBuilder.Entity("Dilon.Core.SysPos", b =>
modelBuilder.Entity("Ewide.Core.SysPos", b =>
{
b.Navigation("SysEmpPos");
});
modelBuilder.Entity("Dilon.Core.SysRole", b =>
modelBuilder.Entity("Ewide.Core.SysRole", b =>
{
b.Navigation("SysRoleDataScopes");
@@ -6576,7 +6576,7 @@ namespace Ewide.Database.Migrations.Migrations
b.Navigation("SysUserRoles");
});
modelBuilder.Entity("Dilon.Core.SysUser", b =>
modelBuilder.Entity("Ewide.Core.SysUser", b =>
{
b.Navigation("SysUserDataScopes");

2
Api/Ewide.EntityFramework.Core/Startup.cs
View File

@@ -14,7 +14,7 @@ namespace Ewide.EntityFramework.Core
options.AddDb<DefaultDbContext>();
options.AddDb<MultiTenantDbContext, MultiTenantDbContextLocator>();
}, "Dilon.Database.Migrations");
}, "Ewide.Database.Migrations");
}
}
}

6
Api/Ewide.EntityFramework.Core/dbsettings.json
View File

@@ -1,8 +1,8 @@
{
"ConnectionStrings": {
//"DefaultConnection": "Data Source=./Dilon.db",
"DefaultConnection": "Data Source=118.178.224.202;Database=dilon;User ID=root;Password=root;pooling=true;port=3306;sslmode=none;CharSet=utf8;",
"PgSqlConnection": "HOST=127.0.0.1;PORT=5432;DATABASE=dilon;PASSWORD=postgres;USER ID=postgres;",
//"DefaultConnection": "Data Source=./Ewide.db",
"DefaultConnection": "Data Source=118.178.224.202;Database=ewide;User ID=root;Password=root;pooling=true;port=3306;sslmode=none;CharSet=utf8;",
"PgSqlConnection": "HOST=127.0.0.1;PORT=5432;DATABASE=ewide;PASSWORD=postgres;USER ID=postgres;",
"MultiTenantConnection": "Data Source=./Dilon_SaaS.db"
}
}

2
Api/Ewide.Web.Entry/Dockerfile
View File

@@ -4,4 +4,4 @@ EXPOSE 80
EXPOSE 443
COPY . .
ENTRYPOINT ["dotnet", "Dilon.Web.Entry.dll"]
ENTRYPOINT ["dotnet", "Ewide.Web.Entry.dll"]

2
Api/Ewide.Web.Entry/Properties/launchSettings.json
View File

@@ -15,7 +15,7 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"Dilon.Web.Entry": {
"Ewide.Web.Entry": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {

4
Api/Ewide.Web.Entry/Startup.cs
View File

@@ -16,12 +16,12 @@ namespace Ewide.Web.Entry
public void ConfigureServices(IServiceCollection services)
{
// 代码迁移至 Dilon.Web.Core/Startup.cs
// 代码迁移至 Ewide.Web.Core/Startup.cs
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
{
// 代码迁移至 Dilon.Web.Core/Startup.cs
// 代码迁移至 Ewide.Web.Core/Startup.cs
}
}
}

2
Api/Ewide.Web.Entry/wwwroot/Template/IService.cs.vm
View File

@@ -1,4 +1,4 @@
using Dilon.Core;
using Ewide.Core;
using Microsoft.AspNetCore.Mvc;
using System.Threading.Tasks;

2
Api/Ewide.Web.Entry/wwwroot/Template/Input.cs.vm
View File

@@ -1,4 +1,4 @@
using Dilon.Core;
using Ewide.Core;
using System;
using System.ComponentModel.DataAnnotations;

2
Api/Ewide.Web.Entry/wwwroot/Template/Service.cs.vm
View File

@@ -1,4 +1,4 @@
using Dilon.Core;
using Ewide.Core;
using Furion.DatabaseAccessor;
using Furion.DatabaseAccessor.Extensions;
using Furion.DependencyInjection;