Skip to content

Commit

Permalink
Merge pull request #15 from Esri/xiao5286-patch-2
Browse files Browse the repository at this point in the history 
Update proxy.config
  • Loading branch information
@xiao5286
xiao5286 authored Feb 28, 2020
2 parents 7826d52 + e9f6fbb commit 28cee08
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 27 deletions.
24 changes: 12 additions & 12 deletions js/app/WorkflowManager/config/AppConfig.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define( function() {
// Note: If using https, replace http with https and include port numbers
// 6080 or 6443 as needed.
app: {
ServiceRoot: "http://workflowsample.esri.com/arcgis/rest/services/Workflow/WMServer",
ServiceRoot: "https://workflowsample.esri.com/arcgis/rest/services/Workflow/WMServer",
// Determines authentication mode to use for the application
// "windows" - windows authentication
// "token" - ArcGIS Server token authentication
Expand All @@ -31,7 +31,7 @@ define( function() {

jobLOILayer: {
type: "dynamic",
url: "http://workflowsample.esri.com/arcgis/rest/services/Workflow_LOI/MapServer",
url: "https://workflowsample.esri.com/arcgis/rest/services/Workflow_LOI/MapServer",
// Point layer ID
POILayerID: 0,
// Polygon layer ID
Expand All @@ -52,7 +52,7 @@ define( function() {
},

//geometry Service
geometryServiceURL : "http://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer",
geometryServiceURL : "https://tasks.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer",

map: {
// Confiugre maps to be included in the basemap toggle
Expand Down Expand Up @@ -80,29 +80,29 @@ define( function() {
id: "streets",
title: "streets",
layers: [{
url: "http://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"
url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Street_Map/MapServer"
}],
thumbnailUrl: "js/widget/gis/BasemapGallery/images/streets.jpg"
},
{
id: "hybrid",
title: "hybrid",
layers: [{
url: "http://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"
url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer"
},
{
url: "http://services.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer"
url: "https://services.arcgisonline.com/ArcGIS/rest/services/Reference/World_Boundaries_and_Places/MapServer"
},
{
url: "http://services.arcgisonline.com/ArcGIS/rest/services/Reference/World_Transportation/MapServer"
url: "https://services.arcgisonline.com/ArcGIS/rest/services/Reference/World_Transportation/MapServer"
}],
thumbnailUrl: "js/widget/gis/BasemapGallery/images/hybrid.jpg"
},
{
id: "topo",
title: "topo",
layers: [{
url: "http://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"
url: "https://services.arcgisonline.com/ArcGIS/rest/services/World_Topo_Map/MapServer"
}],
thumbnailUrl: "js/widget/gis/BasemapGallery/images/topo.jpg"
}
Expand All @@ -118,7 +118,7 @@ define( function() {
type: "map-image",
properties: {
id: "usaMap",
url: "http://sampleserver6.arcgisonline.com/arcgis/rest/services/USA/MapServer",
url: "https://sampleserver6.arcgisonline.com/arcgis/rest/services/USA/MapServer",
// sublayers: [
// {
// id: 1,
Expand All @@ -137,13 +137,13 @@ define( function() {
// type: "imagery",
// properties: {
// id: "torontoCanadaImagery",
// url: "http://sampleserver6.arcgisonline.com/arcgis/rest/services/Toronto/ImageServer",
// url: "https://sampleserver6.arcgisonline.com/arcgis/rest/services/Toronto/ImageServer",
// opacity: 0.75
// }
},

// InitialExtent: extent the the map starts at.
// helper tool: http://www.arcgis.com/home/item.html?id=dd1091f33a3e4ecb8cd77adf3e585c8a
// helper tool: https://www.arcgis.com/home/item.html?id=dd1091f33a3e4ecb8cd77adf3e585c8a
initialExtent: {
xmin: -15489130.48708616,
ymin: 398794.4860580916,
Expand All @@ -167,4 +167,4 @@ define( function() {
}
}
};
});
});
28 changes: 13 additions & 15 deletions proxy/proxy.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
dynamicToken = if true, gets token dynamically with username and
password stored in web.config file's appSettings section.
-->
<serverUrl url="http://server.arcgisonline.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://services.arcgisonline.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://tasks.arcgisonline.com/ArcGIS/rest/services" matchAll="true"/>
<serverUrl url="http://sampleserver1.arcgisonline.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://sampleserver2.arcgisonline.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://sampleserver3.arcgisonline.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="https://server.arcgisonline.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="https://services.arcgisonline.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="https://tasks.arcgisonline.com/ArcGIS/rest/services" matchAll="true"/>
<serverUrl url="https://sampleserver1.arcgisonline.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="https://sampleserver2.arcgisonline.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="https://sampleserver3.arcgisonline.com/arcgis/rest/services" matchAll="true"/>

<serverUrl url="http://workflowsample.esri.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://workflowsample.esri.com:6080/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://workflowsample.esri.com:6080/arcgis/tokens" matchAll="true"/>
<serverUrl url="https://workflowsample.esri.com/arcgis/rest/services" matchAll="true"/>
<serverUrl url="https://workflowsample.esri.com:6443/arcgis/rest/services" matchAll="true"/>
<serverUrl url="https://workflowsample.esri.com:6443/arcgis/tokens" matchAll="true"/>

<!-- NOTE: Replace "myserver" with your server name and uncomment the XML lines below
If using https, replace http with https and update the port number from
Expand All @@ -28,13 +28,11 @@
-->
<!--
<serverUrl url="http://myserver/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://myserver:6080/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://myserver:8399/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://myserver/wmrest/services" matchAll="true"/>
<serverUrl url="https://myserver/arcgis/rest/services" matchAll="true"/>
<serverUrl url="https://myserver:6443/arcgis/rest/services" matchAll="true"/>
<serverUrl url="http://myserver/arcgis/tokens" matchAll="true"/>
<serverUrl url="http://myserver:6080/arcgis/tokens" matchAll="true"/>
<serverUrl url="https://myserver/arcgis/tokens" matchAll="true"/>
<serverUrl url="https://myserver:6443/arcgis/tokens" matchAll="true"/>
-->

</serverUrls>
Expand Down

0 comments on commit 28cee08

Please sign in to comment.