Merge branch 'develop' into qianjin-sqlserver-refactor

shenqianjin · shenqianjin · commit f450d9d8672b · 2021-05-21T16:29:59.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/insights/ApplicationInsightsComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/insights/ApplicationInsightsComboBox.java
@@ -51,7 +51,7 @@ public void setValue(final ApplicationInsightsConfig insightsConfig) {
     @Override
     @AzureOperation(
         name = "ai.list.subscription",
-        params = {"this.subscription.subscriptionId()"},
+        params = {"this.subscription.getId()"},
         type = AzureOperation.Type.SERVICE
     )
     protected List<? extends ApplicationInsightsConfig> loadItems() throws Exception {
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/mysql/AzureMySQLService.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/mysql/AzureMySQLService.java
@@ -47,7 +47,7 @@ public static AzureMySQLService getInstance() {
         name = "mysql.create",
         params = {
             "config.getServerName()",
-            "config.getSubscription().displayName()"
+            "config.getSubscription().getName()"
         },
         type = AzureOperation.Type.SERVICE
     )

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void setValue(final ApplicationInsightsConfig insightsConfig) {`
`51`	`51`	`@Override`
`52`	`52`	`@AzureOperation(`
`53`	`53`	`name = "ai.list.subscription",`
`54`		`- params = {"this.subscription.subscriptionId()"},`
	`54`	`+ params = {"this.subscription.getId()"},`
`55`	`55`	`type = AzureOperation.Type.SERVICE`
`56`	`56`	`)`
`57`	`57`	`protected List<? extends ApplicationInsightsConfig> loadItems() throws Exception {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public static AzureMySQLService getInstance() {`
`47`	`47`	`name = "mysql.create",`
`48`	`48`	`params = {`
`49`	`49`	`"config.getServerName()",`
`50`		`- "config.getSubscription().displayName()"`
	`50`	`+ "config.getSubscription().getName()"`
`51`	`51`	`},`
`52`	`52`	`type = AzureOperation.Type.SERVICE`
`53`	`53`	`)`