Skip to content
This repository has been archived by the owner on Dec 4, 2023. It is now read-only.

Commit

Permalink
fix java
Browse files Browse the repository at this point in the history
  • Loading branch information
@fangyangci
fangyangci committed Aug 30, 2022
1 parent e58db1f commit 8856407
Show file tree
Hide file tree
Showing 15 changed files with 69 additions and 78 deletions.
10 changes: 5 additions & 5 deletions ...ploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
},
"newAppServicePlanSku": {
"value": {
"name": "S1",
"tier": "Standard",
"size": "S1",
"family": "S",
"name": "P1v2",
"tier": "PremiumV2",
"size": "P1v2",
"family": "Pv2",
"capacity": 1
}
},
Expand All @@ -33,4 +33,4 @@
"value": ""
}
}
}
}
2 changes: 1 addition & 1 deletion ...ploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand Down
10 changes: 5 additions & 5 deletions ...deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand All @@ -19,10 +19,10 @@
},
"appServicePlanSku": {
"value": {
"name": "S1",
"tier": "Standard",
"size": "S1",
"family": "S",
"name": "P1v2",
"tier": "PremiumV2",
"size": "P1v2",
"family": "Pv2",
"capacity": 1
}
},
Expand Down
4 changes: 2 additions & 2 deletions ...core/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand Down Expand Up @@ -67,7 +67,7 @@
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {},
"variables": {},
Expand Down
23 changes: 10 additions & 13 deletions ...s/core/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand Down Expand Up @@ -59,9 +59,7 @@
}
},
"variables": {
"appServicePlanName": "[parameters('appServicePlanName')]",
"resourcesLocation": "[if(empty(parameters('appServicePlanLocation')), parameters('groupLocation'), parameters('appServicePlanLocation'))]",
"appServiceName": "[parameters('appServiceName')]",
"resourceGroupId": "[concat(subscription().id, '/resourceGroups/', parameters('groupName'))]"
},
"resources": [
Expand All @@ -83,15 +81,15 @@
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {},
"variables": {},
"resources": [
{
"comments": "Create a new App Service Plan",
"type": "Microsoft.Web/serverfarms",
"name": "[variables('appServicePlanName')]",
"name": "[parameters('appServicePlanName')]",
"apiVersion": "2018-02-01",
"location": "[variables('resourcesLocation')]",
"sku": "[parameters('appServicePlanSku')]",
Expand All @@ -110,15 +108,15 @@
{
"comments": "Create a Web App using the new App Service Plan",
"type": "Microsoft.Web/sites",
"apiVersion": "2015-08-01",
"apiVersion": "2018-11-01",
"location": "[variables('resourcesLocation')]",
"kind": "app,linux",
"dependsOn": [
"[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
"[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', parameters('appServicePlanName'))]"
],
"name": "[variables('appServiceName')]",
"name": "[parameters('appServiceName')]",
"properties": {
"name": "[variables('appServiceName')]",
"name": "[parameters('appServiceName')]",
"hostNameSslStates": [
{
"name": "[concat(parameters('appServiceName'), '.azurewebsites.net')]",
Expand All @@ -131,7 +129,7 @@
"hostType": "Repository"
}
],
"serverFarmId": "[variables('appServicePlanName')]",
"serverFarmId": "[parameters('appServicePlanName')]",
"reserved": true,
"isXenon": false,
"hyperV": false,
Expand Down Expand Up @@ -163,14 +161,13 @@
"https://botservice.hosting.portal.azure.net",
"https://hosting.onecloud.azure-test.net/"
]
},
"webSocketsEnabled": true
}
}
}
},
{
"type": "Microsoft.Web/sites/config",
"apiVersion": "2016-08-01",
"apiVersion": "2018-11-01",
"name": "[concat(parameters('appServiceName'), '/web')]",
"location": "[variables('resourcesLocation')]",
"dependsOn": [
Expand Down
10 changes: 5 additions & 5 deletions ...ploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
},
"newAppServicePlanSku": {
"value": {
"name": "S1",
"tier": "Standard",
"size": "S1",
"family": "S",
"name": "P1v2",
"tier": "PremiumV2",
"size": "P1v2",
"family": "Pv2",
"capacity": 1
}
},
Expand All @@ -33,4 +33,4 @@
"value": ""
}
}
}
}
2 changes: 1 addition & 1 deletion ...ploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand Down
10 changes: 5 additions & 5 deletions ...deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand All @@ -19,10 +19,10 @@
},
"appServicePlanSku": {
"value": {
"name": "S1",
"tier": "Standard",
"size": "S1",
"family": "S",
"name": "P1v2",
"tier": "PremiumV2",
"size": "P1v2",
"family": "Pv2",
"capacity": 1
}
},
Expand Down
4 changes: 2 additions & 2 deletions ...echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand Down Expand Up @@ -67,7 +67,7 @@
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {},
"variables": {},
Expand Down
23 changes: 10 additions & 13 deletions ...s/echo/project/deploymentTemplates/DeployWithNewResourceGroup/template-BotApp-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand Down Expand Up @@ -59,9 +59,7 @@
}
},
"variables": {
"appServicePlanName": "[parameters('appServicePlanName')]",
"resourcesLocation": "[if(empty(parameters('appServicePlanLocation')), parameters('groupLocation'), parameters('appServicePlanLocation'))]",
"appServiceName": "[parameters('appServiceName')]",
"resourceGroupId": "[concat(subscription().id, '/resourceGroups/', parameters('groupName'))]"
},
"resources": [
Expand All @@ -83,15 +81,15 @@
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {},
"variables": {},
"resources": [
{
"comments": "Create a new App Service Plan",
"type": "Microsoft.Web/serverfarms",
"name": "[variables('appServicePlanName')]",
"name": "[parameters('appServicePlanName')]",
"apiVersion": "2018-02-01",
"location": "[variables('resourcesLocation')]",
"sku": "[parameters('appServicePlanSku')]",
Expand All @@ -110,15 +108,15 @@
{
"comments": "Create a Web App using the new App Service Plan",
"type": "Microsoft.Web/sites",
"apiVersion": "2015-08-01",
"apiVersion": "2018-11-01",
"location": "[variables('resourcesLocation')]",
"kind": "app,linux",
"dependsOn": [
"[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', variables('appServicePlanName'))]"
"[concat(variables('resourceGroupId'), '/providers/Microsoft.Web/serverfarms/', parameters('appServicePlanName'))]"
],
"name": "[variables('appServiceName')]",
"name": "[parameters('appServiceName')]",
"properties": {
"name": "[variables('appServiceName')]",
"name": "[parameters('appServiceName')]",
"hostNameSslStates": [
{
"name": "[concat(parameters('appServiceName'), '.azurewebsites.net')]",
Expand All @@ -131,7 +129,7 @@
"hostType": "Repository"
}
],
"serverFarmId": "[variables('appServicePlanName')]",
"serverFarmId": "[parameters('appServicePlanName')]",
"reserved": true,
"isXenon": false,
"hyperV": false,
Expand Down Expand Up @@ -163,14 +161,13 @@
"https://botservice.hosting.portal.azure.net",
"https://hosting.onecloud.azure-test.net/"
]
},
"webSocketsEnabled": true
}
}
}
},
{
"type": "Microsoft.Web/sites/config",
"apiVersion": "2016-08-01",
"apiVersion": "2018-11-01",
"name": "[concat(parameters('appServiceName'), '/web')]",
"location": "[variables('resourcesLocation')]",
"dependsOn": [
Expand Down
10 changes: 5 additions & 5 deletions ...ploymentTemplates/DeployUseExistResourceGroup/parameters-for-template-BotApp-with-rg.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
},
"newAppServicePlanSku": {
"value": {
"name": "S1",
"tier": "Standard",
"size": "S1",
"family": "S",
"name": "P1v2",
"tier": "PremiumV2",
"size": "P1v2",
"family": "Pv2",
"capacity": 1
}
},
Expand All @@ -33,4 +33,4 @@
"value": ""
}
}
}
}
2 changes: 1 addition & 1 deletion ...ploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-AzureBot-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand Down
10 changes: 5 additions & 5 deletions ...deploymentTemplates/DeployWithNewResourceGroup/parameters-for-template-BotApp-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand All @@ -19,10 +19,10 @@
},
"appServicePlanSku": {
"value": {
"name": "S1",
"tier": "Standard",
"size": "S1",
"family": "S",
"name": "P1v2",
"tier": "PremiumV2",
"size": "P1v2",
"family": "Pv2",
"capacity": 1
}
},
Expand Down
4 changes: 2 additions & 2 deletions ...mpty/project/deploymentTemplates/DeployWithNewResourceGroup/template-AzureBot-new-rg.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"groupName": {
Expand Down Expand Up @@ -67,7 +67,7 @@
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"parameters": {},
"variables": {},
Expand Down

0 comments on commit 8856407

Please sign in to comment.