From d70436f24dab94f3a905abf20d28a0093f7ceeba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AE=8F?= Date: Tue, 15 Aug 2023 01:17:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E5=8F=8A=E9=83=A8=E5=88=86=E5=8A=9F=E8=83=BD=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E5=8C=96=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=20=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E7=AE=A1=E7=90=86=E5=A4=84=E7=90=86=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=B5=B7=E4=BD=9C=E7=94=A8=E7=9A=84=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/localization/model/resourcesModel.ts | 4 +++ apps/vue/src/api/localization/resources.ts | 9 ++++--- apps/vue/src/utils/http/axios/index.ts | 3 +++ .../resources/components/ResourceTable.vue | 7 ++++- .../messages/notifications/datas/ModalData.ts | 2 +- .../messages/notifications/datas/TableData.ts | 2 +- .../saas/tenant/components/TenantTable.vue | 2 +- aspnet-core/migrate-database.bat | 25 +++++++----------- aspnet-core/migrate-db-cmd.bat | 17 +++++++----- .../Mvc/Localization/GetWithFilter.cs | 7 +++++ .../Mvc/Localization/IResourceAppService.cs | 2 +- .../Mvc/Localization/ResourceAppService.cs | 14 +++++++--- .../Mvc/Localization/ResourceController.cs | 4 +-- ...ksManagementHttpApiHostModule.Configure.cs | 14 ++++++++++ aspnet-core/start-all-service.bat | 2 -- starter/00.auto-config-docker.cmd | 26 +++++++++++++++++++ starter/01.migrate-db.cmd | 4 +++ starter/08.start-realtime-message.bat | 4 --- .../{01.start-ids.bat => 10.start-ids.bat} | 0 ...t-ids-admin.bat => 11.start-ids-admin.bat} | 0 ...lization.bat => 12.start-localization.bat} | 0 ...art-platform.bat => 13.start-platform.bat} | 0 ...art-messages.bat => 14.start-messages.bat} | 0 ...ement.bat => 15.start-task-management.bat} | 0 ...t.bat => 16.start-webhooks-management.bat} | 0 ...t.bat => 17.start-workflow-management.bat} | 0 ...{10.start-admin.bat => 18.start-admin.bat} | 0 ...eway.bat => 70.start-internal-gateway.bat} | 0 starter/80.start-host.cmd | 9 +++++++ starter/91.install-node-module.cmd | 6 +++++ starter/99.start-all.cmd | 9 ------- starter/{90.start-ui.bat => 99.start-ui.cmd} | 2 +- starter/readme.md | 8 ++++++ 33 files changed, 129 insertions(+), 53 deletions(-) create mode 100644 aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/GetWithFilter.cs create mode 100644 starter/00.auto-config-docker.cmd create mode 100644 starter/01.migrate-db.cmd delete mode 100644 starter/08.start-realtime-message.bat rename starter/{01.start-ids.bat => 10.start-ids.bat} (100%) rename starter/{02.start-ids-admin.bat => 11.start-ids-admin.bat} (100%) rename starter/{03.start-localization.bat => 12.start-localization.bat} (100%) rename starter/{04.start-platform.bat => 13.start-platform.bat} (100%) rename starter/{05.start-messages.bat => 14.start-messages.bat} (100%) rename starter/{06.start-task-management.bat => 15.start-task-management.bat} (100%) rename starter/{07.start-webhooks-management.bat => 16.start-webhooks-management.bat} (100%) rename starter/{09.start-workflow-management.bat => 17.start-workflow-management.bat} (100%) rename starter/{10.start-admin.bat => 18.start-admin.bat} (100%) rename starter/{80.start-internal-gateway.bat => 70.start-internal-gateway.bat} (100%) create mode 100644 starter/80.start-host.cmd create mode 100644 starter/91.install-node-module.cmd delete mode 100644 starter/99.start-all.cmd rename starter/{90.start-ui.bat => 99.start-ui.cmd} (81%) create mode 100644 starter/readme.md diff --git a/apps/vue/src/api/localization/model/resourcesModel.ts b/apps/vue/src/api/localization/model/resourcesModel.ts index c05f6ece2..5bb59d973 100644 --- a/apps/vue/src/api/localization/model/resourcesModel.ts +++ b/apps/vue/src/api/localization/model/resourcesModel.ts @@ -26,3 +26,7 @@ export interface ResourcePagedResult extends PagedResultDto {} export interface GetResourcePagedRequest extends PagedAndSortedResultRequestDto { filter?: string; } + +export interface GetWithFilter { + filter?: string; +} \ No newline at end of file diff --git a/apps/vue/src/api/localization/resources.ts b/apps/vue/src/api/localization/resources.ts index 32b4d497a..b4651aa58 100644 --- a/apps/vue/src/api/localization/resources.ts +++ b/apps/vue/src/api/localization/resources.ts @@ -1,16 +1,17 @@ import { defAbpHttp } from '/@/utils/http/abp'; -import { ResourceListResult, Resource, ResourceCreate, ResourceUpdate } from './model/resourcesModel'; +import { ResourceListResult, Resource, ResourceCreate, ResourceUpdate, GetWithFilter } from './model/resourcesModel'; +import { format } from '/@/utils/strings'; const remoteServiceName = 'LocalizationManagement'; const controllerName = 'Resource'; enum Api { - GetList = '/api/abp/localization/resources', + GetList = '/api/abp/localization/resources?filter={filter}', } -export const getList = () => { +export const getList = (input: GetWithFilter) => { return defAbpHttp.get({ - url: Api.GetList, + url: format(Api.GetList, input), }); }; diff --git a/apps/vue/src/utils/http/axios/index.ts b/apps/vue/src/utils/http/axios/index.ts index 19227be17..8dba6964d 100644 --- a/apps/vue/src/utils/http/axios/index.ts +++ b/apps/vue/src/utils/http/axios/index.ts @@ -136,6 +136,9 @@ const transform: AxiosTransform = { if ((config as Recordable)?.requestOptions?.withAcceptLanguage !== false) { const localeStore = useLocaleStoreWithOut(); config.headers['Accept-Language'] = localeStore.getLocale; + if (config.headers['Accept-Language'] == 'zh_CN') { + config.headers['Accept-Language'] = 'zh-Hans'; + } } return config; }, diff --git a/apps/vue/src/views/localization/resources/components/ResourceTable.vue b/apps/vue/src/views/localization/resources/components/ResourceTable.vue index 8e634dbe0..4dafe1e6a 100644 --- a/apps/vue/src/views/localization/resources/components/ResourceTable.vue +++ b/apps/vue/src/views/localization/resources/components/ResourceTable.vue @@ -47,8 +47,13 @@ import { getList, GetAsyncByName, DeleteAsyncByName } from '/@/api/localization/resources'; import { Resource } from '/@/api/localization/model/resourcesModel'; import { getDataColumns } from './TableData'; + import { reactive } from 'vue'; import ResourceModal from './ResourceModal.vue'; + const state = reactive({ + filter: 'noti' + }); + const { createConfirm, createMessage } = useMessage(); const { L } = useLocalization(['LocalizationManagement', 'AbpLocalization', 'AbpUi']); const [registerModal, { openModal }] = useModal(); @@ -88,7 +93,7 @@ function fetchResources() { const form = getForm(); return form.validate().then(() => { - return getList().then((res) => { + return getList({filter: state.filter}).then((res) => { setTableData(res.items); }); }); diff --git a/apps/vue/src/views/messages/notifications/datas/ModalData.ts b/apps/vue/src/views/messages/notifications/datas/ModalData.ts index 3856bd76e..607031da1 100644 --- a/apps/vue/src/views/messages/notifications/datas/ModalData.ts +++ b/apps/vue/src/views/messages/notifications/datas/ModalData.ts @@ -2,7 +2,7 @@ import { useLocalization } from '/@/hooks/abp/useLocalization'; import { FormProps } from '/@/components/Form'; import { NotificationReadState } from '/@/api/messages/model/notificationsModel'; -const { L } = useLocalization(['AbpMessageService', 'AbpUi']); +const { L } = useLocalization(['AbpMessageService', 'Notifications', 'AbpUi']); export function getSearchFormSchemas(): Partial { return { diff --git a/apps/vue/src/views/messages/notifications/datas/TableData.ts b/apps/vue/src/views/messages/notifications/datas/TableData.ts index ade23fcd3..b01219011 100644 --- a/apps/vue/src/views/messages/notifications/datas/TableData.ts +++ b/apps/vue/src/views/messages/notifications/datas/TableData.ts @@ -2,7 +2,7 @@ import { useLocalization } from '/@/hooks/abp/useLocalization'; import { BasicColumn } from '/@/components/Table'; import { formatToDateTime } from '/@/utils/dateUtil'; -const { L } = useLocalization('AbpMessageService'); +const { L } = useLocalization('Notifications'); export function getDataColumns(): BasicColumn[] { return [ diff --git a/apps/vue/src/views/saas/tenant/components/TenantTable.vue b/apps/vue/src/views/saas/tenant/components/TenantTable.vue index c0b86bf40..256dd9ed4 100644 --- a/apps/vue/src/views/saas/tenant/components/TenantTable.vue +++ b/apps/vue/src/views/saas/tenant/components/TenantTable.vue @@ -73,7 +73,7 @@ import TenantModal from './TenantModal.vue'; import ConnectionTableModal from './ConnectionTableModal.vue'; - const { L } = useLocalization(['AbpSaas', 'AbpFeatureManagement']); + const { L } = useLocalization(['AbpSaas', 'AbpFeatureManagement','WeChat']); const { hasPermission } = usePermission(); const tableElRef = ref>(null); const [registerConnectModal, { openModal: openConnectModal }] = useModal(); diff --git a/aspnet-core/migrate-database.bat b/aspnet-core/migrate-database.bat index 4ce04c22f..03645f8e9 100644 --- a/aspnet-core/migrate-database.bat +++ b/aspnet-core/migrate-database.bat @@ -1,19 +1,12 @@ @echo off cls -set stime=8 -start .\migrate-db-cmd.bat LY.MicroService.BackendAdmin.DbMigrator admin --run -ping -n %stime% 127.1 >nul -start .\migrate-db-cmd.bat LY.MicroService.AuthServer.DbMigrator auth-server --run -ping -n %stime% 127.1 >nul -start .\migrate-db-cmd.bat LY.MicroService.IdentityServer.DbMigrator identityserver4-admin --run -ping -n %stime% 127.1 >nul -start .\migrate-db-cmd.bat LY.MicroService.LocalizationManagement.DbMigrator localization --run -ping -n %stime% 127.1 >nul -start .\migrate-db-cmd.bat LY.MicroService.Platform.DbMigrator platform --run -ping -n %stime% 127.1 >nul -start .\migrate-db-cmd.bat LY.MicroService.RealtimeMessage.DbMigrator messages --run -ping -n %stime% 127.1 >nul -start .\migrate-db-cmd.bat LY.MicroService.TaskManagement.DbMigrator task-management --run -ping -n %stime% 127.1 >nul -start .\migrate-db-cmd.bat LY.MicroService.WebhooksManagement.DbMigrator webhooks-management --run +call .\migrate-db-cmd.bat LY.MicroService.BackendAdmin.DbMigrator admin --run +call .\migrate-db-cmd.bat LY.MicroService.AuthServer.DbMigrator auth-server --run +call .\migrate-db-cmd.bat LY.MicroService.IdentityServer.DbMigrator identityserver4-admin --run +call .\migrate-db-cmd.bat LY.MicroService.LocalizationManagement.DbMigrator localization --run +call .\migrate-db-cmd.bat LY.MicroService.Platform.DbMigrator platform --run +call .\migrate-db-cmd.bat LY.MicroService.RealtimeMessage.DbMigrator messages --run +call .\migrate-db-cmd.bat LY.MicroService.TaskManagement.DbMigrator task-management --run +call .\migrate-db-cmd.bat LY.MicroService.WebhooksManagement.DbMigrator webhooks-management --run +pause \ No newline at end of file diff --git a/aspnet-core/migrate-db-cmd.bat b/aspnet-core/migrate-db-cmd.bat index 87b9014f6..c0200d390 100644 --- a/aspnet-core/migrate-db-cmd.bat +++ b/aspnet-core/migrate-db-cmd.bat @@ -1,10 +1,9 @@ @echo off -cls chcp 65001 title %2 -@echo %2 migration running +@echo %2 migrating cd .\migrations\%1 @@ -15,14 +14,18 @@ if '%3' equ '' goto run exit :run -dotnet run -pause -exit +dotnet run +goto end :restore dotnet restore -exit +goto end :efu dotnet ef databse update -exit \ No newline at end of file +goto end + +:end +cd ..\..\ +@echo %2 migrated +@echo -------- diff --git a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/GetWithFilter.cs b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/GetWithFilter.cs new file mode 100644 index 000000000..e7c3dd4ef --- /dev/null +++ b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/GetWithFilter.cs @@ -0,0 +1,7 @@ +namespace LINGYUN.Abp.AspNetCore.Mvc.Localization +{ + public class GetWithFilter + { + public string Filter { get; set; } + } +} diff --git a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/IResourceAppService.cs b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/IResourceAppService.cs index bcfc40d46..906d3922a 100644 --- a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/IResourceAppService.cs +++ b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/IResourceAppService.cs @@ -6,6 +6,6 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization { public interface IResourceAppService : IApplicationService { - Task> GetListAsync(); + Task> GetListAsync(GetWithFilter filter); } } diff --git a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs index 9e939d2fd..30bdc333d 100644 --- a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs +++ b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceAppService.cs @@ -1,6 +1,12 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.Extensions.Options; -using System.Linq; +using Microsoft.Extensions.Localization; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Dynamic.Core; +using System.Threading.Tasks; +using Volo.Abp; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; @@ -23,12 +29,14 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization _externalLocalizationStore = externalLocalizationStore; } - public virtual async Task> GetListAsync() + public virtual async Task> GetListAsync(GetWithFilter input) { - var externalResources = await _externalLocalizationStore.GetResourcesAsync(); + var externalResources = (await _externalLocalizationStore.GetResourcesAsync()) + .WhereIf(!input.Filter.IsNullOrWhiteSpace(), x => x.ResourceName.Contains(input.Filter)); var resources = _localizationOptions .Resources + .WhereIf(!input.Filter.IsNullOrWhiteSpace(), x => x.Value.ResourceName.Contains(input.Filter)) .Select(x => new ResourceDto { Name = x.Value.ResourceName, diff --git a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceController.cs b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceController.cs index d2cada1c3..58dcc54f1 100644 --- a/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceController.cs +++ b/aspnet-core/modules/localization/LINGYUN.Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceController.cs @@ -19,9 +19,9 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization } [HttpGet] - public virtual Task> GetListAsync() + public virtual Task> GetListAsync(GetWithFilter filter) { - return _service.GetListAsync(); + return _service.GetListAsync(filter); } } } diff --git a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs index c1511c529..56f607319 100644 --- a/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs +++ b/aspnet-core/services/LY.MicroService.WebhooksManagement.HttpApi.Host/WebhooksManagementHttpApiHostModule.Configure.cs @@ -2,6 +2,7 @@ using LINGYUN.Abp.BackgroundTasks; using LINGYUN.Abp.ExceptionHandling; using LINGYUN.Abp.ExceptionHandling.Emailing; +using LINGYUN.Abp.Localization.CultureMap; using LINGYUN.Abp.Serilog.Enrichers.Application; using LINGYUN.Abp.Serilog.Enrichers.UniqueId; using LINGYUN.Abp.Webhooks; @@ -358,6 +359,19 @@ public partial class WebhooksManagementHttpApiHostModule options.UsePersistence(); }); + + + Configure(options => + { + var zhHansCultureMapInfo = new CultureMapInfo + { + TargetCulture = "zh-Hans", + SourceCultures = new string[] { "zh", "zh_CN", "zh-CN" } + }; + + options.CulturesMaps.Add(zhHansCultureMapInfo); + options.UiCulturesMaps.Add(zhHansCultureMapInfo); + }); } private void ConfigureSecurity(IServiceCollection services, IConfiguration configuration, bool isDevelopment = false) diff --git a/aspnet-core/start-all-service.bat b/aspnet-core/start-all-service.bat index 77bace5bd..78bc55b29 100644 --- a/aspnet-core/start-all-service.bat +++ b/aspnet-core/start-all-service.bat @@ -16,8 +16,6 @@ start .\start-http-api-host.bat LY.MicroService.TaskManagement.HttpApi.Host task ping -n %stime% 127.1 >nul start .\start-http-api-host.bat LY.MicroService.WebhooksManagement.HttpApi.Host webhooks-management--run ping -n %stime% 127.1 >nul -start .\start-http-api-host.bat LY.MicroService.RealtimeMessage.HttpApi.Host realtime-message --run -ping -n %stime% 127.1 >nul start .\start-http-api-host.bat LY.MicroService.WorkflowManagement.HttpApi.Host workflow-management --run ping -n %stime% 127.1 >nul start .\start-http-api-host.bat LY.MicroService.BackendAdmin.HttpApi.Host admin --run diff --git a/starter/00.auto-config-docker.cmd b/starter/00.auto-config-docker.cmd new file mode 100644 index 000000000..ab7531779 --- /dev/null +++ b/starter/00.auto-config-docker.cmd @@ -0,0 +1,26 @@ +docker network create --subnet=172.18.0.0/16 nt + +docker pull mysql +docker volume rm mysql-data +docker volume rm mysql-log +docker volume create mysql-data +docker volume create mysql-log +docker run --ip 172.18.0.10 -d --name mysql --net nt -v mysql-log:/var/log/mysql -v mysql-data:/var/lib/mysql -p 3306:3306 -p 33060:33060 -e MYSQL_ROOT_PASSWORD=123456 -d mysql --init-connect="SET collation_connection=utf8mb4_0900_ai_ci" --init-connect="SET NAMES utf8mb4" --skip-character-set-client-handshake + +docker pull rabbitmq:management +docker volume rm rabbitmq-home +docker volume create rabbitmq-home +docker run --ip 172.18.0.40 -d -id --name=rabbitmq --net nt -v rabbitmq-home:/var/lib/rabbitmq -p 15672:15672 -p 5672:5672 -e RABBITMQ_DEFAULT_USER=admin -e RABBITMQ_DEFAULT_PASS=admin rabbitmq:management + +docker pull redis +docker volume rm redis-home +docker volume create redis-home +docker run --ip 172.18.0.50 -d --net nt -p 6379:6379 --name redis -v redis-home:/data redis + +docker pull docker.elastic.co/elasticsearch/elasticsearch:8.9.0 +docker volume rm elasticsearch-home +docker volume create elasticsearch-home +docker run --ip 172.18.0.60 -d --name es --net nt -v elasticsearch-home:/usr/share/elasticsearch/data -e "discovery.type=single-node" -e ES_JAVA_OPTS="-Xms1G -Xmx1G" -e xpack.security.enabled=false -p 9200:9200 -p 9300:9300 -it docker.elastic.co/elasticsearch/elasticsearch:8.9.0 + +docker pull docker.elastic.co/kibana/kibana:8.9.0 +docker run --ip 172.18.0.70 -d --name kib --net nt -p 5601:5601 docker.elastic.co/kibana/kibana:8.9.0 diff --git a/starter/01.migrate-db.cmd b/starter/01.migrate-db.cmd new file mode 100644 index 000000000..ed36af3e6 --- /dev/null +++ b/starter/01.migrate-db.cmd @@ -0,0 +1,4 @@ +@echo off +cd ..\aspnet-core +migrate-database.bat + diff --git a/starter/08.start-realtime-message.bat b/starter/08.start-realtime-message.bat deleted file mode 100644 index 98ed971e3..000000000 --- a/starter/08.start-realtime-message.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cls -cd ..\aspnet-core\ -.\start-http-api-host.bat LY.MicroService.RealtimeMessage.HttpApi.Host realtime-message --run \ No newline at end of file diff --git a/starter/01.start-ids.bat b/starter/10.start-ids.bat similarity index 100% rename from starter/01.start-ids.bat rename to starter/10.start-ids.bat diff --git a/starter/02.start-ids-admin.bat b/starter/11.start-ids-admin.bat similarity index 100% rename from starter/02.start-ids-admin.bat rename to starter/11.start-ids-admin.bat diff --git a/starter/03.start-localization.bat b/starter/12.start-localization.bat similarity index 100% rename from starter/03.start-localization.bat rename to starter/12.start-localization.bat diff --git a/starter/04.start-platform.bat b/starter/13.start-platform.bat similarity index 100% rename from starter/04.start-platform.bat rename to starter/13.start-platform.bat diff --git a/starter/05.start-messages.bat b/starter/14.start-messages.bat similarity index 100% rename from starter/05.start-messages.bat rename to starter/14.start-messages.bat diff --git a/starter/06.start-task-management.bat b/starter/15.start-task-management.bat similarity index 100% rename from starter/06.start-task-management.bat rename to starter/15.start-task-management.bat diff --git a/starter/07.start-webhooks-management.bat b/starter/16.start-webhooks-management.bat similarity index 100% rename from starter/07.start-webhooks-management.bat rename to starter/16.start-webhooks-management.bat diff --git a/starter/09.start-workflow-management.bat b/starter/17.start-workflow-management.bat similarity index 100% rename from starter/09.start-workflow-management.bat rename to starter/17.start-workflow-management.bat diff --git a/starter/10.start-admin.bat b/starter/18.start-admin.bat similarity index 100% rename from starter/10.start-admin.bat rename to starter/18.start-admin.bat diff --git a/starter/80.start-internal-gateway.bat b/starter/70.start-internal-gateway.bat similarity index 100% rename from starter/80.start-internal-gateway.bat rename to starter/70.start-internal-gateway.bat diff --git a/starter/80.start-host.cmd b/starter/80.start-host.cmd new file mode 100644 index 000000000..38f8eafd6 --- /dev/null +++ b/starter/80.start-host.cmd @@ -0,0 +1,9 @@ +@echo off +cls +title start-all +set stime=12 +for /f "delims=" %%i in ('dir *.bat /b') do ( + echo %%i + start %%i + ping -n %stime% 127.1 >nul +) \ No newline at end of file diff --git a/starter/91.install-node-module.cmd b/starter/91.install-node-module.cmd new file mode 100644 index 000000000..f8a87743a --- /dev/null +++ b/starter/91.install-node-module.cmd @@ -0,0 +1,6 @@ +@echo off +cls +cd ../apps/vue/ +title install-module +pnpm install +pause diff --git a/starter/99.start-all.cmd b/starter/99.start-all.cmd deleted file mode 100644 index a03b5997a..000000000 --- a/starter/99.start-all.cmd +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -cls -title start-all -set stime=8 -for /f "delims=" %%i in ('dir *.bat *.cmd /b /s^|findstr /v /i "99.start-all.cmd"') do ( - echo %%i - start %%i - ping -n %stime% 127.1 >nul -) \ No newline at end of file diff --git a/starter/90.start-ui.bat b/starter/99.start-ui.cmd similarity index 81% rename from starter/90.start-ui.bat rename to starter/99.start-ui.cmd index ad9797f4f..6338080b2 100644 --- a/starter/90.start-ui.bat +++ b/starter/99.start-ui.cmd @@ -2,4 +2,4 @@ cls cd ../apps/vue/ title abp-next-admin-ui -npm run dev \ No newline at end of file +pnpm run dev \ No newline at end of file diff --git a/starter/readme.md b/starter/readme.md new file mode 100644 index 000000000..1ef2f6f55 --- /dev/null +++ b/starter/readme.md @@ -0,0 +1,8 @@ +快速启动后端项目： +1.使用 00.auto-config-docker.cmd 自动配置docker环境 +2.使用 01.migrate-db.cmd 迁移数据库 +3.使用 80.start-host.cmd 启动后端项目 +注：请按自己电脑运行速度调整 80.start-host.cmd 文件中的 stime 参数。 +快速启动前端项目： +1.使用 91.install-node-module.cmd 安装npm依赖 +2.使用 99.start-all.cmd 启动项目 \ No newline at end of file