diff --git a/RELEASE.md b/RELEASE.md
index 6dabc5df3..29a4454a6 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,5 +1,23 @@
 ## 总览
 
+# [2021-12-11]
+
+* 升级 abp framework 5.0.0 RC-2
+
+1、修改SettingManagement模块, 只返回指定提供者所有的配置;
+
+2、工作流增加 Elasticsearch 持久层扩展;
+  
+3、修复SignalR序列化协议不一致引起的IM错误;
+
+4、修复构建模块依赖路径引用错误;
+
+5、可以在文件url中添加token解决身份认证问题;
+
+6、因聚合网关导致的租户IsAvailable可能为空;
+
+7、聚合网关使用本地配置文件。
+
 # [2021-12-07]
 
 * 升级 abp framework 5.0.0 RC-1
diff --git a/apps/vue/docker-compose.yml b/apps/vue/docker-compose.yml
index f78e7666d..8ab0c9e19 100644
--- a/apps/vue/docker-compose.yml
+++ b/apps/vue/docker-compose.yml
@@ -7,9 +7,10 @@ services:
     restart: always
     ports:
       - "40080:80"
-
-volumes:
-  dbdata:
+    networks:
+      - framework
 
 networks:
-  linyun-abp:
+  framework:
+    external:
+      name: ly_app_net
diff --git a/apps/vue/src/api/settings/model/settingModel.ts b/apps/vue/src/api/settings/model/settingModel.ts
index a577068b7..32cb86c0f 100644
--- a/apps/vue/src/api/settings/model/settingModel.ts
+++ b/apps/vue/src/api/settings/model/settingModel.ts
@@ -56,3 +56,7 @@ export class SettingGroup {
   description?: string;
   settings = new Array<Setting>();
 }
+
+export interface SettingGroupResult {
+  items: SettingGroup[];
+}
diff --git a/apps/vue/src/api/settings/settings.ts b/apps/vue/src/api/settings/settings.ts
index c1d65c9a8..34ace2748 100644
--- a/apps/vue/src/api/settings/settings.ts
+++ b/apps/vue/src/api/settings/settings.ts
@@ -1,16 +1,17 @@
 import { defHttp } from '/@/utils/http/axios';
-import { SettingGroup, SettingsUpdate } from './model/settingModel';
-import { ListResultDto } from '/@/api/model/baseModel';
+import { SettingGroupResult, SettingsUpdate } from './model/settingModel';
 
 enum Api {
   GetGlobalSettings = '/api/setting-management/settings/by-global',
   SetGlobalSettings = '/api/setting-management/settings/change-global',
   GetCurrentTenantSettings = '/api/setting-management/settings/by-current-tenant',
   SetCurrentTenantSettings = '/api/setting-management/settings/change-current-tenant',
+  GetCurrentUserSettings = '/api/setting-management/settings/by-current-user',
+  SetCurrentUserSettings = '/api/setting-management/settings/change-current-user',
 }
 
 export const getGlobalSettings = () => {
-  return defHttp.get<ListResultDto<SettingGroup>>({
+  return defHttp.get<SettingGroupResult>({
     url: Api.GetGlobalSettings,
   });
 };
@@ -23,7 +24,7 @@ export const setGlobalSettings = (payload: SettingsUpdate) => {
 };
 
 export const getCurrentTenantSettings = () => {
-  return defHttp.get<ListResultDto<SettingGroup>>({
+  return defHttp.get<SettingGroupResult>({
     url: Api.GetCurrentTenantSettings,
   });
 };
@@ -34,3 +35,16 @@ export const setCurrentTenantSettings = (payload: SettingsUpdate) => {
     url: Api.SetCurrentTenantSettings,
   });
 };
+
+export const getCurrentUserSettings = () => {
+  return defHttp.get<SettingGroupResult>({
+    url: Api.GetCurrentUserSettings,
+  });
+};
+
+export const setCurrentUserSettings = (payload: SettingsUpdate) => {
+  return defHttp.put({
+    data: payload,
+    url: Api.SetCurrentUserSettings,
+  });
+};
diff --git a/apps/vue/src/components/SettingManagement/src/SettingForm.vue b/apps/vue/src/components/SettingManagement/src/SettingForm.vue
index 2776c5e9e..615f40ae4 100644
--- a/apps/vue/src/components/SettingManagement/src/SettingForm.vue
+++ b/apps/vue/src/components/SettingManagement/src/SettingForm.vue
@@ -2,7 +2,7 @@
   <Form :label-col="{ span: 5 }" :wrapper-col="{ span: 15 }">
     <Row type="flex">
       <Col :span="24">
-        <Tabs v-model:activeKey="activeTabKey">
+        <Tabs v-model:activeKey="activeTabKey" :tab-position="tabPosition">
           <TabPane
             v-for="(group, tabIndex) in settingGroups"
             :key="tabIndex"
@@ -108,7 +108,10 @@
       type: Function as PropType<(...args: any) => Promise<any>>,
       required: true,
     },
-    tabPosition: { type: String },
+    tabPosition: {
+      type: String,
+      defaultValue: 'top',
+    },
   } as const; // 对于存在必输项的props see: https://blog.csdn.net/q535999731/article/details/109578885
 
   export default defineComponent({
diff --git a/apps/vue/src/utils/http/axios/index.ts b/apps/vue/src/utils/http/axios/index.ts
index 455453406..a00d3813d 100644
--- a/apps/vue/src/utils/http/axios/index.ts
+++ b/apps/vue/src/utils/http/axios/index.ts
@@ -38,13 +38,14 @@ const transform: AxiosTransform = {
     }
 
     const { data } = res;
-    if (!data) {
-      // return '[HTTP] Request has no return value';
-      throw new Error(t('sys.api.apiRequestFailed'));
-    }
-      
+    
     // 对包装结果处理
     if (res.headers['_abpwrapresult'] === 'true') {
+      if (!data) {
+        // return '[HTTP] Request has no return value';
+        throw new Error(t('sys.api.apiRequestFailed'));
+      }
+        
       const { code, result, message, details } = data;
       const hasSuccess = data && Reflect.has(data, 'code') && code === ResultEnum.CODE;
       if (hasSuccess) {
@@ -62,7 +63,7 @@ const transform: AxiosTransform = {
         throw new Error(content || t('sys.api.apiRequestFailed'));
     }
 
-    return res.data;
+    return data;
   },
 
   // 请求之前处理config
diff --git a/apps/vue/src/views/account/center/Setting.vue b/apps/vue/src/views/account/center/Setting.vue
new file mode 100644
index 000000000..44284540b
--- /dev/null
+++ b/apps/vue/src/views/account/center/Setting.vue
@@ -0,0 +1,31 @@
+<template>
+  <SettingForm :save-api="settingFormRef.saveApi" :setting-groups="group" tab-position="left" />
+</template>
+<script lang="ts" setup>
+  import { ref, onMounted } from 'vue';
+  import { useAbpStoreWithOut } from '/@/store/modules/abp';
+
+  import { SettingForm } from '/@/components/SettingManagement';
+  import { SettingGroup } from '/@/api/settings/model/settingModel';
+  import { getCurrentUserSettings, setCurrentUserSettings } from '/@/api/settings/settings';
+
+  interface ISettingForm {
+    providerName: string;
+    providerKey?: string;
+    saveApi: (...args: any) => Promise<any>;
+  }
+
+  const abpStore = useAbpStoreWithOut();
+  const group = ref<SettingGroup[]>([]);
+  const settingFormRef = ref<ISettingForm>({
+    providerName: 'U',
+    providerKey: abpStore.getApplication.currentUser.id,
+    saveApi: setCurrentUserSettings,
+  });
+
+  onMounted(() => {
+    getCurrentUserSettings().then((res) => {
+      group.value = res.items;
+    })
+  });
+</script>
diff --git a/apps/vue/src/views/account/center/index.vue b/apps/vue/src/views/account/center/index.vue
index a8519f37b..38d73c451 100644
--- a/apps/vue/src/views/account/center/index.vue
+++ b/apps/vue/src/views/account/center/index.vue
@@ -14,7 +14,7 @@
       </a-col>
     </a-row>
     <div :class="`${prefixCls}-bottom`">
-      <Tabs>
+      <Tabs tab-position="top" v-model:activeKey="activeTabKey">
         <template v-for="item in components" :key="item.key">
           <TabPane :tab="item.name">
             <component :is="item.component" />
@@ -27,13 +27,14 @@
 
 <script lang="ts">
   import { Tag, Tabs, Row, Col } from 'ant-design-vue';
-  import { defineComponent, computed } from 'vue';
+  import { defineComponent, computed, ref } from 'vue';
   import { CollapseContainer } from '/@/components/Container/index';
   import Icon from '/@/components/Icon/index';
   import headerImg from '/@/assets/images/header.jpg';
   import { useUserStore } from '/@/store/modules/user';
   import { useLocalization } from '/@/hooks/abp/useLocalization';
   import Cloud from './Cloud.vue';
+  import Setting from './Setting.vue';
   export default defineComponent({
     components: {
       Cloud,
@@ -42,20 +43,29 @@
       Tag,
       Tabs,
       TabPane: Tabs.TabPane,
+      Setting,
       [Row.name]: Row,
       [Col.name]: Col,
     },
     setup() {
       const userStore = useUserStore();
-      const { L } = useLocalization('AbpOssManagement');
+      const activeTabKey = ref('cloud');
+      const { L } = useLocalization('AbpOssManagement', 'AbpSettingManagement');
       const components = [
         {
+          key: 'cloud',
           name: L('MyCloud'),
           component: 'cloud',
         },
+        {
+          key: 'setting',
+          name: L('DisplayName:UserSetting'),
+          component: 'setting',
+        },
       ];
       const userInfo = computed(() => userStore.getUserInfo);
       return {
+        activeTabKey,
         prefixCls: 'account-center',
         userInfo,
         headerImg,
diff --git a/apps/vue/src/views/sys/settings/index.vue b/apps/vue/src/views/sys/settings/index.vue
index 64135a254..bcc90c573 100644
--- a/apps/vue/src/views/sys/settings/index.vue
+++ b/apps/vue/src/views/sys/settings/index.vue
@@ -29,7 +29,7 @@
   const abpStore = useAbpStoreWithOut();
 
   onMounted(() => {
-    if (abpStore.getApplication.currentTenant.isAvailable) {
+    if (abpStore.getApplication.currentTenant.id) {
       settingFormRef.value = {
         providerName: 'T',
         providerKey: abpStore.getApplication.currentTenant.id,
diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props
index adfe8e5e3..0cdfddd29 100644
--- a/aspnet-core/Directory.Build.props
+++ b/aspnet-core/Directory.Build.props
@@ -1,12 +1,13 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>5.0.0-rc.1</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.0.0-rc.1</LINGYUNAbpPackageVersion>
+		<VoloAbpPackageVersion>5.0.0-rc.2</VoloAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>5.0.0-rc.2</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.5.0</DaprPackageVersion>
+		<DistributedLockRedisPackageVersion>1.0.1</DistributedLockRedisPackageVersion>
 		<DotNetCoreCAPPackageVersion>5.2.0</DotNetCoreCAPPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
 		<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
-		<AgileConfigClientPackageVersion>1.2.1.3</AgileConfigClientPackageVersion>
+		<AgileConfigClientPackageVersion>1.2.1.5</AgileConfigClientPackageVersion>
 		<HangfireMySqlStoragePackageVersion>2.0.3</HangfireMySqlStoragePackageVersion>
 		<HangfireMSSQLStoragePackageVersion>1.7.27</HangfireMSSQLStoragePackageVersion>
 		<NESTPackageVersion>7.15.1</NESTPackageVersion>
diff --git a/aspnet-core/LINGYUN.MicroService.All.sln b/aspnet-core/LINGYUN.MicroService.All.sln
index 12701821c..4e40d23ed 100644
--- a/aspnet-core/LINGYUN.MicroService.All.sln
+++ b/aspnet-core/LINGYUN.MicroService.All.sln
@@ -351,6 +351,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OpenApi", "modu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OpenApi.Authorization", "modules\open-api\LINGYUN.Abp.OpenApi.Authorization\LINGYUN.Abp.OpenApi.Authorization.csproj", "{433AD1FB-2DE8-479F-B89E-A17217591538}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.Wrapper", "modules\common\LINGYUN.Abp.Wrapper\LINGYUN.Abp.Wrapper.csproj", "{65311EC9-7A86-4E73-A587-F06A99474EDD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.BlobStoring.OssManagement", "modules\oss-management\LINGYUN.Abp.BlobStoring.OssManagement\LINGYUN.Abp.BlobStoring.OssManagement.csproj", "{CD9081C6-7CA0-4A93-9318-33E54F3ED275}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.OssManagement.HttpApi.Client", "modules\oss-management\LINGYUN.Abp.OssManagement.HttpApi.Client\LINGYUN.Abp.OssManagement.HttpApi.Client.csproj", "{D262405E-1C72-4F14-A799-40471BAD48DC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -909,6 +915,18 @@ Global
 		{433AD1FB-2DE8-479F-B89E-A17217591538}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{433AD1FB-2DE8-479F-B89E-A17217591538}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{433AD1FB-2DE8-479F-B89E-A17217591538}.Release|Any CPU.Build.0 = Release|Any CPU
+		{65311EC9-7A86-4E73-A587-F06A99474EDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{65311EC9-7A86-4E73-A587-F06A99474EDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{65311EC9-7A86-4E73-A587-F06A99474EDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{65311EC9-7A86-4E73-A587-F06A99474EDD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD9081C6-7CA0-4A93-9318-33E54F3ED275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD9081C6-7CA0-4A93-9318-33E54F3ED275}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD9081C6-7CA0-4A93-9318-33E54F3ED275}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD9081C6-7CA0-4A93-9318-33E54F3ED275}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D262405E-1C72-4F14-A799-40471BAD48DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D262405E-1C72-4F14-A799-40471BAD48DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D262405E-1C72-4F14-A799-40471BAD48DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D262405E-1C72-4F14-A799-40471BAD48DC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1082,6 +1100,9 @@ Global
 		{3C7A8246-DE82-4330-8697-24EF1B1C515D} = {C5CAD011-DF84-4914-939C-0C029DCEF26F}
 		{4059F87E-9762-46C1-AEB1-B1128EA533AE} = {3C7A8246-DE82-4330-8697-24EF1B1C515D}
 		{433AD1FB-2DE8-479F-B89E-A17217591538} = {3C7A8246-DE82-4330-8697-24EF1B1C515D}
+		{65311EC9-7A86-4E73-A587-F06A99474EDD} = {8AC72641-30D3-4ACF-89FA-808FADC55C2E}
+		{CD9081C6-7CA0-4A93-9318-33E54F3ED275} = {B05CB08F-C088-4D6D-97EE-A94A5D1AE4A6}
+		{D262405E-1C72-4F14-A799-40471BAD48DC} = {B05CB08F-C088-4D6D-97EE-A94A5D1AE4A6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C95FDF91-16F2-4A8B-A4BE-0E62D1B66718}
diff --git a/aspnet-core/LINGYUN.MicroService.Common.sln b/aspnet-core/LINGYUN.MicroService.Common.sln
index 1553edd40..c07a7616f 100644
--- a/aspnet-core/LINGYUN.MicroService.Common.sln
+++ b/aspnet-core/LINGYUN.MicroService.Common.sln
@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.IM", "modules\c
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.RealTime", "modules\common\LINGYUN.Abp.RealTime\LINGYUN.Abp.RealTime.csproj", "{E9BE3C65-2AB2-4CE8-8EB9-5C91B329ADB4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.RealTime.SignalR", "modules\common\LINGYUN.Abp.RealTime.SignalR\LINGYUN.Abp.RealTime.SignalR.csproj", "{824CB367-383B-48B2-972D-33923438A9A0}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json", "modules\common\LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json\LINGYUN.Abp.AspNetCore.SignalR.Protocol.Json.csproj", "{E9AEC9D6-1FE7-4B00-BAC5-2C3D4B63CCA2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.AspNetCore.SignalR.JwtToken", "modules\common\LINGYUN.Abp.AspNetCore.SignalR\LINGYUN.Abp.AspNetCore.SignalR.JwtToken.csproj", "{304D06E6-41EC-4DCB-AEAE-DBEEC75F9ADC}"
@@ -246,10 +244,6 @@ Global
 		{E9BE3C65-2AB2-4CE8-8EB9-5C91B329ADB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9BE3C65-2AB2-4CE8-8EB9-5C91B329ADB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E9BE3C65-2AB2-4CE8-8EB9-5C91B329ADB4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{824CB367-383B-48B2-972D-33923438A9A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{824CB367-383B-48B2-972D-33923438A9A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{824CB367-383B-48B2-972D-33923438A9A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{824CB367-383B-48B2-972D-33923438A9A0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E9AEC9D6-1FE7-4B00-BAC5-2C3D4B63CCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E9AEC9D6-1FE7-4B00-BAC5-2C3D4B63CCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E9AEC9D6-1FE7-4B00-BAC5-2C3D4B63CCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -606,7 +600,6 @@ Global
 		{086BE5BE-8594-4DA7-8819-935FEF76DABD} = {02EA4E78-5891-43BC-944F-3E52FEE032E4}
 		{5A87E9DD-3340-44DC-9564-4D8832A0228E} = {B91F26C5-B148-4094-B5F1-71E5F945DBED}
 		{E9BE3C65-2AB2-4CE8-8EB9-5C91B329ADB4} = {B91F26C5-B148-4094-B5F1-71E5F945DBED}
-		{824CB367-383B-48B2-972D-33923438A9A0} = {B91F26C5-B148-4094-B5F1-71E5F945DBED}
 		{E9AEC9D6-1FE7-4B00-BAC5-2C3D4B63CCA2} = {E2E7A062-0ABB-41B4-8220-60228446D2C2}
 		{304D06E6-41EC-4DCB-AEAE-DBEEC75F9ADC} = {E2E7A062-0ABB-41B4-8220-60228446D2C2}
 		{492710E6-EEF5-4390-A474-8FB2412ECBE5} = {3A0784A6-AFBF-406F-B79E-9505EB100445}
diff --git a/aspnet-core/LINGYUN.MicroService.Workflow.sln b/aspnet-core/LINGYUN.MicroService.Workflow.sln
index 8d629f7bf..0e6d1504e 100644
--- a/aspnet-core/LINGYUN.MicroService.Workflow.sln
+++ b/aspnet-core/LINGYUN.MicroService.Workflow.sln
@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.WorkflowCore.Pe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.WorkflowCore.RabbitMQ", "modules\workflow\LINGYUN.Abp.WorkflowCore.RabbitMQ\LINGYUN.Abp.WorkflowCore.RabbitMQ.csproj", "{8F904E49-E6DA-499D-8127-DB60DA6B2EE9}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components", "components", "{15F788FB-C7D0-4EE2-B1D9-EB9F3CCB7F33}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflow-components", "workflow-components", "{15F788FB-C7D0-4EE2-B1D9-EB9F3CCB7F33}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.WorkflowCore.Components", "modules\workflow\LINGYUN.Abp.WorkflowCore.Components\LINGYUN.Abp.WorkflowCore.Components.csproj", "{13D116F7-C158-48D3-A78A-6F2BFAED1CDF}"
 EndProject
@@ -37,7 +37,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.WorkflowManagem
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore", "modules\workflow\LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore\LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore.csproj", "{C4B1160A-BF25-4868-B962-342ABA4A96EF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch", "modules\workflow\LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch\LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch.csproj", "{9F9453F3-7124-4C22-91E3-0DC41A4FD8AB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch", "modules\workflow\LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch\LINGYUN.Abp.WorkflowCore.Persistence.Elasticsearch.csproj", "{9F9453F3-7124-4C22-91E3-0DC41A4FD8AB}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{6CB521FC-AC40-49A6-B9A5-91399CAA59AB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LY.MicroService.WorkflowManagement.HttpApi.Host", "services\LY.MicroService.WorkflowManagement.HttpApi.Host\LY.MicroService.WorkflowManagement.HttpApi.Host.csproj", "{D5ED348D-D6F0-4093-BD7D-20E05AA1EB7B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflow-tests", "workflow-tests", "{57CB3446-B825-4C55-A24A-E15EB2CAA80D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LINGYUN.Abp.WorkflowCore.Tests", "tests\LINGYUN.Abp.WorkflowCore.Tests\LINGYUN.Abp.WorkflowCore.Tests.csproj", "{0A21C843-4175-42F2-A95D-A75ED1DC1E05}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -105,6 +113,14 @@ Global
 		{9F9453F3-7124-4C22-91E3-0DC41A4FD8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F9453F3-7124-4C22-91E3-0DC41A4FD8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F9453F3-7124-4C22-91E3-0DC41A4FD8AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D5ED348D-D6F0-4093-BD7D-20E05AA1EB7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D5ED348D-D6F0-4093-BD7D-20E05AA1EB7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D5ED348D-D6F0-4093-BD7D-20E05AA1EB7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D5ED348D-D6F0-4093-BD7D-20E05AA1EB7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0A21C843-4175-42F2-A95D-A75ED1DC1E05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0A21C843-4175-42F2-A95D-A75ED1DC1E05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0A21C843-4175-42F2-A95D-A75ED1DC1E05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0A21C843-4175-42F2-A95D-A75ED1DC1E05}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -125,6 +141,8 @@ Global
 		{99BDFED5-907F-44C9-8BA0-90E1725BE211} = {C4496993-41F5-4821-829E-B80A8B3BC260}
 		{C4B1160A-BF25-4868-B962-342ABA4A96EF} = {C4496993-41F5-4821-829E-B80A8B3BC260}
 		{9F9453F3-7124-4C22-91E3-0DC41A4FD8AB} = {A2963E0D-D290-40B2-9B36-75F4A5922ABF}
+		{D5ED348D-D6F0-4093-BD7D-20E05AA1EB7B} = {6CB521FC-AC40-49A6-B9A5-91399CAA59AB}
+		{0A21C843-4175-42F2-A95D-A75ED1DC1E05} = {57CB3446-B825-4C55-A24A-E15EB2CAA80D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6BB7A5DE-DA12-44DC-BC9B-0F6CA524346F}
diff --git a/aspnet-core/common.props b/aspnet-core/common.props
index 71ffe52ae..600df4c53 100644
--- a/aspnet-core/common.props
+++ b/aspnet-core/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>5.0.0-rc.1</Version>
+    <Version>5.0.0-rc.2</Version>
     <Authors>colin</Authors>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <PackageProjectUrl>https://github.com/colinin/abp-vue-admin-element-typescript/</PackageProjectUrl>
diff --git a/aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN/Abp/AuditLogging/Elasticsearch/IndexInitializer.cs b/aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN/Abp/AuditLogging/Elasticsearch/IndexInitializer.cs
index 079394ed1..f49259704 100644
--- a/aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN/Abp/AuditLogging/Elasticsearch/IndexInitializer.cs
+++ b/aspnet-core/modules/auditing/LINGYUN.Abp.AuditLogging.Elasticsearch/LINGYUN/Abp/AuditLogging/Elasticsearch/IndexInitializer.cs
@@ -74,7 +74,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
                                             .Properties((np => 
                                                 np.Object<ExtraPropertyDictionary>(p => p.Name(n => n.ExtraProperties))
                                                   .Date(p => p.Name(n => n.ExecutionTime).Format(dateTimeFormat))))))));
-                if (indexCreateResponse.IsValid)
+                if (!indexCreateResponse.IsValid)
                 {
                     Logger.LogWarning("Failed to initialize index and audit log may not be retrieved.");
                     Logger.LogWarning(indexCreateResponse.OriginalException.ToString());
@@ -96,7 +96,7 @@ namespace LINGYUN.Abp.AuditLogging.Elasticsearch
                                        .Properties(mp => 
                                             mp.Object<ExtraPropertyDictionary>(p => p.Name(n => n.ExtraProperties))
                                               .Date(p => p.Name(n => n.CreationTime).Format(dateTimeFormat)))));
-                if (indexCreateResponse.IsValid)
+                if (!indexCreateResponse.IsValid)
                 {
                     Logger.LogWarning("Failed to initialize index and security log may not be retrieved.");
                     Logger.LogWarning(indexCreateResponse.OriginalException.ToString());
diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs
index 585d659f0..945b68a9f 100644
--- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs
+++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingAppService.cs
@@ -2,9 +2,7 @@
 using LINGYUN.Abp.Aliyun.Settings;
 using LINGYUN.Abp.SettingManagement;
 using LINGYUN.Abp.Sms.Aliyun.Settings;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.MultiTenancy;
@@ -31,19 +29,19 @@ namespace LINGYUN.Abp.Aliyun.SettingManagement
             LocalizationResource = typeof(AliyunResource);
         }
 
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
+        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await GetAllForProviderAsync(TenantSettingValueProvider.ProviderName, CurrentTenant.GetId().ToString());
         }
 
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
+        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await GetAllForProviderAsync(GlobalSettingValueProvider.ProviderName, null);
         }
 
-        protected virtual async Task<ListResultDto<SettingGroupDto>> GetAllForProviderAsync(string providerName, string providerKey)
+        protected virtual async Task<SettingGroupResult> GetAllForProviderAsync(string providerName, string providerKey)
         {
-            var settingGroups = new List<SettingGroupDto>();
+            var settingGroups = new SettingGroupResult();
 
             // 无权限返回空结果,直接报错的话,网关聚合会抛出异常
             if (await PermissionChecker.IsGrantedAsync(AliyunSettingPermissionNames.Settings))
@@ -57,42 +55,50 @@ namespace LINGYUN.Abp.Aliyun.SettingManagement
                     SettingDefinitionManager.Get(AliyunSettingNames.Authorization.RegionId),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.RegionId, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 ramSetting.AddDetail(
                     SettingDefinitionManager.Get(AliyunSettingNames.Authorization.AccessKeyId),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.AccessKeyId, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 ramSetting.AddDetail(
                     SettingDefinitionManager.Get(AliyunSettingNames.Authorization.AccessKeySecret),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.AccessKeySecret, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 ramSetting.AddDetail(
                     SettingDefinitionManager.Get(AliyunSettingNames.Authorization.RamRoleArn),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.RamRoleArn, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 ramSetting.AddDetail(
                     SettingDefinitionManager.Get(AliyunSettingNames.Authorization.RoleSessionName),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.RoleSessionName, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 ramSetting.AddDetail(
                     SettingDefinitionManager.Get(AliyunSettingNames.Authorization.Policy),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.Policy, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 ramSetting.AddDetail(
                     SettingDefinitionManager.Get(AliyunSettingNames.Authorization.UseSecurityTokenService),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.UseSecurityTokenService, providerName, providerKey),
-                    ValueType.Boolean);
+                    ValueType.Boolean,
+                    providerName);
                 ramSetting.AddDetail(
                     SettingDefinitionManager.Get(AliyunSettingNames.Authorization.DurationSeconds),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(AliyunSettingNames.Authorization.DurationSeconds, providerName, providerKey),
-                    ValueType.Number);
+                    ValueType.Number,
+                    providerName);
 
                 #endregion
 
@@ -103,44 +109,51 @@ namespace LINGYUN.Abp.Aliyun.SettingManagement
                    SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.Domain),
                    StringLocalizerFactory,
                    await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.Domain, providerName, providerKey),
-                   ValueType.String);
+                   ValueType.String,
+                    providerName);
                 smsSetting.AddDetail(
                    SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.Version),
                    StringLocalizerFactory,
                    await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.Version, providerName, providerKey),
-                   ValueType.String);
+                   ValueType.String,
+                    providerName);
                 smsSetting.AddDetail(
                    SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.ActionName),
                    StringLocalizerFactory,
                    await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.ActionName, providerName, providerKey),
-                   ValueType.String);
+                   ValueType.String,
+                    providerName);
                 smsSetting.AddDetail(
                    SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.DefaultPhoneNumber),
                    StringLocalizerFactory,
                    await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.DefaultPhoneNumber, providerName, providerKey),
-                   ValueType.String);
+                   ValueType.String,
+                    providerName);
                 smsSetting.AddDetail(
                    SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.DefaultSignName),
                    StringLocalizerFactory,
                    await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.DefaultSignName, providerName, providerKey),
-                   ValueType.String);
+                   ValueType.String,
+                    providerName);
                 smsSetting.AddDetail(
                    SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.DefaultTemplateCode),
                    StringLocalizerFactory,
                    await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.DefaultTemplateCode, providerName, providerKey),
-                   ValueType.String);
+                   ValueType.String,
+                    providerName);
                 smsSetting.AddDetail(
                    SettingDefinitionManager.Get(AliyunSmsSettingNames.Sms.VisableErrorToClient),
                    StringLocalizerFactory,
                    await SettingManager.GetOrNullAsync(AliyunSmsSettingNames.Sms.VisableErrorToClient, providerName, providerKey),
-                   ValueType.Boolean);
+                   ValueType.Boolean,
+                    providerName);
 
                 #endregion
 
-                settingGroups.Add(aliyunSettingGroup);
+                settingGroups.AddGroup(aliyunSettingGroup);
             }
 
-            return new ListResultDto<SettingGroupDto>(settingGroups);
+            return settingGroups;
         }
     }
 }
diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs
index a811fbdc3..59d5cd24c 100644
--- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs
+++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs
@@ -22,14 +22,14 @@ namespace LINGYUN.Abp.Aliyun.SettingManagement
 
         [HttpGet]
         [Route("by-current-tenant")]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
+        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await AppService.GetAllForCurrentTenantAsync();
         }
 
         [HttpGet]
         [Route("by-global")]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
+        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await AppService.GetAllForGlobalAsync();
         }
diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/IAliyunSettingAppService.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/IAliyunSettingAppService.cs
index d312249be..1a2756a42 100644
--- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/IAliyunSettingAppService.cs
+++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/IAliyunSettingAppService.cs
@@ -1,13 +1,8 @@
 using LINGYUN.Abp.SettingManagement;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
 
 namespace LINGYUN.Abp.Aliyun.SettingManagement
 {
-    public interface IAliyunSettingAppService
+    public interface IAliyunSettingAppService : IReadonlySettingAppService
     {
-        Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync();
-
-        Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync();
     }
 }
diff --git a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs
index d4f06b6d4..5ae07c6df 100644
--- a/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs
+++ b/aspnet-core/modules/cloud-aliyun/LINGYUN.Abp.Aliyun/LINGYUN/Abp/Aliyun/Settings/AliyunSettingProvider.cs
@@ -21,55 +21,87 @@ namespace LINGYUN.Abp.Aliyun.Settings
                     description: L("Description:AccessKeyId"),
                     isVisibleToClients: false,
                     isEncrypted: true
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSettingNames.Authorization.AccessKeySecret,
                     displayName: L("DisplayName:AccessKeySecret"),
                     description: L("Description:AccessKeySecret"),
                     isVisibleToClients: false,
                     isEncrypted: true
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSettingNames.Authorization.DurationSeconds,
                     defaultValue: "3600",
                     displayName: L("DisplayName:DurationSeconds"),
                     description: L("Description:DurationSeconds"),
                     isVisibleToClients: false
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSettingNames.Authorization.Policy,
                     displayName: L("DisplayName:Policy"),
                     description: L("Description:Policy"),
                     isVisibleToClients: false,
                     isEncrypted: true
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSettingNames.Authorization.RamRoleArn,
                     displayName: L("DisplayName:RamRoleArn"),
                     description: L("Description:RamRoleArn"),
                     isVisibleToClients: false,
                     isEncrypted: true
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSettingNames.Authorization.RegionId,
                     displayName: L("DisplayName:RegionId"),
                     description: L("Description:RegionId"),
                     isVisibleToClients: false
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSettingNames.Authorization.RoleSessionName,
                     displayName: L("DisplayName:RoleSessionName"),
                     description: L("Description:RoleSessionName"),
                     isVisibleToClients: false,
                     isEncrypted: true
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSettingNames.Authorization.UseSecurityTokenService,
                     defaultValue: true.ToString(),
                     displayName: L("DisplayName:UseSecurityTokenService"),
                     description: L("Description:UseSecurityTokenService"),
                     isVisibleToClients: false
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
             };
         }
 
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Data.DbMigrator/LINGYUN/Abp/Data/DbMigrator/DefaultDbSchemaMigrator.cs b/aspnet-core/modules/common/LINGYUN.Abp.Data.DbMigrator/LINGYUN/Abp/Data/DbMigrator/DefaultDbSchemaMigrator.cs
index 18c1fbf8f..879953f2a 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.Data.DbMigrator/LINGYUN/Abp/Data/DbMigrator/DefaultDbSchemaMigrator.cs
+++ b/aspnet-core/modules/common/LINGYUN.Abp.Data.DbMigrator/LINGYUN/Abp/Data/DbMigrator/DefaultDbSchemaMigrator.cs
@@ -27,14 +27,16 @@ namespace LINGYUN.Abp.Data.DbMigrator
             [NotNull] Func<string, DbContextOptionsBuilder<TDbContext>, TDbContext> configureDbContext) 
             where TDbContext : AbpDbContext<TDbContext>
         {
+            var connectionStringName = ConnectionStringNameAttribute.GetConnStringName<TDbContext>();
             var connectionStringResolver = _serviceProvider
                 .GetRequiredService<IConnectionStringResolver>();
-            var connectionString = await connectionStringResolver.ResolveAsync();
 
+            var connectionString = await connectionStringResolver.ResolveAsync(connectionStringName);
+            var defaultConnectionString = _dbConnectionOptions.GetConnectionStringOrNull(connectionStringName);
             // 租户连接字符串与默认连接字符串相同,则不执行迁移脚本
             if (string.Equals(
                 connectionString,
-                _dbConnectionOptions.ConnectionStrings.Default,
+                defaultConnectionString,
                 StringComparison.InvariantCultureIgnoreCase))
             {
                 return;
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/DotNetCore/CAP/Processor/AbpCapExpiresMessageCleanupBackgroundWorker.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/DotNetCore/CAP/Processor/AbpCapExpiresMessageCleanupBackgroundWorker.cs
deleted file mode 100644
index fac8e99a8..000000000
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/DotNetCore/CAP/Processor/AbpCapExpiresMessageCleanupBackgroundWorker.cs
+++ /dev/null
@@ -1,74 +0,0 @@
-using DotNetCore.CAP.Persistence;
-using LINGYUN.Abp.EventBus.CAP;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.BackgroundWorkers;
-using Volo.Abp.Threading;
-
-namespace DotNetCore.CAP.Processor
-{
-    /// <summary>
-    /// 过期消息清理任务
-    /// </summary>
-    public class AbpCapExpiresMessageCleanupBackgroundWorker : AsyncPeriodicBackgroundWorkerBase
-    {
-        /// <summary>
-        /// 过期消息清理配置
-        /// </summary>
-        protected AbpCAPEventBusOptions Options { get; }
-        /// <summary>
-        /// Initializer
-        /// </summary>
-        protected IStorageInitializer Initializer { get; }
-        /// <summary>
-        /// Storage
-        /// </summary>
-        protected IDataStorage Storage{ get; }
-        /// <summary>
-        /// 创建过期消息清理任务
-        /// </summary>
-        /// <param name="timer"></param>
-        /// <param name="storage"></param>
-        /// <param name="initializer"></param>
-        /// <param name="options"></param>
-        /// <param name="serviceScopeFactory"></param>
-        public AbpCapExpiresMessageCleanupBackgroundWorker(
-            AbpAsyncTimer timer,
-            IDataStorage storage,
-            IStorageInitializer initializer,
-            IOptions<AbpCAPEventBusOptions> options,
-            IServiceScopeFactory serviceScopeFactory) 
-            : base(timer, serviceScopeFactory)
-        {
-            Storage = storage;
-            Options = options.Value;
-            Initializer = initializer;
-
-            timer.Period = Options.CleanUpExpiresMessageInterval;
-        }
-
-        /// <summary>
-        /// 异步执行任务
-        /// </summary>
-        /// <param name="workerContext"></param>
-        /// <returns></returns>
-        protected override async Task DoWorkAsync(PeriodicBackgroundWorkerContext workerContext)
-        {
-            var tables = new[]
-            {
-                Initializer.GetPublishedTableName(),
-                Initializer.GetReceivedTableName()
-            };
-
-            foreach (var table in tables)
-            {
-                Logger.LogDebug($"Collecting expired data from table: {table}");
-                var time = DateTime.Now;
-                await Storage.DeleteExpiresAsync(table, time, Options.CleanUpExpiresMessageBatch);
-            }
-        }
-    }
-}
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/DotNetCore/CAP/Processor/AbpCapProcessingServer.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/DotNetCore/CAP/Processor/AbpCapProcessingServer.cs
deleted file mode 100644
index 68d315b96..000000000
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/DotNetCore/CAP/Processor/AbpCapProcessingServer.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-using DotNetCore.CAP.Internal;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace DotNetCore.CAP.Processor
-{
-    /// <summary>
-    /// CapProcessingServer
-    /// </summary>
-    public class AbpCapProcessingServer : IProcessingServer
-    {
-        private readonly CancellationTokenSource _cts;
-        private readonly ILogger _logger;
-        private readonly ILoggerFactory _loggerFactory;
-        private readonly IServiceProvider _provider;
-
-        private Task _compositeTask;
-        private ProcessingContext _context;
-        private bool _disposed;
-        /// <summary>
-        /// CapProcessingServer
-        /// </summary>
-        /// <param name="logger"></param>
-        /// <param name="loggerFactory"></param>
-        /// <param name="provider"></param>
-        public AbpCapProcessingServer(
-            ILogger<AbpCapProcessingServer> logger,
-            ILoggerFactory loggerFactory,
-            IServiceProvider provider)
-        {
-            _logger = logger;
-            _loggerFactory = loggerFactory;
-            _provider = provider;
-            _cts = new CancellationTokenSource();
-        }
-        /// <summary>
-        /// Start
-        /// </summary>
-        public void Start(CancellationToken stoppingToken)
-        {
-            _logger.LogInformation("Starting the processing server.");
-            stoppingToken.Register(() =>
-            {
-                _cts.Cancel();
-            });
-
-            _context = new ProcessingContext(_provider, _cts.Token);
-
-            var processorTasks = GetProcessors()
-                .Select(InfiniteRetry)
-                .Select(p => p.ProcessAsync(_context));
-            _compositeTask = Task.WhenAll(processorTasks);
-        }
-        /// <summary>
-        /// Pulse
-        /// </summary>
-        public void Pulse()
-        {
-            _logger.LogTrace("Pulsing the processor.");
-        }
-        /// <summary>
-        /// Dispose
-        /// </summary>
-        public void Dispose()
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            try
-            {
-                _disposed = true;
-
-                _logger.LogInformation("Shutting down the processing server...");
-                _cts.Cancel();
-
-                _compositeTask?.Wait((int)TimeSpan.FromSeconds(10).TotalMilliseconds);
-            }
-            catch (AggregateException ex)
-            {
-                var innerEx = ex.InnerExceptions[0];
-                if (!(innerEx is OperationCanceledException))
-                {
-                    _logger.LogWarning(innerEx, $"Expected an OperationCanceledException, but found '{innerEx.Message}'.");
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "An exception was occured when disposing.");
-            }
-            finally
-            {
-                _logger.LogInformation("### CAP shutdown!");
-            }
-        }
-
-        private IProcessor InfiniteRetry(IProcessor inner)
-        {
-            return new InfiniteRetryProcessor(inner, _loggerFactory);
-        }
-
-        private IProcessor[] GetProcessors()
-        {
-            var returnedProcessors = new List<IProcessor>
-            {
-                _provider.GetRequiredService<TransportCheckProcessor>(),
-                _provider.GetRequiredService<MessageNeedToRetryProcessor>(),
-            };
-
-            return returnedProcessors.ToArray();
-        }
-    }
-}
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj
index 928fd3f6b..6973ce8fc 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj
+++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.csproj
@@ -1,21 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<Import Project="..\..\..\configureawait.props" />
-  <Import Project="..\..\..\common.props" />
+	<Import Project="..\..\..\common.props" />
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <RootNamespace />
-    <Description>Cap分布式事件总线</Description>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <DocumentationFile>$(SolutionDir)modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.xml</DocumentationFile>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>netstandard2.1</TargetFramework>
+		<RootNamespace />
+		<Description>Cap分布式事件总线</Description>
+		<GenerateDocumentationFile>true</GenerateDocumentationFile>
+		<DocumentationFile>$(SolutionDir)modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.xml</DocumentationFile>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="DotNetCore.CAP" Version="$(DotNetCoreCAPPackageVersion)" />
-    <PackageReference Include="Volo.Abp.BackgroundWorkers" Version="$(VoloAbpPackageVersion)" />
-    <PackageReference Include="Volo.Abp.EventBus" Version="$(VoloAbpPackageVersion)" />
-	<PackageReference Include="Volo.Abp.Json" Version="$(VoloAbpPackageVersion)" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="DotNetCore.CAP" Version="$(DotNetCoreCAPPackageVersion)" />
+		<PackageReference Include="Volo.Abp.EventBus" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.Json" Version="$(VoloAbpPackageVersion)" />
+	</ItemGroup>
 
 </Project>
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml
index 0f822f075..5c139a103 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml
+++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml
@@ -4,39 +4,39 @@
         <name>LINGYUN.Abp.EventBus.CAP</name>
     </assembly>
     <members>
-        <member name="T:DotNetCore.CAP.ConsumerServiceSelector">
+        <member name="T:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector">
             <summary>
             消费者查找器
             </summary>
         </member>
-        <member name="P:DotNetCore.CAP.ConsumerServiceSelector.CapOptions">
+        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.CapOptions">
             <summary>
             CAP配置
             </summary>
         </member>
-        <member name="P:DotNetCore.CAP.ConsumerServiceSelector.AbpDistributedEventBusOptions">
+        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.AbpDistributedEventBusOptions">
             <summary>
             Abp分布式事件配置
             </summary>
         </member>
-        <member name="P:DotNetCore.CAP.ConsumerServiceSelector.ServiceProvider">
+        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.ServiceProvider">
             <summary>
             服务提供者
             </summary>
         </member>
-        <member name="M:DotNetCore.CAP.ConsumerServiceSelector.#ctor(System.IServiceProvider,Microsoft.Extensions.Options.IOptions{DotNetCore.CAP.CapOptions},Microsoft.Extensions.Options.IOptions{Volo.Abp.EventBus.Distributed.AbpDistributedEventBusOptions})">
+        <member name="M:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.#ctor(System.IServiceProvider,Microsoft.Extensions.Options.IOptions{DotNetCore.CAP.CapOptions},Microsoft.Extensions.Options.IOptions{Volo.Abp.EventBus.Distributed.AbpDistributedEventBusOptions})">
             <summary>
             Creates a new <see cref="T:DotNetCore.CAP.Internal.ConsumerServiceSelector" />.
             </summary>
         </member>
-        <member name="M:DotNetCore.CAP.ConsumerServiceSelector.FindConsumersFromInterfaceTypes(System.IServiceProvider)">
+        <member name="M:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.FindConsumersFromInterfaceTypes(System.IServiceProvider)">
             <summary>
             查找消费者集合
             </summary>
             <param name="provider"></param>
             <returns></returns>
         </member>
-        <member name="M:DotNetCore.CAP.ConsumerServiceSelector.GetHandlerDescription(System.Type,System.Type)">
+        <member name="M:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.GetHandlerDescription(System.Type,System.Type)">
             <summary>
             获取事件处理器集合
             </summary>
@@ -44,71 +44,6 @@
             <param name="typeInfo"></param>
             <returns></returns>
         </member>
-        <member name="T:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker">
-            <summary>
-            过期消息清理任务
-            </summary>
-        </member>
-        <member name="P:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.Options">
-            <summary>
-            过期消息清理配置
-            </summary>
-        </member>
-        <member name="P:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.Initializer">
-            <summary>
-            Initializer
-            </summary>
-        </member>
-        <member name="P:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.Storage">
-            <summary>
-            Storage
-            </summary>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.#ctor(Volo.Abp.Threading.AbpAsyncTimer,DotNetCore.CAP.Persistence.IDataStorage,DotNetCore.CAP.Persistence.IStorageInitializer,Microsoft.Extensions.Options.IOptions{LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory)">
-            <summary>
-            创建过期消息清理任务
-            </summary>
-            <param name="timer"></param>
-            <param name="storage"></param>
-            <param name="initializer"></param>
-            <param name="options"></param>
-            <param name="serviceScopeFactory"></param>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.DoWorkAsync(Volo.Abp.BackgroundWorkers.PeriodicBackgroundWorkerContext)">
-            <summary>
-            异步执行任务
-            </summary>
-            <param name="workerContext"></param>
-            <returns></returns>
-        </member>
-        <member name="T:DotNetCore.CAP.Processor.AbpCapProcessingServer">
-            <summary>
-            CapProcessingServer
-            </summary>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapProcessingServer.#ctor(Microsoft.Extensions.Logging.ILogger{DotNetCore.CAP.Processor.AbpCapProcessingServer},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)">
-            <summary>
-            CapProcessingServer
-            </summary>
-            <param name="logger"></param>
-            <param name="loggerFactory"></param>
-            <param name="provider"></param>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapProcessingServer.Start(System.Threading.CancellationToken)">
-            <summary>
-            Start
-            </summary>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapProcessingServer.Pulse">
-            <summary>
-            Pulse
-            </summary>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapProcessingServer.Dispose">
-            <summary>
-            Dispose
-            </summary>
-        </member>
         <member name="T:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusModule">
             <summary>
             AbpCAPEventBusModule
@@ -120,12 +55,6 @@
             </summary>
             <param name="context"></param>
         </member>
-        <member name="M:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusModule.OnApplicationInitialization(Volo.Abp.ApplicationInitializationContext)">
-            <summary>
-            OnApplicationInitialization
-            </summary>
-            <param name="context"></param>
-        </member>
         <member name="T:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions">
             <summary>
             过期消息清理配置项
@@ -137,18 +66,6 @@
             default: false
             </summary>
         </member>
-        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions.CleanUpExpiresMessageBatch">
-            <summary>
-            批量清理数量
-            default: 1000
-            </summary>
-        </member>
-        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions.CleanUpExpiresMessageInterval">
-            <summary>
-            执行间隔(ms)
-            default: 3600000 (1 hours)
-            </summary>
-        </member>
         <member name="T:LINGYUN.Abp.EventBus.CAP.AbpCAPExecutionFailedException">
             <summary>
             AbpECAPExecutionFailedException
@@ -282,12 +199,17 @@
             当前客户端
             </summary>
         </member>
+        <member name="P:LINGYUN.Abp.EventBus.CAP.CAPDistributedEventBus.JsonSerializer">
+            <summary>
+            typeof <see cref="T:Volo.Abp.Json.IJsonSerializer"/>
+            </summary>
+        </member>
         <member name="P:LINGYUN.Abp.EventBus.CAP.CAPDistributedEventBus.CancellationTokenProvider">
             <summary>
             取消令牌
             </summary>
         </member>
-        <member name="M:LINGYUN.Abp.EventBus.CAP.CAPDistributedEventBus.#ctor(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,Microsoft.Extensions.Options.IOptions{Volo.Abp.EventBus.Distributed.AbpDistributedEventBusOptions},DotNetCore.CAP.ICapPublisher,Volo.Abp.Users.ICurrentUser,Volo.Abp.Clients.ICurrentClient,Volo.Abp.MultiTenancy.ICurrentTenant,Volo.Abp.Uow.IUnitOfWorkManager,Volo.Abp.Guids.IGuidGenerator,Volo.Abp.Timing.IClock,Volo.Abp.Threading.ICancellationTokenProvider,LINGYUN.Abp.EventBus.CAP.ICustomDistributedEventSubscriber)">
+        <member name="M:LINGYUN.Abp.EventBus.CAP.CAPDistributedEventBus.#ctor(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,Microsoft.Extensions.Options.IOptions{Volo.Abp.EventBus.Distributed.AbpDistributedEventBusOptions},DotNetCore.CAP.ICapPublisher,Volo.Abp.Users.ICurrentUser,Volo.Abp.Clients.ICurrentClient,Volo.Abp.MultiTenancy.ICurrentTenant,Volo.Abp.Json.IJsonSerializer,Volo.Abp.Uow.IUnitOfWorkManager,Volo.Abp.Guids.IGuidGenerator,Volo.Abp.Timing.IClock,Volo.Abp.Threading.ICancellationTokenProvider,LINGYUN.Abp.EventBus.CAP.ICustomDistributedEventSubscriber)">
             <summary>
             constructor
             </summary>
@@ -297,6 +219,7 @@
             <param name="currentUser"></param>
             <param name="currentClient"></param>
             <param name="currentTenant"></param>
+            <param name="jsonSerializer"></param>
             <param name="unitOfWorkManager"></param>
             <param name="cancellationTokenProvider"></param>
             <param name="guidGenerator"></param>
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/DotNetCore/CAP/ConsumerServiceSelector.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPConsumerServiceSelector.cs
similarity index 95%
rename from aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/DotNetCore/CAP/ConsumerServiceSelector.cs
rename to aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPConsumerServiceSelector.cs
index f3df9280c..712bdecb2 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/DotNetCore/CAP/ConsumerServiceSelector.cs
+++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPConsumerServiceSelector.cs
@@ -1,5 +1,5 @@
-using DotNetCore.CAP.Internal;
-using LINGYUN.Abp.EventBus.CAP;
+using DotNetCore.CAP;
+using DotNetCore.CAP.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using System;
@@ -10,15 +10,15 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus;
 using Volo.Abp.EventBus.Distributed;
 
-namespace DotNetCore.CAP
+namespace LINGYUN.Abp.EventBus.CAP
 {
     /// <summary>
     /// 消费者查找器
     /// </summary>
     [Dependency(ServiceLifetime.Singleton, ReplaceServices = true)]
-    [ExposeServices(typeof(IConsumerServiceSelector), typeof(ConsumerServiceSelector))]
+    [ExposeServices(typeof(IConsumerServiceSelector), typeof(AbpCAPConsumerServiceSelector))]
 
-    public class ConsumerServiceSelector : Internal.ConsumerServiceSelector
+    public class AbpCAPConsumerServiceSelector : ConsumerServiceSelector
     {
         /// <summary>
         /// CAP配置
@@ -36,7 +36,7 @@ namespace DotNetCore.CAP
         /// <summary>
         /// Creates a new <see cref="T:DotNetCore.CAP.Internal.ConsumerServiceSelector" />.
         /// </summary>
-        public ConsumerServiceSelector(
+        public AbpCAPConsumerServiceSelector(
             IServiceProvider serviceProvider,
             IOptions<CapOptions> capOptions,
             IOptions<AbpDistributedEventBusOptions> distributedEventBusOptions) : base(serviceProvider)
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPEventBusModule.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPEventBusModule.cs
index ad28b0fe6..fe13cad0c 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPEventBusModule.cs
+++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPEventBusModule.cs
@@ -1,8 +1,5 @@
-using DotNetCore.CAP.Processor;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.BackgroundWorkers;
 using Volo.Abp.EventBus;
 using Volo.Abp.Modularity;
 
@@ -11,9 +8,7 @@ namespace LINGYUN.Abp.EventBus.CAP
     /// <summary>
     /// AbpCAPEventBusModule
     /// </summary>
-    [DependsOn(
-        typeof(AbpEventBusModule),
-        typeof(AbpBackgroundWorkersModule))]
+    [DependsOn(typeof(AbpEventBusModule))]
     public class AbpCAPEventBusModule : AbpModule
     {
         /// <summary>
@@ -30,6 +25,9 @@ namespace LINGYUN.Abp.EventBus.CAP
 
             context.Services.AddCAPEventBus(options =>
             {
+                // 取消默认的五分钟高频清理
+                // options.CollectorCleaningInterval = 360_0000;
+
                 configuration.GetSection("CAP:EventBus").Bind(options);
                 context.Services.ExecutePreConfiguredActions(options);
                 if (options.FailedThresholdCallback == null)
@@ -46,19 +44,5 @@ namespace LINGYUN.Abp.EventBus.CAP
                 }
             });
         }
-
-        /// <summary>
-        /// OnApplicationInitialization
-        /// </summary>
-        /// <param name="context"></param>
-        public override void OnApplicationInitialization(ApplicationInitializationContext context)
-        {
-            context.ServiceProvider
-                    .GetRequiredService<IBackgroundWorkerManager>()
-                    .Add(
-                        context.ServiceProvider
-                            .GetRequiredService<AbpCapExpiresMessageCleanupBackgroundWorker>()
-                    );
-        }
     }
 }
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPEventBusOptions.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPEventBusOptions.cs
index e11e7b9a9..a3303f3b0 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPEventBusOptions.cs
+++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/AbpCAPEventBusOptions.cs
@@ -10,15 +10,5 @@
         /// default: false
         /// </summary>
         public bool NotifyFailedCallback { get; set; } = false;
-        /// <summary>
-        /// 批量清理数量
-        /// default: 1000
-        /// </summary>
-        public int CleanUpExpiresMessageBatch { get; set; } = 1000;
-        /// <summary>
-        /// 执行间隔(ms)
-        /// default: 3600000 (1 hours)
-        /// </summary>
-        public int CleanUpExpiresMessageInterval { get; set; } = 360_0000;
     }
 }
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs
index 1ed008cc7..c2af2ea61 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs
+++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN/Abp/EventBus/CAP/CAPDistributedEventBus.cs
@@ -5,6 +5,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp;
 using Volo.Abp.Clients;
@@ -12,6 +13,7 @@ using Volo.Abp.DependencyInjection;
 using Volo.Abp.EventBus;
 using Volo.Abp.EventBus.Distributed;
 using Volo.Abp.Guids;
+using Volo.Abp.Json;
 using Volo.Abp.MultiTenancy;
 using Volo.Abp.Threading;
 using Volo.Abp.Timing;
@@ -51,10 +53,14 @@ namespace LINGYUN.Abp.EventBus.CAP
         /// 当前客户端
         /// </summary>
         protected ICurrentClient CurrentClient { get; }
-    /// <summary>
-    /// 取消令牌
-    /// </summary>
-    protected ICancellationTokenProvider CancellationTokenProvider { get; }
+        /// <summary>
+        /// typeof <see cref="IJsonSerializer"/>
+        /// </summary>
+        protected IJsonSerializer JsonSerializer { get; }
+        /// <summary>
+        /// 取消令牌
+        /// </summary>
+        protected ICancellationTokenProvider CancellationTokenProvider { get; }
         /// <summary>
         /// constructor
         /// </summary>
@@ -64,6 +70,7 @@ namespace LINGYUN.Abp.EventBus.CAP
         /// <param name="currentUser"></param>
         /// <param name="currentClient"></param>
         /// <param name="currentTenant"></param>
+        /// <param name="jsonSerializer"></param>
         /// <param name="unitOfWorkManager"></param>
         /// <param name="cancellationTokenProvider"></param>
         /// <param name="guidGenerator"></param>
@@ -75,6 +82,7 @@ namespace LINGYUN.Abp.EventBus.CAP
             ICurrentUser currentUser,
             ICurrentClient currentClient,
             ICurrentTenant currentTenant,
+            IJsonSerializer jsonSerializer,
             IUnitOfWorkManager unitOfWorkManager,
             IGuidGenerator guidGenerator,
             IClock clock,
@@ -91,6 +99,7 @@ namespace LINGYUN.Abp.EventBus.CAP
             CapPublisher = capPublisher;
             CurrentUser = currentUser;
             CurrentClient = currentClient;
+            JsonSerializer = jsonSerializer;
             CancellationTokenProvider = cancellationTokenProvider;
             CustomDistributedEventSubscriber = customDistributedEventSubscriber;
             HandlerFactories = new ConcurrentDictionary<Type, List<IEventHandlerFactory>>();
@@ -104,9 +113,7 @@ namespace LINGYUN.Abp.EventBus.CAP
         /// <returns></returns>
         public override IDisposable Subscribe(Type eventType, IEventHandlerFactory factory)
         {
-            // 自定义的事件订阅者,可以不需要事件注册的事件类型
-            CustomDistributedEventSubscriber.Subscribe(eventType, factory);
-            return new DisposeAction(() => CustomDistributedEventSubscriber.UnSubscribe(eventType, factory));
+            return NullDisposable.Instance;
         }
         /// <summary>
         /// 退订事件
@@ -115,27 +122,6 @@ namespace LINGYUN.Abp.EventBus.CAP
         /// <param name="action"></param>
         public override void Unsubscribe<TEvent>(Func<TEvent, Task> action)
         {
-            Check.NotNull(action, nameof(action));
-
-            GetOrCreateHandlerFactories(typeof(TEvent))
-                .Locking(factories =>
-                {
-                    factories.RemoveAll(
-                        factory =>
-                        {
-                            if (!(factory is SingleInstanceHandlerFactory singleInstanceFactory))
-                            {
-                                return false;
-                            }
-
-                            if (!(singleInstanceFactory.HandlerInstance is ActionEventHandler<TEvent> actionHandler))
-                            {
-                                return false;
-                            }
-
-                            return actionHandler.Action == action;
-                        });
-                });
         }
         /// <summary>
         /// 退订事件
@@ -144,15 +130,6 @@ namespace LINGYUN.Abp.EventBus.CAP
         /// <param name="handler">事件处理器</param>
         public override void Unsubscribe(Type eventType, IEventHandler handler)
         {
-            GetOrCreateHandlerFactories(eventType)
-                .Locking(factories =>
-                {
-                    factories.RemoveAll(
-                        factory =>
-                            factory is SingleInstanceHandlerFactory &&
-                            (factory as SingleInstanceHandlerFactory).HandlerInstance == handler
-                    );
-                });
         }
         /// <summary>
         /// 退订事件
@@ -161,8 +138,6 @@ namespace LINGYUN.Abp.EventBus.CAP
         /// <param name="factory">事件处理器工厂</param>
         public override void Unsubscribe(Type eventType, IEventHandlerFactory factory)
         {
-            GetOrCreateHandlerFactories(eventType).Locking(factories => factories.Remove(factory));
-            CustomDistributedEventSubscriber.UnSubscribe(eventType, factory);
         }
         /// <summary>
         /// 退订所有事件
@@ -170,7 +145,6 @@ namespace LINGYUN.Abp.EventBus.CAP
         /// <param name="eventType">事件类型</param>
         public override void UnsubscribeAll(Type eventType)
         {
-            GetOrCreateHandlerFactories(eventType).Locking(factories => factories.Clear());
         }
         /// <summary>
         /// 发布事件
@@ -181,16 +155,7 @@ namespace LINGYUN.Abp.EventBus.CAP
         protected override async Task PublishToEventBusAsync(Type eventType, object eventData)
         {
             var eventName = EventNameAttribute.GetNameOrDefault(eventType);
-            await CapPublisher
-                .PublishAsync(
-                    eventName, eventData,
-                    new Dictionary<string, string>
-                    {
-                        { AbpCAPHeaders.UserId, CurrentUser.Id?.ToString() ?? "" },
-                        { AbpCAPHeaders.ClientId, CurrentClient.Id ?? "" },
-                        { AbpCAPHeaders.TenantId, CurrentTenant.Id?.ToString() ?? "" },
-                    },
-                    CancellationTokenProvider.FallbackToProvider());
+            await PublishAsync(eventName, eventData);
         }
         /// <summary>
         /// 获取事件处理器工厂列表
@@ -209,19 +174,6 @@ namespace LINGYUN.Abp.EventBus.CAP
             return handlerFactoryList.ToArray();
         }
 
-        private List<IEventHandlerFactory> GetOrCreateHandlerFactories(Type eventType)
-        {
-            return HandlerFactories.GetOrAdd(
-                eventType,
-                type =>
-                {
-                    var eventName = EventNameAttribute.GetNameOrDefault(type);
-                    EventTypes[eventName] = type;
-                    return new List<IEventHandlerFactory>();
-                }
-            );
-        }
-
         private static bool ShouldTriggerEventForHandler(Type targetEventType, Type handlerEventType)
         {
             //Should trigger same type
@@ -240,26 +192,53 @@ namespace LINGYUN.Abp.EventBus.CAP
             return false;
         }
 
-        public override Task PublishFromOutboxAsync(OutgoingEventInfo outgoingEvent, OutboxConfig outboxConfig)
+        public override async Task PublishFromOutboxAsync(OutgoingEventInfo outgoingEvent, OutboxConfig outboxConfig)
         {
-            // cap自行实现
-            return Task.CompletedTask;
+            await PublishAsync(outgoingEvent.EventName, outgoingEvent.EventData);
         }
 
-        public override Task ProcessFromInboxAsync(IncomingEventInfo incomingEvent, InboxConfig inboxConfig)
+        public override async Task ProcessFromInboxAsync(IncomingEventInfo incomingEvent, InboxConfig inboxConfig)
         {
-            // cap自行实现
-            return Task.CompletedTask;
+            var eventType = EventTypes.GetOrDefault(incomingEvent.EventName);
+            if (eventType == null)
+            {
+                return;
+            }
+
+            var eventJson = Encoding.UTF8.GetString(incomingEvent.EventData);
+            var eventData = JsonSerializer.Deserialize(eventType, eventJson);
+            var exceptions = new List<Exception>();
+            await TriggerHandlersAsync(eventType, eventData, exceptions, inboxConfig);
+            if (exceptions.Any())
+            {
+                ThrowOriginalExceptions(eventType, exceptions);
+            }
         }
 
         protected override byte[] Serialize(object eventData)
         {
-            throw new NotImplementedException();
+            var eventJson = JsonSerializer.Serialize(eventData);
+
+            return Encoding.UTF8.GetBytes(eventJson);
         }
 
         protected override void AddToUnitOfWork(IUnitOfWork unitOfWork, UnitOfWorkEventRecord eventRecord)
         {
             unitOfWork.AddOrReplaceDistributedEvent(eventRecord);
         }
+
+        protected async Task PublishAsync(string eventName, object eventData)
+        {
+            await CapPublisher
+                .PublishAsync(
+                    eventName, eventData,
+                    new Dictionary<string, string>
+                    {
+                        { AbpCAPHeaders.UserId, CurrentUser.Id?.ToString() ?? "" },
+                        { AbpCAPHeaders.ClientId, CurrentClient.Id ?? "" },
+                        { AbpCAPHeaders.TenantId, CurrentTenant.Id?.ToString() ?? "" },
+                    },
+                    CancellationTokenProvider.FallbackToProvider());
+        }
     }
 }
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
index 9b8b488ee..136fdb0b4 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
+++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/Microsoft/Extensions/DependencyInjection/ServiceCollectionExtensions.cs
@@ -1,11 +1,8 @@
 using DotNetCore.CAP;
 using DotNetCore.CAP.Internal;
-using DotNetCore.CAP.Processor;
 using DotNetCore.CAP.Serialization;
 using LINGYUN.Abp.EventBus.CAP;
-using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
-using System.Linq;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -23,16 +20,6 @@ namespace Microsoft.Extensions.DependencyInjection
         public static IServiceCollection AddCAPEventBus(this IServiceCollection services, Action<CapOptions> capAction)
         {
             services.AddCap(capAction);
-            // 移除默认的定时清理过期消息任务
-            // 默认的五分钟,不可配置,时间间隔过短,使用自定义的后台任务
-            services.RemoveAll(typeof(CollectorProcessor));
-            var capProcessingServiceDescriptor = services
-                .FirstOrDefault(x => typeof(CapProcessingServer).Equals(x.ImplementationType));
-            if(capProcessingServiceDescriptor != null)
-            {
-                services.Remove(capProcessingServiceDescriptor);
-            }
-            services.TryAddEnumerable(ServiceDescriptor.Singleton<IProcessingServer, AbpCapProcessingServer>());
             // 替换为自己的实现
             services.AddSingleton<ISubscribeInvoker, AbpCAPSubscribeInvoker>();
             services.AddSingleton<ISerializer, AbpCapSerializer>();
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml
index 0f822f075..5c139a103 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml
+++ b/aspnet-core/modules/common/LINGYUN.Abp.EventBus.CAP/modules/common/LINGYUN.Abp.EventBus.CAP/LINGYUN.Abp.EventBus.CAP.xml
@@ -4,39 +4,39 @@
         <name>LINGYUN.Abp.EventBus.CAP</name>
     </assembly>
     <members>
-        <member name="T:DotNetCore.CAP.ConsumerServiceSelector">
+        <member name="T:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector">
             <summary>
             消费者查找器
             </summary>
         </member>
-        <member name="P:DotNetCore.CAP.ConsumerServiceSelector.CapOptions">
+        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.CapOptions">
             <summary>
             CAP配置
             </summary>
         </member>
-        <member name="P:DotNetCore.CAP.ConsumerServiceSelector.AbpDistributedEventBusOptions">
+        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.AbpDistributedEventBusOptions">
             <summary>
             Abp分布式事件配置
             </summary>
         </member>
-        <member name="P:DotNetCore.CAP.ConsumerServiceSelector.ServiceProvider">
+        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.ServiceProvider">
             <summary>
             服务提供者
             </summary>
         </member>
-        <member name="M:DotNetCore.CAP.ConsumerServiceSelector.#ctor(System.IServiceProvider,Microsoft.Extensions.Options.IOptions{DotNetCore.CAP.CapOptions},Microsoft.Extensions.Options.IOptions{Volo.Abp.EventBus.Distributed.AbpDistributedEventBusOptions})">
+        <member name="M:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.#ctor(System.IServiceProvider,Microsoft.Extensions.Options.IOptions{DotNetCore.CAP.CapOptions},Microsoft.Extensions.Options.IOptions{Volo.Abp.EventBus.Distributed.AbpDistributedEventBusOptions})">
             <summary>
             Creates a new <see cref="T:DotNetCore.CAP.Internal.ConsumerServiceSelector" />.
             </summary>
         </member>
-        <member name="M:DotNetCore.CAP.ConsumerServiceSelector.FindConsumersFromInterfaceTypes(System.IServiceProvider)">
+        <member name="M:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.FindConsumersFromInterfaceTypes(System.IServiceProvider)">
             <summary>
             查找消费者集合
             </summary>
             <param name="provider"></param>
             <returns></returns>
         </member>
-        <member name="M:DotNetCore.CAP.ConsumerServiceSelector.GetHandlerDescription(System.Type,System.Type)">
+        <member name="M:LINGYUN.Abp.EventBus.CAP.AbpCAPConsumerServiceSelector.GetHandlerDescription(System.Type,System.Type)">
             <summary>
             获取事件处理器集合
             </summary>
@@ -44,71 +44,6 @@
             <param name="typeInfo"></param>
             <returns></returns>
         </member>
-        <member name="T:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker">
-            <summary>
-            过期消息清理任务
-            </summary>
-        </member>
-        <member name="P:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.Options">
-            <summary>
-            过期消息清理配置
-            </summary>
-        </member>
-        <member name="P:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.Initializer">
-            <summary>
-            Initializer
-            </summary>
-        </member>
-        <member name="P:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.Storage">
-            <summary>
-            Storage
-            </summary>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.#ctor(Volo.Abp.Threading.AbpAsyncTimer,DotNetCore.CAP.Persistence.IDataStorage,DotNetCore.CAP.Persistence.IStorageInitializer,Microsoft.Extensions.Options.IOptions{LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions},Microsoft.Extensions.DependencyInjection.IServiceScopeFactory)">
-            <summary>
-            创建过期消息清理任务
-            </summary>
-            <param name="timer"></param>
-            <param name="storage"></param>
-            <param name="initializer"></param>
-            <param name="options"></param>
-            <param name="serviceScopeFactory"></param>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapExpiresMessageCleanupBackgroundWorker.DoWorkAsync(Volo.Abp.BackgroundWorkers.PeriodicBackgroundWorkerContext)">
-            <summary>
-            异步执行任务
-            </summary>
-            <param name="workerContext"></param>
-            <returns></returns>
-        </member>
-        <member name="T:DotNetCore.CAP.Processor.AbpCapProcessingServer">
-            <summary>
-            CapProcessingServer
-            </summary>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapProcessingServer.#ctor(Microsoft.Extensions.Logging.ILogger{DotNetCore.CAP.Processor.AbpCapProcessingServer},Microsoft.Extensions.Logging.ILoggerFactory,System.IServiceProvider)">
-            <summary>
-            CapProcessingServer
-            </summary>
-            <param name="logger"></param>
-            <param name="loggerFactory"></param>
-            <param name="provider"></param>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapProcessingServer.Start(System.Threading.CancellationToken)">
-            <summary>
-            Start
-            </summary>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapProcessingServer.Pulse">
-            <summary>
-            Pulse
-            </summary>
-        </member>
-        <member name="M:DotNetCore.CAP.Processor.AbpCapProcessingServer.Dispose">
-            <summary>
-            Dispose
-            </summary>
-        </member>
         <member name="T:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusModule">
             <summary>
             AbpCAPEventBusModule
@@ -120,12 +55,6 @@
             </summary>
             <param name="context"></param>
         </member>
-        <member name="M:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusModule.OnApplicationInitialization(Volo.Abp.ApplicationInitializationContext)">
-            <summary>
-            OnApplicationInitialization
-            </summary>
-            <param name="context"></param>
-        </member>
         <member name="T:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions">
             <summary>
             过期消息清理配置项
@@ -137,18 +66,6 @@
             default: false
             </summary>
         </member>
-        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions.CleanUpExpiresMessageBatch">
-            <summary>
-            批量清理数量
-            default: 1000
-            </summary>
-        </member>
-        <member name="P:LINGYUN.Abp.EventBus.CAP.AbpCAPEventBusOptions.CleanUpExpiresMessageInterval">
-            <summary>
-            执行间隔(ms)
-            default: 3600000 (1 hours)
-            </summary>
-        </member>
         <member name="T:LINGYUN.Abp.EventBus.CAP.AbpCAPExecutionFailedException">
             <summary>
             AbpECAPExecutionFailedException
@@ -282,12 +199,17 @@
             当前客户端
             </summary>
         </member>
+        <member name="P:LINGYUN.Abp.EventBus.CAP.CAPDistributedEventBus.JsonSerializer">
+            <summary>
+            typeof <see cref="T:Volo.Abp.Json.IJsonSerializer"/>
+            </summary>
+        </member>
         <member name="P:LINGYUN.Abp.EventBus.CAP.CAPDistributedEventBus.CancellationTokenProvider">
             <summary>
             取消令牌
             </summary>
         </member>
-        <member name="M:LINGYUN.Abp.EventBus.CAP.CAPDistributedEventBus.#ctor(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,Microsoft.Extensions.Options.IOptions{Volo.Abp.EventBus.Distributed.AbpDistributedEventBusOptions},DotNetCore.CAP.ICapPublisher,Volo.Abp.Users.ICurrentUser,Volo.Abp.Clients.ICurrentClient,Volo.Abp.MultiTenancy.ICurrentTenant,Volo.Abp.Uow.IUnitOfWorkManager,Volo.Abp.Guids.IGuidGenerator,Volo.Abp.Timing.IClock,Volo.Abp.Threading.ICancellationTokenProvider,LINGYUN.Abp.EventBus.CAP.ICustomDistributedEventSubscriber)">
+        <member name="M:LINGYUN.Abp.EventBus.CAP.CAPDistributedEventBus.#ctor(Microsoft.Extensions.DependencyInjection.IServiceScopeFactory,Microsoft.Extensions.Options.IOptions{Volo.Abp.EventBus.Distributed.AbpDistributedEventBusOptions},DotNetCore.CAP.ICapPublisher,Volo.Abp.Users.ICurrentUser,Volo.Abp.Clients.ICurrentClient,Volo.Abp.MultiTenancy.ICurrentTenant,Volo.Abp.Json.IJsonSerializer,Volo.Abp.Uow.IUnitOfWorkManager,Volo.Abp.Guids.IGuidGenerator,Volo.Abp.Timing.IClock,Volo.Abp.Threading.ICancellationTokenProvider,LINGYUN.Abp.EventBus.CAP.ICustomDistributedEventSubscriber)">
             <summary>
             constructor
             </summary>
@@ -297,6 +219,7 @@
             <param name="currentUser"></param>
             <param name="currentClient"></param>
             <param name="currentTenant"></param>
+            <param name="jsonSerializer"></param>
             <param name="unitOfWorkManager"></param>
             <param name="cancellationTokenProvider"></param>
             <param name="guidGenerator"></param>
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj b/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj
deleted file mode 100644
index b4dc93846..000000000
--- a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN.Abp.RealTime.SignalR.csproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<Import Project="..\..\..\configureawait.props" />
-	<Import Project="..\..\..\common.props" />
-
-	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
-		<RootNamespace />
-	</PropertyGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="$(VoloAbpPackageVersion)" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\LINGYUN.Abp.RealTime\LINGYUN.Abp.RealTime.csproj" />
-	</ItemGroup>
-
-</Project>
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN/Abp/RealTime/SignalR/AbpRealTimeSignalRModule.cs b/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN/Abp/RealTime/SignalR/AbpRealTimeSignalRModule.cs
deleted file mode 100644
index 190b91a1d..000000000
--- a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN/Abp/RealTime/SignalR/AbpRealTimeSignalRModule.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Volo.Abp.AspNetCore.SignalR;
-using Volo.Abp.Modularity;
-
-namespace LINGYUN.Abp.RealTime.SignalR
-{
-    [DependsOn(
-        typeof(AbpRealTimeModule),
-        typeof(AbpAspNetCoreSignalRModule))]
-    public class AbpRealTimeSignalRModule : AbpModule
-    {
-    }
-}
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN/Abp/RealTime/SignalR/Hubs/OnlineClientHubBase.cs b/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN/Abp/RealTime/SignalR/Hubs/OnlineClientHubBase.cs
deleted file mode 100644
index 85dec4012..000000000
--- a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/LINGYUN/Abp/RealTime/SignalR/Hubs/OnlineClientHubBase.cs
+++ /dev/null
@@ -1,98 +0,0 @@
-using LINGYUN.Abp.RealTime.Client;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Threading.Tasks;
-using Volo.Abp.AspNetCore.SignalR;
-using Volo.Abp.AspNetCore.WebClientInfo;
-
-namespace LINGYUN.Abp.RealTime.SignalR
-{
-    public abstract class OnlineClientHubBase : AbpHub, IClient
-    {
-        protected IWebClientInfoProvider WebClientInfoProvider => LazyServiceProvider.LazyGetRequiredService<IWebClientInfoProvider>();
-        protected IOnlineClientManager OnlineClientManager => LazyServiceProvider.LazyGetRequiredService<IOnlineClientManager>();
-
-        public override async Task OnConnectedAsync()
-        {
-            await base.OnConnectedAsync();
-
-            IOnlineClient onlineClient = CreateClientForCurrentConnection();
-            OnlineClientManager.Add(onlineClient);
-
-            await OnConnectedAsync(onlineClient);
-        }
-
-        public async Task OnConnectedAsync(IOnlineClient client)
-        {
-            Logger.LogDebug("A client is connected: " + client.ToString());
-
-            // 角色添加进组
-            foreach (var role in client.Roles)
-            {
-                await Groups.AddToGroupAsync(client.ConnectionId, role);
-            }
-
-            await OnClientConnectedAsync(client);
-        }
-
-        public override async Task OnDisconnectedAsync(Exception exception)
-        {
-            // 从通讯组移除
-            var onlineClient = OnlineClientManager.GetByConnectionIdOrNull(Context.ConnectionId);
-            await OnDisconnectedAsync(onlineClient);
-
-            await base.OnDisconnectedAsync(exception);
-        }
-
-        public async Task OnDisconnectedAsync(IOnlineClient client)
-        {
-            if (client != null)
-            {
-                try
-                {
-                    // 角色添加进组
-                    foreach (var role in client.Roles)
-                    {
-                        await Groups.RemoveFromGroupAsync(client.ConnectionId, role);
-                    }
-
-                    Logger.LogDebug("A client is disconnected: " + client);
-                    // 移除在线客户端
-                    OnlineClientManager.Remove(Context.ConnectionId);
-
-                    await OnClientDisconnectedAsync(client);
-                }
-                catch (Exception ex)
-                {
-                    Logger.LogWarning(ex.ToString(), ex);
-                }
-            }
-        }
-
-        protected virtual IOnlineClient CreateClientForCurrentConnection()
-        {
-            return new OnlineClient(
-                Context.ConnectionId,
-                WebClientInfoProvider.ClientIpAddress,
-                CurrentTenant.Id, 
-                CurrentUser.Id)
-            {
-                ConnectTime = Clock.Now,
-                UserName = CurrentUser.UserName,
-                UserAccount = CurrentUser.UserName,
-                Roles = CurrentUser.Roles ?? new string[0],
-                Properties = Context.Items
-            };
-        }
-
-        protected virtual Task OnClientConnectedAsync(IOnlineClient client)
-        {
-            return Task.CompletedTask;   
-        }
-
-        protected virtual Task OnClientDisconnectedAsync(IOnlineClient client)
-        {
-            return Task.CompletedTask;
-        }
-    }
-}
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs
index f7aff8d6e..c248abd80 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs
+++ b/aspnet-core/modules/common/LINGYUN.Abp.Sms.Aliyun/LINGYUN/Abp/Sms/Aliyun/Settings/AliyunSmsSettingProvider.cs
@@ -21,41 +21,65 @@ namespace LINGYUN.Abp.Sms.Aliyun.Settings
                     displayName: L("DisplayName:ActionName"),
                     description: L("Description:ActionName"),
                     isVisibleToClients: false
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSmsSettingNames.Sms.DefaultSignName,
                     displayName: L("DisplayName:DefaultSignName"),
                     description: L("Description:DefaultSignName"),
                     isVisibleToClients: false,
                     isEncrypted: true
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSmsSettingNames.Sms.DefaultTemplateCode,
                     displayName: L("DisplayName:DefaultTemplateCode"),
                     description: L("Description:DefaultTemplateCode"),
                     isVisibleToClients: false,
                     isEncrypted: true
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSmsSettingNames.Sms.DefaultPhoneNumber,
                     displayName: L("DisplayName:DefaultPhoneNumber"),
                     description: L("Description:DefaultPhoneNumber"),
                     isVisibleToClients: false
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSmsSettingNames.Sms.Domain,
                     defaultValue: "dysmsapi.aliyuncs.com",
                     displayName: L("DisplayName:Domain"),
                     description: L("Description:Domain"),
                     isVisibleToClients: false
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSmsSettingNames.Sms.Version,
                     defaultValue: "2017-05-25",
                     displayName: L("DisplayName:Version"),
                     description: L("Description:Version"),
                     isVisibleToClients: false
-                ),
+                )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     AliyunSmsSettingNames.Sms.VisableErrorToClient,
                     defaultValue: false.ToString(),
@@ -63,6 +87,10 @@ namespace LINGYUN.Abp.Sms.Aliyun.Settings
                     description: L("Description:VisableErrorToClient"),
                     isVisibleToClients: false
                 )
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName)
             };
         }
 
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Wrapper/LINGYUN/Abp/Wrapper/DefaultExceptionWrapHandler.cs b/aspnet-core/modules/common/LINGYUN.Abp.Wrapper/LINGYUN/Abp/Wrapper/DefaultExceptionWrapHandler.cs
index b933eeeb4..83f4f02ba 100644
--- a/aspnet-core/modules/common/LINGYUN.Abp.Wrapper/LINGYUN/Abp/Wrapper/DefaultExceptionWrapHandler.cs
+++ b/aspnet-core/modules/common/LINGYUN.Abp.Wrapper/LINGYUN/Abp/Wrapper/DefaultExceptionWrapHandler.cs
@@ -30,10 +30,9 @@ namespace LINGYUN.Abp.Wrapper
             {
                 if (context.StatusCode.HasValue)
                 {
-                    context.WithCode(context.StatusCode.ToString());
+                    context.WithCode(((int)context.StatusCode).ToString());
                     return;
                 }
-                // TODO: 先从TttpStatusCodeFinder中查找
                 var wrapperOptions = context.ServiceProvider.GetRequiredService<IOptions<AbpWrapperOptions>>().Value;
                 context.WithCode(wrapperOptions.CodeWithUnhandled);
             }
diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN/Abp/MessageService/Settings/MessageServiceSettingDefinitionProvider.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN/Abp/MessageService/Settings/MessageServiceSettingDefinitionProvider.cs
index 208c993db..232088bf3 100644
--- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN/Abp/MessageService/Settings/MessageServiceSettingDefinitionProvider.cs
+++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain.Shared/LINGYUN/Abp/MessageService/Settings/MessageServiceSettingDefinitionProvider.cs
@@ -17,8 +17,9 @@ namespace LINGYUN.Abp.MessageService.Settings
                      isVisibleToClients: false,
                      isEncrypted: false)
                  .WithProviders(
-                     GlobalSettingValueProvider.ProviderName,
-                     TenantSettingValueProvider.ProviderName)
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName)
              );
         }
 
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/FodyWeavers.xml b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/FodyWeavers.xml
similarity index 100%
rename from aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/FodyWeavers.xml
rename to aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/FodyWeavers.xml
diff --git a/aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/FodyWeavers.xsd b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/FodyWeavers.xsd
similarity index 100%
rename from aspnet-core/modules/common/LINGYUN.Abp.RealTime.SignalR/FodyWeavers.xsd
rename to aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/FodyWeavers.xsd
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN.Abp.BlobStoring.OssManagement.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN.Abp.BlobStoring.OssManagement.csproj
new file mode 100644
index 000000000..05a77d6d7
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN.Abp.BlobStoring.OssManagement.csproj
@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<Import Project="..\..\..\configureawait.props" />
+	<Import Project="..\..\..\common.props" />
+
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<RootNamespace />
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Volo.Abp.BlobStoring" Version="$(VoloAbpPackageVersion)" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <ProjectReference Include="..\LINGYUN.Abp.OssManagement.HttpApi.Client\LINGYUN.Abp.OssManagement.HttpApi.Client.csproj" />
+	</ItemGroup>
+
+</Project>
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/AbpBlobStoringOssManagementModule.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/AbpBlobStoringOssManagementModule.cs
new file mode 100644
index 000000000..509b4f779
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/AbpBlobStoringOssManagementModule.cs
@@ -0,0 +1,12 @@
+using LINGYUN.Abp.OssManagement;
+using Volo.Abp.BlobStoring;
+using Volo.Abp.Modularity;
+
+namespace LINGYUN.Abp.BlobStoring.OssManagement
+{
+    [DependsOn(typeof(AbpBlobStoringModule))]
+    [DependsOn(typeof(AbpOssManagementHttpApiClientModule))]
+    public class AbpBlobStoringOssManagementModule : AbpModule
+    {
+    }
+}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobContainerConfigurationExtensions.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobContainerConfigurationExtensions.cs
new file mode 100644
index 000000000..d485da99d
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobContainerConfigurationExtensions.cs
@@ -0,0 +1,25 @@
+using System;
+using Volo.Abp.BlobStoring;
+
+namespace LINGYUN.Abp.BlobStoring.OssManagement;
+
+public static class OssManagementBlobContainerConfigurationExtensions
+{
+    public static OssManagementBlobProviderConfiguration GetOssManagementConfiguration(
+        this BlobContainerConfiguration containerConfiguration)
+    {
+        return new OssManagementBlobProviderConfiguration(containerConfiguration);
+    }
+
+    public static BlobContainerConfiguration UseOssManagement(
+        this BlobContainerConfiguration containerConfiguration,
+        Action<OssManagementBlobProviderConfiguration> fileSystemConfigureAction)
+    {
+        containerConfiguration.ProviderType = typeof(OssManagementBlobProvider);
+        containerConfiguration.NamingNormalizers.TryAdd<OssManagementBlobNamingNormalizer>();
+
+        fileSystemConfigureAction(new OssManagementBlobProviderConfiguration(containerConfiguration));
+
+        return containerConfiguration;
+    }
+}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobNamingNormalizer.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobNamingNormalizer.cs
new file mode 100644
index 000000000..5a6ffbba9
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobNamingNormalizer.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Text;
+using System.Web;
+using Volo.Abp.BlobStoring;
+using Volo.Abp.DependencyInjection;
+
+namespace LINGYUN.Abp.BlobStoring.OssManagement
+{
+    public class OssManagementBlobNamingNormalizer : IBlobNamingNormalizer, ITransientDependency
+    {
+        public string NormalizeBlobName(string blobName)
+        {
+            // 路径需要URL编码
+            return HttpUtility.UrlEncode(blobName, Encoding.UTF8);
+        }
+
+        public string NormalizeContainerName(string containerName)
+        {
+            // 取消反斜杠开头
+            return containerName.EnsureStartsWith('/');
+        }
+    }
+}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobProvider.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobProvider.cs
new file mode 100644
index 000000000..100fe5c5c
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobProvider.cs
@@ -0,0 +1,92 @@
+using LINGYUN.Abp.OssManagement;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using Volo.Abp.BlobStoring;
+using Volo.Abp.Content;
+using Volo.Abp.DependencyInjection;
+
+namespace LINGYUN.Abp.BlobStoring.OssManagement
+{
+    public class OssManagementBlobProvider : BlobProviderBase, ITransientDependency
+    {
+        public ILogger<OssManagementBlobProvider> Logger { protected get; set; }
+
+        private readonly IOssObjectAppService _ossObjectAppService;
+        public OssManagementBlobProvider(
+            IOssObjectAppService ossObjectAppService)
+        {
+            _ossObjectAppService = ossObjectAppService;
+
+            Logger = NullLogger<OssManagementBlobProvider>.Instance;
+        }
+
+        public override async Task<bool> DeleteAsync(BlobProviderDeleteArgs args)
+        {
+            var configuration = args.Configuration.GetOssManagementConfiguration();
+            await _ossObjectAppService.DeleteAsync(new GetOssObjectInput
+            {
+                Bucket = configuration.Bucket,
+                Object = args.BlobName
+            });
+            return true;
+        }
+
+        public override async Task<bool> ExistsAsync(BlobProviderExistsArgs args)
+        {
+            try
+            {
+                var configuration = args.Configuration.GetOssManagementConfiguration();
+                var oss = await _ossObjectAppService.GetAsync(new GetOssObjectInput
+                {
+                    Bucket = configuration.Bucket,
+                    Object = args.BlobName
+                });
+                return oss != null;
+            }
+            catch (Exception ex)
+            {
+                Logger.LogWarning("An error occurred while getting the OSS object, always returning that the object does not exist");
+                Logger.LogWarning(ex.Message);
+
+                return false;
+            }
+        }
+
+        public override async Task<Stream> GetOrNullAsync(BlobProviderGetArgs args)
+        {
+            try
+            {
+                var configuration = args.Configuration.GetOssManagementConfiguration();
+                var content = await _ossObjectAppService.GetContentAsync(new GetOssObjectInput
+                {
+                    Bucket = configuration.Bucket,
+                    Object = args.BlobName
+                });
+
+                return content?.GetStream();
+            }
+            catch(Exception ex)
+            {
+                Logger.LogWarning("An error occurred while getting the OSS object and an empty data stream will be returned");
+                Logger.LogWarning(ex.Message);
+
+                return null;
+            }
+        }
+
+        public override async Task SaveAsync(BlobProviderSaveArgs args)
+        {
+            var configuration = args.Configuration.GetOssManagementConfiguration();
+            await _ossObjectAppService.CreateAsync(new CreateOssObjectInput
+            {
+                Bucket = configuration.Bucket,
+                Overwrite = true,
+                FileName = args.BlobName,
+                File = new RemoteStreamContent(args.BlobStream)
+            });
+        }
+    }
+}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobProviderConfiguration.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobProviderConfiguration.cs
new file mode 100644
index 000000000..cb8c5502b
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobProviderConfiguration.cs
@@ -0,0 +1,21 @@
+using Volo.Abp;
+using Volo.Abp.BlobStoring;
+
+namespace LINGYUN.Abp.BlobStoring.OssManagement
+{
+    public class OssManagementBlobProviderConfiguration
+    {
+        public string Bucket
+        {
+            get => _containerConfiguration.GetConfiguration<string>(OssManagementBlobProviderConfigurationNames.Bucket);
+            set => _containerConfiguration.SetConfiguration(OssManagementBlobProviderConfigurationNames.Bucket, Check.NotNullOrWhiteSpace(value, nameof(value)));
+        }
+
+        private readonly BlobContainerConfiguration _containerConfiguration;
+
+        public OssManagementBlobProviderConfiguration(BlobContainerConfiguration containerConfiguration)
+        {
+            _containerConfiguration = containerConfiguration;
+        }
+    }
+}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobProviderConfigurationNames.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobProviderConfigurationNames.cs
new file mode 100644
index 000000000..489d4c359
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/LINGYUN/Abp/BlobStoring/OssManagement/OssManagementBlobProviderConfigurationNames.cs
@@ -0,0 +1,7 @@
+namespace LINGYUN.Abp.BlobStoring.OssManagement
+{
+    public class OssManagementBlobProviderConfigurationNames
+    {
+        public const string Bucket = "OssManagement:Bucket";
+    }
+}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/README.md b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/README.md
new file mode 100644
index 000000000..58e9f6168
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.BlobStoring.OssManagement/README.md
@@ -0,0 +1,68 @@
+# LINGYUN.Abp.BlobStoring.OssManagement
+
+abp框架对象存储提供者**IBlobProvider**的Oss管理模块实现
+
+## 配置使用
+
+模块按需引用, 依赖于OssManagement模块, 所以需要配置远端Oss管理模块的客户端代理  
+
+事先定义**appsettings.json**文件
+
+```json
+{
+  "OssManagement": {
+    "Bucket": "你定义的BucketName"
+  },
+  "RemoteServices": {
+    "AbpOssManagement": {
+      "BaseUrl": "http://127.0.0.1:30025",
+      "IdentityClient": "InternalServiceClient",
+      "UseCurrentAccessToken": false
+    }
+  },
+  "IdentityClients": {
+    "InternalServiceClient": {
+      "Authority": "http://127.0.0.1:44385",
+      "RequireHttps": false,
+      "GrantType": "client_credentials",
+      "Scope": "lingyun-abp-application",
+      "ClientId": "InternalServiceClient",
+      "ClientSecret": "1q2w3E*"
+    }
+  }
+}
+
+```
+
+```csharp
+[DependsOn(typeof(AbpBlobStoringOssManagementModule))]
+public class YouProjectModule : AbpModule
+{
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        var configuration = context.Services.GetConfiguration();
+        Configure<AbpBlobStoringOptions>(options =>
+        {
+            services.ExecutePreConfiguredActions(options);
+            // YouContainer use oss management
+            options.Containers.Configure<YouContainer>((containerConfiguration) =>
+            {
+                containerConfiguration.UseOssManagement(config =>
+                {
+                    config.Bucket = configuration[OssManagementBlobProviderConfigurationNames.Bucket];
+                });
+            });
+
+            // all container use oss management
+            options.Containers.ConfigureAll((containerName, containerConfiguration) =>
+            {
+                // use oss management
+                containerConfiguration.UseOssManagement(config =>
+                {
+                    config.Bucket = configuration[OssManagementBlobProviderConfigurationNames.Bucket];
+                });
+            });
+        });
+    }
+}
+```
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN/Abp/OssManagement/IOssObjectAppService.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN/Abp/OssManagement/IOssObjectAppService.cs
index bd4377e4f..d90ece811 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN/Abp/OssManagement/IOssObjectAppService.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application.Contracts/LINGYUN/Abp/OssManagement/IOssObjectAppService.cs
@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using Volo.Abp.Application.Services;
-
+using Volo.Abp.Content;
+
 namespace LINGYUN.Abp.OssManagement
 {
     public interface IOssObjectAppService : IApplicationService
@@ -9,6 +10,8 @@ namespace LINGYUN.Abp.OssManagement
 
         Task<OssObjectDto> GetAsync(GetOssObjectInput input);
 
+        Task<IRemoteStreamContent> GetContentAsync(GetOssObjectInput input);
+
         Task DeleteAsync(GetOssObjectInput input);
 
         Task BulkDeleteAsync(BulkDeleteOssObjectInput input);
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/OssObjectAppService.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/OssObjectAppService.cs
index ce395333f..c59f45854 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/OssObjectAppService.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Application/LINGYUN/Abp/OssManagement/OssObjectAppService.cs
@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 using System.IO;
 using System.Threading.Tasks;
 using System.Web;
+using Volo.Abp.Content;
 
 namespace LINGYUN.Abp.OssManagement
 {
@@ -69,6 +70,15 @@ namespace LINGYUN.Abp.OssManagement
             return ObjectMapper.Map<OssObject, OssObjectDto>(ossObject);
         }
 
+        public virtual async Task<IRemoteStreamContent> GetContentAsync(GetOssObjectInput input)
+        {
+            var oss = CreateOssContainer();
+
+            var ossObject = await oss.GetObjectAsync(input.Bucket, input.Object, input.Path, input.MD5);
+
+            return new RemoteStreamContent(ossObject.Content, ossObject.Name);
+        }
+
         protected virtual IOssContainer CreateOssContainer()
         {
             return OssContainerFactory.Create();
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN/Abp/OssManagement/Settings/AbpOssManagementSettingDefinitionProvider.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN/Abp/OssManagement/Settings/AbpOssManagementSettingDefinitionProvider.cs
index 364f0806f..fcec77225 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN/Abp/OssManagement/Settings/AbpOssManagementSettingDefinitionProvider.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain.Shared/LINGYUN/Abp/OssManagement/Settings/AbpOssManagementSettingDefinitionProvider.cs
@@ -22,6 +22,7 @@ namespace LINGYUN.Abp.OssManagement.Settings
                     description: L("Description:FileLimitLength"), 
                     isVisibleToClients: true)
                 .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
                     GlobalSettingValueProvider.ProviderName,
                     TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
@@ -31,6 +32,7 @@ namespace LINGYUN.Abp.OssManagement.Settings
                     description: L("Description:AllowFileExtensions"), 
                     isVisibleToClients: true)
                 .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
                     GlobalSettingValueProvider.ProviderName,
                     TenantSettingValueProvider.ProviderName),
             };
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain/LINGYUN/Abp/OssManagement/AbpOssManagementOptions.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain/LINGYUN/Abp/OssManagement/AbpOssManagementOptions.cs
index 38cdefd93..c800e316c 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain/LINGYUN/Abp/OssManagement/AbpOssManagementOptions.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.Domain/LINGYUN/Abp/OssManagement/AbpOssManagementOptions.cs
@@ -16,9 +16,16 @@ namespace LINGYUN.Abp.OssManagement
         {
             StaticBuckets = new List<string>
             {
+                // 公共目录
                 "public",
+                // 用户私有目录
                 "users",
+                // 系统目录
                 "system",
+                // 工作流
+                "workflow",
+                // 图标
+                "icons"
             };
         }
 
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/FodyWeavers.xsd b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/FodyWeavers.xsd
new file mode 100644
index 000000000..11da52550
--- /dev/null
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN.Abp.OssManagement.HttpApi.Client.csproj b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN.Abp.OssManagement.HttpApi.Client.csproj
index a646795a9..fb415f1bb 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN.Abp.OssManagement.HttpApi.Client.csproj
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN.Abp.OssManagement.HttpApi.Client.csproj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+	<Import Project="..\..\..\configureawait.props" />
 	<Import Project="..\..\..\common.props" />
 
 	<PropertyGroup>
@@ -8,7 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Volo.Abp.Http.Client" Version="4.4.0" />
+		<PackageReference Include="Volo.Abp.Http.Client" Version="$(VoloAbpPackageVersion)" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN/Abp/OssManagement/LINGYUNApiDescriptionFinder.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN/Abp/OssManagement/LINGYUNApiDescriptionFinder.cs
deleted file mode 100644
index 2fe15b2c0..000000000
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi.Client/LINGYUN/Abp/OssManagement/LINGYUNApiDescriptionFinder.cs
+++ /dev/null
@@ -1,162 +0,0 @@
-using Microsoft.Extensions.Options;
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Reflection;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-using Volo.Abp;
-using Volo.Abp.DependencyInjection;
-using Volo.Abp.Http.Client.DynamicProxying;
-using Volo.Abp.Http.Modeling;
-using Volo.Abp.MultiTenancy;
-using Volo.Abp.Threading;
-using Volo.Abp.Tracing;
-
-namespace LINGYUN.Abp.OssManagement
-{
-    public class LINGYUNApiDescriptionFinder : IApiDescriptionFinder, ITransientDependency
-    {
-        public ICancellationTokenProvider CancellationTokenProvider { get; set; }
-        protected IApiDescriptionCache Cache { get; }
-        protected AbpCorrelationIdOptions AbpCorrelationIdOptions { get; }
-        protected ICorrelationIdProvider CorrelationIdProvider { get; }
-        protected ICurrentTenant CurrentTenant { get; }
-
-        public LINGYUNApiDescriptionFinder(
-            IApiDescriptionCache cache,
-            IOptions<AbpCorrelationIdOptions> abpCorrelationIdOptions,
-            ICorrelationIdProvider correlationIdProvider,
-            ICurrentTenant currentTenant)
-        {
-            Cache = cache;
-            AbpCorrelationIdOptions = abpCorrelationIdOptions.Value;
-            CorrelationIdProvider = correlationIdProvider;
-            CurrentTenant = currentTenant;
-            CancellationTokenProvider = NullCancellationTokenProvider.Instance;
-        }
-
-        public async Task<ActionApiDescriptionModel> FindActionAsync(HttpClient client, string baseUrl, Type serviceType, MethodInfo method)
-        {
-            var apiDescription = await GetApiDescriptionAsync(client, baseUrl);
-
-            //TODO: Cache finding?
-
-            var methodParameters = method.GetParameters().ToArray();
-
-            foreach (var module in apiDescription.Modules.Values)
-            {
-                foreach (var controller in module.Controllers.Values)
-                {
-                    if (!controller.Implements(serviceType))
-                    {
-                        continue;
-                    }
-
-                    foreach (var action in controller.Actions.Values)
-                    {
-                        if (action.Name == method.Name && action.ParametersOnMethod.Count == methodParameters.Length)
-                        {
-                            var found = true;
-
-                            for (int i = 0; i < methodParameters.Length; i++)
-                            {
-                                if (!TypeMatches(action.ParametersOnMethod[i], methodParameters[i]))
-                                {
-                                    found = false;
-                                    break;
-                                }
-                            }
-
-                            if (found)
-                            {
-                                return action;
-                            }
-                        }
-                    }
-                }
-            }
-
-            throw new AbpException($"Could not found remote action for method: {method} on the URL: {baseUrl}");
-        }
-
-        public virtual async Task<ApplicationApiDescriptionModel> GetApiDescriptionAsync(HttpClient client, string baseUrl)
-        {
-            return await Cache.GetAsync(baseUrl, () => GetApiDescriptionFromServerAsync(client, baseUrl));
-        }
-
-        protected virtual async Task<ApplicationApiDescriptionModel> GetApiDescriptionFromServerAsync(
-            HttpClient client,
-            string baseUrl)
-        {
-            var requestMessage = new HttpRequestMessage(
-                HttpMethod.Get,
-                baseUrl.EnsureEndsWith('/') + "api/abp/api-definition"
-            );
-
-            AddHeaders(requestMessage);
-
-            var response = await client.SendAsync(
-                requestMessage,
-                CancellationTokenProvider.Token
-            );
-
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new AbpException("Remote service returns error! StatusCode = " + response.StatusCode);
-            }
-
-            var content = await response.Content.ReadAsStringAsync();
-
-            var result = JsonSerializer.Deserialize<ApplicationApiDescriptionModel>(content, new JsonSerializerOptions
-            {
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase
-            });
-
-            return (ApplicationApiDescriptionModel)result;
-        }
-
-        protected virtual void AddHeaders(HttpRequestMessage requestMessage)
-        {
-            //CorrelationId
-            requestMessage.Headers.Add(AbpCorrelationIdOptions.HttpHeaderName, CorrelationIdProvider.Get());
-
-            //TenantId
-            if (CurrentTenant.Id.HasValue)
-            {
-                //TODO: Use AbpAspNetCoreMultiTenancyOptions to get the key
-                requestMessage.Headers.Add(TenantResolverConsts.DefaultTenantKey, CurrentTenant.Id.Value.ToString());
-            }
-
-            //Culture
-            //TODO: Is that the way we want? Couldn't send the culture (not ui culture)
-            var currentCulture = CultureInfo.CurrentUICulture.Name ?? CultureInfo.CurrentCulture.Name;
-            if (!currentCulture.IsNullOrEmpty())
-            {
-                requestMessage.Headers.AcceptLanguage.Add(new StringWithQualityHeaderValue(currentCulture));
-            }
-
-            //X-Requested-With
-            requestMessage.Headers.Add("X-Requested-With", "XMLHttpRequest");
-        }
-
-        protected virtual bool TypeMatches(MethodParameterApiDescriptionModel actionParameter, ParameterInfo methodParameter)
-        {
-            return NormalizeTypeName(actionParameter.TypeAsString) ==
-                   NormalizeTypeName(methodParameter.ParameterType.GetFullNameWithAssemblyName());
-        }
-
-        protected virtual string NormalizeTypeName(string typeName)
-        {
-            const string placeholder = "%COREFX%";
-            const string netCoreLib = "System.Private.CoreLib";
-            const string netFxLib = "mscorlib";
-
-            return typeName.Replace(netCoreLib, placeholder).Replace(netFxLib, placeholder);
-        }
-    }
-}
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/OssObjectController.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/OssObjectController.cs
index 0dbc09701..08942d48b 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/OssObjectController.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.HttpApi/LINGYUN/Abp/OssManagement/OssObjectController.cs
@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.Auditing;
+using Volo.Abp.Content;
 
 namespace LINGYUN.Abp.OssManagement
 {
@@ -25,7 +26,7 @@ namespace LINGYUN.Abp.OssManagement
         }
 
         [HttpPost]
-        public virtual async Task<OssObjectDto> CreateAsync([FromForm] CreateOssObjectInput input)
+        public virtual async Task<OssObjectDto> CreateAsync(CreateOssObjectInput input)
         {
             return await OssObjectAppService.CreateAsync(input);
         }
@@ -57,5 +58,12 @@ namespace LINGYUN.Abp.OssManagement
         {
             return await OssObjectAppService.GetAsync(input);
         }
+
+        [HttpGet]
+        [Route("download")]
+        public virtual async Task<IRemoteStreamContent> GetContentAsync(GetOssObjectInput input)
+        {
+            return await OssObjectAppService.GetContentAsync(input);
+        }
     }
 }
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/IOssManagementSettingAppService.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/IOssManagementSettingAppService.cs
index d58768920..b22edcb04 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/IOssManagementSettingAppService.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/IOssManagementSettingAppService.cs
@@ -1,13 +1,8 @@
 using LINGYUN.Abp.SettingManagement;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
 
 namespace LINGYUN.Abp.OssManagement.SettingManagement
 {
-    public interface IOssManagementSettingAppService
+    public interface IOssManagementSettingAppService : IReadonlySettingAppService
     {
-        Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync();
-
-        Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync();
     }
 }
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingAppService.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingAppService.cs
index d9f594a06..53e2decb8 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingAppService.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingAppService.cs
@@ -2,9 +2,7 @@
 using LINGYUN.Abp.OssManagement.Permissions;
 using LINGYUN.Abp.OssManagement.Settings;
 using LINGYUN.Abp.SettingManagement;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.MultiTenancy;
@@ -31,24 +29,23 @@ namespace LINGYUN.Abp.OssManagement.SettingManagement
             LocalizationResource = typeof(AbpOssManagementResource);
         }
 
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
+        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await GetAllForProviderAsync(TenantSettingValueProvider.ProviderName, CurrentTenant.GetId().ToString());
         }
 
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
+        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await GetAllForProviderAsync(GlobalSettingValueProvider.ProviderName, null);
         }
 
-        protected virtual async Task<ListResultDto<SettingGroupDto>> GetAllForProviderAsync(string providerName, string providerKey)
+        protected virtual async Task<SettingGroupResult> GetAllForProviderAsync(string providerName, string providerKey)
         {
-            var settingGroups = new List<SettingGroupDto>();
+            var settingGroups = new SettingGroupResult();
 
             // 无权限返回空结果,直接报错的话,网关聚合会抛出异常
             if (await PermissionChecker.IsGrantedAsync(AbpOssManagementPermissions.OssObject.Default))
             {
-
                 var ossSettingGroup = new SettingGroupDto(L["DisplayName:OssManagement"], L["Description:OssManagement"]);
 
                 var ossObjectSetting = ossSettingGroup.AddSetting(L["DisplayName:OssObject"], L["Description:OssObject"]);
@@ -64,10 +61,10 @@ namespace LINGYUN.Abp.OssManagement.SettingManagement
                     await SettingManager.GetOrNullAsync(AbpOssManagementSettingNames.AllowFileExtensions, providerName, providerKey),
                     ValueType.String);
 
-                settingGroups.Add(ossSettingGroup);
+                settingGroups.AddGroup(ossSettingGroup);
             }
 
-            return new ListResultDto<SettingGroupDto>(settingGroups);
+            return settingGroups;
         }
     }
 }
diff --git a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingController.cs b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingController.cs
index 3668216db..93d151b9b 100644
--- a/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingController.cs
+++ b/aspnet-core/modules/oss-management/LINGYUN.Abp.OssManagement.SettingManagement/LINGYUN/Abp/OssManagement/SettingManagement/OssManagementSettingController.cs
@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using Volo.Abp;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc;
 
 namespace LINGYUN.Abp.OssManagement.SettingManagement
@@ -22,14 +21,14 @@ namespace LINGYUN.Abp.OssManagement.SettingManagement
 
         [HttpGet]
         [Route("by-current-tenant")]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
+        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await WeChatSettingAppService.GetAllForCurrentTenantAsync();
         }
 
         [HttpGet]
         [Route("by-global")]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
+        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await WeChatSettingAppService.GetAllForGlobalAsync();
         }
diff --git a/aspnet-core/modules/oss-management/README.md b/aspnet-core/modules/oss-management/README.md
index d82dd708a..5aa93b44f 100644
--- a/aspnet-core/modules/oss-management/README.md
+++ b/aspnet-core/modules/oss-management/README.md
@@ -11,10 +11,12 @@ File-Management更名为Oss-Management
 * [LINGYUN.Abp.OssManagement.Application.Contracts](./LINGYUN.Abp.OssManagement.Application.Contracts)	应用服务层公共模块，定义了管理Oss的外部接口、权限、功能限制策略  
 * [LINGYUN.Abp.OssManagement.Application](./LINGYUN.Abp.OssManagement.Application)						应用服务层实现，实现了Oss管理接口  
 * [LINGYUN.Abp.OssManagement.HttpApi](./LINGYUN.Abp.OssManagement.HttpApi)								RestApi实现，实现了独立的对外RestApi接口  
+* [LINGYUN.Abp.OssManagement.HttpApi.Client](./LINGYUN.Abp.OssManagement.HttpApi.Client)				客户端代理模块, 简化远程调用过程  
 * [LINGYUN.Abp.OssManagement.SettingManagement](./LINGYUN.Abp.OssManagement.SettingManagement)			设置管理模块，对外暴露自身的设置管理，用于网关聚合  
 
 ### 高阶模块
 
+* [LINGYUN.Abp.BlobStoring.OssManagement](./LINGYUN.Abp.BlobStoring.OssManagement)						abp框架对象存储提供者**IBlobProvider**的Oss管理模块实现, 依赖于Oss客户端代理模块  
 * [LINGYUN.Abp.OssManagement.Aliyun](./LINGYUN.Abp.OssManagement.Aliyun)									Oss管理的阿里云实现，实现了部分阿里云Oss服务的容器与对象管理  
 * [LINGYUN.Abp.OssManagement.FileSystem](./LINGYUN.Abp.OssManagement.FileSystem)							Oss管理的本地文件系统实现，实现了部分本地文件系统的容器（目录）与对象（文件/目录）管理  
 * [LINGYUN.Abp.OssManagement.FileSystem.ImageSharp](./LINGYUN.Abp.OssManagement.FileSystem.ImageSharp)	Oss本地对象的ImageSharp扩展，当前端传递需求处理对象时，此模块用于实现基于图形文件流的处理   
@@ -48,4 +50,5 @@ File-Management更名为Oss-Management
 ## 更新日志
 
 *【2021-03-10】 变更FileManagement命名空间为OssManagement  
-*【2021-10-22】	增加PublicFilesController用于身份认证通过的用户上传/下载文件,所有操作限定在用户目录下
+*【2021-10-22】	增加PublicFilesController用于身份认证通过的用户上传/下载文件,所有操作限定在用户目录下  
+*【2021-12-13】	增加LINGYUN.Abp.BlobStoring.OssManagement用于实现Oss代理二进制文件存储  
diff --git a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Settings/PlatformSettingDefinitionProvider.cs b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Settings/PlatformSettingDefinitionProvider.cs
index 09fc0b180..08410d3c8 100644
--- a/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Settings/PlatformSettingDefinitionProvider.cs
+++ b/aspnet-core/modules/platform/LINGYUN.Platform.Domain/LINGYUN/Platform/Settings/PlatformSettingDefinitionProvider.cs
@@ -23,6 +23,7 @@ namespace LINGYUN.Platform.Settings
                     description: L("Description:VersionFileLimitLength"), 
                     isVisibleToClients: true)
                 .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
                     GlobalSettingValueProvider.ProviderName,
                     TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
@@ -32,6 +33,7 @@ namespace LINGYUN.Platform.Settings
                     description: L("Description:AllowVersionFileExtensions"), 
                     isVisibleToClients: true)
                 .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
                     GlobalSettingValueProvider.ProviderName,
                     TenantSettingValueProvider.ProviderName),
             };
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDetailsDto.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDetailsDto.cs
index 56c47a192..720c0b095 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDetailsDto.cs
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDetailsDto.cs
@@ -26,6 +26,8 @@ namespace LINGYUN.Abp.SettingManagement
         /// </summary>
         public List<OptionDto> Options { get; set; } = new List<OptionDto>();
 
+        public List<string> Providers { get; set; } = new List<string>();
+
         public SettingDetailsDto WithSlot(string slot)
         {
             Slot = slot;
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDto.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDto.cs
index c88ba4fe9..f83330f4d 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDto.cs
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingDto.cs
@@ -1,5 +1,7 @@
 using Microsoft.Extensions.Localization;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using Volo.Abp.Settings;
 
 namespace LINGYUN.Abp.SettingManagement
@@ -12,6 +14,8 @@ namespace LINGYUN.Abp.SettingManagement
 
         public List<SettingDetailsDto> Details { get; set; } = new List<SettingDetailsDto>();
 
+        
+
         public SettingDto()
         {
 
@@ -21,10 +25,22 @@ namespace LINGYUN.Abp.SettingManagement
         {
             DisplayName = displayName;
             Description = description;
-        }
-
-        public SettingDetailsDto AddDetail(SettingDefinition setting, IStringLocalizerFactory factory, string value, ValueType type)
+        }
+
+#nullable enable
+        public SettingDetailsDto? AddDetail(
+            SettingDefinition setting, 
+            IStringLocalizerFactory factory, 
+            string value, 
+            ValueType type,
+            string keepProvider = "")
         {
+            if (setting.Providers.Any() &&
+                !keepProvider.IsNullOrWhiteSpace() &&
+                !setting.Providers.Any(p => p.Equals(keepProvider)))
+            {
+                return null;
+            }
             var detail = new SettingDetailsDto()
             {
                 DefaultValue = setting.DefaultValue,
@@ -35,9 +51,11 @@ namespace LINGYUN.Abp.SettingManagement
                 Value = value,
                 ValueType = type
             };
+            detail.Providers.AddRange(setting.Providers);
             Details.Add(detail);
 
             return detail;
         }
-    }
+    }
+#nullable disable
 }
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingGroupResult.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingGroupResult.cs
new file mode 100644
index 000000000..e003c6e2c
--- /dev/null
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Dto/SettingGroupResult.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace LINGYUN.Abp.SettingManagement
+{
+    public class SettingGroupResult
+    {
+        public IList<SettingGroupDto> Items { get; }
+
+        public SettingGroupResult()
+        {
+            Items = new List<SettingGroupDto>();
+        }
+
+        public void AddGroup(SettingGroupDto group)
+        {
+            if (group.Settings.Any(g => g.Details.Any()))
+            {
+                Items.Add(group);
+            }
+        }
+    }
+}
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/IReadonlySettingAppService.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/IReadonlySettingAppService.cs
new file mode 100644
index 000000000..65f704707
--- /dev/null
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/IReadonlySettingAppService.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace LINGYUN.Abp.SettingManagement
+{
+    public interface IReadonlySettingAppService : IApplicationService
+    {
+        Task<SettingGroupResult> GetAllForGlobalAsync();
+
+        Task<SettingGroupResult> GetAllForCurrentTenantAsync();
+    }
+}
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/ISettingAppService.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/ISettingAppService.cs
index 1a49ad46a..cccab79aa 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/ISettingAppService.cs
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/ISettingAppService.cs
@@ -1,17 +1,11 @@
 using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
-using Volo.Abp.Application.Services;
 
 namespace LINGYUN.Abp.SettingManagement
 {
-    public interface ISettingAppService : IApplicationService
+    public interface ISettingAppService : IReadonlySettingAppService
     {
         Task SetGlobalAsync(UpdateSettingsDto input);
 
         Task SetCurrentTenantAsync(UpdateSettingsDto input);
-
-        Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync();
-
-        Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync();
     }
 }
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/IUserSettingAppService.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/IUserSettingAppService.cs
new file mode 100644
index 000000000..f4f0a7664
--- /dev/null
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/IUserSettingAppService.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace LINGYUN.Abp.SettingManagement
+{
+    public interface IUserSettingAppService : IApplicationService
+    {
+        Task SetCurrentUserAsync(UpdateSettingsDto input);
+
+        Task<SettingGroupResult> GetAllForCurrentUserAsync();
+    }
+}
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/en.json b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/en.json
index 17d9ce8f2..30efeb7e6 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/en.json
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/en.json
@@ -5,6 +5,8 @@
     "Permission:Settings": "Settings",
     "Permission:Update": "Update",
     "Permission:Manager": "Manager",
+    "DisplayName:UserSetting": "User Settings",
+    "Description:UserSetting": "User defined settings",
     "DisplayName:System": "System",
     "Description:System": "System",
     "DisplayName:System.Language": "Language",
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/zh-Hans.json b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/zh-Hans.json
index f8b88c2c6..34fbdafc2 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/zh-Hans.json
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application.Contracts/LINGYUN/Abp/SettingManagement/Localization/ApplicationContracts/zh-Hans.json
@@ -5,6 +5,8 @@
     "Permission:Settings": "配置管理",
     "Permission:Update": "变更",
     "Permission:Manager": "管理",
+    "DisplayName:UserSetting": "用户设置",
+    "Description:UserSetting": "用户自定义的设置项",
     "DisplayName:System": "系统设置",
     "Description:System": "与系统相关的配置项",
     "DisplayName:System.Language": "语言",
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj
index 59a18c7ca..b490c767d 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN.Abp.SettingManagement.Application.csproj
@@ -5,6 +5,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
+		<RootNamespace />
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs
index 518df2bba..9263ae8b5 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/SettingAppService.cs
@@ -1,13 +1,14 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.Extensions.Options;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Volo.Abp.Account.Settings;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
+using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
 using Volo.Abp.Caching;
 using Volo.Abp.Emailing;
+using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Features;
 using Volo.Abp.Identity.Settings;
 using Volo.Abp.Localization;
 using Volo.Abp.MultiTenancy;
@@ -16,9 +17,6 @@ using Volo.Abp.SettingManagement.Localization;
 using Volo.Abp.Settings;
 using Volo.Abp.Timing;
 using Volo.Abp.Users;
-using Volo.Abp.EventBus.Distributed;
-using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
-using Volo.Abp.Features;
 
 namespace LINGYUN.Abp.SettingManagement
 {
@@ -92,18 +90,18 @@ namespace LINGYUN.Abp.SettingManagement
 
         //[Authorize]
         [AllowAnonymous]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
+        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await GetAllForProviderAsync(TenantSettingValueProvider.ProviderName, CurrentTenant.GetId().ToString());
         }
 
         [AllowAnonymous]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
+        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await GetAllForProviderAsync(GlobalSettingValueProvider.ProviderName, null);
         }
 
-        protected virtual async Task<ListResultDto<SettingGroupDto>> GetAllForProviderAsync(string providerName, string providerKey)
+        protected virtual async Task<SettingGroupResult> GetAllForProviderAsync(string providerName, string providerKey)
         {
             /*
              * 2020-11-19
@@ -117,7 +115,9 @@ namespace LINGYUN.Abp.SettingManagement
              * 最初的设计才是不合理的,前端不能硬编码设置管理界面,这应该是后端的事情
              */ 
 
-            var settingGroups = new List<SettingGroupDto>();
+            // 2021-12-11 重新约定返回格式, 当用户明确只需要对应提供者设置才返回，否则为空数组
+
+            var settingGroups = new SettingGroupResult();
 
             #region 系统设置
 
@@ -128,16 +128,18 @@ namespace LINGYUN.Abp.SettingManagement
                 SettingDefinitionManager.Get(LocalizationSettingNames.DefaultLanguage),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage, providerName, providerKey),
-                ValueType.Option)
-                .AddOptions(LocalizationOptions.Languages.Select(l => new OptionDto(l.DisplayName, l.CultureName)));
+                ValueType.Option,
+                providerName)
+                ?.AddOptions(LocalizationOptions.Languages.Select(l => new OptionDto(l.DisplayName, l.CultureName)));
             // 时区
             var timingSetting = sysSettingGroup.AddSetting(L["DisplayName:System.Timing"], L["Description:System.Timing"]);
             timingSetting.AddDetail(
                SettingDefinitionManager.Get(TimingSettingNames.TimeZone),
                StringLocalizerFactory,
                await SettingManager.GetOrNullAsync(TimingSettingNames.TimeZone, providerName, providerKey),
-               ValueType.String);
-            settingGroups.Add(sysSettingGroup);
+               ValueType.String,
+               providerName);
+            settingGroups.AddGroup(sysSettingGroup);
 
             #endregion
 
@@ -152,14 +154,16 @@ namespace LINGYUN.Abp.SettingManagement
                 SettingDefinitionManager.Get(AccountSettingNames.EnableLocalLogin),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(AccountSettingNames.EnableLocalLogin, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             accountSetting.AddDetail(
                 SettingDefinitionManager.Get(AccountSettingNames.IsSelfRegistrationEnabled),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(AccountSettingNames.IsSelfRegistrationEnabled, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
 
-            settingGroups.Add(securitySettingGroup);
+            settingGroups.AddGroup(securitySettingGroup);
 
             #endregion
 
@@ -175,17 +179,20 @@ namespace LINGYUN.Abp.SettingManagement
                 SettingDefinitionManager.Get(IdentitySettingNames.Lockout.AllowedForNewUsers),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.Lockout.AllowedForNewUsers, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             lockoutSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.Lockout.LockoutDuration),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.Lockout.LockoutDuration, providerName, providerKey),
-                ValueType.Number);
+                ValueType.Number,
+                providerName);
             lockoutSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.Lockout.MaxFailedAccessAttempts),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.Lockout.MaxFailedAccessAttempts, providerName, providerKey),
-                ValueType.Number);
+                ValueType.Number,
+                providerName);
 
             #endregion
 
@@ -196,37 +203,44 @@ namespace LINGYUN.Abp.SettingManagement
                 SettingDefinitionManager.Get(IdentitySettingNames.User.IsEmailUpdateEnabled),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.User.IsEmailUpdateEnabled, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             userSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.User.IsUserNameUpdateEnabled),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.User.IsUserNameUpdateEnabled, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             userSetting.AddDetail(
                 SettingDefinitionManager.Get(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsNewUserRegister),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsNewUserRegister, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
             userSetting.AddDetail(
                 SettingDefinitionManager.Get(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsResetPassword),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsResetPassword, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
             userSetting.AddDetail(
                 SettingDefinitionManager.Get(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsUserSignin),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsUserSignin, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
             userSetting.AddDetail(
                 SettingDefinitionManager.Get(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsPhoneNumberConfirmed),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsPhoneNumberConfirmed, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
             userSetting.AddDetail(
                 SettingDefinitionManager.Get(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsRepetInterval),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(LINGYUN.Abp.Identity.Settings.IdentitySettingNames.User.SmsRepetInterval, providerName, providerKey),
-                ValueType.Number);
+                ValueType.Number,
+                providerName);
 
             #endregion
 
@@ -237,17 +251,20 @@ namespace LINGYUN.Abp.SettingManagement
                 SettingDefinitionManager.Get(IdentitySettingNames.SignIn.EnablePhoneNumberConfirmation),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.SignIn.EnablePhoneNumberConfirmation, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             signinSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.SignIn.RequireConfirmedEmail),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.SignIn.RequireConfirmedEmail, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             signinSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
 
             #endregion
 
@@ -258,32 +275,38 @@ namespace LINGYUN.Abp.SettingManagement
                 SettingDefinitionManager.Get(IdentitySettingNames.Password.RequireDigit),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequireDigit, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             passwordSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.Password.RequiredLength),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequiredLength, providerName, providerKey),
-                ValueType.Number);
+                ValueType.Number,
+                providerName);
             passwordSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.Password.RequiredUniqueChars),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequiredUniqueChars, providerName, providerKey),
-                ValueType.Number);
+                ValueType.Number,
+                providerName);
             passwordSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.Password.RequireLowercase),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequireLowercase, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             passwordSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.Password.RequireUppercase),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequireUppercase, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             passwordSetting.AddDetail(
                 SettingDefinitionManager.Get(IdentitySettingNames.Password.RequireNonAlphanumeric),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequireNonAlphanumeric, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
 
             #endregion
 
@@ -314,9 +337,10 @@ namespace LINGYUN.Abp.SettingManagement
                 SettingDefinitionManager.Get(IdentitySettingNames.OrganizationUnit.MaxUserMembershipCount),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(IdentitySettingNames.OrganizationUnit.MaxUserMembershipCount, providerName, providerKey),
-                ValueType.Number);
+                ValueType.Number,
+                providerName);
 
-            settingGroups.Add(identitySetting);
+            settingGroups.AddGroup(identitySetting);
 
             #endregion
 
@@ -330,55 +354,64 @@ namespace LINGYUN.Abp.SettingManagement
                 SettingDefinitionManager.Get(EmailSettingNames.DefaultFromAddress),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(EmailSettingNames.DefaultFromAddress, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
             defaultMailSetting.AddDetail(
                 SettingDefinitionManager.Get(EmailSettingNames.DefaultFromDisplayName),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(EmailSettingNames.DefaultFromDisplayName, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
 
             var smtpSetting = emailSettingGroup.AddSetting(L["DisplayName:Emailing.Smtp"], L["Description:Emailing.Smtp"]);
             smtpSetting.AddDetail(
                 SettingDefinitionManager.Get(EmailSettingNames.Smtp.EnableSsl),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.EnableSsl, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             smtpSetting.AddDetail(
                 SettingDefinitionManager.Get(EmailSettingNames.Smtp.UseDefaultCredentials),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.UseDefaultCredentials, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
             smtpSetting.AddDetail(
                 SettingDefinitionManager.Get(EmailSettingNames.Smtp.Domain),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.Domain, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
             smtpSetting.AddDetail(
                 SettingDefinitionManager.Get(EmailSettingNames.Smtp.Host),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.Host, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
             smtpSetting.AddDetail(
                 SettingDefinitionManager.Get(EmailSettingNames.Smtp.Port),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.Port, providerName, providerKey),
-                ValueType.Number);
+                ValueType.Number,
+                providerName);
             smtpSetting.AddDetail(
                 SettingDefinitionManager.Get(EmailSettingNames.Smtp.UserName),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.UserName, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
             smtpSetting.AddDetail(
                 SettingDefinitionManager.Get(EmailSettingNames.Smtp.Password),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.Password, providerName, providerKey),
-                ValueType.String);
+                ValueType.String,
+                providerName);
 
-            settingGroups.Add(emailSettingGroup);
+            settingGroups.AddGroup(emailSettingGroup);
 
             #endregion
 
-            return new ListResultDto<SettingGroupDto>(settingGroups);
+            return settingGroups;
         }
 
         protected virtual async Task CheckFeatureAsync()
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/UserSettingAppService.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/UserSettingAppService.cs
new file mode 100644
index 000000000..7316e44d5
--- /dev/null
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.Application/LINGYUN/Abp/SettingManagement/UserSettingAppService.cs
@@ -0,0 +1,247 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Options;
+using System.Linq;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+using Volo.Abp.AspNetCore.Mvc.ApplicationConfigurations;
+using Volo.Abp.Caching;
+using Volo.Abp.Emailing;
+using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.Features;
+using Volo.Abp.Identity.Settings;
+using Volo.Abp.Localization;
+using Volo.Abp.SettingManagement;
+using Volo.Abp.SettingManagement.Localization;
+using Volo.Abp.Settings;
+using Volo.Abp.Timing;
+using Volo.Abp.Users;
+
+namespace LINGYUN.Abp.SettingManagement
+{
+    [Authorize]
+    public class UserSettingAppService : ApplicationService, IUserSettingAppService
+    {
+        protected AbpLocalizationOptions LocalizationOptions { get; }
+
+        protected IDistributedEventBus EventBus { get; }
+        protected ISettingManager SettingManager { get; }
+        protected ISettingDefinitionManager SettingDefinitionManager { get; }
+
+        protected IDistributedCache<SettingCacheItem> Cache { get; }
+        public UserSettingAppService(
+            IDistributedEventBus eventBus,
+            ISettingManager settingManager,
+            IDistributedCache<SettingCacheItem> cache,
+            IOptions<AbpLocalizationOptions> localizationOptions,
+            ISettingDefinitionManager settingDefinitionManager)
+        {
+            Cache = cache;
+            EventBus = eventBus;
+            SettingManager = settingManager;
+            SettingDefinitionManager = settingDefinitionManager;
+            LocalizationOptions = localizationOptions.Value;
+            LocalizationResource = typeof(AbpSettingManagementResource);
+        }
+
+        public virtual async Task SetCurrentUserAsync(UpdateSettingsDto input)
+        {
+            // 增加特性检查
+            await CheckFeatureAsync();
+
+            foreach (var setting in input.Settings)
+            {
+                await SettingManager.SetForCurrentUserAsync(setting.Name, setting.Value);
+            }
+
+            CurrentUnitOfWork.OnCompleted(async () =>
+            {
+                // 发送刷新用户缓存事件
+                await EventBus.PublishAsync(new CurrentApplicationConfigurationCacheResetEventData());
+            });
+
+            await CurrentUnitOfWork.SaveChangesAsync();
+        }
+
+        public virtual async Task<SettingGroupResult> GetAllForCurrentUserAsync()
+        {
+            return await GetAllForProviderAsync(UserSettingValueProvider.ProviderName, CurrentUser.GetId().ToString());
+        }
+
+        protected virtual async Task<SettingGroupResult> GetAllForProviderAsync(string providerName, string providerKey)
+        {
+            var settingGroups = new SettingGroupResult();
+
+            #region 系统设置
+
+            var sysSettingGroup = new SettingGroupDto(L["DisplayName:System"], L["Description:System"]);
+            // 语言
+            var languageSetting = sysSettingGroup.AddSetting(L["DisplayName:System.Language"], L["Description:System.Language"]);
+            languageSetting.AddDetail(
+                SettingDefinitionManager.Get(LocalizationSettingNames.DefaultLanguage),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(LocalizationSettingNames.DefaultLanguage, providerName, providerKey),
+                ValueType.Option,
+                providerName)
+                ?.AddOptions(LocalizationOptions.Languages.Select(l => new OptionDto(l.DisplayName, l.CultureName)));
+            // 时区
+            var timingSetting = sysSettingGroup.AddSetting(L["DisplayName:System.Timing"], L["Description:System.Timing"]);
+            timingSetting.AddDetail(
+               SettingDefinitionManager.Get(TimingSettingNames.TimeZone),
+               StringLocalizerFactory,
+               await SettingManager.GetOrNullAsync(TimingSettingNames.TimeZone, providerName, providerKey),
+               ValueType.String,
+               providerName);
+            settingGroups.AddGroup(sysSettingGroup);
+
+            #endregion
+
+            #region 身份标识设置
+
+            // 身份标识设置
+            var identitySetting = new SettingGroupDto(L["DisplayName:Identity"], L["Description:Identity"]);
+
+
+            #region 登录
+
+            var signinSetting = identitySetting.AddSetting(L["DisplayName:Identity.SignIn"], L["Description:Identity.SignIn"]);
+            signinSetting.AddDetail(
+                SettingDefinitionManager.Get(IdentitySettingNames.SignIn.EnablePhoneNumberConfirmation),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(IdentitySettingNames.SignIn.EnablePhoneNumberConfirmation, providerName, providerKey),
+                ValueType.Boolean,
+                providerName);
+            signinSetting.AddDetail(
+                SettingDefinitionManager.Get(IdentitySettingNames.SignIn.RequireConfirmedEmail),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(IdentitySettingNames.SignIn.RequireConfirmedEmail, providerName, providerKey),
+                ValueType.Boolean,
+                providerName);
+            signinSetting.AddDetail(
+                SettingDefinitionManager.Get(IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(IdentitySettingNames.SignIn.RequireConfirmedPhoneNumber, providerName, providerKey),
+                ValueType.Boolean,
+                providerName);
+
+            #endregion
+
+            #region 密码
+
+            var passwordSetting = identitySetting.AddSetting(L["DisplayName:Identity.Password"], L["Description:Identity.Password"]);
+            passwordSetting.AddDetail(
+                SettingDefinitionManager.Get(IdentitySettingNames.Password.RequireDigit),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequireDigit, providerName, providerKey),
+                ValueType.Boolean,
+                providerName);
+            passwordSetting.AddDetail(
+                SettingDefinitionManager.Get(IdentitySettingNames.Password.RequiredLength),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequiredLength, providerName, providerKey),
+                ValueType.Number,
+                providerName);
+            passwordSetting.AddDetail(
+                SettingDefinitionManager.Get(IdentitySettingNames.Password.RequiredUniqueChars),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequiredUniqueChars, providerName, providerKey),
+                ValueType.Number,
+                providerName);
+            passwordSetting.AddDetail(
+                SettingDefinitionManager.Get(IdentitySettingNames.Password.RequireLowercase),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequireLowercase, providerName, providerKey),
+                ValueType.Boolean,
+                providerName);
+            passwordSetting.AddDetail(
+                SettingDefinitionManager.Get(IdentitySettingNames.Password.RequireUppercase),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequireUppercase, providerName, providerKey),
+                ValueType.Boolean,
+                providerName);
+            passwordSetting.AddDetail(
+                SettingDefinitionManager.Get(IdentitySettingNames.Password.RequireNonAlphanumeric),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(IdentitySettingNames.Password.RequireNonAlphanumeric, providerName, providerKey),
+                ValueType.Boolean,
+                providerName);
+
+            #endregion
+
+            settingGroups.AddGroup(identitySetting);
+
+            #endregion
+
+            #region 邮件设置
+
+            var emailSettingGroup = new SettingGroupDto(L["DisplayName:Emailing"], L["Description:Emailing"]);
+            var defaultMailSetting = emailSettingGroup.AddSetting(L["DisplayName:Emailing.Default"], L["Description:Emailing.Default"]);
+            defaultMailSetting.AddDetail(
+                SettingDefinitionManager.Get(EmailSettingNames.DefaultFromAddress),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(EmailSettingNames.DefaultFromAddress, providerName, providerKey),
+                ValueType.String,
+                providerName);
+            defaultMailSetting.AddDetail(
+                SettingDefinitionManager.Get(EmailSettingNames.DefaultFromDisplayName),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(EmailSettingNames.DefaultFromDisplayName, providerName, providerKey),
+                ValueType.String,
+                providerName);
+
+            var smtpSetting = emailSettingGroup.AddSetting(L["DisplayName:Emailing.Smtp"], L["Description:Emailing.Smtp"]);
+            smtpSetting.AddDetail(
+                SettingDefinitionManager.Get(EmailSettingNames.Smtp.EnableSsl),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.EnableSsl, providerName, providerKey),
+                ValueType.Boolean,
+                providerName);
+            smtpSetting.AddDetail(
+                SettingDefinitionManager.Get(EmailSettingNames.Smtp.UseDefaultCredentials),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.UseDefaultCredentials, providerName, providerKey),
+                ValueType.Boolean,
+                providerName);
+            smtpSetting.AddDetail(
+                SettingDefinitionManager.Get(EmailSettingNames.Smtp.Domain),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.Domain, providerName, providerKey),
+                ValueType.String,
+                providerName);
+            smtpSetting.AddDetail(
+                SettingDefinitionManager.Get(EmailSettingNames.Smtp.Host),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.Host, providerName, providerKey),
+                ValueType.String,
+                providerName);
+            smtpSetting.AddDetail(
+                SettingDefinitionManager.Get(EmailSettingNames.Smtp.Port),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.Port, providerName, providerKey),
+                ValueType.Number,
+                providerName);
+            smtpSetting.AddDetail(
+                SettingDefinitionManager.Get(EmailSettingNames.Smtp.UserName),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.UserName, providerName, providerKey),
+                ValueType.String,
+                providerName);
+            smtpSetting.AddDetail(
+                SettingDefinitionManager.Get(EmailSettingNames.Smtp.Password),
+                StringLocalizerFactory,
+                await SettingManager.GetOrNullAsync(EmailSettingNames.Smtp.Password, providerName, providerKey),
+                ValueType.String,
+                providerName);
+
+            settingGroups.AddGroup(emailSettingGroup);
+
+            #endregion
+
+            return settingGroups;
+        }
+
+        protected virtual async Task CheckFeatureAsync()
+        {
+            await FeatureChecker.CheckEnabledAsync(SettingManagementFeatures.Enable);
+        }
+    }
+}
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/SettingController.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/SettingController.cs
index 8a8d10e50..c720a8854 100644
--- a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/SettingController.cs
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/SettingController.cs
@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using Volo.Abp;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc;
 
 namespace LINGYUN.Abp.SettingManagement
@@ -33,14 +32,14 @@ namespace LINGYUN.Abp.SettingManagement
 
         [HttpGet]
         [Route("by-global")]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
+        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await _settingAppService.GetAllForGlobalAsync();
         }
 
         [HttpGet]
         [Route("by-current-tenant")]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
+        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await _settingAppService.GetAllForCurrentTenantAsync();
         }
diff --git a/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/UserSettingController.cs b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/UserSettingController.cs
new file mode 100644
index 000000000..4db5e24fd
--- /dev/null
+++ b/aspnet-core/modules/settings/LINGYUN.Abp.SettingManagement.HttpApi/LINGYUN/Abp/SettingManagement/UserSettingController.cs
@@ -0,0 +1,35 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace LINGYUN.Abp.SettingManagement
+{
+    [RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
+    [Area("settingManagement")]
+    [Route("api/setting-management/settings")]
+    public class UserSettingController : AbpController, IUserSettingAppService
+    {
+        private readonly IUserSettingAppService _service;
+
+        public UserSettingController(
+            IUserSettingAppService service)
+        {
+            _service = service;
+        }
+
+        [HttpGet]
+        [Route("by-current-user")]
+        public virtual async Task<SettingGroupResult> GetAllForCurrentUserAsync()
+        {
+            return await _service.GetAllForCurrentUserAsync();
+        }
+
+        [HttpPut]
+        [Route("change-current-user")]
+        public virtual async Task SetCurrentUserAsync(UpdateSettingsDto input)
+        {
+            await _service.SetCurrentUserAsync(input);
+        }
+    }
+}
diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN/Abp/WeChat/MiniProgram/Settings/WeChatMiniProgramSettingDefinitionProvider.cs b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN/Abp/WeChat/MiniProgram/Settings/WeChatMiniProgramSettingDefinitionProvider.cs
index 1cb3b49a1..79c5e95aa 100644
--- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN/Abp/WeChat/MiniProgram/Settings/WeChatMiniProgramSettingDefinitionProvider.cs
+++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.MiniProgram/LINGYUN/Abp/WeChat/MiniProgram/Settings/WeChatMiniProgramSettingDefinitionProvider.cs
@@ -14,25 +14,41 @@ namespace LINGYUN.Abp.WeChat.MiniProgram.Settings
                     L("DisplayName:WeChat.MiniProgram.AppId"),
                     L("Description:WeChat.MiniProgram.AppId"),
                     isVisibleToClients: false,
-                    isEncrypted: true),
+                    isEncrypted: true)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     WeChatMiniProgramSettingNames.AppSecret, "",
                     L("DisplayName:WeChat.MiniProgram.AppSecret"),
                     L("Description:WeChat.MiniProgram.AppSecret"),
                     isVisibleToClients: false,
-                    isEncrypted: true),
+                    isEncrypted: true)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     WeChatMiniProgramSettingNames.Token, "",
                     L("DisplayName:WeChat.MiniProgram.Token"),
                     L("Description:WeChat.MiniProgram.Token"),
                     isVisibleToClients: false,
-                    isEncrypted: true),
+                    isEncrypted: true)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     WeChatMiniProgramSettingNames.EncodingAESKey, "",
                     L("DisplayName:WeChat.MiniProgram.EncodingAESKey"),
                     L("Description:WeChat.MiniProgram.EncodingAESKey"),
                     isVisibleToClients: false,
                     isEncrypted: true)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName)
             );
         }
 
diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Settings/WeChatOfficialSettingDefinitionProvider.cs b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Settings/WeChatOfficialSettingDefinitionProvider.cs
index f65d2c2b7..3b6131f62 100644
--- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Settings/WeChatOfficialSettingDefinitionProvider.cs
+++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.Official/LINGYUN/Abp/WeChat/Official/Settings/WeChatOfficialSettingDefinitionProvider.cs
@@ -14,31 +14,51 @@ namespace LINGYUN.Abp.WeChat.Official.Settings
                     L("DisplayName:WeChat.Official.AppId"),
                     L("Description:WeChat.Official.AppId"),
                     isVisibleToClients: false,
-                    isEncrypted: true),
+                    isEncrypted: true)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     WeChatOfficialSettingNames.AppSecret, "",
                     L("DisplayName:WeChat.Official.AppSecret"),
                     L("Description:WeChat.Official.AppSecret"),
                     isVisibleToClients: false,
-                    isEncrypted: true),
+                    isEncrypted: true)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     WeChatOfficialSettingNames.Url, "",
                     L("DisplayName:WeChat.Official.Url"),
                     L("Description:WeChat.Official.Url"),
                     isVisibleToClients: false,
-                    isEncrypted: false),
+                    isEncrypted: false)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     WeChatOfficialSettingNames.Token, "",
                     L("DisplayName:WeChat.Official.Token"),
                     L("Description:WeChat.Official.Token"),
                     isVisibleToClients: false,
-                    isEncrypted: true),
+                    isEncrypted: true)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName),
                 new SettingDefinition(
                     WeChatOfficialSettingNames.EncodingAESKey, "",
                     L("DisplayName:WeChat.Official.EncodingAESKey"),
                     L("Description:WeChat.Official.EncodingAESKey"),
                     isVisibleToClients: false,
                     isEncrypted: true)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName)
             );
         }
 
diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/IWeChatSettingAppService.cs b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/IWeChatSettingAppService.cs
index 3d76a7f3e..5abc87f4c 100644
--- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/IWeChatSettingAppService.cs
+++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/IWeChatSettingAppService.cs
@@ -1,13 +1,8 @@
 using LINGYUN.Abp.SettingManagement;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
 
 namespace LINGYUN.Abp.WeChat.SettingManagement
 {
-    public interface IWeChatSettingAppService
+    public interface IWeChatSettingAppService : IReadonlySettingAppService
     {
-        Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync();
-
-        Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync();
     }
 }
diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs
index 5b6b4263c..90a3a0474 100644
--- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs
+++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingAppService.cs
@@ -3,9 +3,7 @@ using LINGYUN.Abp.WeChat.Localization;
 using LINGYUN.Abp.WeChat.MiniProgram.Settings;
 using LINGYUN.Abp.WeChat.Official.Settings;
 using LINGYUN.Abp.WeChat.Settings;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Authorization.Permissions;
 using Volo.Abp.MultiTenancy;
@@ -31,19 +29,19 @@ namespace LINGYUN.Abp.WeChat.SettingManagement
             LocalizationResource = typeof(WeChatResource);
         }
 
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
+        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await GetAllForProviderAsync(TenantSettingValueProvider.ProviderName, CurrentTenant.GetId().ToString());
         }
 
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
+        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await GetAllForProviderAsync(GlobalSettingValueProvider.ProviderName, null);
         }
 
-        protected virtual async Task<ListResultDto<SettingGroupDto>> GetAllForProviderAsync(string providerName, string providerKey)
+        protected virtual async Task<SettingGroupResult> GetAllForProviderAsync(string providerName, string providerKey)
         {
-            var settingGroups = new List<SettingGroupDto>();
+            var settingGroups = new SettingGroupResult();
             var wechatSettingGroup = new SettingGroupDto(L["DisplayName:WeChat"], L["Description:WeChat"]);
 
             var loginSetting = wechatSettingGroup.AddSetting(L["UserLogin"], L["UserLogin"]);
@@ -51,7 +49,8 @@ namespace LINGYUN.Abp.WeChat.SettingManagement
                 SettingDefinitionManager.Get(WeChatSettingNames.EnabledQuickLogin),
                 StringLocalizerFactory,
                 await SettingManager.GetOrNullAsync(WeChatSettingNames.EnabledQuickLogin, providerName, providerKey),
-                ValueType.Boolean);
+                ValueType.Boolean,
+                providerName);
 
             // 无权限返回空结果,直接报错的话,网关聚合会抛出异常
             if (await PermissionChecker.IsGrantedAsync(WeChatSettingPermissionNames.Official))
@@ -63,27 +62,32 @@ namespace LINGYUN.Abp.WeChat.SettingManagement
                     SettingDefinitionManager.Get(WeChatOfficialSettingNames.AppId),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(WeChatOfficialSettingNames.AppId, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 officialSetting.AddDetail(
                     SettingDefinitionManager.Get(WeChatOfficialSettingNames.AppSecret),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(WeChatOfficialSettingNames.AppSecret, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 officialSetting.AddDetail(
                     SettingDefinitionManager.Get(WeChatOfficialSettingNames.Url),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(WeChatOfficialSettingNames.Url, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 officialSetting.AddDetail(
                     SettingDefinitionManager.Get(WeChatOfficialSettingNames.Token),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(WeChatOfficialSettingNames.Token, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 officialSetting.AddDetail(
                     SettingDefinitionManager.Get(WeChatOfficialSettingNames.EncodingAESKey),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(WeChatOfficialSettingNames.EncodingAESKey, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
 
                 #endregion
             }
@@ -97,28 +101,33 @@ namespace LINGYUN.Abp.WeChat.SettingManagement
                     SettingDefinitionManager.Get(WeChatMiniProgramSettingNames.AppId),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(WeChatMiniProgramSettingNames.AppId, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 miniProgramSetting.AddDetail(
                     SettingDefinitionManager.Get(WeChatMiniProgramSettingNames.AppSecret),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(WeChatMiniProgramSettingNames.AppSecret, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 miniProgramSetting.AddDetail(
                     SettingDefinitionManager.Get(WeChatMiniProgramSettingNames.Token),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(WeChatMiniProgramSettingNames.Token, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
                 miniProgramSetting.AddDetail(
                     SettingDefinitionManager.Get(WeChatMiniProgramSettingNames.EncodingAESKey),
                     StringLocalizerFactory,
                     await SettingManager.GetOrNullAsync(WeChatMiniProgramSettingNames.EncodingAESKey, providerName, providerKey),
-                    ValueType.String);
+                    ValueType.String,
+                    providerName);
 
                 #endregion
             }
 
-            settingGroups.Add(wechatSettingGroup);
-            return new ListResultDto<SettingGroupDto>(settingGroups);
+            settingGroups.AddGroup(wechatSettingGroup);
+
+            return settingGroups;
         }
     }
 }
diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingController.cs b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingController.cs
index 2fe1983aa..aa1246e40 100644
--- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingController.cs
+++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingController.cs
@@ -2,7 +2,6 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using Volo.Abp;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc;
 
 namespace LINGYUN.Abp.WeChat.SettingManagement
@@ -22,14 +21,14 @@ namespace LINGYUN.Abp.WeChat.SettingManagement
 
         [HttpGet]
         [Route("by-current-tenant")]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForCurrentTenantAsync()
+        public virtual async Task<SettingGroupResult> GetAllForCurrentTenantAsync()
         {
             return await WeChatSettingAppService.GetAllForCurrentTenantAsync();
         }
 
         [HttpGet]
         [Route("by-global")]
-        public virtual async Task<ListResultDto<SettingGroupDto>> GetAllForGlobalAsync()
+        public virtual async Task<SettingGroupResult> GetAllForGlobalAsync()
         {
             return await WeChatSettingAppService.GetAllForGlobalAsync();
         }
diff --git a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN/Abp/WeChat/Settings/WeChatSettingDefinitionProvider.cs b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN/Abp/WeChat/Settings/WeChatSettingDefinitionProvider.cs
index 44b2731c4..7638a6f9d 100644
--- a/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN/Abp/WeChat/Settings/WeChatSettingDefinitionProvider.cs
+++ b/aspnet-core/modules/wechat/LINGYUN.Abp.WeChat/LINGYUN/Abp/WeChat/Settings/WeChatSettingDefinitionProvider.cs
@@ -17,6 +17,10 @@ namespace LINGYUN.Abp.WeChat.Settings
                     L("Description:WeChat.EnabledQuickLogin"),
                     isVisibleToClients: true,
                     isEncrypted: false)
+                .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName)
             );
         }
 
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN.Abp.WorkflowCore.Components.csproj b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN.Abp.WorkflowCore.Components.csproj
index 41f84616c..c0ed1ec7a 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN.Abp.WorkflowCore.Components.csproj
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN.Abp.WorkflowCore.Components.csproj
@@ -9,6 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Volo.Abp.BlobStoring" Version="$(VoloAbpPackageVersion)" />
 		<PackageReference Include="Volo.Abp.Emailing" Version="$(VoloAbpPackageVersion)" />
 		<PackageReference Include="Volo.Abp.Sms" Version="$(VoloAbpPackageVersion)" />
 		<PackageReference Include="Volo.Abp.Http.Client" Version="$(VoloAbpPackageVersion)" />
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/AbpWorkflowCoreComponentsModule.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/AbpWorkflowCoreComponentsModule.cs
index cac71425a..d6f32653d 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/AbpWorkflowCoreComponentsModule.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/AbpWorkflowCoreComponentsModule.cs
@@ -1,4 +1,5 @@
-using Volo.Abp.Emailing;
+using Volo.Abp.BlobStoring;
+using Volo.Abp.Emailing;
 using Volo.Abp.Modularity;
 using Volo.Abp.Sms;
 
@@ -7,6 +8,7 @@ namespace LINGYUN.Abp.WorkflowCore.Components
     [DependsOn(
         typeof(AbpSmsModule),
         typeof(AbpEmailingModule),
+        typeof(AbpBlobStoringModule),
         typeof(AbpWorkflowCoreModule))]
     public class AbpWorkflowCoreComponentsModule : AbpModule
     {
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/Primitives/SendEmail.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/Primitives/SendEmail.cs
index 07e69b36a..48cf09ae4 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/Primitives/SendEmail.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/Primitives/SendEmail.cs
@@ -2,8 +2,12 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using System;
+using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
+using System.Net.Mail;
 using System.Threading.Tasks;
+using Volo.Abp.BlobStoring;
 using Volo.Abp.Emailing;
 using Volo.Abp.Emailing.Templates;
 using Volo.Abp.TextTemplating;
@@ -18,12 +22,15 @@ namespace LINGYUN.Abp.WorkflowCore.Components.Primitives
 
         private readonly IEmailSender _emailSender;
         private readonly ITemplateRenderer _templateRenderer;
+        private readonly IBlobContainer<WorkflowContainer> _blobContainer;
 
         public SendEmail(
             IEmailSender emailSender,
-            ITemplateRenderer templateRenderer)
+            ITemplateRenderer templateRenderer,
+            IBlobContainer<WorkflowContainer> blobContainer)
         {
             _emailSender = emailSender;
+            _blobContainer = blobContainer;
             _templateRenderer = templateRenderer;
 
             Logger = NullLogger<SendEmail>.Instance;
@@ -41,6 +48,9 @@ namespace LINGYUN.Abp.WorkflowCore.Components.Primitives
         [CanBeNull]
         public string Template { get; set; }
 
+        [CanBeNull]
+        public string Attachments { get; set; }
+
         public override async Task<ExecutionResult> RunAsync(IStepExecutionContext context)
         {
             Logger.LogInformation("Working on sending email step.");
@@ -50,7 +60,28 @@ namespace LINGYUN.Abp.WorkflowCore.Components.Primitives
                 Data,
                 CultureInfo.CurrentCulture.Name);
 
-            await _emailSender.SendAsync(Receivers, Title, templateContent);
+            var mailMessage = new MailMessage
+            {
+                To = { Receivers },
+                Subject = Title,
+                Body = templateContent,
+                IsBodyHtml = true
+            };
+
+            if (!Attachments.IsNullOrWhiteSpace())
+            {
+                var attachments = Attachments.Split(';');
+                foreach (var attachment in attachments)
+                {
+                    var stream = await _blobContainer.GetOrNullAsync(attachment);
+                    if (stream != null && stream != Stream.Null)
+                    {
+                        mailMessage.Attachments.Add(new Attachment(stream, Path.GetFileName(attachment)));
+                    }
+                }
+            }
+
+            await _emailSender.SendAsync(mailMessage);
 
             Logger.LogInformation("Email sent, forward to next step.");
 
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/WorkflowContainer.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/WorkflowContainer.cs
new file mode 100644
index 000000000..b3e114482
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Components/LINGYUN/Abp/WorkflowCore/Components/WorkflowContainer.cs
@@ -0,0 +1,10 @@
+using Volo.Abp.BlobStoring;
+
+namespace LINGYUN.Abp.WorkflowCore.Components
+{
+    [BlobContainerName(Name)]
+    public class WorkflowContainer
+    {
+        public const string Name = "workflow";
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN.Abp.WorkflowCore.DistributedLock.csproj b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN.Abp.WorkflowCore.DistributedLock.csproj
index 4d1174192..bf77fa720 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN.Abp.WorkflowCore.DistributedLock.csproj
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN.Abp.WorkflowCore.DistributedLock.csproj
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(MicrosoftPackageVersion)" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftPackageVersion)" />
 		<PackageReference Include="Volo.Abp.DistributedLocking" Version="$(VoloAbpPackageVersion)" />
 	</ItemGroup>
 
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN/Abp/WorkflowCore/DistributedLock/AbpWorkflowCoreDistributedLockModule.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN/Abp/WorkflowCore/DistributedLock/AbpWorkflowCoreDistributedLockModule.cs
index 908258912..578713b8d 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN/Abp/WorkflowCore/DistributedLock/AbpWorkflowCoreDistributedLockModule.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.DistributedLock/LINGYUN/Abp/WorkflowCore/DistributedLock/AbpWorkflowCoreDistributedLockModule.cs
@@ -12,6 +12,7 @@ namespace LINGYUN.Abp.WorkflowCore.DistributedLock
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddMemoryCache();
             context.Services.AddSingleton<IDistributedLockProvider, AbpDistributedLockProvider>();
             context.Services.AddSingleton<AbpDistributedLockProvider>();
 
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore/LINGYUN/Abp/WorkflowCore/Persistence/EntityFrameworkCore/EfCoreRepositoryExtensions.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore/LINGYUN/Abp/WorkflowCore/Persistence/EntityFrameworkCore/EfCoreRepositoryExtensions.cs
new file mode 100644
index 000000000..4bae00f7c
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore/LINGYUN/Abp/WorkflowCore/Persistence/EntityFrameworkCore/EfCoreRepositoryExtensions.cs
@@ -0,0 +1,18 @@
+using Microsoft.EntityFrameworkCore;
+using System.Linq;
+
+namespace LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore
+{
+    public static class EfCoreRepositoryExtensions
+    {
+        public static IQueryable<PersistedWorkflow> IncludeIf(
+            this IQueryable<PersistedWorkflow> quertable,
+            bool includeDetails = true)
+        {
+            return !includeDetails ? quertable :
+                quertable
+                    .Include(x => x.ExecutionPointers)
+                        .ThenInclude(p => p.ExtensionAttributes);
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore/LINGYUN/Abp/WorkflowCore/Persistence/EntityFrameworkCore/EfCoreWorkflowRepository.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore/LINGYUN/Abp/WorkflowCore/Persistence/EntityFrameworkCore/EfCoreWorkflowRepository.cs
index 8885f1375..bbc2f4b8a 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore/LINGYUN/Abp/WorkflowCore/Persistence/EntityFrameworkCore/EfCoreWorkflowRepository.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore/LINGYUN/Abp/WorkflowCore/Persistence/EntityFrameworkCore/EfCoreWorkflowRepository.cs
@@ -27,8 +27,7 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
             int take,
             CancellationToken cancellationToken = default)
         {
-            return await (await GetDbSetAsync())
-                .Include(x => x.ExecutionPointers)
+            return await (await WithDetailsAsync())
                 .WhereIf(status.HasValue, x => x.Status == status.Value)
                 .WhereIf(!type.IsNullOrWhiteSpace(), x => x.WorkflowDefinitionId.Equals(type))
                 .WhereIf(createdFrom.HasValue, x => x.CreationTime >= createdFrom.Value)
@@ -37,12 +36,22 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
                 .ToListAsync();
         }
 
+        public virtual async Task<List<PersistedWorkflow>> GetOlderListAsync(
+            WorkflowStatus status,
+            DateTime olderThan,
+            bool includeDetails = false,
+            int? maxResultCount = null,
+            CancellationToken cancellationToken = default)
+        {
+            return await (await WithDetailsAsync())
+                .Where(x => x.Status == status && x.CompleteTime < olderThan)
+                .ToListAsync();
+        }
+
         public override async Task<IQueryable<PersistedWorkflow>> WithDetailsAsync()
         {
             var quertable = await base.WithDetailsAsync();
-            return quertable
-                .Include(x => x.ExecutionPointers)
-                    .ThenInclude(p => p.ExtensionAttributes);
+            return quertable.IncludeIf(true);
         }
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowCorePersistenceModule.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowCorePersistenceModule.cs
index f2a887a25..97f0724d0 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowCorePersistenceModule.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowCorePersistenceModule.cs
@@ -10,6 +10,7 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
     {
         public override void PreConfigureServices(ServiceConfigurationContext context)
         {
+            context.Services.AddTransient<IWorkflowPurger, AbpWorkflowPurger>();
             context.Services.AddTransient<IPersistenceProvider, AbpWorkflowPersistenceProvider>();
             context.Services.AddTransient<AbpWorkflowPersistenceProvider>();
 
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowPersistenceProvider.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowPersistenceProvider.cs
index d9d89b885..84b353c8c 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowPersistenceProvider.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowPersistenceProvider.cs
@@ -108,7 +108,6 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
             return workflow.Id;
         }
 
-        [UnitOfWork(IsDisabled = true)]
         public void EnsureStoreExists()
         {
             // TODO:
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowPurger.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowPurger.cs
new file mode 100644
index 000000000..d0c18904b
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/AbpWorkflowPurger.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Threading.Tasks;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+
+namespace LINGYUN.Abp.WorkflowCore.Persistence
+{
+    public class AbpWorkflowPurger : IWorkflowPurger
+    {
+        private readonly IWorkflowRepository _workflowRepository;
+
+        public AbpWorkflowPurger(
+            IWorkflowRepository workflowRepository)
+        {
+            _workflowRepository = workflowRepository;
+        }
+
+        public virtual async Task PurgeWorkflows(WorkflowStatus status, DateTime olderThan)
+        {
+            var olderThanUtc = olderThan.ToUniversalTime();
+
+            var workflows = await _workflowRepository
+                .GetOlderListAsync(status, olderThanUtc, includeDetails: true);
+
+            await _workflowRepository.DeleteManyAsync(workflows);
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/IWorkflowRepository.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/IWorkflowRepository.cs
index 1025baaba..e2d7ed969 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/IWorkflowRepository.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/IWorkflowRepository.cs
@@ -17,5 +17,12 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
             int skip,
             int take,
             CancellationToken cancellationToken = default);
+
+        Task<List<PersistedWorkflow>> GetOlderListAsync(
+            WorkflowStatus status,
+            DateTime olderThan,
+            bool includeDetails = false,
+            int? maxResultCount = null,
+            CancellationToken cancellationToken = default);
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/PersistedWorkflow.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/PersistedWorkflow.cs
index 3c6331f0c..098b2b5ad 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/PersistedWorkflow.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.Persistence/LINGYUN/Abp/WorkflowCore/Persistence/PersistedWorkflow.cs
@@ -1,7 +1,9 @@
-using System;
+using JetBrains.Annotations;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using Volo.Abp;
 using Volo.Abp.Domain.Entities.Auditing;
 using Volo.Abp.MultiTenancy;
 using WorkflowCore.Models;
@@ -53,8 +55,10 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
             ExecutionPointers = new Collection<PersistedExecutionPointer>();
         }
 
-        public void AddPointer(PersistedExecutionPointer pointer)
+        public void AddPointer([NotNull] PersistedExecutionPointer pointer)
         {
+            Check.NotNull(pointer, nameof(pointer));
+
             ExecutionPointers.Add(pointer);
         }
 
@@ -62,5 +66,22 @@ namespace LINGYUN.Abp.WorkflowCore.Persistence
         {
             return ExecutionPointers.FirstOrDefault(point => point.Id.Equals(id));
         }
+
+        public void RemovePointers([NotNull] IEnumerable<PersistedExecutionPointer> pointers)
+        {
+            Check.NotNull(pointers, nameof(pointers));
+
+            foreach (var pointer in pointers)
+            {
+                RemovePointer(pointer);
+            }
+        }
+
+        public virtual void RemovePointer([NotNull] PersistedExecutionPointer pointer)
+        {
+            Check.NotNull(pointer, nameof(pointer));
+
+            ExecutionPointers.RemoveAll(c => c.Id == pointer.Id);
+        }
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpRabbitMqQueueProvider.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpRabbitMqQueueProvider.cs
index c6580fb61..5bd6ed5ae 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpRabbitMqQueueProvider.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpRabbitMqQueueProvider.cs
@@ -6,13 +6,15 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp;
+using Volo.Abp.DependencyInjection;
 using Volo.Abp.RabbitMQ;
 using Volo.Abp.Threading;
 using WorkflowCore.Interface;
 
 namespace LINGYUN.Abp.WorkflowCore.RabbitMQ
 {
-    public class AbpRabbitMqQueueProvider : IQueueProvider
+    [Dependency(ReplaceServices = true)]
+    public class AbpRabbitMqQueueProvider : IQueueAdapterProvider, ISingletonDependency
     {
         protected bool IsDiposed { get; private set; }
         protected SemaphoreSlim SyncObj = new SemaphoreSlim(1, 1);
@@ -41,6 +43,7 @@ namespace LINGYUN.Abp.WorkflowCore.RabbitMQ
 
         public async Task<string> DequeueWork(QueueType queue, CancellationToken cancellationToken)
         {
+            // TODO: 存在已知的问题,在多租户情况下, 从队列获取的工作流标识将无法查询到工作流实例
             CheckDisposed();
 
             using (await SyncObj.LockAsync(cancellationToken))
@@ -61,6 +64,11 @@ namespace LINGYUN.Abp.WorkflowCore.RabbitMQ
         }
 
         public async Task QueueWork(string id, QueueType queue)
+        {
+            await QueueWorkAsync(id, queue);
+        }
+
+        protected virtual async Task QueueWorkAsync(string id, QueueType queue)
         {
             CheckDisposed();
 
@@ -69,7 +77,7 @@ namespace LINGYUN.Abp.WorkflowCore.RabbitMQ
                 await EnsureInitializedAsync();
 
                 var body = Encoding.UTF8.GetBytes(id);
-
+                
                 ChannelAccessor.Channel.BasicPublish(
                     exchange: "",
                     routingKey: QueueNameNormalizer.NormalizeKey(queue),
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpWorkflowCoreRabbitMQModule.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpWorkflowCoreRabbitMQModule.cs
index adda074f2..ed04851f1 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpWorkflowCoreRabbitMQModule.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore.RabbitMQ/LINGYUN/Abp/WorkflowCore/RabbitMQ/AbpWorkflowCoreRabbitMQModule.cs
@@ -1,9 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
 using Volo.Abp.RabbitMQ;
-using WorkflowCore.Interface;
-using WorkflowCore.Models;
 
 namespace LINGYUN.Abp.WorkflowCore.RabbitMQ
 {
@@ -11,22 +7,5 @@ namespace LINGYUN.Abp.WorkflowCore.RabbitMQ
     [DependsOn(typeof(AbpWorkflowCoreModule))]
     public class AbpWorkflowCoreRabbitMQModule : AbpModule
     {
-        public override void PreConfigureServices(ServiceConfigurationContext context)
-        {
-            context.Services.AddSingleton<IQueueProvider, AbpRabbitMqQueueProvider>();
-            context.Services.AddSingleton<AbpRabbitMqQueueProvider>();
-
-            PreConfigure<WorkflowOptions>(options =>
-            {
-                options.UseQueueProvider(provider => provider.GetRequiredService<AbpRabbitMqQueueProvider>());
-            });
-        }
-
-        public override void OnApplicationShutdown(ApplicationShutdownContext context)
-        {
-            context.ServiceProvider
-                .GetRequiredService<AbpRabbitMqQueueProvider>()
-                .Dispose();
-        }
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj
index 8c9185900..758428432 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN.Abp.WorkflowCore.csproj
@@ -10,13 +10,14 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Volo.Abp.Features" Version="$(VoloAbpPackageVersion)" />
 		<PackageReference Include="Volo.Abp.Timing" Version="$(VoloAbpPackageVersion)" />
 		<PackageReference Include="Volo.Abp.Threading" Version="$(VoloAbpPackageVersion)" />
-		<!--<PackageReference Include="WorkflowCore.DSL" Version="3.6.1" />-->
+		<PackageReference Include="WorkflowCore.DSL" Version="3.6.1" />
 	</ItemGroup>
 
-	<ItemGroup>
+	<!--<ItemGroup>
 	  <ProjectReference Include="..\..\..\consoles\source\src\WorkflowCore.DSL\WorkflowCore.DSL.csproj" />
-	</ItemGroup>
+	</ItemGroup>-->
 
 </Project>
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpUnitOfWorkQueueProvider.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpUnitOfWorkQueueProvider.cs
new file mode 100644
index 000000000..a70b64cb4
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpUnitOfWorkQueueProvider.cs
@@ -0,0 +1,67 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Uow;
+using WorkflowCore.Interface;
+
+namespace LINGYUN.Abp.WorkflowCore
+{
+    /// <summary>
+    /// 当触发新的工作流时，如果持久层在事务中会导致默认队列获取工作流实例失败
+    /// 建立一个事务适配队列在工作单元结束时再将消息入队
+    /// </summary>
+    public class AbpUnitOfWorkQueueProvider : IQueueProvider
+    {
+        private readonly IUnitOfWorkManager _unitOfWorkManager;
+        private readonly IQueueAdapterProvider _queueProvider;
+
+        public AbpUnitOfWorkQueueProvider(
+            IQueueAdapterProvider queueProvider,
+            IUnitOfWorkManager unitOfWorkManager)
+        {
+            _queueProvider = queueProvider;
+            _unitOfWorkManager = unitOfWorkManager;
+        }
+
+        public bool IsDequeueBlocking => _queueProvider.IsDequeueBlocking;
+
+        public virtual async Task<string> DequeueWork(QueueType queue, CancellationToken cancellationToken)
+        {
+            if (_unitOfWorkManager.Current != null && !_unitOfWorkManager.Current.IsCompleted)
+            {
+                return null;
+            }
+
+            return await _queueProvider.DequeueWork(queue, cancellationToken);
+        }
+
+        public void Dispose()
+        {
+            _queueProvider.Dispose();
+        }
+
+        public async Task QueueWork(string id, QueueType queue)
+        {
+            if (_unitOfWorkManager.Current != null)
+            {
+                _unitOfWorkManager.Current.OnCompleted(async () =>
+                {
+                    await _queueProvider.QueueWork(id, queue);
+                });
+            }
+            else
+            {
+                await _queueProvider.QueueWork(id, queue);
+            }
+        }
+
+        public async Task Start()
+        {
+            await _queueProvider.Start();
+        }
+
+        public async Task Stop()
+        {
+            await _queueProvider.Stop();
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreModule.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreModule.cs
index 842085fb4..97a49d442 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreModule.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreModule.cs
@@ -1,14 +1,14 @@
-using Microsoft.Extensions.DependencyInjection;
+using LINGYUN.Abp.WorkflowCore.Middleware;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
 using Volo.Abp;
 using Volo.Abp.Modularity;
 using Volo.Abp.Threading;
 using Volo.Abp.Timing;
 using WorkflowCore.Interface;
+using WorkflowCore.Models;
 
 namespace LINGYUN.Abp.WorkflowCore
 {
@@ -23,6 +23,14 @@ namespace LINGYUN.Abp.WorkflowCore
         {
             context.Services.AddConventionalRegistrar(new AbpWorkflowCoreConventionalRegistrar());
 
+            context.Services.AddSingleton<IQueueProvider, AbpUnitOfWorkQueueProvider>();
+            context.Services.AddSingleton<AbpUnitOfWorkQueueProvider>();
+
+            PreConfigure<WorkflowOptions>(options =>
+            {
+                options.UseQueueProvider(provider => provider.GetRequiredService<AbpUnitOfWorkQueueProvider>());
+            });
+
             AutoAddDefinitionWorkflows(context.Services);
         }
 
@@ -33,6 +41,10 @@ namespace LINGYUN.Abp.WorkflowCore
                 context.Services.ExecutePreConfiguredActions(options);
             });
             context.Services.AddWorkflowDSL();
+
+            context.Services.AddWorkflowMiddleware<FeatureCheckWorkflowMiddleware>();
+
+            context.Services.AddWorkflowStepMiddleware<MultiTenancyStepMiddleware>();
         }
 
         public override void OnApplicationInitialization(ApplicationInitializationContext context)
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreOptions.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreOptions.cs
index ff2e7a6fc..4bb0dfeab 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreOptions.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreOptions.cs
@@ -3,6 +3,7 @@
     public class AbpWorkflowCoreOptions
     {
         public bool IsEnabled { get; set; }
+
         public AbpWorkflowCoreOptions()
         {
             IsEnabled = true;
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/ExceptionHandling/ExceptionNotifierHandler.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/ExceptionHandling/ExceptionNotifierHandler.cs
new file mode 100644
index 000000000..a6d5224a0
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/ExceptionHandling/ExceptionNotifierHandler.cs
@@ -0,0 +1,33 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using Volo.Abp.ExceptionHandling;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+
+namespace LINGYUN.Abp.WorkflowCore.ExceptionHandling
+{
+    /// <summary>
+    /// 不会自动注册到容器
+    /// 需要时手动注册
+    /// </summary>
+    public class ExceptionNotifierHandler : IWorkflowErrorHandler
+    {
+        public WorkflowErrorHandling Type => WorkflowErrorHandling.Terminate;
+
+        private readonly IExceptionNotifier _exceptionNotifier;
+
+        public ExceptionNotifierHandler(IExceptionNotifier exceptionNotifier)
+        {
+            _exceptionNotifier = exceptionNotifier;
+        }
+
+        public void Handle(WorkflowInstance workflow, WorkflowDefinition def, ExecutionPointer pointer, WorkflowStep step, Exception exception, Queue<ExecutionPointer> bubbleUpQueue)
+        {
+            _ = _exceptionNotifier.NotifyAsync(
+                new ExceptionNotificationContext(
+                    exception,
+                    LogLevel.Warning));
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/IQueueAdapterProvider.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/IQueueAdapterProvider.cs
new file mode 100644
index 000000000..443119d54
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/IQueueAdapterProvider.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using WorkflowCore.Interface;
+
+namespace LINGYUN.Abp.WorkflowCore
+{
+    public interface IQueueAdapterProvider : IDisposable
+    {
+        bool IsDequeueBlocking { get; }
+
+        Task QueueWork(string id, QueueType queue);
+
+        Task<string> DequeueWork(QueueType queue, CancellationToken cancellationToken);
+
+        Task Start();
+
+        Task Stop();
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/IStepMultiTenant.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/IStepMultiTenant.cs
new file mode 100644
index 000000000..ac3c5e7ce
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/IStepMultiTenant.cs
@@ -0,0 +1,9 @@
+namespace LINGYUN.Abp.WorkflowCore
+{
+    /// <summary>
+    /// 实现接口用于启动多租户
+    /// </summary>
+    public interface IStepMultiTenant
+    {
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/Middleware/FeatureCheckWorkflowMiddleware.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/Middleware/FeatureCheckWorkflowMiddleware.cs
new file mode 100644
index 000000000..5e0aef738
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/Middleware/FeatureCheckWorkflowMiddleware.cs
@@ -0,0 +1,43 @@
+using Microsoft.Extensions.Logging;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.Features;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+
+namespace LINGYUN.Abp.WorkflowCore.Middleware
+{
+    public class FeatureCheckWorkflowMiddleware : IWorkflowMiddleware
+    {
+        private readonly IFeatureChecker _featureChecker;
+        private readonly ILogger<FeatureCheckWorkflowMiddleware> _logger;
+        public WorkflowMiddlewarePhase Phase => WorkflowMiddlewarePhase.PreWorkflow;
+
+        public FeatureCheckWorkflowMiddleware(
+            IFeatureChecker featureChecker,
+            ILogger<FeatureCheckWorkflowMiddleware> logger)
+        {
+            _featureChecker = featureChecker;
+            _logger = logger;
+        }
+
+        public async Task HandleAsync(WorkflowInstance workflow, WorkflowDelegate next)
+        {
+            if (workflow.Data is IDictionary<string, object> dictionary &&
+                dictionary.TryGetValue(WorkflowCoreConsts.FeatureField, out var defFeatures))
+            {
+                var requiresFeatures = defFeatures.ToString().Split(';');
+                var passed = await _featureChecker.IsEnabledAsync(requiresAll: true, requiresFeatures);
+                if (!passed)
+                {
+                    _logger.LogWarning("Workflow {0} was forcibly terminated for the following reasons: These required functions must be enabled: {1}",
+                        workflow.Id,
+                        requiresFeatures);
+                    workflow.Status = WorkflowStatus.Terminated;
+                }
+            }
+
+            await next();
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/Middleware/MultiTenancyStepMiddleware.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/Middleware/MultiTenancyStepMiddleware.cs
new file mode 100644
index 000000000..002049e3b
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/Middleware/MultiTenancyStepMiddleware.cs
@@ -0,0 +1,65 @@
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp.MultiTenancy;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+
+namespace LINGYUN.Abp.WorkflowCore.Middleware
+{
+    public class MultiTenancyStepMiddleware : IWorkflowStepMiddleware
+    {
+        private readonly AbpMultiTenancyOptions _multiTenancyOptions;
+        private readonly ICurrentTenant _currentTenant;
+
+        public MultiTenancyStepMiddleware(
+            ICurrentTenant currentTenant,
+            IOptions<AbpMultiTenancyOptions> options)
+        {
+            _currentTenant = currentTenant;
+            _multiTenancyOptions = options.Value;
+        }
+
+        public async Task<ExecutionResult> HandleAsync(IStepExecutionContext context, IStepBody body, WorkflowStepDelegate next)
+        {
+            // 触发多租户中间件条件
+            // 1、需要启用多租户
+            // 2、步骤需要实现接口 IStepMultiTenant
+            // 3.1、传递的工作流实现接口 IMultiTenant
+            // 3.2、传递的工作流数据包含 TenantId 字段
+
+            if (!_multiTenancyOptions.IsEnabled)
+            {
+                return await next();
+            }
+
+            if (typeof(IStepMultiTenant).IsAssignableFrom(body.GetType()))
+            {
+                if (context.Workflow.Data != null)
+                {
+                    if (context.Workflow.Data is IMultiTenant tenant)
+                    {
+                        using (_currentTenant.Change(tenant.TenantId))
+                        {
+                            return await next();
+                        }
+                    }
+
+                    var dataObj = JObject.FromObject(context.Workflow.Data);
+                    var tenantToken = dataObj.GetOrDefault(nameof(IMultiTenant.TenantId));
+                    if (tenantToken?.HasValues == true)
+                    {
+                        using (_currentTenant.Change(tenantToken.Value<Guid?>()))
+                        {
+                            return await next();
+                        }
+                    }
+                }
+            }
+
+            return await next();
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/SingleNodeQueueAdapterProvider.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/SingleNodeQueueAdapterProvider.cs
new file mode 100644
index 000000000..836765990
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/SingleNodeQueueAdapterProvider.cs
@@ -0,0 +1,50 @@
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using WorkflowCore.Interface;
+using Volo.Abp.DependencyInjection;
+
+namespace LINGYUN.Abp.WorkflowCore
+{
+    [Dependency(TryRegister = true)]
+    public class SingleNodeQueueAdapterProvider : IQueueAdapterProvider, ISingletonDependency
+    {
+        private readonly Dictionary<QueueType, BlockingCollection<string>> _queues = new Dictionary<QueueType, BlockingCollection<string>>
+        {
+            [QueueType.Workflow] = new BlockingCollection<string>(),
+            [QueueType.Event] = new BlockingCollection<string>(),
+            [QueueType.Index] = new BlockingCollection<string>()
+        };
+
+        public bool IsDequeueBlocking => true;
+
+        public Task QueueWork(string id, QueueType queue)
+        {
+            _queues[queue].Add(id);
+            return Task.CompletedTask;
+        }
+
+        public Task<string> DequeueWork(QueueType queue, CancellationToken cancellationToken)
+        {
+            if (_queues[queue].TryTake(out string id, 100, cancellationToken))
+                return Task.FromResult(id);
+
+            return Task.FromResult<string>(null);
+        }
+
+        public Task Start()
+        {
+            return Task.CompletedTask;
+        }
+
+        public Task Stop()
+        {
+            return Task.CompletedTask;
+        }
+
+        public void Dispose()
+        {
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/StepBodyAsyncBase.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/StepBodyAsyncBase.cs
index be01a966f..7d44be262 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/StepBodyAsyncBase.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/StepBodyAsyncBase.cs
@@ -2,7 +2,7 @@
 
 namespace LINGYUN.Abp.WorkflowCore
 {
-    public abstract class StepBodyAsyncBase : StepBodyAsync
+    public abstract class StepBodyAsyncBase : StepBodyAsync, IStepMultiTenant
     {
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/StepBodyBase.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/StepBodyBase.cs
index 87d9b942d..2bdb268fb 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/StepBodyBase.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/StepBodyBase.cs
@@ -2,7 +2,7 @@
 
 namespace LINGYUN.Abp.WorkflowCore
 {
-    public abstract class StepBodyBase : StepBody
+    public abstract class StepBodyBase : StepBody, IStepMultiTenant
     {
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/WorkflowCoreConsts.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/WorkflowCoreConsts.cs
new file mode 100644
index 000000000..58070cd74
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/WorkflowCoreConsts.cs
@@ -0,0 +1,7 @@
+namespace LINGYUN.Abp.WorkflowCore
+{
+    public static class WorkflowCoreConsts
+    {
+        public const string FeatureField = "Feature";
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/ActivityFailureInput.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/ActivityFailureInput.cs
new file mode 100644
index 000000000..1b7093101
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/ActivityFailureInput.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace LINGYUN.Abp.WorkflowManagement.Activitys
+{
+    public class ActivityFailureInput
+    {
+        [Required]
+        public string Token { get; set; }
+
+        [Required]
+        public object Result { get; set; }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/ActivityReleaseInput.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/ActivityReleaseInput.cs
new file mode 100644
index 000000000..22ab0043d
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/ActivityReleaseInput.cs
@@ -0,0 +1,10 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace LINGYUN.Abp.WorkflowManagement.Activitys
+{
+    public class ActivityReleaseInput
+    {
+        [Required]
+        public string Token { get; set; }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/ActivitySuccessInput.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/ActivitySuccessInput.cs
new file mode 100644
index 000000000..a32d959fb
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/ActivitySuccessInput.cs
@@ -0,0 +1,13 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace LINGYUN.Abp.WorkflowManagement.Activitys
+{
+    public class ActivitySuccessInput
+    {
+        [Required]
+        public string Token { get; set; }
+
+        [Required]
+        public object Result { get; set; }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/GetPendingActivityInput.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/GetPendingActivityInput.cs
new file mode 100644
index 000000000..e2f72e3fd
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/GetPendingActivityInput.cs
@@ -0,0 +1,16 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace LINGYUN.Abp.WorkflowManagement.Activitys
+{
+    public class GetPendingActivityInput
+    {
+        [Required]
+        public string ActivityName { get; set; }
+
+        [Required]
+        public string WorkflowId { get; set; }
+
+        public TimeSpan? Timeout { get; set; }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/PendingActivityDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/PendingActivityDto.cs
new file mode 100644
index 000000000..cc44e87be
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/Dto/PendingActivityDto.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace LINGYUN.Abp.WorkflowManagement.Activitys
+{
+    public class PendingActivityDto
+    {
+        public string Token { get; set; }
+
+        public string ActivityName { get; set; }
+
+        public object Parameters { get; set; }
+
+        public DateTime TokenExpiry { get; set; }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/IActivityAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/IActivityAppService.cs
new file mode 100644
index 000000000..c859ab989
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Activitys/IActivityAppService.cs
@@ -0,0 +1,16 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace LINGYUN.Abp.WorkflowManagement.Activitys
+{
+    public interface IActivityAppService : IApplicationService
+    {
+        Task<PendingActivityDto> GetAsync(GetPendingActivityInput input);
+
+        Task DeleteAsync(ActivityReleaseInput input);
+
+        Task SuccessAsync(ActivitySuccessInput input);
+
+        Task FailureAsync(ActivityFailureInput input);
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Authorization/WorkflowManagementPermissionDefinitionProvider.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Authorization/WorkflowManagementPermissionDefinitionProvider.cs
index b50e751e7..7f3c6344d 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Authorization/WorkflowManagementPermissionDefinitionProvider.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Authorization/WorkflowManagementPermissionDefinitionProvider.cs
@@ -10,6 +10,26 @@ namespace LINGYUN.Abp.WorkflowManagement.Authorization
         {
             var group = context.AddGroup(WorkflowManagementPermissions.GroupName, L("Permission:WorkflowManagement"));
 
+            var engine = group.AddPermission(
+                WorkflowManagementPermissions.Engine.Default,
+                L("Permission:Engine"));
+            engine.AddChild(
+                WorkflowManagementPermissions.Engine.Initialize,
+                L("Permission:Initialize"));
+            engine.AddChild(
+                WorkflowManagementPermissions.Engine.Register,
+                L("Permission:Register"));
+
+            var workflow = group.AddPermission(
+                WorkflowManagementPermissions.WorkflowDef.Default,
+                L("Permission:WorkflowDef"));
+            workflow.AddChild(
+                WorkflowManagementPermissions.WorkflowDef.Create,
+                L("Permission:Create"));
+            workflow.AddChild(
+                WorkflowManagementPermissions.WorkflowDef.Delete,
+                L("Permission:Delete"));
+
             group.AddPermission(
                 WorkflowManagementPermissions.ManageSettings,
                 L("Permission:ManageSettings"));
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Authorization/WorkflowManagementPermissions.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Authorization/WorkflowManagementPermissions.cs
index 3e7a64511..de9ee2765 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Authorization/WorkflowManagementPermissions.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Authorization/WorkflowManagementPermissions.cs
@@ -5,5 +5,23 @@
         public const string GroupName = "WorkflowManagement";
 
         public const string ManageSettings = GroupName + ".ManageSettings";
+
+        public static class Engine
+        {
+            public const string Default = GroupName + ".Engine";
+
+            public const string Initialize = Default + ".Initialize";
+
+            public const string Register = Default + ".Register";
+        }
+
+        public static class WorkflowDef
+        {
+            public const string Default = GroupName + ".WorkflowDef";
+
+            public const string Create = Default + ".Create";
+
+            public const string Delete = Default + ".Delete";
+        }
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Engine/IEngineAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Engine/IEngineAppService.cs
new file mode 100644
index 000000000..a6e60297f
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Engine/IEngineAppService.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace LINGYUN.Abp.WorkflowManagement.Engine
+{
+    public interface IEngineAppService : IApplicationService
+    {
+        Task InitializeAsync();
+
+        Task RegisterAsync();
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Events/Dto/EventPublishInput.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Events/Dto/EventPublishInput.cs
new file mode 100644
index 000000000..0b0dbd562
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Events/Dto/EventPublishInput.cs
@@ -0,0 +1,21 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace LINGYUN.Abp.WorkflowManagement.Events
+{
+    public class EventPublishInput
+    {
+        [Required]
+        [StringLength(200)]
+        public string EventName { get; set; }
+
+        [Required]
+        [StringLength(200)]
+        public string EventKey { get; set; }
+
+        [Required]
+        public object EventData { get; set; }
+
+        public DateTime? EffectiveDate { get; set; }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Events/IEventAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Events/IEventAppService.cs
new file mode 100644
index 000000000..0f7181323
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Events/IEventAppService.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace LINGYUN.Abp.WorkflowManagement.Events
+{
+    public interface IEventAppService : IApplicationService
+    {
+        Task PublishAsync(EventPublishInput input);
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/ExecutionPointerDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/ExecutionPointerDto.cs
new file mode 100644
index 000000000..72ea3b444
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/ExecutionPointerDto.cs
@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public class ExecutionPointerDto
+    {
+        public string Id { get; set; }
+        public int StepId { get; set; }
+        public bool Active { get; set; }
+        public DateTime? SleepUntil { get; set; }
+        public object PersistenceData { get; set; }
+        public DateTime? StartTime { get; set; }
+        public DateTime? EndTime { get; set; }
+        public string EventName { get; set; }
+        public string EventKey { get; set; }
+        public bool EventPublished { get; set; }
+        public object EventData { get; set; }
+        public string StepName { get; set; }
+        public int RetryCount { get; set; }
+        public List<string> Children { get; set; } = new List<string>();
+        public object ContextItem { get; set; }
+        public string PredecessorId { get; set; }
+        public object Outcome { get; set; }
+        public string Status { get; set; }
+        public List<string> Scope { get; set; } = new List<string>();
+        public Dictionary<string, object> ExtensionAttributes { get; set; } = new Dictionary<string, object>();
+
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/StepDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/StepDto.cs
new file mode 100644
index 000000000..a9347ec8c
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/StepDto.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Data;
+using Volo.Abp.Validation;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public class StepDto
+    {
+        [Required]
+        [DynamicStringLength(typeof(WorkflowConsts), nameof(WorkflowConsts.MaxNameLength))]
+        public string Name { get; set; }
+
+        [Required]
+        [DynamicStringLength(typeof(WorkflowConsts), nameof(WorkflowConsts.MaxStepTypeLength))]
+        public string StepType { get; set; }
+
+        [DynamicStringLength(typeof(WorkflowConsts), nameof(WorkflowConsts.MaxCancelConditionLength))]
+        public string CancelCondition { get; set; }
+        public TimeSpan? RetryInterval { get; set; }
+        public bool Saga { get; set; }
+        public string NextStep { get; set; }
+        public List<StepDto> CompensateWith { get; set; } = new List<StepDto>();
+        public ExtraPropertyDictionary Inputs { get; set; } = new ExtraPropertyDictionary();
+        public ExtraPropertyDictionary Outputs { get; set; } = new ExtraPropertyDictionary();
+        public ExtraPropertyDictionary SelectNextStep { get; set; } = new ExtraPropertyDictionary();
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/StepNodeDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/StepNodeDto.cs
new file mode 100644
index 000000000..d583aeff6
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/StepNodeDto.cs
@@ -0,0 +1,25 @@
+using System;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Data;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public class StepNodeDto : EntityDto<Guid>
+    {
+        public string Name { get; set; }
+        public string StepType { get; set; }
+        public string CancelCondition { get; set; }
+        public TimeSpan? RetryInterval { get; set; }
+        public bool Saga { get; set; }
+        public Guid? ParentId { get; set; }
+        public ExtraPropertyDictionary Inputs { get; set; }
+        public ExtraPropertyDictionary Outputs { get; set; }
+        public ExtraPropertyDictionary SelectNextStep { get; set; }
+        public StepNodeDto()
+        {
+            Inputs = new ExtraPropertyDictionary();
+            Outputs = new ExtraPropertyDictionary();
+            SelectNextStep = new ExtraPropertyDictionary();
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDataDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDataDto.cs
new file mode 100644
index 000000000..3f53a1060
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDataDto.cs
@@ -0,0 +1,29 @@
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public class WorkflowDataDto
+    {
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 显示名称
+        /// </summary>
+        public string DisplayName { get; set; }
+        /// <summary>
+        /// 数据类型
+        /// </summary>
+        public DataType DataType { get; set; }
+        /// <summary>
+        /// 是否必输
+        /// 默认: false
+        /// </summary>
+        public bool IsRequired { get; set; }
+        /// <summary>
+        /// 是否区分大小写
+        /// 默认: false
+        /// 暂无用
+        /// </summary>
+        public bool IsCaseSensitive { get; set; }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDefinitionCreateDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDefinitionCreateDto.cs
new file mode 100644
index 000000000..57b9ab835
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDefinitionCreateDto.cs
@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Volo.Abp.Validation;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public class WorkflowDefinitionCreateDto
+    {
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnabled { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        [Required]
+        [DynamicStringLength(typeof(WorkflowConsts), nameof(WorkflowConsts.MaxNameLength))]
+        public string Name { get; set; }
+        /// <summary>
+        /// 显示名称
+        /// </summary>
+        [Required]
+        [DynamicStringLength(typeof(WorkflowConsts), nameof(WorkflowConsts.MaxDisplayNameLength))]
+        public string DisplayName { get; set; }
+        /// <summary>
+        /// 描述
+        /// </summary>
+        [DynamicStringLength(typeof(WorkflowConsts), nameof(WorkflowConsts.MaxDescriptionLength))] 
+        public string Description { get; set; }
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        [Required]
+        [Range(1, 100)]
+        public int Version { get; set; }
+
+        /// <summary>
+        /// 输入数据约束
+        /// </summary>
+        public List<WorkflowDataDto> Datas { get; set; } = new List<WorkflowDataDto>();
+
+        [Required]
+        [MinLength(1)]
+        public List<StepDto> Steps { get; set; } = new List<StepDto>();
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDefinitionDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDefinitionDto.cs
new file mode 100644
index 000000000..1f24f85f3
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDefinitionDto.cs
@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public class WorkflowDefinitionDto
+    {
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Description { get; set; }
+        /// <summary>
+        /// 版本号
+        /// </summary>
+        public int Version { get; set; }
+
+        public List<StepDto> Steps { get; set; } = new List<StepDto>();
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDto.cs
new file mode 100644
index 000000000..780848b26
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowDto.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using Volo.Abp.Application.Dtos;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public class WorkflowDto : AuditedEntityDto<Guid>
+    {
+        public bool IsEnabled { get; set; }
+
+        public string Name { get; set; }
+
+        public string DisplayName { get; set; }
+
+        public string Description { get; set; }
+
+        public int Version { get; set; }
+
+        public TimeSpan? ErrorRetryInterval { get; set; }
+
+        public List<StepNodeDto> Steps { get; set; } = new List<StepNodeDto>();
+
+        public List<StepNodeDto> CompensateNodes { get; set; } = new List<StepNodeDto>();
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowInstanceDto.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowInstanceDto.cs
new file mode 100644
index 000000000..cea0cbd60
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowInstanceDto.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public class WorkflowInstanceDto
+    {
+        public string Id { get; set; }
+        public object Data { get; set; }
+        public string WorkflowDefinitionId { get; set; }
+        public int Version { get; set; }
+        public string Status { get; set; }
+        public string Description { get; set; }
+        public string Reference { get; set; }
+        public DateTime CreateTime { get; set; }
+        public DateTime? CompleteTime { get; set; }
+        public ICollection<ExecutionPointerDto> ExecutionPointers { get; set; } = new List<ExecutionPointerDto>();
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowStartInput.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowStartInput.cs
new file mode 100644
index 000000000..d8f5b40e5
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/Dto/WorkflowStartInput.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public class WorkflowStartInput
+    {
+        public Dictionary<string, object> Data { get; set; }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/IWorkflowAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/IWorkflowAppService.cs
new file mode 100644
index 000000000..871aa8d5e
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/IWorkflowAppService.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.Application.Services;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public interface IWorkflowAppService : IApplicationService
+    {
+        Task<WorkflowInstanceDto> GetAsync(string id);
+
+        Task<WorkflowInstanceDto> StartAsync(Guid id, WorkflowStartInput input);
+
+        Task SuspendAsync(string id);
+
+        Task ResumeAsync(string id);
+
+        Task TerminateAsync(string id);
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/IWorkflowDefinitionAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/IWorkflowDefinitionAppService.cs
new file mode 100644
index 000000000..e1d2e0ad6
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application.Contracts/LINGYUN/Abp/WorkflowManagement/Workflows/IWorkflowDefinitionAppService.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Threading.Tasks;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    public interface IWorkflowDefinitionAppService
+    {
+        Task<WorkflowDto> CreateAsync(WorkflowDefinitionCreateDto input);
+
+        Task<WorkflowDto> GetAsync(Guid id);
+
+        Task DeleteAsync(Guid id);
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Activitys/ActivityAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Activitys/ActivityAppService.cs
new file mode 100644
index 000000000..d8c921907
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Activitys/ActivityAppService.cs
@@ -0,0 +1,40 @@
+using Microsoft.AspNetCore.Authorization;
+using System.Threading.Tasks;
+using WorkflowCore.Interface;
+
+namespace LINGYUN.Abp.WorkflowManagement.Activitys
+{
+    [Authorize]
+    public class ActivityAppService : WorkflowManagementAppServiceBase, IActivityAppService
+    {
+        private readonly IActivityController _controller;
+
+        public ActivityAppService(IActivityController controller)
+        {
+            _controller = controller;
+        }
+
+        public virtual async Task FailureAsync(ActivityFailureInput input)
+        {
+            await _controller.SubmitActivityFailure(input.Token, input.Result);
+        }
+
+        public virtual async Task<PendingActivityDto> GetAsync(GetPendingActivityInput input)
+        {
+            var activity = await _controller.GetPendingActivity(
+                input.ActivityName, input.WorkflowId, input.Timeout);
+
+            return ObjectMapper.Map<PendingActivity, PendingActivityDto>(activity);
+        }
+
+        public virtual async Task DeleteAsync(ActivityReleaseInput input)
+        {
+            await _controller.ReleaseActivityToken(input.Token);
+        }
+
+        public virtual async Task SuccessAsync(ActivitySuccessInput input)
+        {
+            await _controller.SubmitActivitySuccess(input.Token, input.Result);
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Engine/EngineAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Engine/EngineAppService.cs
new file mode 100644
index 000000000..0a2cc6bbf
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Engine/EngineAppService.cs
@@ -0,0 +1,34 @@
+using LINGYUN.Abp.WorkflowManagement.Authorization;
+using Microsoft.AspNetCore.Authorization;
+using System.Threading.Tasks;
+
+namespace LINGYUN.Abp.WorkflowManagement.Engine
+{
+    [Authorize(WorkflowManagementPermissions.Engine.Default)]
+    public class EngineAppService : WorkflowManagementAppServiceBase, IEngineAppService
+    {
+        private readonly IWorkflowEngineManager _engineManager;
+        private readonly IWorkflowRegistryManager _registryManager;
+
+        public EngineAppService(
+            IWorkflowEngineManager engineManager,
+            IWorkflowRegistryManager registryManager)
+        {
+            _engineManager = engineManager;
+            _registryManager = registryManager;
+        }
+
+        [Authorize(WorkflowManagementPermissions.Engine.Initialize)]
+        public virtual async Task InitializeAsync()
+        {
+            await _engineManager.InitializeAsync();
+        }
+
+        [Authorize(WorkflowManagementPermissions.Engine.Register)]
+        public virtual async Task RegisterAsync()
+        {
+            // 暂时没有解决多租户自动注册工作流,管理员可以通过api主动注册
+            await _registryManager.RegisterAsync();
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Events/EventAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Events/EventAppService.cs
new file mode 100644
index 000000000..dd3931881
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Events/EventAppService.cs
@@ -0,0 +1,22 @@
+using Microsoft.AspNetCore.Authorization;
+using System.Threading.Tasks;
+using WorkflowCore.Interface;
+
+namespace LINGYUN.Abp.WorkflowManagement.Events
+{
+    [Authorize]
+    public class EventAppService : WorkflowManagementAppServiceBase, IEventAppService
+    {
+        private readonly IWorkflowController _controller;
+
+        public EventAppService(IWorkflowController controller)
+        {
+            _controller = controller;
+        }
+
+        public virtual async Task PublishAsync(EventPublishInput input)
+        {
+            await _controller.PublishEvent(input.EventName, input.EventKey, input.EventData, input.EffectiveDate);
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs
index 2bb35efe9..2a32e16ac 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/WorkflowManagementApplicationMapperProfile.cs
@@ -1,4 +1,8 @@
 using AutoMapper;
+using LINGYUN.Abp.WorkflowManagement.Activitys;
+using LINGYUN.Abp.WorkflowManagement.Workflows;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
 
 namespace LINGYUN.Abp.WorkflowManagement
 {
@@ -6,6 +10,17 @@ namespace LINGYUN.Abp.WorkflowManagement
     {
         public WorkflowManagementApplicationMapperProfile()
         {
+            CreateMap<ExecutionPointer, ExecutionPointerDto>()
+                .ForMember(dto => dto.Status, map => map.MapFrom(src => src.Status.ToString()));
+            CreateMap<WorkflowInstance, WorkflowInstanceDto>()
+                .ForMember(dto => dto.Status, map => map.MapFrom(src => src.Status.ToString()));
+            CreateMap<PendingActivity, PendingActivityDto>();
+
+            CreateMap<StepNode, StepNodeDto>();
+            CreateMap<CompensateNode, StepNodeDto>();
+            CreateMap<Workflow, WorkflowDto>()
+                .ForMember(dto => dto.Steps, map => map.Ignore())
+                .ForMember(dto => dto.CompensateNodes, map => map.Ignore());
         }
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowAppService.cs
new file mode 100644
index 000000000..8bbb98c6d
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowAppService.cs
@@ -0,0 +1,123 @@
+using Microsoft.AspNetCore.Authorization;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.MultiTenancy;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    [Authorize]
+    public class WorkflowAppService : WorkflowManagementAppServiceBase, IWorkflowAppService
+    {
+        private readonly IWorkflowController _controller;
+        private readonly IPersistenceProvider _persistence;
+        private readonly IWorkflowRepository _workflowRepository;
+
+        public WorkflowAppService(
+            IWorkflowController controller,
+            IPersistenceProvider persistence,
+            IWorkflowRepository workflowRepository)
+        {
+            _controller = controller;
+            _persistence = persistence;
+            _workflowRepository = workflowRepository;
+        }
+
+        public virtual async Task<WorkflowInstanceDto> GetAsync(string id)
+        {
+            var workflow = await _persistence.GetWorkflowInstance(id);
+
+            return ObjectMapper.Map<WorkflowInstance, WorkflowInstanceDto>(workflow);
+        }
+
+        public virtual async Task ResumeAsync(string id)
+        {
+            var result = await _controller.ResumeWorkflow(id);
+            if (!result)
+            {
+                throw new BusinessException(
+                        WorkflowManagementErrorCodes.SuspendError,
+                        "The workflow cannot be resumed at this time. Please check the log");
+            }
+        }
+
+        public virtual async Task<WorkflowInstanceDto> StartAsync(Guid id, WorkflowStartInput input)
+        {
+            var workflowDef = await _workflowRepository.GetAsync(id);
+
+            var workflowData = new Dictionary<string, object>(StringComparer.InvariantCultureIgnoreCase);
+            foreach (var data in input.Data)
+            {
+                object inputValue = data.Value;
+                if (data.Value is JsonElement element)
+                {
+                    inputValue = JsonConvert.DeserializeObject(element.ToString());
+                }
+                else
+                {
+                    var defData = workflowDef.FindData(data.Key);
+                    if (defData != null)
+                    {
+                        if (defData.TryParse(inputValue, out inputValue))
+                        {
+                            workflowData.TryAdd(data.Key, inputValue);
+                            continue;
+                        }
+
+                        throw new BusinessException(WorkflowManagementErrorCodes.InvalidInputDataType)
+                            .WithData("Property", defData.DisplayName)
+                            .WithData("DataType", defData.DataType.ToString());
+                    }
+                }
+
+                workflowData.TryAdd(data.Key, inputValue);
+            }
+
+            if (CurrentTenant.IsAvailable)
+            {
+                workflowData.TryAdd(nameof(IMultiTenant.TenantId), CurrentTenant.GetId());
+            }
+
+            foreach (var data in workflowDef.Datas)
+            {
+                if (data.IsRequired && !workflowData.ContainsKey(data.Name))
+                {
+                    throw new BusinessException(WorkflowManagementErrorCodes.MissingRequiredProperty)
+                        .WithData("Property", data.DisplayName);
+                }
+            }
+
+            var instanceId = await _controller.StartWorkflow(workflowDef.Id.ToString(), workflowData);
+            var result = await _persistence.GetWorkflowInstance(instanceId);
+
+            return ObjectMapper.Map<WorkflowInstance, WorkflowInstanceDto>(result);
+        }
+
+        public virtual async Task SuspendAsync(string id)
+        {
+            var result = await _controller.SuspendWorkflow(id);
+            if (!result)
+            {
+                throw new BusinessException(
+                      WorkflowManagementErrorCodes.SuspendError,
+                      "The workflow cannot be suspend at this time. Please check the log");
+            }
+        }
+
+        public virtual async Task TerminateAsync(string id)
+        {
+            var result = await _controller.TerminateWorkflow(id);
+            if (!result)
+            {
+                throw new BusinessException(
+                    WorkflowManagementErrorCodes.TerminateError,
+                    "The workflow cannot be terminated at this time. Please check the log");
+            }
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowDefinitionAppService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowDefinitionAppService.cs
new file mode 100644
index 000000000..8a986411d
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Application/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowDefinitionAppService.cs
@@ -0,0 +1,153 @@
+using LINGYUN.Abp.WorkflowManagement.Authorization;
+using Microsoft.AspNetCore.Authorization;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Volo.Abp;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    [Authorize(WorkflowManagementPermissions.WorkflowDef.Default)]
+    public class WorkflowDefinitionAppService : WorkflowManagementAppServiceBase, IWorkflowDefinitionAppService
+    {
+        private readonly WorkflowManager _workflowManager;
+
+        private readonly IWorkflowRepository _workflowRepository;
+        private readonly IStepNodeRepository _stepNodeRepository;
+        private readonly ICompensateNodeRepository _compensateNodeRepository;
+
+        public WorkflowDefinitionAppService(
+           WorkflowManager workflowManager,
+           IWorkflowRepository workflowRepository,
+           IStepNodeRepository stepNodeRepository,
+           ICompensateNodeRepository compensateNodeRepository)
+        {
+            _workflowManager = workflowManager;
+            _workflowRepository = workflowRepository;
+            _stepNodeRepository = stepNodeRepository;
+            _compensateNodeRepository = compensateNodeRepository;
+        }
+
+        [Authorize(WorkflowManagementPermissions.WorkflowDef.Create)]
+        public virtual async Task<WorkflowDto> CreateAsync(WorkflowDefinitionCreateDto input)
+        {
+            if (await _workflowRepository.CheckVersionAsync(input.Name, input.Version))
+            {
+                throw new BusinessException();
+            }
+
+            var workflowDef = new Workflow(
+                GuidGenerator.Create(),
+                input.Name,
+                input.DisplayName,
+                input.Description,
+                input.Version,
+                tenantId: CurrentTenant.Id)
+            {
+                IsEnabled = input.IsEnabled,
+            };
+
+            foreach (var data in input.Datas)
+            {
+                workflowDef.AddData(
+                    GuidGenerator,
+                    data.Name,
+                    data.DisplayName,
+                    data.DataType,
+                    data.IsRequired,
+                    data.IsCaseSensitive);
+            }
+
+            var stepDefNodes = new List<StepNode>();
+            var stepCompensateDefNodes = new List<CompensateNode>();
+
+            ICollection<CompensateNode> CreateCompensateNodes(StepNode node, ICollection<StepDto> steps)
+            {
+                var stepNodes = new List<CompensateNode>();
+                foreach (var step in steps)
+                {
+                    var stepNode = new CompensateNode(
+                        GuidGenerator.Create(),
+                        workflowDef.Id,
+                        step.Name,
+                        step.StepType,
+                        step.CancelCondition,
+                        saga: step.Saga,
+                        parentId: node.Id,
+                        tenantId: CurrentTenant.Id);
+                    stepNode.Inputs.AddIfNotContains(step.Inputs);
+                    stepNode.Outputs.AddIfNotContains(step.Outputs);
+                    stepNode.SelectNextStep.AddIfNotContains(step.SelectNextStep);
+
+                    stepNodes.Add(stepNode);
+                }
+                return stepNodes;
+            }
+
+            foreach (var stepInput in input.Steps)
+            {
+                var stepNode = new StepNode(
+                    GuidGenerator.Create(),
+                    workflowDef.Id,
+                    stepInput.Name,
+                    stepInput.StepType,
+                    stepInput.CancelCondition,
+                    saga: stepInput.Saga,
+                    tenantId: CurrentTenant.Id);
+                stepNode.Inputs.AddIfNotContains(stepInput.Inputs);
+                stepNode.Outputs.AddIfNotContains(stepInput.Outputs);
+                stepNode.SelectNextStep.AddIfNotContains(stepInput.SelectNextStep);
+
+                stepDefNodes.Add(stepNode);
+                stepCompensateDefNodes.AddRange(CreateCompensateNodes(stepNode, stepInput.CompensateWith));
+            }
+
+            await _workflowRepository.InsertAsync(workflowDef);
+            await _stepNodeRepository.InsertManyAsync(stepDefNodes);
+            await _compensateNodeRepository.InsertManyAsync(stepCompensateDefNodes);
+
+            _workflowManager.Register(workflowDef, stepDefNodes, stepCompensateDefNodes);
+
+            var workflowDto = ObjectMapper.Map<Workflow, WorkflowDto>(workflowDef);
+
+            workflowDto.Steps.AddRange(
+                ObjectMapper.Map<List<StepNode>, List<StepNodeDto>>(stepDefNodes));
+
+            workflowDto.CompensateNodes.AddRange(
+                ObjectMapper.Map<List<CompensateNode>, List<StepNodeDto>>(stepCompensateDefNodes));
+
+            return workflowDto;
+        }
+
+        [Authorize(WorkflowManagementPermissions.WorkflowDef.Delete)]
+        public virtual async Task DeleteAsync(Guid id)
+        {
+            var workflowDef = await _workflowRepository.GetAsync(id);
+            var stepDefNodes = await _stepNodeRepository.GetAllChildrenWithWorkflowAsync(workflowDef.Id);
+            var compensateDefNodes = await _compensateNodeRepository.GetAllChildrenWithWorkflowAsync(workflowDef.Id);
+
+            await _workflowRepository.DeleteAsync(workflowDef);
+            await _stepNodeRepository.DeleteManyAsync(stepDefNodes);
+            await _compensateNodeRepository.DeleteManyAsync(compensateDefNodes);
+
+            _workflowManager.UnRegister(workflowDef);
+        }
+
+        public virtual async Task<WorkflowDto> GetAsync(Guid id)
+        {
+            var workflowDef = await _workflowRepository.GetAsync(id);
+            var stepDefNodes = await _stepNodeRepository.GetAllChildrenWithWorkflowAsync(workflowDef.Id);
+            var compensateDefNodes = await _compensateNodeRepository.GetAllChildrenWithWorkflowAsync(workflowDef.Id);
+
+            var workflowDto = ObjectMapper.Map<Workflow, WorkflowDto>(workflowDef);
+
+            workflowDto.Steps.AddRange(
+                ObjectMapper.Map<List<StepNode>, List<StepNodeDto>>(stepDefNodes));
+
+            workflowDto.CompensateNodes.AddRange(
+                ObjectMapper.Map<List<CompensateNode>, List<StepNodeDto>>(compensateDefNodes));
+
+            return workflowDto;
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/DataType.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/DataType.cs
new file mode 100644
index 000000000..f70c65fdd
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/DataType.cs
@@ -0,0 +1,12 @@
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public enum DataType
+    {
+        Object,
+        String,
+        Number,
+        Date,
+        DateTime,
+        Booleaen
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/Localization/Resources/en.json b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/Localization/Resources/en.json
index d656102c6..fb0e6995e 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/Localization/Resources/en.json
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/Localization/Resources/en.json
@@ -2,6 +2,39 @@
   "culture": "en",
   "texts": {
     "Permission:WorkflowManagement": "WorkflowManagement",
-    "Permission:ManageSettings": "Manage Settings"
+    "Permission:Engine": "Engine",
+    "Permission:Initialize": "Initialize",
+    "Permission:Register": "Register",
+    "Permission:WorkflowDef": "Definition",
+    "Permission:Create": "Create",
+    "Permission:Delete": "Delete",
+    "Permission:ManageSettings": "Manage Settings",
+    "Workflow:10100": "Unable to restart workflow temporarily, please check log.",
+    "Workflow:10101": "Unable to suspend workflow, please check log.",
+    "Workflow:10102": "Unable to terminate workflow temporarily, please check log.",
+    "Workflow:10110": "Missing required Property {Property}.",
+    "Workflow:10111": "The mandatory {Property} field cannot be null.",
+    "Workflow:10112": "The field {Property} is not a valid {DataType} type.",
+    "DisplayName:IsEnabled": "Is Enabled",
+    "DisplayName:Name": "Name",
+    "DisplayName:DisplayName": "DisplayName",
+    "DisplayName:Description": "Description",
+    "DisplayName:Version": "Version",
+    "DisplayName:Steps": "Steps",
+    "DisplayName:StepType": "Step Type",
+    "DisplayName:CancelCondition": "Cancel Condition",
+    "DisplayName:RetryInterval": "Retry Interval",
+    "DisplayName:NextStep": "Next Step",
+    "DisplayName:CompensateWith": "Compensates",
+    "DisplayName:Inputs": "Inputs",
+    "DisplayName:Outputs": "Outputs",
+    "DisplayName:SelectNextStep": "Select Next Step",
+    "DisplayName:EventName": "Event Name",
+    "DisplayName:EventKey": "Event Key",
+    "DisplayName:EventData": "Event Data",
+    "DisplayName:Token": "Token",
+    "DisplayName:Result": "Result",
+    "DisplayName:ActivityName": "Activity Name",
+    "DisplayName:WorkflowId": "Workflow Id"
   }
 }
\ No newline at end of file
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/Localization/Resources/zh-Hans.json b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/Localization/Resources/zh-Hans.json
index c18804bb8..6d5b14852 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/Localization/Resources/zh-Hans.json
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/Localization/Resources/zh-Hans.json
@@ -1,7 +1,40 @@
 {
   "culture": "zh-Hans",
   "texts": {
-    "Permission:WorkflowManagement": "WorkflowManagement",
-    "Permission:ManageSettings": "管理设置"
+    "Permission:WorkflowManagement": "工作流管理",
+    "Permission:Engine": "流程引擎",
+    "Permission:Initialize": "初始化",
+    "Permission:Register": "注册组件",
+    "Permission:WorkflowDef": "流程定义",
+    "Permission:Create": "创建",
+    "Permission:Delete": "删除",
+    "Permission:ManageSettings": "管理设置",
+    "Workflow:10100": "暂时无法重启工作流,请检查日志.",
+    "Workflow:10101": "暂时无法暂停工作流,请检查日志.",
+    "Workflow:10102": "暂时无法终止工作流,请检查日志.",
+    "Workflow:10110": "缺失必要的属性 {Property}.",
+    "Workflow:10111": "必输字段 {Property} 不能为空.",
+    "Workflow:10112": "字段 {Property} 不是有效的 {DataType} 类型.",
+    "DisplayName:IsEnabled": "是否启用",
+    "DisplayName:Name": "名称",
+    "DisplayName:DisplayName": "显示名称",
+    "DisplayName:Description": "描述",
+    "DisplayName:Version": "版本",
+    "DisplayName:Steps": "节点列表",
+    "DisplayName:StepType": "步骤类型",
+    "DisplayName:CancelCondition": "终止条件",
+    "DisplayName:RetryInterval": "重试间隔",
+    "DisplayName:NextStep": "下一个节点",
+    "DisplayName:CompensateWith": "补偿节点",
+    "DisplayName:Inputs": "数据输入",
+    "DisplayName:Outputs": "数据输出",
+    "DisplayName:SelectNextStep": "选择下一步",
+    "DisplayName:EventName": "事件名称",
+    "DisplayName:EventKey": "事件标识",
+    "DisplayName:EventData": "事件数据",
+    "DisplayName:Token": "令牌",
+    "DisplayName:Result": "返回数据",
+    "DisplayName:ActivityName": "活动名称",
+    "DisplayName:WorkflowId": "工作流标识"
   }
 }
\ No newline at end of file
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowConsts.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowConsts.cs
new file mode 100644
index 000000000..d1055cfcd
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowConsts.cs
@@ -0,0 +1,11 @@
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public static class WorkflowConsts
+    {
+        public static int MaxCancelConditionLength { get; set; } = 200;
+        public static int MaxNameLength { get; set; } = 100;
+        public static int MaxDisplayNameLength { get; set; } = 200;
+        public static int MaxDescriptionLength { get; set; } = 200;
+        public static int MaxStepTypeLength { get; set; } = 100;
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowDataConsts.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowDataConsts.cs
new file mode 100644
index 000000000..c35b2299b
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowDataConsts.cs
@@ -0,0 +1,8 @@
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public static class WorkflowDataConsts
+    {
+        public static int MaxNameLength { get; set; } = 100;
+        public static int MaxDisplayNameLength { get; set; } = 100;
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDomainSharedModule.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDomainSharedModule.cs
index e580439ba..fc6a953ab 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDomainSharedModule.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDomainSharedModule.cs
@@ -21,7 +21,7 @@ namespace LINGYUN.Abp.WorkflowManagement
             {
                 options.Resources
                     .Add<WorkflowManagementResource>()
-                    .AddVirtualJson("/Abp/WorkflowManagement/Localization/Resources");
+                    .AddVirtualJson("/LINGYUN/Abp/WorkflowManagement/Localization/Resources");
             });
 
             Configure<AbpExceptionLocalizationOptions>(options =>
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowManagementErrorCodes.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowManagementErrorCodes.cs
index 9d611e14e..e9949fddb 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowManagementErrorCodes.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain.Shared/LINGYUN/Abp/WorkflowManagement/WorkflowManagementErrorCodes.cs
@@ -2,6 +2,23 @@
 {
     public static class WorkflowManagementErrorCodes
     {
-        public const string Namespace = "WorkflowManagement";
+        public const string Namespace = "Workflow";
+
+        public const string ResumeError = Namespace + ":10100";
+        public const string SuspendError = Namespace + ":10101";
+        public const string TerminateError = Namespace + ":10102";
+
+        /// <summary>
+        /// 缺失必要的属性 {Property}
+        /// </summary>
+        public const string MissingRequiredProperty = Namespace + ":10110";
+        /// <summary>
+        /// 必输字段 {Property} 不能为空
+        /// </summary>
+        public const string InvalidInputNullable = Namespace + ":10111";
+        /// <summary>
+        /// 字段 {Property} 不是有效的 {DataType} 类型
+        /// </summary>
+        public const string InvalidInputDataType = Namespace + ":10112";
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/CompensateNode.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/CompensateNode.cs
new file mode 100644
index 000000000..c1e79a13c
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/CompensateNode.cs
@@ -0,0 +1,27 @@
+using System;
+using WorkflowCore.Models;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public class CompensateNode : Step
+    {
+        public CompensateNode()
+        {
+        }
+
+        public CompensateNode(
+            Guid id, 
+            Guid workflowId, 
+            string name, 
+            string stepType,
+            string cancelCondition, 
+            WorkflowErrorHandling? errorBehavior = null, 
+            TimeSpan? retryInterval = null,
+            bool saga = false, 
+            Guid? parentId = null,
+            Guid? tenantId = null) 
+            : base(id, workflowId, name, stepType, cancelCondition, errorBehavior, retryInterval, saga, parentId, tenantId)
+        {
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/ICompensateNodeRepository.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/ICompensateNodeRepository.cs
new file mode 100644
index 000000000..d9c7d1f7f
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/ICompensateNodeRepository.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public interface ICompensateNodeRepository : IRepository<CompensateNode, Guid>
+    {
+        Task<List<CompensateNode>> GetAllChildrenWithWorkflowAsync(
+            Guid workflowId,
+            CancellationToken cancellationToken = default);
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IStep.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IStep.cs
new file mode 100644
index 000000000..a0e35a309
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IStep.cs
@@ -0,0 +1,21 @@
+using System;
+using Volo.Abp.Data;
+using WorkflowCore.Models;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public interface IStep
+    {
+        Guid WorkflowId { get; }
+        string Name { get; }
+        string StepType { get; }
+        Guid? ParentId { get; }
+        WorkflowErrorHandling? ErrorBehavior { get; }
+        string CancelCondition { get; set; }
+        TimeSpan? RetryInterval { get; set; }
+        bool Saga { get; set; }
+        ExtraPropertyDictionary Inputs { get; set; }
+        ExtraPropertyDictionary Outputs { get; set; }
+        ExtraPropertyDictionary SelectNextStep { get; set; }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IStepNodeRepository.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IStepNodeRepository.cs
new file mode 100644
index 000000000..f800795c1
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IStepNodeRepository.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public interface IStepNodeRepository : IRepository<StepNode, Guid>
+    {
+        Task<List<StepNode>> GetAllChildrenWithWorkflowAsync(
+            Guid workflowId,
+            CancellationToken cancellationToken = default);
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IWorkflowEngineManager.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IWorkflowEngineManager.cs
new file mode 100644
index 000000000..22779459d
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IWorkflowEngineManager.cs
@@ -0,0 +1,14 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public interface IWorkflowEngineManager
+    {
+        Task InitializeAsync(CancellationToken cancellationToken = default);
+
+        Task StopAsync(CancellationToken cancellationToken = default);
+
+        Task StartAsync(CancellationToken cancellationToken = default);
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IWorkflowRegistryManager.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IWorkflowRegistryManager.cs
new file mode 100644
index 000000000..c6c174b36
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IWorkflowRegistryManager.cs
@@ -0,0 +1,10 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public interface IWorkflowRegistryManager
+    {
+        Task RegisterAsync(CancellationToken cancellationToken = default);
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IWorkflowRepository.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IWorkflowRepository.cs
new file mode 100644
index 000000000..348804633
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/IWorkflowRepository.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public interface IWorkflowRepository : IRepository<Workflow, Guid>
+    {
+        Task<bool> CheckVersionAsync(
+            string name,
+            int version,
+            CancellationToken cancellationToken = default);
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/Step.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/Step.cs
index 3fc65ef3a..c310257f2 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/Step.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/Step.cs
@@ -6,7 +6,7 @@ using WorkflowCore.Models;
 
 namespace LINGYUN.Abp.WorkflowManagement
 {
-    public class Step : Entity<Guid>, IMultiTenant
+    public abstract class Step : Entity<Guid>, IMultiTenant
     {
         public virtual Guid? TenantId { get; protected set; }
         public virtual Guid WorkflowId { get; protected set; }
@@ -14,9 +14,9 @@ namespace LINGYUN.Abp.WorkflowManagement
         public virtual string StepType { get; protected set; }
         public virtual string CancelCondition { get; set; }
         public virtual WorkflowErrorHandling? ErrorBehavior { get; protected set; }
-        public virtual int? RetryInterval { get; set; }
+        public virtual TimeSpan? RetryInterval { get; set; }
         public virtual bool Saga { get; set; }
-        public virtual Guid? NextStep { get; protected set; }
+        public virtual Guid? ParentId { get; protected set; }
         public virtual ExtraPropertyDictionary Inputs { get; set; }
         public virtual ExtraPropertyDictionary Outputs { get; set; }
         public virtual ExtraPropertyDictionary SelectNextStep { get; set; }
@@ -27,16 +27,16 @@ namespace LINGYUN.Abp.WorkflowManagement
             SelectNextStep = new ExtraPropertyDictionary();
         }
 
-        public Step(
+        protected Step(
             Guid id,
             Guid workflowId,
             string name,
             string stepType,
             string cancelCondition,
             WorkflowErrorHandling? errorBehavior = null,
-            int? retryInterval = null,
+            TimeSpan? retryInterval = null,
             bool saga = false,
-            Guid? nextStep = null,
+            Guid? parentId = null,
             Guid? tenantId = null) : base(id)
         {
             Name = name;
@@ -46,7 +46,7 @@ namespace LINGYUN.Abp.WorkflowManagement
             ErrorBehavior = errorBehavior;
             RetryInterval = retryInterval;
             Saga = saga;
-            NextStep = nextStep;
+            ParentId = parentId;
             TenantId = tenantId;
 
             Inputs = new ExtraPropertyDictionary();
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/StepNode.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/StepNode.cs
new file mode 100644
index 000000000..0862881d4
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/StepNode.cs
@@ -0,0 +1,27 @@
+using System;
+using WorkflowCore.Models;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public class StepNode : Step
+    {
+        protected StepNode()
+        {
+        }
+
+        public StepNode(
+            Guid id, 
+            Guid workflowId, 
+            string name, 
+            string stepType,
+            string cancelCondition, 
+            WorkflowErrorHandling? errorBehavior = null, 
+            TimeSpan? retryInterval = null,
+            bool saga = false, 
+            Guid? parentId = null,
+            Guid? tenantId = null) 
+            : base(id, workflowId, name, stepType, cancelCondition, errorBehavior, retryInterval, saga, parentId, tenantId)
+        {
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/Workflow.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/Workflow.cs
index abebeb49b..55e0aac79 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/Workflow.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/Workflow.cs
@@ -1,6 +1,11 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
 using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Guids;
 using Volo.Abp.MultiTenancy;
+using WorkflowCore.Models;
 
 namespace LINGYUN.Abp.WorkflowManagement
 {
@@ -16,7 +21,11 @@ namespace LINGYUN.Abp.WorkflowManagement
         /// <summary>
         /// 是否启用
         /// </summary>
-        public virtual bool IsEnabled { get; protected set; }
+        public virtual bool IsEnabled { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public virtual string Name { get; set; }
         /// <summary>
         /// 显示名称
         /// </summary>
@@ -30,16 +39,63 @@ namespace LINGYUN.Abp.WorkflowManagement
         /// </summary>
         public virtual int Version { get; protected set; }
 
+        public virtual WorkflowErrorHandling ErrorBehavior { get; set; }
+
+        public virtual TimeSpan? ErrorRetryInterval { get; set; }
+
+        public virtual ICollection<WorkflowData> Datas { get; protected set; }
+
         protected Workflow()
         {
+            Datas = new Collection<WorkflowData>();
         }
 
         public Workflow(
             Guid id,
+            string name,
             string displayName,
             string description = "",
-            int version = 1) : base(id)
+            int version = 1,
+            WorkflowErrorHandling errorBehavior = WorkflowErrorHandling.Retry,
+            TimeSpan? errorRetryInterval = null,
+            Guid? tenantId = null) : base(id)
+        {
+            Name = name;
+            DisplayName = displayName;
+            Description = description;
+            Version = version;
+            ErrorBehavior = errorBehavior;
+            ErrorRetryInterval = errorRetryInterval;
+            TenantId = tenantId;
+
+            Datas = new Collection<WorkflowData>();
+        }
+
+        public void AddData(
+            IGuidGenerator guidGenerator,
+            string name,
+            string displayName,
+            DataType dataType,
+            bool isRequired = false,
+            bool isCaseSensitive = false)
+        {
+            if (FindData(name) == null)
+            {
+                Datas.Add(new WorkflowData(
+                    guidGenerator.Create(),
+                    Id,
+                    name,
+                    displayName,
+                    dataType,
+                    isRequired,
+                    isCaseSensitive,
+                    TenantId));
+            }
+        }
+
+        public WorkflowData FindData(string name)
         {
+            return Datas.FirstOrDefault(x => x.Name.Equals(name));
         }
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowData.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowData.cs
new file mode 100644
index 000000000..a1247dbee
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowData.cs
@@ -0,0 +1,108 @@
+using System;
+using Volo.Abp;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.MultiTenancy;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public class WorkflowData : Entity<Guid>, IMultiTenant
+    {
+        public virtual Guid? TenantId { get; protected set; }
+        public virtual Guid WorkflowId { get; protected set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public virtual string Name { get; protected set; }
+        /// <summary>
+        /// 显示名称
+        /// </summary>
+        public virtual string DisplayName { get; protected set; }
+        /// <summary>
+        /// 数据类型
+        /// </summary>
+        public virtual DataType DataType { get; protected set; }
+        /// <summary>
+        /// 是否必输
+        /// 默认: false
+        /// </summary>
+        public virtual bool IsRequired { get; protected set; }
+        /// <summary>
+        /// 是否区分大小写
+        /// 默认: false
+        /// 暂无用
+        /// </summary>
+        public virtual bool IsCaseSensitive { get; protected set; }
+        protected WorkflowData() { }
+        public WorkflowData(
+            Guid id,
+            Guid workflowId,
+            string name,
+            string displayName,
+            DataType dataType = DataType.String,
+            bool isRequired = false,
+            bool isCaseSensitive = false,
+            Guid? tenantId = null) : base(id)
+        {
+            WorkflowId = workflowId;
+            Name = name;
+            DisplayName = displayName;
+            DataType = dataType;
+            IsRequired = isRequired;
+            IsCaseSensitive = isCaseSensitive;
+            TenantId = tenantId;
+        }
+
+        public bool TryParse(object input, out object value)
+        {
+            if (input == null)
+            {
+                if (IsRequired)
+                {
+                    throw new BusinessException(WorkflowManagementErrorCodes.InvalidInputNullable)
+                        .WithData("Property", DisplayName);
+                }
+                // 字典类型不能为空
+                value = new { };
+                return true;
+            }
+
+            switch (DataType)
+            {
+                case DataType.String:
+                    value = input.ToString();
+                    return true;
+                case DataType.Booleaen:
+                    if (input is bool boValue)
+                    {
+                        value = boValue;
+                        return true;
+                    }
+                    value = input.ToString().ToLower() == "true";
+                    return true;
+                case DataType.Date:
+                case DataType.DateTime:
+                    if (input is DateTime dateValue)
+                    {
+                        value = DataType == DataType.Date
+                            ? dateValue.Date
+                            : dateValue;
+                        return true;
+                    }
+                    value = DateTime.Parse(input.ToString());
+                    return true;
+                case DataType.Number:
+                    if (int.TryParse(input.ToString(), out int intValue))
+                    {
+                        value = intValue;
+                        return true;
+                    }
+                    value = 0;
+                    return false;
+                case DataType.Object:
+                default:
+                    value = input;
+                    return true;
+            }
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDbProperties.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDbProperties.cs
index 2f85c3451..4775e8a57 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDbProperties.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDbProperties.cs
@@ -2,7 +2,7 @@
 {
     public static class WorkflowManagementDbProperties
     {
-        public static string DbTablePrefix { get; set; } = "WorkflowManagement_";
+        public static string DbTablePrefix { get; set; } = "WF_";
 
         public static string DbSchema { get; set; } = null;
 
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDomainModule.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDomainModule.cs
index 9e3dede8e..2bb687818 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDomainModule.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManagementDomainModule.cs
@@ -21,7 +21,10 @@ namespace LINGYUN.Abp.WorkflowManagement
 
             Configure<AbpDistributedEntityEventOptions>(options =>
             {
+
             });
+
+            context.Services.AddHostedService<WorkflowRegisterService>();
         }
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManager.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManager.cs
new file mode 100644
index 000000000..e6971dc72
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowManager.cs
@@ -0,0 +1,545 @@
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using System.Linq.Expressions;
+using System.Reflection;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Services;
+using WorkflowCore.Exceptions;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+using WorkflowCore.Models.DefinitionStorage.v1;
+using WorkflowCore.Primitives;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public class WorkflowManager : DomainService, ITransientDependency
+    {
+        private readonly IWorkflowRegistry _registry;
+
+        public WorkflowManager(IWorkflowRegistry registry)
+        {
+            _registry = registry;
+        }
+
+        public virtual bool IsRegistered(Workflow workflow)
+        {
+            return _registry.IsRegistered(workflow.Id.ToString(), workflow.Version);
+        }
+
+        public virtual void UnRegister(Workflow workflow)
+        {
+            if (IsRegistered(workflow))
+            {
+                _registry.DeregisterWorkflow(workflow.Id.ToString(), workflow.Version);
+            }
+        }
+
+        public virtual WorkflowDefinition Register(
+            Workflow workflow,
+            ICollection<StepNode> steps,
+            ICollection<CompensateNode> compensates)
+        {
+            if (!IsRegistered(workflow))
+            {
+                var dataType = typeof(Dictionary<string, object>);
+                var source = new DefinitionSourceV1
+                {
+                    Id = workflow.Id.ToString(),
+                    Version = workflow.Version,
+                    Description = workflow.Description ?? workflow.DisplayName,
+                    DataType = $"{dataType.FullName}, {dataType.Assembly}",
+                    DefaultErrorBehavior = workflow.ErrorBehavior,
+                    DefaultErrorRetryInterval = workflow.ErrorRetryInterval,
+                    Steps = ConvertSteps(steps, compensates)
+                };
+
+                var def = Convert(source);
+
+                _registry.RegisterWorkflow(def);
+
+                return def;
+            }
+
+            return _registry.GetDefinition(workflow.Id.ToString(), workflow.Version);
+        }
+
+        private List<StepSourceV1> ConvertSteps(
+            ICollection<StepNode> steps,
+            ICollection<CompensateNode> compensates)
+        {
+            var nodes = new List<StepSourceV1>();
+
+            foreach (var step in steps)
+            {
+                var source = new StepSourceV1
+                {
+                    Id = step.Id.ToString(),
+                    Saga = step.Saga,
+                    StepType = step.StepType,
+                    CancelCondition = step.CancelCondition,
+                    ErrorBehavior = step.ErrorBehavior,
+                    RetryInterval = step.RetryInterval,
+                    Name = step.Name
+                };
+
+                foreach (var input in step.Inputs)
+                {
+                    source.Inputs.AddIfNotContains(input);
+                }
+
+                foreach (var output in step.Outputs)
+                {
+                    source.Outputs.Add(output.Key, output.Value.ToString());
+                }
+
+                foreach (var nextStep in step.SelectNextStep)
+                {
+                    source.SelectNextStep.Add(nextStep.Key, nextStep.Value.ToString());
+                }
+
+                var childrenNodes = steps.Where(x => Equals(x.ParentId, step.Id)).ToArray();
+                if (childrenNodes.Any())
+                {
+                    source.NextStepId = childrenNodes[0].Id.ToString();
+
+                    nodes.AddRange(ConvertSteps(childrenNodes, compensates));
+                }
+
+                var stepCps = compensates.Where(x => Equals(x.ParentId, step.Id)).ToArray();
+                if (stepCps.Any())
+                {
+                    source.CompensateWith.AddRange(ConvertCompensateSteps(stepCps));
+                }
+
+                nodes.Add(source);
+            }
+
+            return nodes;
+        }
+
+        private List<StepSourceV1> ConvertCompensateSteps(
+            ICollection<CompensateNode> compensates)
+        {
+            var nodes = new List<StepSourceV1>();
+
+            foreach (var step in compensates)
+            {
+                var source = new StepSourceV1
+                {
+                    Id = step.Id.ToString(),
+                    Saga = step.Saga,
+                    StepType = step.StepType,
+                    CancelCondition = step.CancelCondition,
+                    ErrorBehavior = step.ErrorBehavior,
+                    RetryInterval = step.RetryInterval,
+                    Name = step.Name
+                };
+
+                foreach (var input in step.Inputs)
+                {
+                    source.Inputs.AddIfNotContains(input);
+                }
+
+                foreach (var output in step.Outputs)
+                {
+                    source.Outputs.Add(output.Key, output.Value.ToString());
+                }
+
+                foreach (var nextStep in step.SelectNextStep)
+                {
+                    source.SelectNextStep.Add(nextStep.Key, nextStep.Value.ToString());
+                }
+
+                var stepCps = compensates.Where(x => Equals(x.ParentId, step.Id)).ToArray();
+                if (stepCps.Any())
+                {
+                    source.CompensateWith.AddRange(ConvertCompensateSteps(stepCps));
+                }
+
+                nodes.Add(source);
+            }
+
+            return nodes;
+        }
+
+        private WorkflowDefinition Convert(DefinitionSourceV1 source)
+        {
+            var dataType = typeof(object);
+            if (!string.IsNullOrEmpty(source.DataType))
+                dataType = FindType(source.DataType);
+
+            var result = new WorkflowDefinition
+            {
+                Id = source.Id,
+                Version = source.Version,
+                Steps = ConvertSteps(source.Steps, dataType),
+                DefaultErrorBehavior = source.DefaultErrorBehavior,
+                DefaultErrorRetryInterval = source.DefaultErrorRetryInterval,
+                Description = source.Description,
+                DataType = dataType
+            };
+
+            return result;
+        }
+
+
+        private WorkflowStepCollection ConvertSteps(ICollection<StepSourceV1> source, Type dataType)
+        {
+            var result = new WorkflowStepCollection();
+            int i = 0;
+            var stack = new Stack<StepSourceV1>(source.Reverse<StepSourceV1>());
+            var parents = new List<StepSourceV1>();
+            var compensatables = new List<StepSourceV1>();
+
+            while (stack.Count > 0)
+            {
+                var nextStep = stack.Pop();
+
+                var stepType = FindType(nextStep.StepType);
+
+                WorkflowStep targetStep;
+
+                Type containerType;
+                if (stepType.GetInterfaces().Contains(typeof(IStepBody)))
+                {
+                    containerType = typeof(WorkflowStep<>).MakeGenericType(stepType);
+
+                    targetStep = (containerType.GetConstructor(new Type[] { }).Invoke(null) as WorkflowStep);
+                }
+                else
+                {
+                    targetStep = stepType.GetConstructor(new Type[] { }).Invoke(null) as WorkflowStep;
+                    if (targetStep != null)
+                        stepType = targetStep.BodyType;
+                }
+
+                if (nextStep.Saga)
+                {
+                    containerType = typeof(SagaContainer<>).MakeGenericType(stepType);
+                    targetStep = (containerType.GetConstructor(new Type[] { }).Invoke(null) as WorkflowStep);
+                }
+
+                if (!string.IsNullOrEmpty(nextStep.CancelCondition))
+                {
+                    var cancelExprType = typeof(Expression<>).MakeGenericType(typeof(Func<,>).MakeGenericType(dataType, typeof(bool)));
+                    var dataParameter = Expression.Parameter(dataType, "data");
+                    var cancelExpr = DynamicExpressionParser.ParseLambda(new[] { dataParameter }, typeof(bool), nextStep.CancelCondition);
+                    targetStep.CancelCondition = cancelExpr;
+                }
+
+                targetStep.Id = i;
+                targetStep.Name = nextStep.Name;
+                targetStep.ErrorBehavior = nextStep.ErrorBehavior;
+                targetStep.RetryInterval = nextStep.RetryInterval;
+                targetStep.ExternalId = $"{nextStep.Id}";
+
+                AttachInputs(nextStep, dataType, stepType, targetStep);
+                AttachOutputs(nextStep, dataType, stepType, targetStep);
+
+                if (nextStep.Do != null)
+                {
+                    foreach (var branch in nextStep.Do)
+                    {
+                        foreach (var child in branch.Reverse<StepSourceV1>())
+                            stack.Push(child);
+                    }
+
+                    if (nextStep.Do.Count > 0)
+                        parents.Add(nextStep);
+                }
+
+                if (nextStep.CompensateWith != null)
+                {
+                    foreach (var compChild in nextStep.CompensateWith.Reverse<StepSourceV1>())
+                        stack.Push(compChild);
+
+                    if (nextStep.CompensateWith.Count > 0)
+                        compensatables.Add(nextStep);
+                }
+
+                AttachOutcomes(nextStep, dataType, targetStep);
+
+                result.Add(targetStep);
+
+                i++;
+            }
+
+            foreach (var step in result)
+            {
+                if (result.Any(x => x.ExternalId == step.ExternalId && x.Id != step.Id))
+                    throw new WorkflowDefinitionLoadException($"Duplicate step Id {step.ExternalId}");
+
+                foreach (var outcome in step.Outcomes)
+                {
+                    if (result.All(x => x.ExternalId != outcome.ExternalNextStepId))
+                        throw new WorkflowDefinitionLoadException($"Cannot find step id {outcome.ExternalNextStepId}");
+
+                    outcome.NextStep = result.Single(x => x.ExternalId == outcome.ExternalNextStepId).Id;
+                }
+            }
+
+            foreach (var parent in parents)
+            {
+                var target = result.Single(x => x.ExternalId == parent.Id);
+                foreach (var branch in parent.Do)
+                {
+                    var childTags = branch.Select(x => x.Id).ToList();
+                    target.Children.AddRange(result
+                        .Where(x => childTags.Contains(x.ExternalId))
+                        .OrderBy(x => x.Id)
+                        .Select(x => x.Id)
+                        .Take(1)
+                        .ToList());
+                }
+            }
+
+            foreach (var item in compensatables)
+            {
+                var target = result.Single(x => x.ExternalId == item.Id);
+                var tag = item.CompensateWith.Select(x => x.Id).FirstOrDefault();
+                if (tag != null)
+                {
+                    var compStep = result.FirstOrDefault(x => x.ExternalId == tag);
+                    if (compStep != null)
+                        target.CompensationStepId = compStep.Id;
+                }
+            }
+
+            return result;
+        }
+
+        private void AttachInputs(StepSourceV1 source, Type dataType, Type stepType, WorkflowStep step)
+        {
+            foreach (var input in source.Inputs)
+            {
+                var dataParameter = Expression.Parameter(dataType, "data");
+                var contextParameter = Expression.Parameter(typeof(IStepExecutionContext), "context");
+                var environmentVarsParameter = Expression.Parameter(typeof(IDictionary), "environment");
+                var stepProperty = stepType.GetProperty(input.Key);
+
+                if (stepProperty == null)
+                {
+                    throw new ArgumentException($"Unknown property for input {input.Key} on {source.Id}");
+                }
+
+                if (input.Value is string)
+                {
+                    var acn = BuildScalarInputAction(input, dataParameter, contextParameter, environmentVarsParameter, stepProperty);
+                    step.Inputs.Add(new ActionParameter<IStepBody, object>(acn));
+                    continue;
+                }
+
+                if ((input.Value is IDictionary<string, object>) || (input.Value is IDictionary<object, object>))
+                {
+                    var acn = BuildObjectInputAction(input, dataParameter, contextParameter, environmentVarsParameter, stepProperty);
+                    step.Inputs.Add(new ActionParameter<IStepBody, object>(acn));
+                    continue;
+                }
+
+                throw new ArgumentException($"Unknown type for input {input.Key} on {source.Id}");
+            }
+        }
+
+        private void AttachOutputs(StepSourceV1 source, Type dataType, Type stepType, WorkflowStep step)
+        {
+            foreach (var output in source.Outputs)
+            {
+                var stepParameter = Expression.Parameter(stepType, "step");
+                var sourceExpr = DynamicExpressionParser.ParseLambda(new[] { stepParameter }, typeof(object), output.Value);
+
+                var dataParameter = Expression.Parameter(dataType, "data");
+
+
+                if (output.Key.Contains(".") || output.Key.Contains("["))
+                {
+                    AttachNestedOutput(output, step, source, sourceExpr, dataParameter);
+                }
+                else
+                {
+                    AttachDirectlyOutput(output, step, dataType, sourceExpr, dataParameter);
+                }
+            }
+        }
+
+        private void AttachDirectlyOutput(KeyValuePair<string, string> output, WorkflowStep step, Type dataType, LambdaExpression sourceExpr, ParameterExpression dataParameter)
+        {
+            Expression targetProperty;
+
+            // Check if our datatype has a matching property
+            var propertyInfo = dataType.GetProperty(output.Key);
+            if (propertyInfo != null)
+            {
+                targetProperty = Expression.Property(dataParameter, propertyInfo);
+                var targetExpr = Expression.Lambda(targetProperty, dataParameter);
+                step.Outputs.Add(new MemberMapParameter(sourceExpr, targetExpr));
+            }
+            else
+            {
+                // If we did not find a matching property try to find a Indexer with string parameter
+                propertyInfo = dataType.GetProperty("Item");
+                targetProperty = Expression.Property(dataParameter, propertyInfo, Expression.Constant(output.Key));
+
+                Action<IStepBody, object> acn = (pStep, pData) =>
+                {
+                    object resolvedValue = sourceExpr.Compile().DynamicInvoke(pStep); ;
+                    propertyInfo.SetValue(pData, resolvedValue, new object[] { output.Key });
+                };
+
+                step.Outputs.Add(new ActionParameter<IStepBody, object>(acn));
+            }
+
+        }
+
+        private void AttachNestedOutput(KeyValuePair<string, string> output, WorkflowStep step, StepSourceV1 source, LambdaExpression sourceExpr, ParameterExpression dataParameter)
+        {
+            PropertyInfo propertyInfo = null;
+            String[] paths = output.Key.Split('.');
+
+            Expression targetProperty = dataParameter;
+
+            bool hasAddOutput = false;
+
+            foreach (String propertyName in paths)
+            {
+                if (hasAddOutput)
+                {
+                    throw new ArgumentException($"Unknown property for output {output.Key} on {source.Id}");
+                }
+
+                if (targetProperty == null)
+                {
+                    break;
+                }
+
+                if (propertyName.Contains("["))
+                {
+                    String[] items = propertyName.Split('[');
+
+                    if (items.Length != 2)
+                    {
+                        throw new ArgumentException($"Unknown property for output {output.Key} on {source.Id}");
+                    }
+
+                    items[1] = items[1].Trim().TrimEnd(']').Trim().Trim('"');
+
+                    MemberExpression memberExpression = Expression.Property(targetProperty, items[0]);
+
+                    if (memberExpression == null)
+                    {
+                        throw new ArgumentException($"Unknown property for output {output.Key} on {source.Id}");
+                    }
+                    propertyInfo = ((PropertyInfo)memberExpression.Member).PropertyType.GetProperty("Item");
+
+                    Action<IStepBody, object> acn = (pStep, pData) =>
+                    {
+                        var targetExpr = Expression.Lambda(memberExpression, dataParameter);
+                        object data = targetExpr.Compile().DynamicInvoke(pData);
+                        object resolvedValue = sourceExpr.Compile().DynamicInvoke(pStep); ;
+                        propertyInfo.SetValue(data, resolvedValue, new object[] { items[1] });
+                    };
+
+                    step.Outputs.Add(new ActionParameter<IStepBody, object>(acn));
+                    hasAddOutput = true;
+                }
+                else
+                {
+                    try
+                    {
+                        targetProperty = Expression.Property(targetProperty, propertyName);
+                    }
+                    catch
+                    {
+                        targetProperty = null;
+                        break;
+                    }
+                }
+            }
+
+            if (targetProperty != null && !hasAddOutput)
+            {
+                var targetExpr = Expression.Lambda(targetProperty, dataParameter);
+                step.Outputs.Add(new MemberMapParameter(sourceExpr, targetExpr));
+            }
+        }
+
+        private void AttachOutcomes(StepSourceV1 source, Type dataType, WorkflowStep step)
+        {
+            if (!string.IsNullOrEmpty(source.NextStepId))
+                step.Outcomes.Add(new ValueOutcome { ExternalNextStepId = $"{source.NextStepId}" });
+
+            var dataParameter = Expression.Parameter(dataType, "data");
+            var outcomeParameter = Expression.Parameter(typeof(object), "outcome");
+
+            foreach (var nextStep in source.SelectNextStep)
+            {
+                var sourceDelegate = DynamicExpressionParser.ParseLambda(new[] { dataParameter, outcomeParameter }, typeof(object), nextStep.Value).Compile();
+                Expression<Func<object, object, bool>> sourceExpr = (data, outcome) => System.Convert.ToBoolean(sourceDelegate.DynamicInvoke(data, outcome));
+                step.Outcomes.Add(new ExpressionOutcome<object>(sourceExpr)
+                {
+                    ExternalNextStepId = $"{nextStep.Key}"
+                });
+            }
+        }
+
+        private Type FindType(string name)
+        {
+            return Type.GetType(name, true, true);
+        }
+
+        private static Action<IStepBody, object, IStepExecutionContext> BuildScalarInputAction(KeyValuePair<string, object> input, ParameterExpression dataParameter, ParameterExpression contextParameter, ParameterExpression environmentVarsParameter, PropertyInfo stepProperty)
+        {
+            var expr = System.Convert.ToString(input.Value);
+            var sourceExpr = DynamicExpressionParser.ParseLambda(new[] { dataParameter, contextParameter, environmentVarsParameter }, typeof(object), expr);
+
+            void acn(IStepBody pStep, object pData, IStepExecutionContext pContext)
+            {
+                object resolvedValue = sourceExpr.Compile().DynamicInvoke(pData, pContext, Environment.GetEnvironmentVariables());
+                if (stepProperty.PropertyType.IsEnum)
+                    stepProperty.SetValue(pStep, Enum.Parse(stepProperty.PropertyType, (string)resolvedValue, true));
+                else
+                {
+                    if ((resolvedValue != null) && (stepProperty.PropertyType.IsAssignableFrom(resolvedValue.GetType())))
+                        stepProperty.SetValue(pStep, resolvedValue);
+                    else
+                        stepProperty.SetValue(pStep, System.Convert.ChangeType(resolvedValue, stepProperty.PropertyType));
+                }
+            }
+            return acn;
+        }
+
+        private static Action<IStepBody, object, IStepExecutionContext> BuildObjectInputAction(KeyValuePair<string, object> input, ParameterExpression dataParameter, ParameterExpression contextParameter, ParameterExpression environmentVarsParameter, PropertyInfo stepProperty)
+        {
+            void acn(IStepBody pStep, object pData, IStepExecutionContext pContext)
+            {
+                var stack = new Stack<JObject>();
+                var destObj = JObject.FromObject(input.Value);
+                stack.Push(destObj);
+
+                while (stack.Count > 0)
+                {
+                    var subobj = stack.Pop();
+                    foreach (var prop in subobj.Properties().ToList())
+                    {
+                        if (prop.Name.StartsWith("@"))
+                        {
+                            var sourceExpr = DynamicExpressionParser.ParseLambda(new[] { dataParameter, contextParameter, environmentVarsParameter }, typeof(object), prop.Value.ToString());
+                            object resolvedValue = sourceExpr.Compile().DynamicInvoke(pData, pContext, Environment.GetEnvironmentVariables());
+                            subobj.Remove(prop.Name);
+                            subobj.Add(prop.Name.TrimStart('@'), JToken.FromObject(resolvedValue));
+                        }
+                    }
+
+                    foreach (var child in subobj.Children<JObject>())
+                        stack.Push(child);
+                }
+
+                stepProperty.SetValue(pStep, destObj);
+            }
+            return acn;
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegisterService.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegisterService.cs
new file mode 100644
index 000000000..0869e8f4a
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegisterService.cs
@@ -0,0 +1,22 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public class WorkflowRegisterService : BackgroundService
+    {
+        private readonly IWorkflowRegistryManager _registryManager;
+
+        public WorkflowRegisterService(
+            IWorkflowRegistryManager registryManager)
+        {
+            _registryManager = registryManager;
+        }
+
+        protected override async Task ExecuteAsync(CancellationToken stoppingToken)
+        {
+            await _registryManager.RegisterAsync(stoppingToken);
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegistryManager.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegistryManager.cs
new file mode 100644
index 000000000..c49cc0b6c
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.Domain/LINGYUN/Abp/WorkflowManagement/WorkflowRegistryManager.cs
@@ -0,0 +1,48 @@
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace LINGYUN.Abp.WorkflowManagement
+{
+    public class WorkflowRegistryManager : IWorkflowRegistryManager, ITransientDependency
+    {
+        private readonly WorkflowManager _workflowManager;
+
+        private readonly IWorkflowRepository _workflowRepository;
+        private readonly IStepNodeRepository _stepNodeRepository;
+        private readonly ICompensateNodeRepository _compensateNodeRepository;
+
+        public WorkflowRegistryManager(
+            WorkflowManager workflowManager,
+            IWorkflowRepository workflowRepository,
+            IStepNodeRepository stepNodeRepository,
+            ICompensateNodeRepository compensateNodeRepository)
+        {
+            _workflowManager = workflowManager;
+            _workflowRepository = workflowRepository;
+            _stepNodeRepository = stepNodeRepository;
+            _compensateNodeRepository = compensateNodeRepository;
+        }
+
+        public virtual async Task RegisterAsync(CancellationToken cancellationToken = default)
+        {
+            // TODO: 多租户如何注册?
+
+            var workflows = await _workflowRepository
+                .GetListAsync(x => x.IsEnabled, cancellationToken: cancellationToken);
+
+            foreach (var workflow in workflows)
+            {
+                if (!_workflowManager.IsRegistered(workflow))
+                {
+                    var stepNodes = await _stepNodeRepository
+                        .GetAllChildrenWithWorkflowAsync(workflow.Id, cancellationToken: cancellationToken);
+                    var compensateNodes = await _compensateNodeRepository
+                        .GetAllChildrenWithWorkflowAsync(workflow.Id, cancellationToken: cancellationToken);
+
+                    _workflowManager.Register(workflow, stepNodes, compensateNodes);
+                }
+            }
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/EfCoreCompensateNodeRepository.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/EfCoreCompensateNodeRepository.cs
new file mode 100644
index 000000000..6c5e69367
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/EfCoreCompensateNodeRepository.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore
+{
+    public class EfCoreCompensateNodeRepository : EfCoreRepository<WorkflowManagementDbContext, CompensateNode, Guid>, ICompensateNodeRepository
+    {
+        public EfCoreCompensateNodeRepository(
+            IDbContextProvider<WorkflowManagementDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+
+        public virtual async Task<List<CompensateNode>> GetAllChildrenWithWorkflowAsync(Guid workflowId, CancellationToken cancellationToken = default)
+        {
+            return await (await GetDbSetAsync())
+                .Where(x => x.WorkflowId.Equals(workflowId))
+                .ToListAsync(GetCancellationToken(cancellationToken));
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/EfCoreStepNodeRepository.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/EfCoreStepNodeRepository.cs
new file mode 100644
index 000000000..96c3d43ea
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/EfCoreStepNodeRepository.cs
@@ -0,0 +1,27 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore
+{
+    public class EfCoreStepNodeRepository : EfCoreRepository<WorkflowManagementDbContext, StepNode, Guid>, IStepNodeRepository
+    {
+        public EfCoreStepNodeRepository(
+            IDbContextProvider<WorkflowManagementDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+
+        public virtual async Task<List<StepNode>> GetAllChildrenWithWorkflowAsync(Guid workflowId, CancellationToken cancellationToken = default)
+        {
+            return await (await GetDbSetAsync())
+                .Where(x => x.WorkflowId.Equals(workflowId))
+                .ToListAsync(GetCancellationToken(cancellationToken));
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/EfCoreWorkflowRepository.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/EfCoreWorkflowRepository.cs
new file mode 100644
index 000000000..e26001568
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/EfCoreWorkflowRepository.cs
@@ -0,0 +1,33 @@
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore
+{
+    public class EfCoreWorkflowRepository : EfCoreRepository<WorkflowManagementDbContext, Workflow, Guid>, IWorkflowRepository
+    {
+        public EfCoreWorkflowRepository(
+            IDbContextProvider<WorkflowManagementDbContext> dbContextProvider)
+            : base(dbContextProvider)
+        {
+        }
+
+        public virtual async Task<bool> CheckVersionAsync(string name, int version, CancellationToken cancellationToken = default)
+        {
+            return await (await GetDbSetAsync())
+                .AnyAsync(x => x.Name.Equals(name) && x.Version == version,
+                    GetCancellationToken(cancellationToken));
+        }
+
+        public override async Task<IQueryable<Workflow>> WithDetailsAsync()
+        {
+            var queryable = await base.WithDetailsAsync();
+
+            return queryable.Include(x => x.Datas);
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/WorkflowManagementDbContextModelCreatingExtensions.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/WorkflowManagementDbContextModelCreatingExtensions.cs
index 7d88cc563..6482a0138 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/WorkflowManagementDbContextModelCreatingExtensions.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/WorkflowManagementDbContextModelCreatingExtensions.cs
@@ -1,6 +1,10 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using System;
 using Volo.Abp;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+using Volo.Abp.EntityFrameworkCore.ValueComparers;
+using Volo.Abp.EntityFrameworkCore.ValueConverters;
 
 namespace LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore
 {
@@ -17,6 +21,66 @@ namespace LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore
                 WorkflowManagementDbProperties.DbSchema
             );
             optionsAction?.Invoke(options);
+
+            builder.Entity<Workflow>(b =>
+            {
+                b.ToTable(options.TablePrefix + "Definition", options.Schema);
+
+                b.Property(p => p.DisplayName).HasMaxLength(WorkflowConsts.MaxDisplayNameLength);
+                b.Property(p => p.Name).HasMaxLength(WorkflowConsts.MaxNameLength).IsRequired();
+                b.Property(p => p.Description).HasMaxLength(WorkflowConsts.MaxDescriptionLength);
+
+                b.HasMany(u => u.Datas).WithOne().HasForeignKey(uc => uc.WorkflowId).IsRequired();
+
+                b.ConfigureByConvention();
+            });
+
+            builder.Entity<WorkflowData>(b =>
+            {
+                b.ToTable(options.TablePrefix + "DefinitionData", options.Schema);
+
+                b.Property(p => p.DisplayName).HasMaxLength(WorkflowDataConsts.MaxDisplayNameLength).IsRequired();
+                b.Property(p => p.Name).HasMaxLength(WorkflowDataConsts.MaxNameLength).IsRequired();
+
+                b.HasIndex(p => p.WorkflowId);
+
+                b.ConfigureByConvention();
+            });
+
+            builder.Entity<StepNode>(b =>
+            {
+                b.ToTable(options.TablePrefix + "Step", options.Schema);
+
+                b.ConfigureStep();
+                b.ConfigureByConvention();
+            });
+
+            builder.Entity<CompensateNode>(b =>
+            {
+                b.ToTable(options.TablePrefix + "Compensate", options.Schema);
+
+                b.ConfigureStep();
+                b.ConfigureByConvention();
+            });
+        }
+
+        public static void ConfigureStep<TStep>(
+            this EntityTypeBuilder<TStep> builder)
+            where TStep : Step
+        {
+            builder.Property(p => p.CancelCondition).HasMaxLength(WorkflowConsts.MaxCancelConditionLength);
+            builder.Property(p => p.Name).HasMaxLength(WorkflowConsts.MaxNameLength);
+            builder.Property(p => p.StepType).HasMaxLength(WorkflowConsts.MaxStepTypeLength);
+
+            builder.Property(p => p.Inputs)
+                .HasConversion(new ExtraPropertiesValueConverter(builder.Metadata.ClrType))
+                .Metadata.SetValueComparer(new ExtraPropertyDictionaryValueComparer());
+            builder.Property(p => p.Outputs)
+                .HasConversion(new ExtraPropertiesValueConverter(builder.Metadata.ClrType))
+                .Metadata.SetValueComparer(new ExtraPropertyDictionaryValueComparer());
+            builder.Property(p => p.SelectNextStep)
+                .HasConversion(new ExtraPropertiesValueConverter(builder.Metadata.ClrType))
+                .Metadata.SetValueComparer(new ExtraPropertyDictionaryValueComparer());
         }
     }
 }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/WorkflowManagementEntityFrameworkCoreModule.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/WorkflowManagementEntityFrameworkCoreModule.cs
index 424a5e701..f41fe9523 100644
--- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/WorkflowManagementEntityFrameworkCoreModule.cs
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore/LINGYUN/Abp/WorkflowManagement/EntityFrameworkCore/WorkflowManagementEntityFrameworkCoreModule.cs
@@ -13,7 +13,9 @@ namespace LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore
         {
             context.Services.AddAbpDbContext<WorkflowManagementDbContext>(options =>
             {
-                options.AddDefaultRepositories(includeAllEntities: true);
+                options.AddRepository<Workflow, EfCoreWorkflowRepository>();
+                options.AddRepository<StepNode, EfCoreStepNodeRepository>();
+                options.AddRepository<CompensateNode, EfCoreCompensateNodeRepository>();
             });
         }
     }
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Activitys/ActivityController.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Activitys/ActivityController.cs
new file mode 100644
index 000000000..12e81bc2a
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Activitys/ActivityController.cs
@@ -0,0 +1,44 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace LINGYUN.Abp.WorkflowManagement.Activitys
+{
+    [RemoteService(Name = WorkflowManagementRemoteServiceConsts.RemoteServiceName)]
+    [Area("WorkflowManagement")]
+    [Route("api/workflow-management/activitys")]
+    public class ActivityController : AbpControllerBase, IActivityAppService
+    {
+        private readonly IActivityAppService _service;
+
+        public ActivityController(IActivityAppService service)
+        {
+            _service = service;
+        }
+
+        [HttpPost("fail/{token}")]
+        public virtual async Task FailureAsync(ActivityFailureInput input)
+        {
+            await _service.FailureAsync(input);
+        }
+
+        [HttpGet("{ActivityName}")]
+        public virtual async Task<PendingActivityDto> GetAsync(GetPendingActivityInput input)
+        {
+            return await _service.GetAsync(input);
+        }
+
+        [HttpDelete("{Token}")]
+        public virtual async Task DeleteAsync(ActivityReleaseInput input)
+        {
+            await _service.DeleteAsync(input);
+        }
+
+        [HttpPost("success/{Token}")]
+        public virtual async Task SuccessAsync(ActivitySuccessInput input)
+        {
+            await _service.SuccessAsync(input);
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Engine/EngineController.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Engine/EngineController.cs
new file mode 100644
index 000000000..cf6c9727c
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Engine/EngineController.cs
@@ -0,0 +1,34 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace LINGYUN.Abp.WorkflowManagement.Engine
+{
+    [RemoteService(Name = WorkflowManagementRemoteServiceConsts.RemoteServiceName)]
+    [Area("WorkflowManagement")]
+    [Route("api/workflow-management/engine")]
+    public class EngineController : AbpControllerBase, IEngineAppService
+    {
+        private readonly IEngineAppService _service;
+
+        public EngineController(IEngineAppService service)
+        {
+            _service = service;
+        }
+
+        [HttpPost]
+        [Route("initialize")]
+        public virtual async Task InitializeAsync()
+        {
+            await _service.InitializeAsync();
+        }
+
+        [HttpPost]
+        [Route("register")]
+        public virtual async Task RegisterAsync()
+        {
+            await _service.RegisterAsync();
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Events/EventController.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Events/EventController.cs
new file mode 100644
index 000000000..fc3ef545f
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Events/EventController.cs
@@ -0,0 +1,27 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace LINGYUN.Abp.WorkflowManagement.Events
+{
+    [RemoteService(Name = WorkflowManagementRemoteServiceConsts.RemoteServiceName)]
+    [Area("WorkflowManagement")]
+    [Route("api/workflow-management/events")]
+    public class EventController : AbpControllerBase, IEventAppService
+    {
+        private readonly IEventAppService _service;
+
+        public EventController(IEventAppService service)
+        {
+            _service = service;
+        }
+
+        [HttpPost]
+        [Route("{EventName}/{EventKey}")]
+        public virtual async Task PublishAsync(EventPublishInput input)
+        {
+            await _service.PublishAsync(input);
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowController.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowController.cs
new file mode 100644
index 000000000..8fd0656ca
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowController.cs
@@ -0,0 +1,56 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    [RemoteService(Name = WorkflowManagementRemoteServiceConsts.RemoteServiceName)]
+    [Area("WorkflowManagement")]
+    [Route("api/workflow-management/workflows")]
+    public class WorkflowController : AbpControllerBase, IWorkflowAppService
+    {
+        private readonly IWorkflowAppService _service;
+
+        public WorkflowController(IWorkflowAppService service)
+        {
+            _service = service;
+        }
+
+        [HttpGet]
+        [Route("{id}")]
+        public virtual async Task<WorkflowInstanceDto> GetAsync(string id)
+        {
+            return await _service.GetAsync(id);
+        }
+
+        [HttpPut]
+        [Route("{id}/resume")]
+        public virtual async Task ResumeAsync(string id)
+        {
+            await _service.ResumeAsync(id);
+        }
+
+        [HttpPost]
+        [Route("{id}/start")]
+        public virtual async Task<WorkflowInstanceDto> StartAsync(Guid id, WorkflowStartInput input)
+        {
+            return await _service.StartAsync(id, input);
+        }
+
+        [HttpPut]
+        [Route("{id}/suspend")]
+        public virtual async Task SuspendAsync(string id)
+        {
+            await _service.SuspendAsync(id);
+        }
+
+        [HttpPut]
+        [Route("{id}/terminate")]
+        public virtual async Task TerminateAsync(string id)
+        {
+            await _service.TerminateAsync(id);
+        }
+    }
+}
diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowDefinitionController.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowDefinitionController.cs
new file mode 100644
index 000000000..fd467ab09
--- /dev/null
+++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowManagement.HttpApi/LINGYUN/Abp/WorkflowManagement/Workflows/WorkflowDefinitionController.cs
@@ -0,0 +1,42 @@
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Threading.Tasks;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace LINGYUN.Abp.WorkflowManagement.Workflows
+{
+    [RemoteService(Name = WorkflowManagementRemoteServiceConsts.RemoteServiceName)]
+    [Area("WorkflowManagement")]
+    [Route("api/workflow-management/workflows/definition")]
+    public class WorkflowDefinitionController : AbpControllerBase, IWorkflowDefinitionAppService
+    {
+        private readonly IWorkflowDefinitionAppService _service;
+
+        public WorkflowDefinitionController(
+            IWorkflowDefinitionAppService service)
+        {
+            _service = service;
+        }
+
+        [HttpPost]
+        public virtual async Task<WorkflowDto> CreateAsync(WorkflowDefinitionCreateDto input)
+        {
+            return await _service.CreateAsync(input);
+        }
+
+        [HttpDelete]
+        [Route("{id}")]
+        public virtual async Task DeleteAsync(Guid id)
+        {
+            await _service.DeleteAsync(id);
+        }
+
+        [HttpGet]
+        [Route("{id}")]
+        public virtual async Task<WorkflowDto> GetAsync(Guid id)
+        {
+            return await _service.GetAsync(id);
+        }
+    }
+}
diff --git a/aspnet-core/services/.gitignore b/aspnet-core/services/.gitignore
index ee6673ebd..fe0a31716 100644
--- a/aspnet-core/services/.gitignore
+++ b/aspnet-core/services/.gitignore
@@ -1 +1,2 @@
-Modules
\ No newline at end of file
+Modules
+file-blob-storing
\ No newline at end of file
diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/AccountSettingDefinitionProvider.cs b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/AccountSettingDefinitionProvider.cs
index ec4418ad7..fd9cf3bbb 100644
--- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/AccountSettingDefinitionProvider.cs
+++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/Settings/AccountSettingDefinitionProvider.cs
@@ -15,7 +15,12 @@ public class AccountSettingDefinitionProvider : SettingDefinitionProvider
                 AccountSettingNames.IsSelfRegistrationEnabled,
                 "true",
                 L("DisplayName:Abp.Account.IsSelfRegistrationEnabled"),
-                L("Description:Abp.Account.IsSelfRegistrationEnabled"), isVisibleToClients: true)
+                L("Description:Abp.Account.IsSelfRegistrationEnabled"),
+                isVisibleToClients: true)
+            .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName)
         );
 
         context.Add(
@@ -23,7 +28,12 @@ public class AccountSettingDefinitionProvider : SettingDefinitionProvider
                 AccountSettingNames.EnableLocalLogin,
                 "true",
                 L("DisplayName:Abp.Account.EnableLocalLogin"),
-                L("Description:Abp.Account.EnableLocalLogin"), isVisibleToClients: true)
+                L("Description:Abp.Account.EnableLocalLogin"),
+                isVisibleToClients: true)
+            .WithProviders(
+                    DefaultValueSettingValueProvider.ProviderName,
+                    GlobalSettingValueProvider.ProviderName,
+                    TenantSettingValueProvider.ProviderName)
         );
     }
 
diff --git a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json
index 909453a8c..7491b882c 100644
--- a/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json
+++ b/aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/appsettings.Development.json
@@ -31,7 +31,8 @@
       "DefaultGroupName": "BackendAdmin",
       "Version": "v1",
       "FailedRetryInterval": 300,
-      "FailedRetryCount": 10
+      "FailedRetryCount": 10,
+      "CollectorCleaningInterval": 3600000
     },
     "MySql": {
       "TableNamePrefix": "admin",
diff --git a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json
index 5cf6b2c22..e0f8327fd 100644
--- a/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json
+++ b/aspnet-core/services/LY.MicroService.LocalizationManagement.HttpApi.Host/appsettings.Development.json
@@ -22,7 +22,8 @@
       "DefaultGroupName": "Localization-Management",
       "Version": "v1",
       "FailedRetryInterval": 300,
-      "FailedRetryCount": 10
+      "FailedRetryCount": 10,
+      "CollectorCleaningInterval": 3600000
     },
     "MySql": {
       "TableNamePrefix": "lta",
diff --git a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json
index 6daef1e60..090b239ce 100644
--- a/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json
+++ b/aspnet-core/services/LY.MicroService.PlatformManagement.HttpApi.Host/appsettings.Development.json
@@ -53,7 +53,8 @@
       "DefaultGroupName": "Platform",
       "Version": "v1",
       "FailedRetryInterval": 300,
-      "FailedRetryCount": 10
+      "FailedRetryCount": 10,
+      "CollectorCleaningInterval": 3600000
     },
     "MySql": {
       "TableNamePrefix": "plt",
diff --git a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json
index 8cd5237a5..ae590fb5f 100644
--- a/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json
+++ b/aspnet-core/services/LY.MicroService.RealtimeMessage.HttpApi.Host/appsettings.Development.json
@@ -60,7 +60,8 @@
       "DefaultGroupName": "MessageService",
       "Version": "v1",
       "FailedRetryInterval": 300,
-      "FailedRetryCount": 10
+      "FailedRetryCount": 10,
+      "CollectorCleaningInterval": 3600000
     },
     "MySql": {
       "TableNamePrefix": "msg",
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Controllers/HomeController.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Controllers/HomeController.cs
new file mode 100644
index 000000000..e1e61391a
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Controllers/HomeController.cs
@@ -0,0 +1,12 @@
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc;
+
+namespace LY.MicroService.WorkflowManagement.Controllers;
+
+public class HomeController : AbpController
+{
+    public IActionResult Index()
+    {
+        return Redirect("/swagger/index.html");
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Dockerfile b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Dockerfile
new file mode 100644
index 000000000..9fe768091
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Dockerfile
@@ -0,0 +1,15 @@
+FROM mcr.microsoft.com/dotnet/aspnet:5.0
+LABEL maintainer="colin.in@foxmail.com"
+WORKDIR /app
+
+COPY . /app
+
+#东8区
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone
+
+EXPOSE 80/tcp
+VOLUME [ "./app/Logs" ]
+VOLUME [ "./app/Modules" ]
+
+ENTRYPOINT ["dotnet", "LY.MicroService.WorkflowManagement.HttpApi.Host.dll"]
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/EntityFrameworkCore/WorkflowManagementMigrationsDbContext.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/EntityFrameworkCore/WorkflowManagementMigrationsDbContext.cs
new file mode 100644
index 000000000..44bbb3b19
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/EntityFrameworkCore/WorkflowManagementMigrationsDbContext.cs
@@ -0,0 +1,23 @@
+using LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore;
+using LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace LY.MicroService.WorkflowManagement.EntityFrameworkCore;
+
+public class WorkflowManagementMigrationsDbContext : AbpDbContext<WorkflowManagementMigrationsDbContext>
+{
+    public WorkflowManagementMigrationsDbContext(DbContextOptions<WorkflowManagementMigrationsDbContext> options)
+        : base(options)
+    {
+
+    }
+
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        base.OnModelCreating(modelBuilder);
+
+        modelBuilder.ConfigureWorkflow();
+        modelBuilder.ConfigureWorkflowManagement();
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/EntityFrameworkCore/WorkflowManagementMigrationsDbContextFactory.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/EntityFrameworkCore/WorkflowManagementMigrationsDbContextFactory.cs
new file mode 100644
index 000000000..fbb81a49c
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/EntityFrameworkCore/WorkflowManagementMigrationsDbContextFactory.cs
@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Design;
+using Microsoft.Extensions.Configuration;
+using System.IO;
+
+namespace LY.MicroService.WorkflowManagement.EntityFrameworkCore;
+
+public class WorkflowManagementMigrationsDbContextFactory : IDesignTimeDbContextFactory<WorkflowManagementMigrationsDbContext>
+{
+    public WorkflowManagementMigrationsDbContext CreateDbContext(string[] args)
+    {
+        var configuration = BuildConfiguration();
+        var connectionString = configuration.GetConnectionString("WorkflowManagement");
+
+        var builder = new DbContextOptionsBuilder<WorkflowManagementMigrationsDbContext>()
+            .UseMySql(connectionString, ServerVersion.AutoDetect(connectionString));
+
+        return new WorkflowManagementMigrationsDbContext(builder.Options);
+    }
+
+    private static IConfigurationRoot BuildConfiguration()
+    {
+        var builder = new ConfigurationBuilder()
+            .SetBasePath(Directory.GetCurrentDirectory())
+            .AddJsonFile("appsettings.json", optional: false)
+            .AddJsonFile("appsettings.Development.json", optional: true);
+
+        return builder.Build();
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/EventBus/Handlers/TenantSynchronizer.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/EventBus/Handlers/TenantSynchronizer.cs
new file mode 100644
index 000000000..02037aa6b
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/EventBus/Handlers/TenantSynchronizer.cs
@@ -0,0 +1,69 @@
+using LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore;
+using LINGYUN.Abp.Data.DbMigrator;
+using LINGYUN.Abp.MultiTenancy;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using System.Threading.Tasks;
+using Volo.Abp.Data;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.EventBus.Distributed;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Uow;
+
+namespace LY.MicroService.WorkflowManagement.EventBus.Handlers;
+
+public class TenantSynchronizer :
+        IDistributedEventHandler<CreateEventData>,
+        ITransientDependency
+{
+    protected IDataSeeder DataSeeder { get; }
+    protected ICurrentTenant CurrentTenant { get; }
+    protected IDbSchemaMigrator DbSchemaMigrator { get; }
+    protected IUnitOfWorkManager UnitOfWorkManager { get; }
+
+    protected ILogger<TenantSynchronizer> Logger { get; }
+
+    public TenantSynchronizer(
+        IDataSeeder dataSeeder,
+        ICurrentTenant currentTenant,
+        IDbSchemaMigrator dbSchemaMigrator,
+        IUnitOfWorkManager unitOfWorkManager,
+        ILogger<TenantSynchronizer> logger)
+    {
+        DataSeeder = dataSeeder;
+        CurrentTenant = currentTenant;
+        DbSchemaMigrator = dbSchemaMigrator;
+        UnitOfWorkManager = unitOfWorkManager;
+
+        Logger = logger;
+    }
+
+    /// <summary>
+    /// 租户创建之后需要预置种子数据
+    /// </summary>
+    /// <param name="eventData"></param>
+    /// <returns></returns>
+    public virtual async Task HandleEventAsync(CreateEventData eventData)
+    {
+        using (var unitOfWork = UnitOfWorkManager.Begin())
+        {
+            using (CurrentTenant.Change(eventData.Id, eventData.Name))
+            {
+                Logger.LogInformation("Migrating the new tenant database with WorkflowManagement...");
+                // 迁移租户数据
+                await DbSchemaMigrator.MigrateAsync<WorkflowManagementDbContext>(
+                    (connectionString, builder) =>
+                    {
+                        builder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString));
+
+                        return new WorkflowManagementDbContext(builder.Options);
+                    });
+                Logger.LogInformation("Migrated the new tenant database with WorkflowManagement...");
+
+                await DataSeeder.SeedAsync(new DataSeedContext(eventData.Id));
+
+                await unitOfWork.SaveChangesAsync();
+            }
+        }
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj
new file mode 100644
index 000000000..d624a7ca9
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/LY.MicroService.WorkflowManagement.HttpApi.Host.csproj
@@ -0,0 +1,59 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace>LY.MicroService.WorkflowManagement</RootNamespace>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="AgileConfig.Client" Version="$(AgileConfigClientPackageVersion)" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftPackageVersion)">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="$(MicrosoftPackageVersion)" />
+		<PackageReference Include="DistributedLock.Redis" Version="$(DistributedLockRedisPackageVersion)" />
+		<PackageReference Include="Serilog.AspNetCore" Version="$(SerilogAspNetCorePackageVersion)" />
+		<PackageReference Include="Serilog.Enrichers.Environment" Version="$(SerilogEnrichersEnvironmentPackageVersion)" />
+		<PackageReference Include="Serilog.Enrichers.Assembly" Version="$(SerilogEnrichersAssemblyPackageVersion)" />
+		<PackageReference Include="Serilog.Enrichers.Process" Version="$(SerilogEnrichersProcessPackageVersion)" />
+		<PackageReference Include="Serilog.Enrichers.Thread" Version="$(SerilogEnrichersThreadPackageVersion)" />
+		<PackageReference Include="Serilog.Settings.Configuration" Version="$(SerilogSettingsConfigurationPackageVersion)" />
+		<PackageReference Include="Serilog.Sinks.Elasticsearch" Version="$(SerilogSinksElasticsearchPackageVersion)" />
+		<PackageReference Include="Serilog.Sinks.File" Version="$(SerilogSinksFilePackageVersion)" />
+		<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.Autofac" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.EventBus.RabbitMQ" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.Swashbuckle" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.EntityFrameworkCore.MySql" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.Http.Client.IdentityModel.Web" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(VoloAbpPackageVersion)" />
+		<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="$(VoloAbpPackageVersion)" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.Data.DbMigrator\LINGYUN.Abp.Data.DbMigrator.csproj" />
+		<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.ExceptionHandling.Emailing\LINGYUN.Abp.ExceptionHandling.Emailing.csproj" />
+		<ProjectReference Include="..\..\modules\tenants\LINGYUN.Abp.MultiTenancy\LINGYUN.Abp.MultiTenancy.csproj" />
+		<ProjectReference Include="..\..\modules\tenants\LINGYUN.Abp.MultiTenancy.DbFinder\LINGYUN.Abp.MultiTenancy.DbFinder.csproj" />
+		<ProjectReference Include="..\..\modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj" />
+		<ProjectReference Include="..\..\modules\logging\LINGYUN.Abp.Serilog.Enrichers.Application\LINGYUN.Abp.Serilog.Enrichers.Application.csproj" />
+		<ProjectReference Include="..\..\modules\lt\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore\LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore.csproj" />
+		<ProjectReference Include="..\..\modules\oss-management\LINGYUN.Abp.BlobStoring.OssManagement\LINGYUN.Abp.BlobStoring.OssManagement.csproj" />
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowCore.Components\LINGYUN.Abp.WorkflowCore.Components.csproj" />
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowCore.DistributedLock\LINGYUN.Abp.WorkflowCore.DistributedLock.csproj" />
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowCore.Elasticsearch\LINGYUN.Abp.WorkflowCore.Elasticsearch.csproj" />
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowCore.LifeCycleEvent\LINGYUN.Abp.WorkflowCore.LifeCycleEvent.csproj" />
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore\LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore.csproj" />
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowCore.RabbitMQ\LINGYUN.Abp.WorkflowCore.RabbitMQ.csproj" />
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowManagement.Application\LINGYUN.Abp.WorkflowManagement.Application.csproj" />
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore\LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore.csproj" />
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowManagement.HttpApi\LINGYUN.Abp.WorkflowManagement.HttpApi.csproj" />
+	</ItemGroup>
+
+</Project>
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211212074420_Add-Module-Workflow-Management.Designer.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211212074420_Add-Module-Workflow-Management.Designer.cs
new file mode 100644
index 000000000..464735504
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211212074420_Add-Module-Workflow-Management.Designer.cs
@@ -0,0 +1,557 @@
+// <auto-generated />
+using System;
+using LY.MicroService.WorkflowManagement.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace LY.MicroService.WorkflowManagement.Migrations
+{
+    [DbContext(typeof(WorkflowManagementMigrationsDbContext))]
+    [Migration("20211212074420_Add-Module-Workflow-Management")]
+    partial class AddModuleWorkflowManagement
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
+                .HasAnnotation("ProductVersion", "6.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<string>("EventData")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EventKey")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("EventName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<bool>("IsProcessed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("IsProcessed");
+
+                    b.HasIndex("EventName", "EventKey");
+
+                    b.ToTable("WF_Event", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionError", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ErrorTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ExecutionPointerId")
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_ExecutionError", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Children")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContextItem")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("EventData")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EventKey")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("EventName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<bool>("EventPublished")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Outcome")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PersistenceData")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PredecessorId")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Scope")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("SleepUntil")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("StartTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("StepId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("StepName")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorkflowId");
+
+                    b.ToTable("WF_ExecutionPointer", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExtensionAttribute", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ExecutionPointerId")
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<string>("Key")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExecutionPointerId");
+
+                    b.ToTable("WF_ExtensionAttribute", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedScheduledCommand", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("CommandName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("Data")
+                        .HasMaxLength(500)
+                        .HasColumnType("varchar(500)");
+
+                    b.Property<long>("ExecuteTime")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExecuteTime");
+
+                    b.HasIndex("CommandName", "Data")
+                        .IsUnique();
+
+                    b.ToTable("WF_ScheduledCommand", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EventKey")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("EventName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<Guid>("ExecutionPointerId")
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<string>("ExternalToken")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<DateTime?>("ExternalTokenExpiry")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("ExternalWorkerId")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int>("StepId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("SubscribeAsOf")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("SubscriptionData")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EventKey");
+
+                    b.HasIndex("EventName");
+
+                    b.ToTable("WF_Subscription", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedWorkflow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("CompleteTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("varchar(500)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("NextExecution")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Reference")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
+                    b.Property<string>("WorkflowDefinitionId")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NextExecution");
+
+                    b.ToTable("WF_Workflow", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.CompensateNode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CancelCondition")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int?>("ErrorBehavior")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Inputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<string>("Outputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeSpan?>("RetryInterval")
+                        .HasColumnType("time(6)");
+
+                    b.Property<bool>("Saga")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SelectNextStep")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StepType")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_Compensate", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.StepNode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CancelCondition")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int?>("ErrorBehavior")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Inputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<string>("Outputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeSpan?>("RetryInterval")
+                        .HasColumnType("time(6)");
+
+                    b.Property<bool>("Saga")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SelectNextStep")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StepType")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_Step", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.Workflow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int>("ErrorBehavior")
+                        .HasColumnType("int");
+
+                    b.Property<TimeSpan?>("ErrorRetryInterval")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_Definition", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", b =>
+                {
+                    b.HasOne("LINGYUN.Abp.WorkflowCore.Persistence.PersistedWorkflow", "Workflow")
+                        .WithMany("ExecutionPointers")
+                        .HasForeignKey("WorkflowId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Workflow");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExtensionAttribute", b =>
+                {
+                    b.HasOne("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", "ExecutionPointer")
+                        .WithMany("ExtensionAttributes")
+                        .HasForeignKey("ExecutionPointerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ExecutionPointer");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", b =>
+                {
+                    b.Navigation("ExtensionAttributes");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedWorkflow", b =>
+                {
+                    b.Navigation("ExecutionPointers");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211212074420_Add-Module-Workflow-Management.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211212074420_Add-Module-Workflow-Management.cs
new file mode 100644
index 000000000..e6abb6314
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211212074420_Add-Module-Workflow-Management.cs
@@ -0,0 +1,385 @@
+using System;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace LY.MicroService.WorkflowManagement.Migrations
+{
+    public partial class AddModuleWorkflowManagement : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterDatabase()
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_Compensate",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    WorkflowId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    StepType = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CancelCondition = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ErrorBehavior = table.Column<int>(type: "int", nullable: true),
+                    RetryInterval = table.Column<TimeSpan>(type: "time(6)", nullable: true),
+                    Saga = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    ParentId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    Inputs = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Outputs = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    SelectNextStep = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_Compensate", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_Definition",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    IsEnabled = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    Name = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DisplayName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Description = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Version = table.Column<int>(type: "int", nullable: false),
+                    ErrorBehavior = table.Column<int>(type: "int", nullable: false),
+                    ErrorRetryInterval = table.Column<TimeSpan>(type: "time(6)", nullable: true),
+                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_Definition", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_Event",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    EventName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EventKey = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EventData = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    IsProcessed = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_Event", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_ExecutionError",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    WorkflowId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    ExecutionPointerId = table.Column<Guid>(type: "char(50)", maxLength: 50, nullable: false, collation: "ascii_general_ci"),
+                    ErrorTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    Message = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_ExecutionError", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_ScheduledCommand",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    CommandName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Data = table.Column<string>(type: "varchar(500)", maxLength: 500, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ExecuteTime = table.Column<long>(type: "bigint", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_ScheduledCommand", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_Step",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    WorkflowId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    StepType = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CancelCondition = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ErrorBehavior = table.Column<int>(type: "int", nullable: true),
+                    RetryInterval = table.Column<TimeSpan>(type: "time(6)", nullable: true),
+                    Saga = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    ParentId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    Inputs = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Outputs = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    SelectNextStep = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_Step", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_Subscription",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    WorkflowId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    StepId = table.Column<int>(type: "int", nullable: false),
+                    ExecutionPointerId = table.Column<Guid>(type: "char(50)", maxLength: 50, nullable: false, collation: "ascii_general_ci"),
+                    EventName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EventKey = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    SubscribeAsOf = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    SubscriptionData = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ExternalToken = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ExternalWorkerId = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ExternalTokenExpiry = table.Column<DateTime>(type: "datetime(6)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_Subscription", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_Workflow",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    WorkflowDefinitionId = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Version = table.Column<int>(type: "int", nullable: false),
+                    Description = table.Column<string>(type: "varchar(500)", maxLength: 500, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Reference = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    NextExecution = table.Column<long>(type: "bigint", nullable: true),
+                    Status = table.Column<int>(type: "int", nullable: false),
+                    Data = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CompleteTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_Workflow", x => x.Id);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_ExecutionPointer",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(50)", maxLength: 50, nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    WorkflowId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    StepId = table.Column<int>(type: "int", nullable: false),
+                    Active = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    SleepUntil = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    PersistenceData = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    StartTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    EndTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
+                    EventName = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EventKey = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    EventPublished = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    EventData = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    StepName = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    RetryCount = table.Column<int>(type: "int", nullable: false),
+                    Children = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    ContextItem = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    PredecessorId = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Outcome = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Status = table.Column<int>(type: "int", nullable: false),
+                    Scope = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_ExecutionPointer", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_WF_ExecutionPointer_WF_Workflow_WorkflowId",
+                        column: x => x.WorkflowId,
+                        principalTable: "WF_Workflow",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_ExtensionAttribute",
+                columns: table => new
+                {
+                    Id = table.Column<long>(type: "bigint", nullable: false)
+                        .Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    ExecutionPointerId = table.Column<Guid>(type: "char(50)", maxLength: 50, nullable: false, collation: "ascii_general_ci"),
+                    Key = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    Value = table.Column<string>(type: "longtext", nullable: true)
+                        .Annotation("MySql:CharSet", "utf8mb4")
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_ExtensionAttribute", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_WF_ExtensionAttribute_WF_ExecutionPointer_ExecutionPointerId",
+                        column: x => x.ExecutionPointerId,
+                        principalTable: "WF_ExecutionPointer",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_Event_CreationTime",
+                table: "WF_Event",
+                column: "CreationTime");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_Event_EventName_EventKey",
+                table: "WF_Event",
+                columns: new[] { "EventName", "EventKey" });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_Event_IsProcessed",
+                table: "WF_Event",
+                column: "IsProcessed");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_ExecutionPointer_WorkflowId",
+                table: "WF_ExecutionPointer",
+                column: "WorkflowId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_ExtensionAttribute_ExecutionPointerId",
+                table: "WF_ExtensionAttribute",
+                column: "ExecutionPointerId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_ScheduledCommand_CommandName_Data",
+                table: "WF_ScheduledCommand",
+                columns: new[] { "CommandName", "Data" },
+                unique: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_ScheduledCommand_ExecuteTime",
+                table: "WF_ScheduledCommand",
+                column: "ExecuteTime");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_Subscription_EventKey",
+                table: "WF_Subscription",
+                column: "EventKey");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_Subscription_EventName",
+                table: "WF_Subscription",
+                column: "EventName");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_Workflow_NextExecution",
+                table: "WF_Workflow",
+                column: "NextExecution");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "WF_Compensate");
+
+            migrationBuilder.DropTable(
+                name: "WF_Definition");
+
+            migrationBuilder.DropTable(
+                name: "WF_Event");
+
+            migrationBuilder.DropTable(
+                name: "WF_ExecutionError");
+
+            migrationBuilder.DropTable(
+                name: "WF_ExtensionAttribute");
+
+            migrationBuilder.DropTable(
+                name: "WF_ScheduledCommand");
+
+            migrationBuilder.DropTable(
+                name: "WF_Step");
+
+            migrationBuilder.DropTable(
+                name: "WF_Subscription");
+
+            migrationBuilder.DropTable(
+                name: "WF_ExecutionPointer");
+
+            migrationBuilder.DropTable(
+                name: "WF_Workflow");
+        }
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211214085456_Add-Entity-Workflow-Data-With-WF-Management.Designer.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211214085456_Add-Entity-Workflow-Data-With-WF-Management.Designer.cs
new file mode 100644
index 000000000..5214e38aa
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211214085456_Add-Entity-Workflow-Data-With-WF-Management.Designer.cs
@@ -0,0 +1,610 @@
+// <auto-generated />
+using System;
+using LY.MicroService.WorkflowManagement.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace LY.MicroService.WorkflowManagement.Migrations
+{
+    [DbContext(typeof(WorkflowManagementMigrationsDbContext))]
+    [Migration("20211214085456_Add-Entity-Workflow-Data-With-WF-Management")]
+    partial class AddEntityWorkflowDataWithWFManagement
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
+                .HasAnnotation("ProductVersion", "6.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<string>("EventData")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EventKey")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("EventName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<bool>("IsProcessed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("IsProcessed");
+
+                    b.HasIndex("EventName", "EventKey");
+
+                    b.ToTable("WF_Event", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionError", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ErrorTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ExecutionPointerId")
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_ExecutionError", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Children")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContextItem")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("EventData")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EventKey")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("EventName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<bool>("EventPublished")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Outcome")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PersistenceData")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PredecessorId")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Scope")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("SleepUntil")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("StartTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("StepId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("StepName")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorkflowId");
+
+                    b.ToTable("WF_ExecutionPointer", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExtensionAttribute", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ExecutionPointerId")
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<string>("Key")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExecutionPointerId");
+
+                    b.ToTable("WF_ExtensionAttribute", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedScheduledCommand", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("CommandName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("Data")
+                        .HasMaxLength(500)
+                        .HasColumnType("varchar(500)");
+
+                    b.Property<long>("ExecuteTime")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExecuteTime");
+
+                    b.HasIndex("CommandName", "Data")
+                        .IsUnique();
+
+                    b.ToTable("WF_ScheduledCommand", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EventKey")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("EventName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<Guid>("ExecutionPointerId")
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<string>("ExternalToken")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<DateTime?>("ExternalTokenExpiry")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("ExternalWorkerId")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int>("StepId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("SubscribeAsOf")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("SubscriptionData")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EventKey");
+
+                    b.HasIndex("EventName");
+
+                    b.ToTable("WF_Subscription", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedWorkflow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("CompleteTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("varchar(500)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("NextExecution")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Reference")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
+                    b.Property<string>("WorkflowDefinitionId")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NextExecution");
+
+                    b.ToTable("WF_Workflow", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.CompensateNode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CancelCondition")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int?>("ErrorBehavior")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Inputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<string>("Outputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeSpan?>("RetryInterval")
+                        .HasColumnType("time(6)");
+
+                    b.Property<bool>("Saga")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SelectNextStep")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StepType")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_Compensate", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.StepNode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CancelCondition")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int?>("ErrorBehavior")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Inputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<string>("Outputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeSpan?>("RetryInterval")
+                        .HasColumnType("time(6)");
+
+                    b.Property<bool>("Saga")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SelectNextStep")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StepType")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_Step", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.Workflow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int>("ErrorBehavior")
+                        .HasColumnType("int");
+
+                    b.Property<TimeSpan?>("ErrorRetryInterval")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_Definition", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.WorkflowData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("DataType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<bool>("IsCaseSensitive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorkflowId");
+
+                    b.ToTable("WF_DefinitionData", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", b =>
+                {
+                    b.HasOne("LINGYUN.Abp.WorkflowCore.Persistence.PersistedWorkflow", "Workflow")
+                        .WithMany("ExecutionPointers")
+                        .HasForeignKey("WorkflowId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Workflow");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExtensionAttribute", b =>
+                {
+                    b.HasOne("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", "ExecutionPointer")
+                        .WithMany("ExtensionAttributes")
+                        .HasForeignKey("ExecutionPointerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ExecutionPointer");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.WorkflowData", b =>
+                {
+                    b.HasOne("LINGYUN.Abp.WorkflowManagement.Workflow", null)
+                        .WithMany("Datas")
+                        .HasForeignKey("WorkflowId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", b =>
+                {
+                    b.Navigation("ExtensionAttributes");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedWorkflow", b =>
+                {
+                    b.Navigation("ExecutionPointers");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.Workflow", b =>
+                {
+                    b.Navigation("Datas");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211214085456_Add-Entity-Workflow-Data-With-WF-Management.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211214085456_Add-Entity-Workflow-Data-With-WF-Management.cs
new file mode 100644
index 000000000..07ee32061
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/20211214085456_Add-Entity-Workflow-Data-With-WF-Management.cs
@@ -0,0 +1,147 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace LY.MicroService.WorkflowManagement.Migrations
+{
+    public partial class AddEntityWorkflowDataWithWFManagement : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<Guid>(
+                name: "ExecutionPointerId",
+                table: "WF_Subscription",
+                type: "char(50)",
+                maxLength: 50,
+                nullable: false,
+                collation: "ascii_general_ci",
+                oldClrType: typeof(string),
+                oldType: "char(50)",
+                oldMaxLength: 50)
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "ExecutionPointerId",
+                table: "WF_ExtensionAttribute",
+                type: "char(50)",
+                maxLength: 50,
+                nullable: false,
+                collation: "ascii_general_ci",
+                oldClrType: typeof(string),
+                oldType: "char(50)",
+                oldMaxLength: 50)
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "Id",
+                table: "WF_ExecutionPointer",
+                type: "char(50)",
+                maxLength: 50,
+                nullable: false,
+                collation: "ascii_general_ci",
+                oldClrType: typeof(string),
+                oldType: "char(50)",
+                oldMaxLength: 50)
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "ExecutionPointerId",
+                table: "WF_ExecutionError",
+                type: "char(50)",
+                maxLength: 50,
+                nullable: false,
+                collation: "ascii_general_ci",
+                oldClrType: typeof(string),
+                oldType: "char(50)",
+                oldMaxLength: 50)
+                .OldAnnotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateTable(
+                name: "WF_DefinitionData",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
+                    WorkflowId = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+                    Name = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DisplayName = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: false)
+                        .Annotation("MySql:CharSet", "utf8mb4"),
+                    DataType = table.Column<int>(type: "int", nullable: false),
+                    IsRequired = table.Column<bool>(type: "tinyint(1)", nullable: false),
+                    IsCaseSensitive = table.Column<bool>(type: "tinyint(1)", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_WF_DefinitionData", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_WF_DefinitionData_WF_Definition_WorkflowId",
+                        column: x => x.WorkflowId,
+                        principalTable: "WF_Definition",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                })
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_WF_DefinitionData_WorkflowId",
+                table: "WF_DefinitionData",
+                column: "WorkflowId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "WF_DefinitionData");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ExecutionPointerId",
+                table: "WF_Subscription",
+                type: "char(50)",
+                maxLength: 50,
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "char(50)",
+                oldMaxLength: 50)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ExecutionPointerId",
+                table: "WF_ExtensionAttribute",
+                type: "char(50)",
+                maxLength: 50,
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "char(50)",
+                oldMaxLength: 50)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Id",
+                table: "WF_ExecutionPointer",
+                type: "char(50)",
+                maxLength: 50,
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "char(50)",
+                oldMaxLength: 50)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ExecutionPointerId",
+                table: "WF_ExecutionError",
+                type: "char(50)",
+                maxLength: 50,
+                nullable: false,
+                oldClrType: typeof(Guid),
+                oldType: "char(50)",
+                oldMaxLength: 50)
+                .Annotation("MySql:CharSet", "utf8mb4")
+                .OldAnnotation("Relational:Collation", "ascii_general_ci");
+        }
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/WorkflowManagementMigrationsDbContextModelSnapshot.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/WorkflowManagementMigrationsDbContextModelSnapshot.cs
new file mode 100644
index 000000000..f39be2376
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Migrations/WorkflowManagementMigrationsDbContextModelSnapshot.cs
@@ -0,0 +1,608 @@
+// <auto-generated />
+using System;
+using LY.MicroService.WorkflowManagement.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace LY.MicroService.WorkflowManagement.Migrations
+{
+    [DbContext(typeof(WorkflowManagementMigrationsDbContext))]
+    partial class WorkflowManagementMigrationsDbContextModelSnapshot : ModelSnapshot
+    {
+        protected override void BuildModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
+                .HasAnnotation("ProductVersion", "6.0.0")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedEvent", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<string>("EventData")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EventKey")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("EventName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<bool>("IsProcessed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CreationTime");
+
+                    b.HasIndex("IsProcessed");
+
+                    b.HasIndex("EventName", "EventKey");
+
+                    b.ToTable("WF_Event", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionError", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("ErrorTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<Guid>("ExecutionPointerId")
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<string>("Message")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_ExecutionError", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<bool>("Active")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Children")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ContextItem")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("EndTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("EventData")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("EventKey")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("EventName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<bool>("EventPublished")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Outcome")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PersistenceData")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PredecessorId")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Scope")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime?>("SleepUntil")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("StartTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<int>("StepId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("StepName")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorkflowId");
+
+                    b.ToTable("WF_ExecutionPointer", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExtensionAttribute", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid>("ExecutionPointerId")
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<string>("Key")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExecutionPointerId");
+
+                    b.ToTable("WF_ExtensionAttribute", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedScheduledCommand", b =>
+                {
+                    b.Property<long>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("CommandName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("Data")
+                        .HasMaxLength(500)
+                        .HasColumnType("varchar(500)");
+
+                    b.Property<long>("ExecuteTime")
+                        .HasColumnType("bigint");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ExecuteTime");
+
+                    b.HasIndex("CommandName", "Data")
+                        .IsUnique();
+
+                    b.ToTable("WF_ScheduledCommand", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedSubscription", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("EventKey")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("EventName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<Guid>("ExecutionPointerId")
+                        .HasMaxLength(50)
+                        .HasColumnType("char(50)");
+
+                    b.Property<string>("ExternalToken")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<DateTime?>("ExternalTokenExpiry")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("ExternalWorkerId")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int>("StepId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("SubscribeAsOf")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("SubscriptionData")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("EventKey");
+
+                    b.HasIndex("EventName");
+
+                    b.ToTable("WF_Subscription", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedWorkflow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<DateTime?>("CompleteTime")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Data")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(500)
+                        .HasColumnType("varchar(500)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<long?>("NextExecution")
+                        .HasColumnType("bigint");
+
+                    b.Property<string>("Reference")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
+                    b.Property<string>("WorkflowDefinitionId")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NextExecution");
+
+                    b.ToTable("WF_Workflow", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.CompensateNode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CancelCondition")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int?>("ErrorBehavior")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Inputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<string>("Outputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeSpan?>("RetryInterval")
+                        .HasColumnType("time(6)");
+
+                    b.Property<bool>("Saga")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SelectNextStep")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StepType")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_Compensate", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.StepNode", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("CancelCondition")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int?>("ErrorBehavior")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Inputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<string>("Outputs")
+                        .HasColumnType("longtext");
+
+                    b.Property<Guid?>("ParentId")
+                        .HasColumnType("char(36)");
+
+                    b.Property<TimeSpan?>("RetryInterval")
+                        .HasColumnType("time(6)");
+
+                    b.Property<bool>("Saga")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SelectNextStep")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("StepType")
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_Step", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.Workflow", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("varchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<string>("Description")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<string>("DisplayName")
+                        .HasMaxLength(200)
+                        .HasColumnType("varchar(200)");
+
+                    b.Property<int>("ErrorBehavior")
+                        .HasColumnType("int");
+
+                    b.Property<TimeSpan?>("ErrorRetryInterval")
+                        .HasColumnType("time(6)");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("longtext")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime(6)")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<int>("Version")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("WF_Definition", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.WorkflowData", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("char(36)");
+
+                    b.Property<int>("DataType")
+                        .HasColumnType("int");
+
+                    b.Property<string>("DisplayName")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<bool>("IsCaseSensitive")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<bool>("IsRequired")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("Name")
+                        .IsRequired()
+                        .HasMaxLength(100)
+                        .HasColumnType("varchar(100)");
+
+                    b.Property<Guid?>("TenantId")
+                        .HasColumnType("char(36)")
+                        .HasColumnName("TenantId");
+
+                    b.Property<Guid>("WorkflowId")
+                        .HasColumnType("char(36)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("WorkflowId");
+
+                    b.ToTable("WF_DefinitionData", (string)null);
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", b =>
+                {
+                    b.HasOne("LINGYUN.Abp.WorkflowCore.Persistence.PersistedWorkflow", "Workflow")
+                        .WithMany("ExecutionPointers")
+                        .HasForeignKey("WorkflowId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Workflow");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExtensionAttribute", b =>
+                {
+                    b.HasOne("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", "ExecutionPointer")
+                        .WithMany("ExtensionAttributes")
+                        .HasForeignKey("ExecutionPointerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("ExecutionPointer");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.WorkflowData", b =>
+                {
+                    b.HasOne("LINGYUN.Abp.WorkflowManagement.Workflow", null)
+                        .WithMany("Datas")
+                        .HasForeignKey("WorkflowId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedExecutionPointer", b =>
+                {
+                    b.Navigation("ExtensionAttributes");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowCore.Persistence.PersistedWorkflow", b =>
+                {
+                    b.Navigation("ExecutionPointers");
+                });
+
+            modelBuilder.Entity("LINGYUN.Abp.WorkflowManagement.Workflow", b =>
+                {
+                    b.Navigation("Datas");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs
new file mode 100644
index 000000000..0ce7dd299
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Program.cs
@@ -0,0 +1,44 @@
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
+using Serilog;
+
+namespace LY.MicroService.WorkflowManagement;
+
+public class Program
+{
+    public static int Main(string[] args)
+    {
+        try
+        {
+            var host = CreateHostBuilder(args).Build();
+            Log.Information("Starting web host.");
+            host.Run();
+            return 0;
+        }
+        finally
+        {
+            Log.CloseAndFlush();
+        }
+    }
+
+    internal static IHostBuilder CreateHostBuilder(string[] args) =>
+       Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.UseStartup<Startup>();
+            })
+            .ConfigureAppConfiguration((context, config) =>
+            {
+                var configuration = config.Build();
+                if (configuration.GetSection("AgileConfig").Exists())
+                {
+                    config.AddAgileConfig(new AgileConfig.Client.ConfigClient(configuration));
+                }
+            })
+            .UseSerilog((context, config) =>
+            {
+                config.ReadFrom.Configuration(context.Configuration);
+            })
+            .UseAutofac();
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Properties/launchSettings.json b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Properties/launchSettings.json
new file mode 100644
index 000000000..cdb3a8756
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Properties/launchSettings.json
@@ -0,0 +1,21 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:20890",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "LINGYUN.Abp.WorkflowManagement.HttpApi.Host": {
+      "commandName": "Project",
+      "launchBrowser": false,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://127.0.0.1:30035",
+      "dotnetRunMessages": "true"
+    }
+  }
+}
\ No newline at end of file
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Startup.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Startup.cs
new file mode 100644
index 000000000..cc0619d01
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/Startup.cs
@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using System.IO;
+using Volo.Abp.IO;
+using Volo.Abp.Modularity.PlugIns;
+
+namespace LY.MicroService.WorkflowManagement;
+
+public class Startup
+{
+    public void ConfigureServices(IServiceCollection services)
+    {
+        services.AddApplication<WorkflowManagementHttpApiHostModule>(options =>
+        {
+            // 搜索 Modules 目录下所有文件作为插件
+            // 取消显示引用所有其他项目的模块，改为通过插件的形式引用 
+            var pluginFolder = Path.Combine(
+                    Directory.GetCurrentDirectory(), "Modules");
+            DirectoryHelper.CreateIfNotExists(pluginFolder);
+            options.PlugInSources.AddFolder(
+                pluginFolder,
+                SearchOption.AllDirectories);
+        });
+    }
+
+    public void Configure(IApplicationBuilder app)
+    {
+        app.InitializeApplication();
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/TenantHeaderParamter.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/TenantHeaderParamter.cs
new file mode 100644
index 000000000..4b2ac7acc
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/TenantHeaderParamter.cs
@@ -0,0 +1,31 @@
+using Microsoft.Extensions.Options;
+using Microsoft.OpenApi.Models;
+using Swashbuckle.AspNetCore.SwaggerGen;
+using System.Collections.Generic;
+using Volo.Abp.MultiTenancy;
+
+namespace LY.MicroService.WorkflowManagement;
+
+public class TenantHeaderParamter : IOperationFilter
+{
+    private readonly AbpMultiTenancyOptions _options;
+    public TenantHeaderParamter(
+        IOptions<AbpMultiTenancyOptions> options)
+    {
+        _options = options.Value;
+    }
+    public void Apply(OpenApiOperation operation, OperationFilterContext context)
+    {
+        if (_options.IsEnabled)
+        {
+            operation.Parameters = operation.Parameters ?? new List<OpenApiParameter>();
+            operation.Parameters.Add(new OpenApiParameter
+            {
+                Name = TenantResolverConsts.DefaultTenantKey,
+                In = ParameterLocation.Header,
+                Description = "Tenant Id/Name",
+                Required = false
+            });
+        }
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowEngineManager.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowEngineManager.cs
new file mode 100644
index 000000000..d705f9c6f
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowEngineManager.cs
@@ -0,0 +1,62 @@
+using LINGYUN.Abp.Data.DbMigrator;
+using LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore;
+using LINGYUN.Abp.WorkflowManagement;
+using LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using System.Threading;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using WorkflowCore.Interface;
+
+namespace LY.MicroService.WorkflowManagement;
+
+public class WorkflowEngineManager : IWorkflowEngineManager, ISingletonDependency
+{
+    private readonly IWorkflowHost _workflowHost;
+    private readonly IDbSchemaMigrator _dbSchemaMigrator;
+
+    private readonly ILogger<WorkflowEngineManager> _logger;
+    public WorkflowEngineManager(
+        IWorkflowHost workflowHost,
+        IDbSchemaMigrator dbSchemaMigrator,
+        ILogger<WorkflowEngineManager> logger)
+    {
+        _logger = logger;
+        _workflowHost = workflowHost;
+        _dbSchemaMigrator = dbSchemaMigrator;
+    }
+
+    public async Task InitializeAsync(CancellationToken cancellationToken = default)
+    {
+        _logger.LogInformation("Migrating workflow core context...");
+        await _dbSchemaMigrator.MigrateAsync<WorkflowDbContext>(
+            (connectionString, builder) =>
+            {
+                builder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString));
+
+                return new WorkflowDbContext(builder.Options);
+            });
+        _logger.LogInformation("Migrated workflow core context.");
+
+        _logger.LogInformation("Migrating workflow management context...");
+        await _dbSchemaMigrator.MigrateAsync<WorkflowManagementDbContext>(
+            (connectionString, builder) =>
+            {
+                builder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString));
+
+                return new WorkflowManagementDbContext(builder.Options);
+            });
+        _logger.LogInformation("Migrated workflow management context.");
+    }
+
+    public async Task StartAsync(CancellationToken cancellationToken = default)
+    {
+        await _workflowHost.StartAsync(cancellationToken);
+    }
+
+    public async Task StopAsync(CancellationToken cancellationToken = default)
+    {
+        await _workflowHost.StopAsync(cancellationToken);
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs
new file mode 100644
index 000000000..d8e359749
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.Configure.cs
@@ -0,0 +1,235 @@
+using LINGYUN.Abp.ExceptionHandling;
+using LINGYUN.Abp.ExceptionHandling.Emailing;
+using LINGYUN.Abp.Serilog.Enrichers.Application;
+using LINGYUN.Abp.BlobStoring.OssManagement;
+using Medallion.Threading;
+using Medallion.Threading.Redis;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.DataProtection;
+using Microsoft.Extensions.Caching.StackExchangeRedis;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.OpenApi.Models;
+using StackExchange.Redis;
+using System;
+using System.Text.Encodings.Web;
+using System.Text.Unicode;
+using Volo.Abp;
+using Volo.Abp.Auditing;
+using Volo.Abp.BlobStoring;
+using Volo.Abp.Caching;
+using Volo.Abp.EntityFrameworkCore;
+using Volo.Abp.Json;
+using Volo.Abp.Json.SystemTextJson;
+using Volo.Abp.Localization;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Uow;
+using Volo.Abp.VirtualFileSystem;
+using LINGYUN.Abp.WorkflowCore.Components;
+
+namespace LY.MicroService.WorkflowManagement;
+
+public partial class WorkflowManagementHttpApiHostModule
+{
+    private void PreConfigureApp()
+    {
+        AbpSerilogEnrichersConsts.ApplicationName = "WorkflowManagement";
+    }
+
+    private void ConfigureDistributedLock(IServiceCollection services, IConfiguration configuration)
+    {
+        var redis = ConnectionMultiplexer.Connect(configuration["DistributedLock:Redis:Configuration"]);
+        services.AddSingleton<IDistributedLockProvider>(_ => new RedisDistributedSynchronizationProvider(redis.GetDatabase()));
+    }
+
+    private void ConfigureBlobStoring(IServiceCollection services, IConfiguration configuration)
+    {
+        Configure<AbpBlobStoringOptions>(options =>
+        {
+            services.ExecutePreConfiguredActions(options);
+            options.Containers.Configure<WorkflowContainer>((containerConfiguration) =>
+            {
+                containerConfiguration.UseOssManagement(config =>
+                {
+                    config.Bucket = configuration[OssManagementBlobProviderConfigurationNames.Bucket] ?? "workflow";
+                });
+            });
+        });
+    }
+
+    private void ConfigureDbContext()
+    {
+        // 配置Ef
+        Configure<AbpDbContextOptions>(options =>
+        {
+            options.UseMySQL();
+        });
+    }
+
+    private void ConfigureJsonSerializer()
+    {
+        // 解决某些不支持类型的序列化
+        Configure<AbpJsonOptions>(options =>
+        {
+            options.DefaultDateTimeFormat = "yyyy-MM-dd HH:mm:ss";
+        });
+        // 中文序列化的编码问题
+        Configure<AbpSystemTextJsonSerializerOptions>(options =>
+        {
+            options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
+        });
+    }
+
+    private void ConfigureExceptionHandling()
+    {
+        // 自定义需要处理的异常
+        Configure<AbpExceptionHandlingOptions>(options =>
+        {
+            //  加入需要处理的异常类型
+            options.Handlers.Add<Volo.Abp.Data.AbpDbConcurrencyException>();
+            options.Handlers.Add<AbpInitializationException>();
+            options.Handlers.Add<OutOfMemoryException>();
+            options.Handlers.Add<System.Data.Common.DbException>();
+            options.Handlers.Add<Microsoft.EntityFrameworkCore.DbUpdateException>();
+            options.Handlers.Add<System.Data.DBConcurrencyException>();
+        });
+        // 自定义需要发送邮件通知的异常类型
+        Configure<AbpEmailExceptionHandlingOptions>(options =>
+        {
+            // 是否发送堆栈信息
+            options.SendStackTrace = true;
+            // 未指定异常接收者的默认接收邮件
+            // 指定自己的邮件地址
+        });
+    }
+
+    private void ConfigureAuditing(IConfiguration configuration)
+    {
+        Configure<AbpAuditingOptions>(options =>
+        {
+            options.ApplicationName = "WorkflowManagement";
+            // 是否启用实体变更记录
+            var entitiesChangedConfig = configuration.GetSection("App:TrackingEntitiesChanged");
+            if (entitiesChangedConfig.Exists() && entitiesChangedConfig.Get<bool>())
+            {
+                options
+                .EntityHistorySelectors
+                .AddAllEntities();
+            }
+        });
+    }
+
+    private void ConfigureCaching(IConfiguration configuration)
+    {
+        Configure<AbpDistributedCacheOptions>(options =>
+        {
+            // 最好统一命名,不然某个缓存变动其他应用服务有例外发生
+            options.KeyPrefix = "LINGYUN.Abp.Application";
+            // 滑动过期30天
+            options.GlobalCacheEntryOptions.SlidingExpiration = TimeSpan.FromDays(30d);
+            // 绝对过期60天
+            options.GlobalCacheEntryOptions.AbsoluteExpiration = DateTimeOffset.Now.AddDays(60d);
+        });
+
+        Configure<RedisCacheOptions>(options =>
+        {
+            var redisConfig = ConfigurationOptions.Parse(options.Configuration);
+            options.ConfigurationOptions = redisConfig;
+            options.InstanceName = configuration["Redis:InstanceName"];
+        });
+    }
+
+    private void ConfigureVirtualFileSystem()
+    {
+        Configure<AbpVirtualFileSystemOptions>(options =>
+        {
+            options.FileSets.AddEmbedded<WorkflowManagementHttpApiHostModule>("LINGYUN.Abp.WorkflowManagement");
+        });
+    }
+
+    private void ConfigureMultiTenancy(IConfiguration configuration)
+    {
+        // 多租户
+        Configure<AbpMultiTenancyOptions>(options =>
+        {
+            options.IsEnabled = true;
+        });
+
+        var tenantResolveCfg = configuration.GetSection("App:Domains");
+        if (tenantResolveCfg.Exists())
+        {
+            Configure<AbpTenantResolveOptions>(options =>
+            {
+                var domains = tenantResolveCfg.Get<string[]>();
+                foreach (var domain in domains)
+                {
+                    options.AddDomainTenantResolver(domain);
+                }
+            });
+        }
+    }
+
+    private void ConfigureSwagger(IServiceCollection services)
+    {
+        // Swagger
+        services.AddSwaggerGen(
+            options =>
+            {
+                options.SwaggerDoc("v1", new OpenApiInfo { Title = "WorkflowManagement API", Version = "v1" });
+                options.DocInclusionPredicate((docName, description) => true);
+                options.CustomSchemaIds(type => type.FullName);
+                options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
+                {
+                    Description = "JWT Authorization header using the Bearer scheme. Example: \"Authorization: Bearer {token}\"",
+                    Name = "Authorization",
+                    In = ParameterLocation.Header,
+                    Scheme = "bearer",
+                    Type = SecuritySchemeType.Http,
+                    BearerFormat = "JWT"
+                });
+                options.AddSecurityRequirement(new OpenApiSecurityRequirement
+                {
+                        {
+                            new OpenApiSecurityScheme
+                            {
+                                Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "Bearer" }
+                            },
+                            new string[] { }
+                        }
+                });
+                options.OperationFilter<TenantHeaderParamter>();
+            });
+    }
+
+    private void ConfigureLocalization()
+    {
+        // 支持本地化语言类型
+        Configure<AbpLocalizationOptions>(options =>
+        {
+            options.Languages.Add(new LanguageInfo("en", "en", "English"));
+            options.Languages.Add(new LanguageInfo("zh-Hans", "zh-Hans", "简体中文"));
+            // 动态语言支持
+            options.Resources.AddDynamic();
+        });
+    }
+
+    private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false)
+    {
+        services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
+            .AddJwtBearer(options =>
+            {
+                options.Authority = configuration["AuthServer:Authority"];
+                options.RequireHttpsMetadata = false;
+                options.Audience = configuration["AuthServer:ApiName"];
+            });
+
+        if (!isDevelopment)
+        {
+            var redis = ConnectionMultiplexer.Connect(configuration["Redis:Configuration"]);
+            services
+                .AddDataProtection()
+                .SetApplicationName("LINGYUN.Abp.Application")
+                .PersistKeysToStackExchangeRedis(redis, "LINGYUN.Abp.Application:DataProtection:Protection-Keys");
+        }
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.DataSeeder.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.DataSeeder.cs
new file mode 100644
index 000000000..d9b9f2ac6
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.DataSeeder.cs
@@ -0,0 +1,20 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Volo.Abp;
+using Volo.Abp.Data;
+using Volo.Abp.Threading;
+
+namespace LY.MicroService.WorkflowManagement;
+
+public partial class WorkflowManagementHttpApiHostModule
+{
+    private void SeedData(ApplicationInitializationContext context)
+    {
+        if (context.GetEnvironment().IsDevelopment())
+        {
+            AsyncHelper.RunSync(async () =>
+                await context.ServiceProvider.GetRequiredService<IDataSeeder>()
+                    .SeedAsync());
+        }
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs
new file mode 100644
index 000000000..ce629ca57
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/WorkflowManagementHttpApiHostModule.cs
@@ -0,0 +1,129 @@
+using LINGYUN.Abp.AuditLogging.Elasticsearch;
+using LINGYUN.Abp.BlobStoring.OssManagement;
+using LINGYUN.Abp.Data.DbMigrator;
+using LINGYUN.Abp.ExceptionHandling.Emailing;
+using LINGYUN.Abp.LocalizationManagement.EntityFrameworkCore;
+using LINGYUN.Abp.MultiTenancy.DbFinder;
+using LINGYUN.Abp.Serilog.Enrichers.Application;
+using LINGYUN.Abp.WorkflowCore.Components;
+using LINGYUN.Abp.WorkflowCore.DistributedLock;
+using LINGYUN.Abp.WorkflowCore.LifeCycleEvent;
+using LINGYUN.Abp.WorkflowCore.Persistence.EntityFrameworkCore;
+using LINGYUN.Abp.WorkflowCore.RabbitMQ;
+using LINGYUN.Abp.WorkflowManagement;
+using LINGYUN.Abp.WorkflowManagement.EntityFrameworkCore;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using System.Globalization;
+using Volo.Abp;
+using Volo.Abp.AspNetCore.Authentication.JwtBearer;
+using Volo.Abp.AspNetCore.MultiTenancy;
+using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Serilog;
+using Volo.Abp.Autofac;
+using Volo.Abp.Caching.StackExchangeRedis;
+using Volo.Abp.EntityFrameworkCore.MySQL;
+using Volo.Abp.EventBus.RabbitMq;
+using Volo.Abp.FeatureManagement.EntityFrameworkCore;
+using Volo.Abp.Http.Client.IdentityModel.Web;
+using Volo.Abp.Modularity;
+using Volo.Abp.PermissionManagement.EntityFrameworkCore;
+using Volo.Abp.SettingManagement.EntityFrameworkCore;
+using Volo.Abp.Swashbuckle;
+using Volo.Abp.TenantManagement.EntityFrameworkCore;
+
+namespace LY.MicroService.WorkflowManagement;
+
+[DependsOn(
+        typeof(AbpSerilogEnrichersApplicationModule),
+        typeof(AbpAuditLoggingElasticsearchModule),
+        typeof(AbpAspNetCoreSerilogModule),
+        typeof(AbpEventBusRabbitMqModule),
+        typeof(AbpBlobStoringOssManagementModule),
+        typeof(WorkflowManagementApplicationModule),
+        typeof(WorkflowManagementHttpApiModule),
+        typeof(WorkflowManagementEntityFrameworkCoreModule),
+        typeof(AbpWorkflowCoreComponentsModule),
+        typeof(AbpWorkflowCoreDistributedLockModule),
+        typeof(AbpWorkflowCoreLifeCycleEventModule),
+        typeof(AbpWorkflowCoreRabbitMQModule),
+        typeof(AbpWorkflowCorePersistenceEntityFrameworkCoreModule),
+        typeof(AbpEntityFrameworkCoreMySQLModule),
+        typeof(AbpAspNetCoreAuthenticationJwtBearerModule),
+        typeof(AbpEmailingExceptionHandlingModule),
+        typeof(AbpHttpClientIdentityModelWebModule),
+        typeof(AbpAspNetCoreMultiTenancyModule),
+        typeof(AbpDbFinderMultiTenancyModule),
+        typeof(AbpFeatureManagementEntityFrameworkCoreModule),
+        typeof(AbpPermissionManagementEntityFrameworkCoreModule),
+        typeof(AbpSettingManagementEntityFrameworkCoreModule),
+        typeof(AbpTenantManagementEntityFrameworkCoreModule),
+        typeof(AbpLocalizationManagementEntityFrameworkCoreModule),
+        typeof(AbpDataDbMigratorModule),
+        typeof(AbpCachingStackExchangeRedisModule),
+        typeof(AbpAspNetCoreMvcModule),
+        typeof(AbpSwashbuckleModule),
+        typeof(AbpAutofacModule)
+        )]
+public partial class WorkflowManagementHttpApiHostModule : AbpModule
+{
+    public override void PreConfigureServices(ServiceConfigurationContext context)
+    {
+        PreConfigureApp();
+    }
+
+    public override void ConfigureServices(ServiceConfigurationContext context)
+    {
+        var hostingEnvironment = context.Services.GetHostingEnvironment();
+        var configuration = context.Services.GetConfiguration();
+
+        ConfigureDbContext();
+        ConfigureLocalization();
+        ConfigureJsonSerializer();
+        ConfigureExceptionHandling();
+        ConfigureVirtualFileSystem();
+        ConfigureCaching(configuration);
+        ConfigureAuditing(configuration);
+        ConfigureMultiTenancy(configuration);
+        ConfigureSwagger(context.Services);
+        ConfigureBlobStoring(context.Services, configuration);
+        ConfigureDistributedLock(context.Services, configuration);
+        ConfigureSecurity(context.Services, configuration, hostingEnvironment.IsDevelopment());
+
+        // 开发取消权限检查
+        // context.Services.AddAlwaysAllowAuthorization();
+    }
+
+    public override void OnApplicationInitialization(ApplicationInitializationContext context)
+    {
+        var app = context.GetApplicationBuilder();
+        var env = context.GetEnvironment();
+
+        app.UseStaticFiles();
+        app.UseCorrelationId();
+        app.UseRouting();
+        app.UseCors();
+        app.UseAuthentication();
+        app.UseJwtTokenMiddleware();
+        app.UseMultiTenancy();
+        app.UseAbpRequestLocalization(options => options.SetDefaultCulture(CultureInfo.CurrentCulture.Name));
+        app.UseAuthorization();
+        app.UseSwagger();
+        app.UseAbpSwaggerUI(options =>
+        {
+            options.SwaggerEndpoint("/swagger/v1/swagger.json", "Support APP API");
+
+            var configuration = context.GetConfiguration();
+            options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
+            options.OAuthClientSecret(configuration["AuthServer:SwaggerClientSecret"]);
+            options.OAuthScopes("WorkflowManagement");
+        });
+        app.UseAuditing();
+        app.UseAbpSerilogEnrichers();
+        app.UseConfiguredEndpoints();
+
+        SeedData(context);
+    }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json
new file mode 100644
index 000000000..215ca2e01
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.Development.json
@@ -0,0 +1,117 @@
+{
+  "AgileConfig": {
+    "env": "DEV",
+    "appId": "LINGYUN.Abp.WorkflowManagement",
+    "secret": "1q2w3E*",
+    "nodes": "http://127.0.0.1:15000",
+    "name": "LINGYUN.Abp.WorkflowManagement",
+    "tag": "LINGYUN.Abp.WorkflowManagement"
+  },
+  "App": {
+    "TrackingEntitiesChanged": true
+  },
+  "ConnectionStrings": {
+    "Default": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456",
+    "WorkflowManagement": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456",
+    "AbpWorkflowCore": "Server=127.0.0.1;Database=Workflow;User Id=root;Password=123456",
+    "AbpFeatureManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456",
+    "AbpPermissionManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456",
+    "AbpLocalizationManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456",
+    "AbpSettingManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456",
+    "AbpTenantManagement": "Server=127.0.0.1;Database=Platform;User Id=root;Password=123456"
+  },
+  "RemoteServices": {
+    "AbpOssManagement": {
+      "BaseUrl": "http://127.0.0.1:30025",
+      "IdentityClient": "InternalServiceClient",
+      "UseCurrentAccessToken": false
+    }
+  },
+  "IdentityClients": {
+    "InternalServiceClient": {
+      "Authority": "http://127.0.0.1:44385",
+      "RequireHttps": false,
+      "GrantType": "client_credentials",
+      "Scope": "lingyun-abp-application",
+      "ClientId": "InternalServiceClient",
+      "ClientSecret": "1q2w3E*"
+    }
+  },
+  "OssManagement": {
+    "Bucket": "workflow"
+  },
+  "RabbitMQ": {
+    "Connections": {
+      "AbpWorkflowCore": {
+        "HostName": "127.0.0.1",
+        "Port": 5672,
+        "UserName": "admin",
+        "Password": "123456",
+        "VirtualHost": "/"
+      }
+    },
+    "EventBus": {
+      "ConnectionName": "AbpWorkflowCore",
+      "ClientName": "workflow.server",
+      "ExchangeName": "AbpWorkflowCore"
+    }
+  },
+  "DistributedLock": {
+    "Redis": {
+      "Configuration": "127.0.0.1,defaultDatabase=15"
+    }
+  },
+  "Redis": {
+    "Configuration": "127.0.0.1,defaultDatabase=10",
+    "InstanceName": "LINGYUN.Abp.Application"
+  },
+  "AuthServer": {
+    "Authority": "http://127.0.0.1:44385/",
+    "ApiName": "lingyun-abp-application",
+    "SwaggerClientId": "InternalServiceClient",
+    "SwaggerClientSecret": "1q2w3E*"
+  },
+  "Logging": {
+    "Serilog": {
+      "Elasticsearch": {
+        "IndexFormat": "abp.dev.logging-{0:yyyy.MM.dd}"
+      }
+    }
+  },
+  "AuditLogging": {
+    "Elasticsearch": {
+      "IndexPrefix": "abp.dev.auditing"
+    }
+  },
+  "Elasticsearch": {
+    "NodeUris": "http://127.0.0.1:9200"
+  },
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Debug",
+      "Override": {
+        "System": "Warning",
+        "Microsoft": "Warning",
+        "DotNetCore": "Debug"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Console",
+        "Args": {
+          "restrictedToMinimumLevel": "Debug",
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "Elasticsearch",
+        "Args": {
+          "nodeUris": "http://127.0.0.1:9200",
+          "indexFormat": "abp.dev.logging-{0:yyyy.MM.dd}",
+          "autoRegisterTemplate": true,
+          "autoRegisterTemplateVersion": "ESv7"
+        }
+      }
+    ]
+  }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.json b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.json
new file mode 100644
index 000000000..95b9dd93b
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/appsettings.json
@@ -0,0 +1,80 @@
+{
+  "StringEncryption": {
+    "DefaultPassPhrase": "s46c5q55nxpeS8Ra",
+    "InitVectorBytes": "s83ng0abvd02js84",
+    "DefaultSalt": "sf&5)s3#"
+  },
+  "AllowedHosts": "*",
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Debug",
+      "Override": {
+        "Microsoft.EntityFrameworkCore": "Debug",
+        "System": "Information",
+        "Microsoft": "Information"
+      }
+    },
+    "Enrich": [ "FromLogContext", "WithProcessId", "WithThreadId", "WithEnvironmentName", "WithMachineName", "WithApplicationName" ],
+    "WriteTo": [
+      {
+        "Name": "Console",
+        "Args": {
+          "initialMinimumLevel": "Verbose",
+          "standardErrorFromLevel": "Verbose",
+          "restrictedToMinimumLevel": "Verbose",
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/Debug-.log",
+          "restrictedToMinimumLevel": "Debug",
+          "rollingInterval": "Day",
+          "fileSizeLimitBytes": 5242880,
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/Info-.log",
+          "restrictedToMinimumLevel": "Information",
+          "rollingInterval": "Day",
+          "fileSizeLimitBytes": 5242880,
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/Warn-.log",
+          "restrictedToMinimumLevel": "Warning",
+          "rollingInterval": "Day",
+          "fileSizeLimitBytes": 5242880,
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/Error-.log",
+          "restrictedToMinimumLevel": "Error",
+          "rollingInterval": "Day",
+          "fileSizeLimitBytes": 5242880,
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "Logs/Fatal-.log",
+          "restrictedToMinimumLevel": "Fatal",
+          "rollingInterval": "Day",
+          "fileSizeLimitBytes": 5242880,
+          "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss} [{Level:u3}] [{SourceContext}] [{ProcessId}] [{ThreadId}] - {Message:lj}{NewLine}{Exception}"
+        }
+      }
+    ]
+  }
+}
diff --git a/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/dapr.sh b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/dapr.sh
new file mode 100644
index 000000000..5b492fddc
--- /dev/null
+++ b/aspnet-core/services/LY.MicroService.WorkflowManagement.HttpApi.Host/dapr.sh
@@ -0,0 +1 @@
+dapr run --app-id workflow --app-port 30035 -H 36550 -- dotnet run --no-build
\ No newline at end of file
diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/FodyWeavers.xml b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/FodyWeavers.xml
deleted file mode 100644
index 1715698cc..000000000
--- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/FodyWeavers.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ConfigureAwait ContinueOnCapturedContext="false" />
-</Weavers>
\ No newline at end of file
diff --git a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json
index 12b6c9a93..82973b8e2 100644
--- a/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json
+++ b/aspnet-core/services/LY.MicroService.identityServer.HttpApi.Host/appsettings.Development.json
@@ -27,7 +27,8 @@
       "DefaultGroupName": "IdentityServer4Admin",
       "Version": "v1",
       "FailedRetryInterval": 300,
-      "FailedRetryCount": 10
+      "FailedRetryCount": 10,
+      "CollectorCleaningInterval": 3600000
     },
     "MySql": {
       "TableNamePrefix": "ida",
diff --git a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json
index ab30e9976..0f9f92842 100644
--- a/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json
+++ b/aspnet-core/services/LY.MicroService.identityServer/appsettings.Development.json
@@ -27,7 +27,8 @@
       "DefaultGroupName": "AuthServer",
       "Version": "v1",
       "FailedRetryInterval": 300,
-      "FailedRetryCount": 10
+      "FailedRetryCount": 10,
+      "CollectorCleaningInterval": 3600000
     },
     "MySql": {
       "TableNamePrefix": "auth",
diff --git a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN.Abp.WorkflowCore.Tests.csproj b/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN.Abp.WorkflowCore.Tests.csproj
index 248440a29..8aca85f09 100644
--- a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN.Abp.WorkflowCore.Tests.csproj
+++ b/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN.Abp.WorkflowCore.Tests.csproj
@@ -1,18 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-	  <RootNamespace />
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<RootNamespace />
+		<IsPackable>false</IsPackable>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+		<!--<PackageReference Include="WorkflowCore.Testing" Version="3.5.2" />-->
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowCore\LINGYUN.Abp.WorkflowCore.csproj" />
-    <ProjectReference Include="..\LINGYUN.Abp.TestBase\LINGYUN.Abp.TestsBase.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\modules\workflow\LINGYUN.Abp.WorkflowCore\LINGYUN.Abp.WorkflowCore.csproj" />
+		<ProjectReference Include="..\LINGYUN.Abp.TestBase\LINGYUN.Abp.TestsBase.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/Middleware/MultiTenancyStepMiddleware_Tests.cs b/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/Middleware/MultiTenancyStepMiddleware_Tests.cs
new file mode 100644
index 000000000..e1dfad767
--- /dev/null
+++ b/aspnet-core/tests/LINGYUN.Abp.WorkflowCore.Tests/LINGYUN/Abp/WorkflowCore/Middleware/MultiTenancyStepMiddleware_Tests.cs
@@ -0,0 +1,72 @@
+using Shouldly;
+using System;
+using System.Threading.Tasks;
+using Volo.Abp.MultiTenancy;
+using WorkflowCore.Interface;
+using WorkflowCore.Models;
+using Xunit;
+
+namespace LINGYUN.Abp.WorkflowCore.Middleware
+{
+    public class MultiTenancyStepMiddleware_Tests : AbpWorkflowCoreTestBase
+    {
+        public static bool IsCompleted = false;
+        public static readonly Guid TenantId = Guid.NewGuid();
+        private readonly IWorkflowController _controller;
+        public MultiTenancyStepMiddleware_Tests()
+        {
+            _controller = GetRequiredService<IWorkflowController>();
+        }
+
+        [Fact]
+        public async Task Should_Be_Resolved_Multi_Tenant_Id_On_Step()
+        {
+            await _controller.StartWorkflow(
+                "MiddlewareWorkflow",
+                new MiddlewareWorkflowData
+                {
+                    TenantId = TenantId
+                });
+
+        }
+    }
+
+    public class MiddlewareWorkflowData : IMultiTenant
+    {
+        public Guid? TenantId { get; set; }
+    }
+
+    public class MiddlewareWorkflow : IWorkflow<MiddlewareWorkflowData>
+    {
+        public string Id => "MiddlewareWorkflow";
+
+        public int Version => 1;
+
+        public void Build(IWorkflowBuilder<MiddlewareWorkflowData> builder)
+        {
+            builder.StartWith((_) => Console.WriteLine("Start Workflow"))
+                .Then<MessageStep>()
+                .Then((_) => MultiTenancyStepMiddleware_Tests.IsCompleted = true)
+                .EndWorkflow();
+        }
+    }
+
+    public class MessageStep : StepBodyBase
+    {
+        private readonly ICurrentTenant _currentTenant;
+
+        public MessageStep(ICurrentTenant currentTenant)
+        {
+            _currentTenant = currentTenant;
+        }
+
+        public override ExecutionResult Run(IStepExecutionContext context)
+        {
+            MultiTenancyStepMiddleware_Tests.TenantId.ShouldBe(_currentTenant.Id.Value);
+
+            Console.WriteLine("Current Tenant Id: {0}", _currentTenant.Id?.ToString() ?? "Null");
+
+            return ExecutionResult.Next();
+        }
+    }
+}
diff --git a/build/modules.dependencies.json b/build/modules.dependencies.json
index e885418b3..2c9b4e490 100644
--- a/build/modules.dependencies.json
+++ b/build/modules.dependencies.json
@@ -55,7 +55,9 @@
         "depPath": "/../aspnet-core/LocalNuget/netstandard2.0/",
         "dependencies": [
           "LINGYUN.Abp.Features.LimitValidation.dll",
-          "LINGYUN.Abp.Features.LimitValidation.Redis.dll"
+          "LINGYUN.Abp.Features.LimitValidation.Redis.dll",
+          "LINGYUN.Abp.WorkflowManagement.Application.Contracts.dll",
+          "LINGYUN.Abp.WorkflowManagement.Domain.Shared.dll"
         ]
       }
     ]
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index e62240780..04a5d8a8c 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,43 +1,53 @@
 version: '3.4'
 
 services:
-  identity-server-sts:
+  sts-server:
     build:
       context: ./aspnet-core/services/Publish/identityserver
     volumes:
       - /var/opt/abp/logs/ids-sts:/app/Logs
       - /var/opt/abp/data/ids-sts/Modules:/app/Modules
     restart: always
+    networks:
+      - framework
 
-  identity-server-admin:
+  sts-api:
     build:
       context: ./aspnet-core/services/Publish/identityserver4-admin
     volumes:
       - /var/opt/abp/logs/ids-admin:/app/Logs
       - /var/opt/abp/data/ids-admin/Modules:/app/Modules
     depends_on:
-      - identity-server-sts
+      - sts-server
     restart: always
+    networks:
+      - framework
 
-  admin-service:
+  admin-api:
     build:
       context: ./aspnet-core/services/Publish/admin
     volumes:
       - /var/opt/abp/logs/backend-admin:/app/Logs
       - /var/opt/abp/data/backend-admin/Modules:/app/Modules
     depends_on:
-      - identity-server-sts
+      - sts-server
     restart: always
+    networks:
+      - framework
 
-  localization-service:
+  localization-api:
     build:
       context: ./aspnet-core/services/Publish/localization
     volumes:
       - /var/opt/abp/logs/localization:/app/Logs
       - /var/opt/abp/data/localization/Modules:/app/Modules
     restart: always
+    depends_on:
+      - sts-server
+    networks:
+      - framework
 
-  platform-service:
+  platform-api:
     build:
       context: ./aspnet-core/services/Publish/platform
     volumes:
@@ -45,29 +55,34 @@ services:
       - /var/opt/abp/data/platform/Modules:/app/Modules
       - /var/opt/abp/data/platform:/app/file-blob-storing
     depends_on:
-      - identity-server-sts
+      - sts-server
     restart: always
+    networks:
+      - framework
 
-  messages-service:
+  messages-api:
     build:
       context: ./aspnet-core/services/Publish/messages
     volumes:
       - /var/opt/abp/logs/messages:/app/Logs
       - /var/opt/abp/data/messages/Modules:/app/Modules
     depends_on:
-      - identity-server-sts
+      - sts-server
     restart: always
+    networks:
+      - framework
 
-  internat-apigateway:
+  internal-apigateway:
     build:
       context: ./aspnet-core/services/Publish/internal-apigateway
     volumes:
-      - /var/opt/abp/logs/internat-apigateway:/app/Logs
-      - /var/opt/abp/data/internat-apigateway/Modules:/app/Modules
+      - /var/opt/abp/logs/internal-apigateway:/app/Logs
+      - /var/opt/abp/data/internal-apigateway/Modules:/app/Modules
     restart: always
-
-volumes:
-  dbdata:
+    networks:
+      - framework
 
 networks:
-  linyun-abp:
+  framework:
+    external:
+      name: ly_app_net
diff --git a/docker-compose.yml b/docker-compose.yml
index 5e0eb6a42..d09c9c101 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,49 +1,49 @@
 version: '3.4'
 
 services:
-  admin-service:
+  admin-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30010:80"
 
-  identity-server-admin:
+  sts-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30015:80"
 
-  localization-service:
+  localization-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30030:80"
 
-  platform-service:
+  platform-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30025:80"
 
-  messages-service:
+  messages-api:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "30020:80"
 
-  identity-server-sts:
+  sts-server:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
     ports:
       - "44385:80"
 
-  internat-apigateway:
+  internal-apigateway:
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - ASPNETCORE_URLS=http://0.0.0.0:80
diff --git a/gateways/Directory.Build.props b/gateways/Directory.Build.props
index adfe8e5e3..50aa64a65 100644
--- a/gateways/Directory.Build.props
+++ b/gateways/Directory.Build.props
@@ -1,12 +1,12 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>5.0.0-rc.1</VoloAbpPackageVersion>
-		<LINGYUNAbpPackageVersion>5.0.0-rc.1</LINGYUNAbpPackageVersion>
+		<VoloAbpPackageVersion>5.0.0-rc.2</VoloAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>5.0.0-rc.2</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.5.0</DaprPackageVersion>
 		<DotNetCoreCAPPackageVersion>5.2.0</DotNetCoreCAPPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
 		<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
-		<AgileConfigClientPackageVersion>1.2.1.3</AgileConfigClientPackageVersion>
+		<AgileConfigClientPackageVersion>1.2.1.5</AgileConfigClientPackageVersion>
 		<HangfireMySqlStoragePackageVersion>2.0.3</HangfireMySqlStoragePackageVersion>
 		<HangfireMSSQLStoragePackageVersion>1.7.27</HangfireMSSQLStoragePackageVersion>
 		<NESTPackageVersion>7.15.1</NESTPackageVersion>
diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs
index 36b2f410f..4148d9578 100644
--- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs
+++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayModule.Configure.cs
@@ -120,7 +120,8 @@ namespace LINGYUN.MicroService.Internal.ApiGateway
 
         private void ConfigureOcelot(IServiceCollection services, IConfiguration configuration)
         {
-            services.AddSingleton<IFileConfigurationRepository, DiskFileConfigurationAggragatorRepository>();
+            // 需要合并自定义配置取消注释
+            // services.AddSingleton<IFileConfigurationRepository, DiskFileConfigurationAggragatorRepository>();
             services
                 .AddOcelot(configuration)
                 .AddPolly()
diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayOptions.cs b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayOptions.cs
index 431efceaa..c8cbecebc 100644
--- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayOptions.cs
+++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/InternalApiGatewayOptions.cs
@@ -4,7 +4,6 @@ namespace LINGYUN.MicroService.Internal.ApiGateway
 {
     public class InternalApiGatewayOptions
     {
-        public string AppId { get; set; }
         public DownstreamOpenApi[] DownstreamOpenApis { get; set; }
         public InternalApiGatewayOptions()
         {
diff --git a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json
index 32b7db74d..836e80b3f 100644
--- a/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json
+++ b/gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/src/LINGYUN.MicroService.Internal.ApiGateway/appsettings.Development.json
@@ -1,7 +1,7 @@
 {
   "AgileConfig": {
     "env": "DEV",
-    "appId": "LINGYUN.Abp.ApiGateway",
+    "appId": "LINGYUN.Internal.ApiGateway",
     "secret": "1q2w3E*",
     "nodes": "http://127.0.0.1:5000",
     "name": "ApiGateway",