diff --git a/docs/en/tutorials/microservice/images/abp-studio-abp-suite-inside.png b/docs/en/tutorials/microservice/images/abp-studio-abp-suite-inside.png index 6739501b1d..cfb20914c3 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-abp-suite-inside.png and b/docs/en/tutorials/microservice/images/abp-studio-abp-suite-inside.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-command.png b/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-command.png index cc7c80b288..d7828afad5 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-command.png and b/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-command.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog-additional-options-step.png b/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog-additional-options-step.png new file mode 100644 index 0000000000..d9c72f30d3 Binary files /dev/null and b/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog-additional-options-step.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog-integration-step.png b/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog-integration-step.png index cdc2a78180..6d88e359c1 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog-integration-step.png and b/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog-integration-step.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog.png b/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog.png index fa603d9c5e..7744d9a9b8 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog.png and b/docs/en/tutorials/microservice/images/abp-studio-add-new-microservice-dialog.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-browse-catalog-service.png b/docs/en/tutorials/microservice/images/abp-studio-browse-catalog-service.png index f2b8fabb9a..563ed9b845 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-browse-catalog-service.png and b/docs/en/tutorials/microservice/images/abp-studio-browse-catalog-service.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-browser-catalog-service-swagger-ui.png b/docs/en/tutorials/microservice/images/abp-studio-browser-catalog-service-swagger-ui.png index 303be2fe32..1d07bbefa7 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-browser-catalog-service-swagger-ui.png and b/docs/en/tutorials/microservice/images/abp-studio-browser-catalog-service-swagger-ui.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-new-catalog-service-in-solution-explorer.png b/docs/en/tutorials/microservice/images/abp-studio-new-catalog-service-in-solution-explorer.png index c6bdd452ff..54fd0eeb98 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-new-catalog-service-in-solution-explorer.png and b/docs/en/tutorials/microservice/images/abp-studio-new-catalog-service-in-solution-explorer.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-open-abp-suite-select-module.png b/docs/en/tutorials/microservice/images/abp-studio-open-abp-suite-select-module.png index 49eeed7b44..a88744312b 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-open-abp-suite-select-module.png and b/docs/en/tutorials/microservice/images/abp-studio-open-abp-suite-select-module.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-open-abp-suite.png b/docs/en/tutorials/microservice/images/abp-studio-open-abp-suite.png index 26330b323f..31b87283bc 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-open-abp-suite.png and b/docs/en/tutorials/microservice/images/abp-studio-open-abp-suite.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-open-with-visual-studio.png b/docs/en/tutorials/microservice/images/abp-studio-open-with-visual-studio.png index ad2557e440..f7922f332b 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-open-with-visual-studio.png and b/docs/en/tutorials/microservice/images/abp-studio-open-with-visual-studio.png differ diff --git a/docs/en/tutorials/microservice/images/abp-studio-solution-runner-play-all.png b/docs/en/tutorials/microservice/images/abp-studio-solution-runner-play-all.png index 75e627267e..c01b46888b 100644 Binary files a/docs/en/tutorials/microservice/images/abp-studio-solution-runner-play-all.png and b/docs/en/tutorials/microservice/images/abp-studio-solution-runner-play-all.png differ diff --git a/docs/en/tutorials/microservice/images/abp-suite-product-properties.png b/docs/en/tutorials/microservice/images/abp-suite-product-properties.png index 09d9e3cf06..fd62432dc9 100644 Binary files a/docs/en/tutorials/microservice/images/abp-suite-product-properties.png and b/docs/en/tutorials/microservice/images/abp-suite-product-properties.png differ diff --git a/docs/en/tutorials/microservice/images/sql-server-management-studio-databases.png b/docs/en/tutorials/microservice/images/sql-server-management-studio-databases.png index b0167c4958..faa6ad17f9 100644 Binary files a/docs/en/tutorials/microservice/images/sql-server-management-studio-databases.png and b/docs/en/tutorials/microservice/images/sql-server-management-studio-databases.png differ diff --git a/docs/en/tutorials/microservice/images/visual-studio-solution-explorer-catalog-service.png b/docs/en/tutorials/microservice/images/visual-studio-solution-explorer-catalog-service.png index 2c75181d16..83c705cec6 100644 Binary files a/docs/en/tutorials/microservice/images/visual-studio-solution-explorer-catalog-service.png and b/docs/en/tutorials/microservice/images/visual-studio-solution-explorer-catalog-service.png differ diff --git a/docs/en/tutorials/microservice/part-02.md b/docs/en/tutorials/microservice/part-02.md index d956abcdf3..4c8f828815 100644 --- a/docs/en/tutorials/microservice/part-02.md +++ b/docs/en/tutorials/microservice/part-02.md @@ -22,7 +22,7 @@ Right-click the `services` folder in the *Solution Explorer* panel, select the * ![abp-studio-add-new-microservice-command](images/abp-studio-add-new-microservice-command.png) -This command opens a new dialog to define the properties of the new microservice. You can use the following values to create a new microservice named `Catalog`: +This command opens a new dialog to define the properties of the new microservice. You can use the following values to create a new microservice named `CatalogService`: ![abp-studio-add-new-microservice-dialog](images/abp-studio-add-new-microservice-dialog.png) @@ -40,11 +40,15 @@ Select *Entity Framework Core* option and proceed the *Next* step. In this step, we can select the options for integrating the new microservice to the rest of the solution components: -![abp-studio-add-new-microservice-dialog-integration-step](D:\Github\abp\docs\en\tutorials\microservice\images\abp-studio-add-new-microservice-dialog-integration-step.png) +![abp-studio-add-new-microservice-dialog-integration-step](images/abp-studio-add-new-microservice-dialog-integration-step.png) ABP Studio intelligently selects the right values for you, but you should still check them carefully since they directly affect what we will do in the next parts of this tutorial. -**Ensure the options are configured the same as in the preceding figure**, and click the *Create* button. +**Ensure the options are configured the same as in the preceding figure**, and click the *Next* button. + +![abp-studio-add-new-microservice-dialog-additional-options-step](images/abp-studio-add-new-microservice-dialog-additional-options-step.png) + +In this step, you can select additional options for the new microservice. You can leave them as default and click the *Create* button. That's all, ABP Studio creates the new microservice and arranges all the integration and configuration for you. @@ -60,9 +64,9 @@ The new microservice is added under the `services` folder in the `CloudCrm` ABP The new microservice has its own separate .NET solution that includes three packages (.NET projects): -* `CloudCrm.Catalog` is the main project that you will implement your service. It typically contains your [entities](../../framework/architecture/domain-driven-design/entities.md), [repositories](../../framework/architecture/domain-driven-design/repositories.md), [application services](../../framework/architecture/domain-driven-design/application-services.md), API controllers, etc. -* `CloudCrm.Catalog.Contracts` project can be shared with the other services and applications. It typically contains interfaces of your [application services](../../framework/architecture/domain-driven-design/application-services.md), [data transfer objects](../../framework/architecture/domain-driven-design/data-transfer-objects.md), and some other types you may want to share with the clients of this microservice. -* `CloudCrm.Catalog.Tests` is for building your unit and integration tests for this microservice. +* `CloudCrm.CatalogService` is the main project that you will implement your service. It typically contains your [entities](../../framework/architecture/domain-driven-design/entities.md), [repositories](../../framework/architecture/domain-driven-design/repositories.md), [application services](../../framework/architecture/domain-driven-design/application-services.md), API controllers, etc. +* `CloudCrm.CatalogService.Contracts` project can be shared with the other services and applications. It typically contains interfaces of your [application services](../../framework/architecture/domain-driven-design/application-services.md), [data transfer objects](../../framework/architecture/domain-driven-design/data-transfer-objects.md), and some other types you may want to share with the clients of this microservice. +* `CloudCrm.CatalogService.Tests` is for building your unit and integration tests for this microservice. ### Opening the Service in an IDE @@ -70,7 +74,7 @@ You can open the new microservice in your favorite IDE for development. As a sho ![abp-studio-open-with-visual-studio](images/abp-studio-open-with-visual-studio.png) -Here is the `CloudCrm.Catalog` .NET solution in Visual Studio: +Here is the `CloudCrm.CatalogService` .NET solution in Visual Studio: ![visual-studio-solution-explorer-catalog-service](images/visual-studio-solution-explorer-catalog-service.png) @@ -104,7 +108,7 @@ Assuming you've selected SQL Server as your DBMS, you can open the SQL Server Ma ![sql-server-management-studio-login-screen](images/sql-server-management-studio-login-screen.png) -Use `localhost,1434` as the *Server name*, select the *SQL Server Authentication* as the *Authentication* type, use `sa` as the *Login* name and `myPassw@rd` as the *Password* value. You can find these values in the `appsettings.json` file in the `CloudCrm.Catalog` project of the .NET solution of the Catalog microservice. +Use `localhost,1434` as the *Server name*, select the *SQL Server Authentication* as the *Authentication* type, use `sa` as the *Login* name and `myPassw@rd` as the *Password* value. You can find these values in the `appsettings.json` file in the `CloudCrm.CatalogService` project of the .NET solution of the Catalog microservice. Once you click the *Connect* button, you can see all the databases and explore their data: diff --git a/docs/en/tutorials/microservice/part-03.md b/docs/en/tutorials/microservice/part-03.md index 02cfdeae1e..f4d18ae536 100644 --- a/docs/en/tutorials/microservice/part-03.md +++ b/docs/en/tutorials/microservice/part-03.md @@ -32,7 +32,7 @@ It will ask to you which module you want to use: The `CloudCrm` microservice solution contains more than one .NET solution. Typically, each ABP Studio module represents a separate .NET solution (see the [concepts](../../studio/concepts.md) document). ABP Suite works on a single .NET solution to generate code, so we should select a module here. -Select the `CloudCrm.Catalog` module and click the *OK* button. It will open ABP Suite as shown below: +Select the `CloudCrm.CatalogService` module and click the *OK* button. It will open ABP Suite as shown below: ![abp-studio-abp-suite-inside](images/abp-studio-abp-suite-inside.png)