+
Skip to content

Merge latest release v1 #387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 18, 2021
Merged

Merge latest release v1 #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
917aee0
enhance cache
nhathoang989 May 17, 2021
65b61ab
Merge remote-tracking branch 'origin/master' into develop
May 17, 2021
6fb3e31
enhance cache
May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/Mix.Cms.Web/bin/Debug/net5.0/Mix.Cms.Web.dll",
"program": "${workspaceFolder}/src/Mix.Cms.Web/bin/Debug/net5.0/Mixcore.dll",
"args": [],
"cwd": "${workspaceFolder}/src/Mix.Cms.Web",
"stopAtEntry": false,
Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixCmsUser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixCmsUser
public partial class MixCmsUser: AuditedEntity
{
public string Id { get; set; }
public string Address { get; set; }
Expand All @@ -16,8 +17,6 @@ public partial class MixCmsUser
public string Email { get; set; }
public string ModifiedBy { get; set; }
public string CreatedBy { get; set; }
public DateTime? LastModified { get; set; }
public DateTime CreatedDateTime { get; set; }
public int Priority { get; set; }
public MixUserStatus Status { get; set; }
}
Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixConfiguration
public partial class MixConfiguration: AuditedEntity
{
public int Id { get; set; }
public string Specificulture { get; set; }
Expand All @@ -13,9 +14,7 @@ public partial class MixConfiguration
public string Description { get; set; }
public string Value { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixCulture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;
using System.Collections.Generic;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixCulture
public partial class MixCulture: AuditedEntity
{
public MixCulture()
{
Expand All @@ -24,9 +25,7 @@ public MixCulture()
public string Lcid { get; set; }
public string Specificulture { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixDatabase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixDatabase
public partial class MixDatabase: AuditedEntity
{
public MixDatabase()
{
Expand All @@ -21,8 +22,6 @@ public MixDatabase()
public bool? EdmAutoSend { get; set; }
public string ModifiedBy { get; set; }
public string CreatedBy { get; set; }
public DateTime? LastModified { get; set; }
public DateTime CreatedDateTime { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }
}
Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixDatabaseColumn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixDatabaseColumn
public partial class MixDatabaseColumn: AuditedEntity
{
public int Id { get; set; }
public int MixDatabaseId { get; set; }
Expand All @@ -23,8 +24,6 @@ public partial class MixDatabaseColumn
public int? ReferenceId { get; set; }
public string ModifiedBy { get; set; }
public string CreatedBy { get; set; }
public DateTime? LastModified { get; set; }
public DateTime CreatedDateTime { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }
}
Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixDatabaseData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixDatabaseData
public partial class MixDatabaseData: AuditedEntity
{
public string Id { get; set; }
public string Specificulture { get; set; }
public int MixDatabaseId { get; set; }
public string MixDatabaseName { get; set; }
public string ModifiedBy { get; set; }
public string CreatedBy { get; set; }
public DateTime? LastModified { get; set; }
public DateTime CreatedDateTime { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixDatabaseDataAssociation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixDatabaseDataAssociation
public partial class MixDatabaseDataAssociation: AuditedEntity
{
public string Id { get; set; }
public string Specificulture { get; set; }
Expand All @@ -14,9 +15,7 @@ public partial class MixDatabaseDataAssociation
public string MixDatabaseName { get; set; }
public string Description { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }
}
Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixDatabaseDataValue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixDatabaseDataValue
public partial class MixDatabaseDataValue: AuditedEntity
{
public string Id { get; set; }
public string Specificulture { get; set; }
Expand All @@ -23,8 +24,6 @@ public partial class MixDatabaseDataValue
public int EncryptType { get; set; }
public string ModifiedBy { get; set; }
public string CreatedBy { get; set; }
public DateTime? LastModified { get; set; }
public DateTime CreatedDateTime { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }
}
Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixFile
public partial class MixFile: AuditedEntity
{
public int Id { get; set; }
public string StringContent { get; set; }
Expand All @@ -14,9 +15,7 @@ public partial class MixFile
public int? ThemeId { get; set; }
public string ThemeName { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixLanguage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixLanguage
public partial class MixLanguage: AuditedEntity
{
public int Id { get; set; }
public string Specificulture { get; set; }
Expand All @@ -14,9 +15,7 @@ public partial class MixLanguage
public string Value { get; set; }
public string DefaultValue { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
6 changes: 2 additions & 4 deletions src/Mix.Cms.Lib/Models/Cms/MixMedia.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Mix.Cms.Lib.Enums;
using System;
using Mix.Heart.Infrastructure.Entities;
using System.Collections.Generic;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixMedia
public partial class MixMedia: AuditedEntity
{
public MixMedia()
{
Expand All @@ -25,9 +25,7 @@ public MixMedia()
public string Source { get; set; }
public string TargetUrl { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
7 changes: 3 additions & 4 deletions src/Mix.Cms.Lib/Models/Cms/MixMessengerHubRoom.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using System;
using Mix.Heart.Infrastructure.Entities;
using System;
using System.Collections.Generic;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixMessengerHubRoom
public partial class MixMessengerHubRoom : AuditedEntity
{
public MixMessengerHubRoom()
{
Expand All @@ -13,11 +14,9 @@ public MixMessengerHubRoom()

public Guid Id { get; set; }
public string Avatar { get; set; }
public DateTime CreatedDate { get; set; }
public string Description { get; set; }
public string HostId { get; set; }
public bool IsOpen { get; set; }
public DateTime? LastModified { get; set; }
public string Name { get; set; }
public int? TeamId { get; set; }
public string Title { get; set; }
Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;
using System.Collections.Generic;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixModule
public partial class MixModule : AuditedEntity
{
public MixModule()
{
Expand All @@ -29,9 +30,7 @@ public MixModule()
public string PostType { get; set; }
public int? PageSize { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixModuleData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixModuleData
public partial class MixModuleData : AuditedEntity
{
public string Id { get; set; }
public string Specificulture { get; set; }
Expand All @@ -13,9 +14,7 @@ public partial class MixModuleData
public string Fields { get; set; }
public string Value { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixModulePost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixModulePost
public partial class MixModulePost : AuditedEntity
{
public int Id { get; set; }
public string Specificulture { get; set; }
Expand All @@ -12,9 +13,7 @@ public partial class MixModulePost
public string Description { get; set; }
public string Image { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
6 changes: 2 additions & 4 deletions src/Mix.Cms.Lib/Models/Cms/MixPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Mix.Cms.Lib.Enums;
using System;
using Mix.Heart.Infrastructure.Entities;
using System.Collections.Generic;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixPage
public partial class MixPage: AuditedEntity
{
public MixPage()
{
Expand Down Expand Up @@ -36,9 +36,7 @@ public MixPage()
public int? PageSize { get; set; }
public string ExtraFields { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
5 changes: 2 additions & 3 deletions src/Mix.Cms.Lib/Models/Cms/MixPageModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
using Mix.Cms.Lib.Enums;
using Mix.Heart.Infrastructure.Entities;
using System;

namespace Mix.Cms.Lib.Models.Cms
{
public partial class MixPageModule
public partial class MixPageModule : AuditedEntity
{
public int Id { get; set; }
public string Specificulture { get; set; }
Expand All @@ -13,9 +14,7 @@ public partial class MixPageModule
public string Image { get; set; }
public int Position { get; set; }
public string CreatedBy { get; set; }
public DateTime CreatedDateTime { get; set; }
public string ModifiedBy { get; set; }
public DateTime? LastModified { get; set; }
public int Priority { get; set; }
public MixContentStatus Status { get; set; }

Expand Down
Loading
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载