Updated the tier name

hangwan97 · hangwan97 · commit 37242f1eb136 · 2023-03-23T00:20:58.000+08:00
diff --git a/articles/spring-apps/quickstart.md b/articles/spring-apps/quickstart.md
@@ -197,7 +197,259 @@ Deploying the application can take a few minutes.
 
 ::: zone-end
 
-::: zone pivot="sc-basic-standard-enterprise"
+::: zone pivot="sc-standard"
+This article explains how to deploy a small application to run on Azure Spring Apps.
+
+The application code used in this tutorial is a simple app. When you've completed this example, the application is accessible online, and you can manage it through the Azure portal.
+
+This quickstart explains how to:
+
+> [!div class="checklist"]
+
+> - Generate a basic Spring project.
+> - Provision a service instance.
+> - Build and deploy an app with a public endpoint.
+> - Clean up the resources.
+
+At the end of this quickstart, you have a working Spring app running on Azure Spring Apps.
+
+## [Azure CLI](#tab/Azure-CLI)
+
+## Prerequisites
+
+- An Azure subscription. If you don't have a subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
+- [Apache Maven](https://maven.apache.org/download.cgi)
+- [Azure CLI](/cli/azure/install-azure-cli). Install the Azure Spring Apps extension with the following command: `az extension add --name spring`
+- If you're deploying Azure Spring Apps Enterprise tier for the first time in the target subscription, see the [Prerequisites](./how-to-enterprise-marketplace-offer.md#prerequisites) section of [View Azure Spring Apps Enterprise tier offering in Azure Marketplace](./how-to-enterprise-marketplace-offer.md).
+
+## Provision an instance of Azure Spring Apps
+
+Use the following steps to create an Azure Spring Apps service instance.
+
+1. Select **Open Cloudshell** and sign in to your Azure account in [Azure Cloud Shell](../cloud-shell/overview.md).
+
+   ```azurecli-interactive
+   az account show
+   ```
+
+1. Azure Cloud Shell workspaces are temporary. When first started, the shell prompts you to select an [Azure Storage](../storage/common/storage-introduction.md) instance with your subscription to persist files across sessions.
+
+   :::image type="content" source="media/quickstart/azure-storage-subscription.png" alt-text="Screenshot of Azure Storage subscription." lightbox="media/quickstart/azure-storage-subscription.png":::
+
+1. After you sign in successfully, use the following command to display a list of your subscriptions.
+
+   ```azurecli-interactive
+   az account list --output table
+   ```
+
+1. Use the following command to set your default subscription.
+
+   ```azurecli-interactive
+   az account set --subscription <subscription-ID>
+   ```
+
+1. Use the following command to create a resource group.
+
+   ```azurecli-interactive
+   az group create \
+       --resource-group <name-of-resource-group> \
+       --location eastus
+   ```
+
+1. Use the following command to create an Azure Spring Apps service instance.
+
+   ```azurecli-interactive
+   az spring create \
+       --resource-group <name-of-resource-group> \
+       --name <Azure-Spring-Apps-instance-name>
+   ```
+
+1. Select **Y** to install the Azure Spring Apps extension and run it.
+
+## Create an app in your Azure Spring Apps instance
+
+An [*App*](concept-understand-app-and-deployment.md) is an abstraction of one business app. Apps run in an Azure Spring Apps service instance, as shown in the following diagram.
+
+:::image type="content" source="media/spring-cloud-app-and-deployment/app-deployment-rev.png" alt-text="Diagram showing the relationship between apps and an Azure Spring Apps service instance.":::
+
+Use the following command to specify the app name on Azure Spring Apps as *hellospring*.
+
+```azurecli-interactive
+az spring app create \
+    --resource-group <name-of-resource-group> \
+    --service <Azure-Spring-Apps-instance-name> \
+    --name hellospring \
+    --assign-endpoint true
+```
+
+## Clone and build the Spring Boot sample project
+
+Use the following steps to clone the Spring Boot sample project.
+
+1. Use the following command to clone the [Spring Boot sample project](https://github.com/spring-guides/gs-spring-boot.git) from GitHub.
+
+   ```azurecli-interactive
+   git clone -b boot-2.7 https://github.com/spring-guides/gs-spring-boot.git
+   ```
+
+1. Use the following command to move to the project folder.
+
+   ```azurecli-interactive
+   cd gs-spring-boot/complete
+   ```
+
+1. Use the following [Maven](https://maven.apache.org/what-is-maven.html) command to build the project.
+
+   ```azurecli-interactive
+   mvn clean package -DskipTests
+   ```
+
+## Deploy the local app to Azure Spring Apps
+
+Use the following command to deploy the *.jar* file for the app (*target/spring-boot-complete-0.0.1-SNAPSHOT.jar* on Windows).
+
+```azurecli-interactive
+az spring app deploy \
+    --resource-group <name-of-resource-group> \
+    --service <Azure-Spring-Apps-instance-name> \
+    --name hellospring \
+    --artifact-path target/spring-boot-complete-0.0.1-SNAPSHOT.jar
+```
+
+Deploying the application can take a few minutes.
+
+## [IntelliJ](#tab/IntelliJ)
+
+## Prerequisites
+
+- An Azure subscription. If you don't have a subscription, create a [free account](https://azure.microsoft.com/free/) before you begin.
+- [IntelliJ IDEA](https://www.jetbrains.com/idea/).
+- [Azure Toolkit for IntelliJ](/azure/developer/java/toolkit-for-intellij/install-toolkit).
+- If you're deploying Azure Spring Apps Enterprise tier for the first time in the target subscription, see the [Prerequisites](./how-to-enterprise-marketplace-offer.md#prerequisites) section of [View Azure Spring Apps Enterprise tier offering in Azure Marketplace](./how-to-enterprise-marketplace-offer.md).
+
+## Generate a Spring project
+
+Use the following steps to create the project:
+
+1. Use [Spring Initializr](https://start.spring.io/#!type=maven-project&language=java&platformVersion=2.6.10&packaging=jar&jvmVersion=11&groupId=com.example&artifactId=hellospring&name=hellospring&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.hellospring&dependencies=web,cloud-eureka,actuator,cloud-config-client) to generate a sample project with recommended dependencies for Azure Spring Apps. The following URL provides default settings for you.
+
+   ```url
+   https://start.spring.io/#!type=maven-project&language=java&platformVersion=2.6.10&packaging=jar&jvmVersion=11&groupId=com.example&artifactId=hellospring&name=hellospring&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.hellospring&dependencies=web,cloud-eureka,actuator,cloud-config-client
+   ```
+
+   The following image shows the recommended Initializr settings for the *hellospring* sample project.
+
+   This example uses Java version 11.  To use a different Java version, change the Java version setting under **Project Metadata**.
+
+   :::image type="content" source="media/quickstart/initializr-page.png" alt-text="Screenshot of Spring Initializr page." lightbox="media/quickstart/initializr-page.png":::
+
+1. When all dependencies are set, select **Generate**.
+1. Download and unpack the package, and then create a web controller for your web application by adding the file *src/main/java/com/example/hellospring/HelloController.java* with the following contents:
+
+   ```java
+   package com.example.hellospring;
+
+   import org.springframework.web.bind.annotation.RestController;
+   import org.springframework.web.bind.annotation.RequestMapping;
+
+   @RestController
+   public class HelloController {
+
+       @RequestMapping("/")
+       public String index() {
+           return "Greetings from Azure Spring Apps!";
+        }
+   }
+   ```
+
+## Create an instance of Azure Spring Apps
+
+Use the following steps to create an instance of Azure Spring Apps using the Azure portal.
+
+1. In a new tab, open the [Azure portal](https://portal.azure.com/).
+
+1. From the top search box, search for **Azure Spring Apps**.
+
+1. Select **Azure Spring Apps** from the results.
+
+   :::image type="content" source="media/quickstart/spring-apps-start.png" alt-text="Screenshot of Azure portal showing Azure Spring Apps service in search results." lightbox="media/quickstart/spring-apps-start.png":::
+
+1. On the Azure Spring Apps page, select **Create**.
+
+   :::image type="content" source="media/quickstart/spring-apps-create.png" alt-text="Screenshot of Azure portal showing Azure Spring Apps resource with Create button highlighted." lightbox="media/quickstart/spring-apps-create.png":::
+
+1. Fill out the form on the Azure Spring Apps **Create** page. Consider the following guidelines:
+
+   - **Subscription**: Select the subscription you want to be billed for this resource.
+   - **Resource group**: Creating new resource groups for new resources is a best practice.
+   - **Service Name**: Specify the service instance name. You use this name later in this article where the *\<Azure-Spring-Apps-instance-name\>* placeholder appears. The name must be between 4 and 32 characters long and can contain only lowercase letters, numbers, and hyphens. The first character of the service name must be a letter and the last character must be either a letter or a number.
+   - **Region**: Select the region for your service instance.
+
+   :::image type="content" source="media/quickstart/portal-start.png" alt-text="Screenshot of Azure portal showing Azure Spring Apps Create page." lightbox="media/quickstart/portal-start.png":::
+
+1. Select **Review and create**.
+
+## Import the project
+
+Use the following steps to import the project.
+
+1. Open IntelliJ IDEA, and then select **Open**.
+1. In the **Open File or Project** dialog box, select the *hellospring* folder.
+
+   :::image type="content" source="media/quickstart/intellij-new-project.png" alt-text="Screenshot of IntelliJ IDEA showing Open File or Project dialog box." lightbox="media/quickstart/intellij-new-project.png":::
+
+## Build and deploy your app
+
+> [!NOTE]
+> To run the project locally, add `spring.config.import=optional:configserver:` to the project's *application.properties* file.
+
+Use the following steps to build and deploy your app.
+
+1. If you haven't already installed the Azure Toolkit for IntelliJ, follow the steps in [Install the Azure Toolkit for IntelliJ](/azure/developer/java/toolkit-for-intellij/install-toolkit).
+
+1. Right-click your project in the IntelliJ Project window, and then select **Azure** -> **Deploy to Azure Spring Apps**.
+
+   :::image type="content" source="media/quickstart/intellij-deploy-azure.png" alt-text="Screenshot of IntelliJ IDEA menu showing Deploy to Azure Spring Apps option." lightbox="media/quickstart/intellij-deploy-azure.png":::
+
+1. Accept the name for the app in the **Name** field. **Name** refers to the configuration, not the app name. You don't usually need to change it.
+1. In the **Artifact** textbox, select **Maven:com.example:hellospring-0.0.1-SNAPSHOT**.
+1. In the **Subscription** textbox, verify that your subscription is correct.
+1. In the **Service** textbox, select the instance of Azure Spring Apps that you created in [Provision an instance of Azure Spring Apps](#provision-an-instance-of-azure-spring-apps-1).
+1. In the **App** textbox, select the plus sign (**+**) to create a new app.
+
+   :::image type="content" source="media/quickstart/intellij-create-new-app.png" alt-text="Screenshot of IntelliJ IDEA showing Deploy Azure Spring Apps dialog box." lightbox="media/quickstart/intellij-create-new-app.png":::
+
+1. In the **App name:** textbox under **App Basics**, enter *hellospring*, and then select the **More settings** check box.
+1. Select the **Enable** button next to **Public endpoint**. The button changes to **Disable \<to be enabled\>**.
+1. If you're using Java 11, select **Java 11** for the **Runtime** option.
+1. Select **OK**.
+
+   :::image type="content" source="media/quickstart/intellij-more-settings.png" alt-text="Screenshot of IntelliJ IDEA Create Azure Spring Apps dialog box with public endpoint Disable button highlighted." lightbox="media/quickstart/intellij-more-settings.png":::
+
+1. Under **Before launch**, select **Run Maven Goal 'hellospring:package'**, and then select the pencil icon to edit the command line.
+
+   :::image type="content" source="media/quickstart/intellij-edit-maven-goal.png" alt-text="Screenshot of IntelliJ IDEA Create Azure Spring Apps dialog box with Maven Goal edit button highlighted." lightbox="media/quickstart/intellij-edit-maven-goal.png":::
+
+1. In the **Command line** textbox, enter *-DskipTests* after *package*, and then select **OK**.
+
+   :::image type="content" source="media/quickstart/intellij-maven-goal-command-line.png" alt-text="Screenshot of IntelliJ IDEA Select Maven Goal dialog box with Command Line value highlighted." lightbox="media/quickstart/intellij-maven-goal-command-line.png":::
+
+1. To start the deployment, select the **Run** button at the bottom of the **Deploy Azure Spring Apps app** dialog box. The plug-in runs the command `mvn package -DskipTests` on the `hellospring` app and deploys the *.jar* file generated by the `package` command.
+
+## [Visual Studio Code](#tab/VS-Code)
+
+## Prerequisites
+
+- If you're deploying Azure Spring Apps Enterprise tier for the first time in the target subscription, see the [Prerequisites](./how-to-enterprise-marketplace-offer.md#prerequisites) section of [View Azure Spring Apps Enterprise tier offering in Azure Marketplace](./how-to-enterprise-marketplace-offer.md).
+
+## Deploy a Spring Boot web app to Azure Spring Apps with Visual Studio Code
+
+To deploy a Spring Boot web app to Azure Spring Apps, follow the steps in [Java on Azure Spring Apps](https://code.visualstudio.com/docs/java/java-spring-apps).
+
+---
+::: zone-end
+
+::: zone pivot="sc-enterprise"
 This article explains how to deploy a small application to run on Azure Spring Apps.
 
 The application code used in this tutorial is a simple app. When you've completed this example, the application is accessible online, and you can manage it through the Azure portal.
diff --git a/articles/zone-pivot-groups.yml b/articles/zone-pivot-groups.yml
@@ -1883,14 +1883,12 @@ groups:
   title: Azure Spring Apps tier
   prompt: Select an Azure Spring Apps tier
   pivots:
-  - id: sc-standard-tier
-    title: Basic/Standard tier
-  - id: sc-enterprise-tier
-    title: Enterprise tier
   - id: sc-consumption-plan
     title: Standard consumption (Preview)
-  - id: sc-basic-standard-enterprise
-    title: Basic/Standard/Enterprise
+  - id: sc-standard
+    title: Basic/Standard
+  - id: sc-enterprise
+    title: Enterprise
 ########### BEGIN APPLICATION MANAGEMENT
 # Service:       Active Directory (active-directory)
 # Sub-service:   APPLICATION MANAGEMENT(manage-apps)
