From 470d07ec07c2bf7808d3bda5d816de10c8611ec4 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Fri, 16 Sep 2022 17:02:33 +0800
Subject: [PATCH] update common.props

---
 apps/vue/src/api/auditing/auditLog.ts         | 28 ++++++++++++++++++-
 .../src/api/auditing/model/auditLogModel.ts   | 19 +++++++++++++
 aspnet-core/Directory.Build.props             |  2 +-
 aspnet-core/common.props                      |  8 +++++-
 .../Auditing/Localization/Resources/en.json   |  1 +
 .../Localization/Resources/zh-Hans.json       |  1 +
 common.props                                  |  2 +-
 gateways/common.props                         |  2 +-
 8 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/apps/vue/src/api/auditing/auditLog.ts b/apps/vue/src/api/auditing/auditLog.ts
index 680e59f4c..01964380f 100644
--- a/apps/vue/src/api/auditing/auditLog.ts
+++ b/apps/vue/src/api/auditing/auditLog.ts
@@ -1,5 +1,13 @@
 import { defAbpHttp } from '/@/utils/http/abp';
-import { AuditLog, GetAuditLogPagedRequest } from './model/auditLogModel';
+import {
+  AuditLog,
+  EntityChange,
+  EntityChangeWithUsername,
+  GetAuditLogPagedRequest,
+  EntityChangeGetByPagedRequest,
+  EntityChangeGetWithUsernameInput
+} from './model/auditLogModel';
+import { ListResultDto } from '../model/baseModel';
 
 enum Api {
   RemoteService = 'AbpAuditing',
@@ -38,3 +46,21 @@ export const getList = (input: GetAuditLogPagedRequest) => {
     },
   });
 };
+
+export const getEntityChanges = (input: EntityChangeGetByPagedRequest) => {
+  return defAbpHttp.pagedRequest<EntityChange>({
+    service: Api.RemoteService,
+    controller: 'EntityChanges',
+    action: 'GetListAsync',
+    params: {
+      input: input,
+    },
+  });
+}
+
+export const getEntityChangesWithUsername = (input: EntityChangeGetWithUsernameInput) => {
+  return defAbpHttp.get<ListResultDto<EntityChangeWithUsername>>({
+    url: '/api/auditing/entity-changes/with-username',
+    params: input,
+  });
+}
diff --git a/apps/vue/src/api/auditing/model/auditLogModel.ts b/apps/vue/src/api/auditing/model/auditLogModel.ts
index 2c0d2e78f..c853aeeee 100644
--- a/apps/vue/src/api/auditing/model/auditLogModel.ts
+++ b/apps/vue/src/api/auditing/model/auditLogModel.ts
@@ -25,6 +25,11 @@ export interface EntityChange {
   extraProperties?: { [key: string]: any };
 }
 
+export interface EntityChangeWithUsername {
+  entityChange: EntityChange;
+  userName?: string;
+}
+
 export interface Action {
   id: string;
   serviceName?: string;
@@ -74,3 +79,17 @@ export interface GetAuditLogPagedRequest extends PagedAndSortedResultRequestDto
   hasException?: boolean;
   httpStatusCode?: number;
 }
+
+export interface EntityChangeGetByPagedRequest extends PagedAndSortedResultRequestDto {
+  auditLogId?: string;
+  startTime?: Date;
+  endTime?: Date;
+  changeType?: ChangeType;
+  entityId?: string;
+  entityTypeFullName?: string;
+}
+
+export interface EntityChangeGetWithUsernameInput {
+  entityId?: string;
+  entityTypeFullName?: string;
+}
diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props
index a02da6022..1516e3210 100644
--- a/aspnet-core/Directory.Build.props
+++ b/aspnet-core/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<VoloAbpPackageVersion>5.3.4</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.3.4</LINGYUNAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>5.3.5</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.8.0</DaprPackageVersion>
 		<DistributedLockRedisPackageVersion>1.0.1</DistributedLockRedisPackageVersion>
 		<DotNetCoreCAPPackageVersion>6.0.1</DotNetCoreCAPPackageVersion>
diff --git a/aspnet-core/common.props b/aspnet-core/common.props
index 983a9534f..8b055b6a6 100644
--- a/aspnet-core/common.props
+++ b/aspnet-core/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.3.4</Version>
+    <Version>5.3.5</Version>
     <Authors>colin</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436;CS8618</NoWarn>
     <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
@@ -17,6 +17,12 @@
 	  <None Remove="LocalNuget\**" />
 	</ItemGroup>
 
+  <ItemGroup>
+	  <Compile Remove="Modules\**" />
+	  <EmbeddedResource Remove="Modules\**" />
+	  <None Remove="Modules\**" />
+	</ItemGroup>
+
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>$(SolutionDir)LocalNuget</OutputPath>
   </PropertyGroup>
diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Localization/Resources/en.json b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Localization/Resources/en.json
index 6e15b1eb2..35877ed6a 100644
--- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Localization/Resources/en.json
+++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Localization/Resources/en.json
@@ -48,6 +48,7 @@
     "MethodName": "Method",
     "Parameters": "Parameters",
     "EntitiesChanged": "Entities changed",
+    "ChangeTime": "Change time",
     "ChangeType": "Change type",
     "EntityTypeFullName": "Entity type",
     "EntityId": "Entity id",
diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Localization/Resources/zh-Hans.json b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Localization/Resources/zh-Hans.json
index 4f86c8238..0790aa937 100644
--- a/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Localization/Resources/zh-Hans.json
+++ b/aspnet-core/modules/auditing/LINGYUN.Abp.Auditing.Application.Contracts/LINGYUN/Abp/Auditing/Localization/Resources/zh-Hans.json
@@ -48,6 +48,7 @@
     "MethodName": "方法名称",
     "Parameters": "参数列表",
     "EntitiesChanged": "实体变更",
+    "ChangeTime": "变更时间",
     "ChangeType": "变更类型",
     "EntityTypeFullName": "实体类型",
     "EntityId": "实体标识",
diff --git a/common.props b/common.props
index e9167e4ca..a43c1b81b 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.3.4</Version>
+    <Version>5.3.5</Version>
     <Authors>LINGYUN</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
diff --git a/gateways/common.props b/gateways/common.props
index 6c29ad8b1..90e03d558 100644
--- a/gateways/common.props
+++ b/gateways/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.3.4</Version>
+    <Version>5.3.5</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
   </PropertyGroup>
 </Project>
\ No newline at end of file