【feature】 新增web 打印服务; review by songym

xiongjiaojiao · xiongjiaojiao · commit b2be44841ec2 · 2020-08-07T18:49:08.000+08:00
diff --git a/examples/mapboxgl/webPrintingJob.html b/examples/mapboxgl/webPrintingJob.html
@@ -266,6 +266,7 @@ <h4 class="panel-title">
     </form>
     <script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
     <script type="text/javascript">
+        var host = window.isLocal ? window.server : "https://iserver.supermap.io";
         var webMap = new mapboxgl.supermap.WebMap(1887887232, {
             target: 'map',
             server: 'https://www.supermapol.com'
@@ -278,7 +279,7 @@ <h4 class="panel-title">
             $('#scale').val(scale * 2);
             $('#exportScale').val(scale);
         });
-        var webPrintingJobService = new mapboxgl.supermap.WebPrintingJobService('http://localhost:8090/iserver/services/webprinting/rest/v1/webprinting', {
+        var webPrintingJobService = new mapboxgl.supermap.WebPrintingJobService(host + '/iserver/services/webprinting/rest/v1/webprinting', {
             withCredentials: window.isLocal
         });
         webPrintingJobService.getLayoutTemplates(function ({ result }) {
diff --git a/examples/openlayers/webPrintingJob.html b/examples/openlayers/webPrintingJob.html
@@ -266,6 +266,7 @@ <h4 class="panel-title">
     </form>
     <script type="text/javascript" include="bootstrap,jquery" src="../js/include-web.js"></script>
     <script type="text/javascript">
+        var host = window.isLocal ? window.server : "https://iserver.supermap.io";
         var webMap = new ol.supermap.WebMap(1887887232, {
             target: 'map',
             successCallback: function (map) {
@@ -276,7 +277,7 @@ <h4 class="panel-title">
                 $('#exportScale').val(scale);
             }
         });
-        var webPrintingJobService = new ol.supermap.WebPrintingJobService('http://localhost:8090/iserver/services/webprinting/rest/v1/webprinting', {
+        var webPrintingJobService = new ol.supermap.WebPrintingJobService(host + '/iserver/services/webprinting/rest/v1/webprinting', {
             withCredentials: window.isLocal
         });
         webPrintingJobService.getLayoutTemplates(function ({ result }) {
diff --git a/test/tool/GlobeParameter.js b/test/tool/GlobeParameter.js
@@ -32,5 +32,5 @@
     ChinaProvincesURL: "http://localhost:8090/iserver/services/map-ChinaProvinces/rest/maps/ChinaProvinces",
     californiaURL: "http://localhost:8090/iserver/services/map-mvt-California/rest/maps/California",
     distributedAnalysisURL:"http://localhost:8090/iserver/services/distributedanalyst/rest/v1/jobs",
-    webPrintingURL: "http://localhost:8091/iserver/services/webprinting/rest/v1/webprinting"
+    webPrintingURL: "http://localhost:8090/iserver/services/webprinting/rest/v1/webprinting"
     }

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@`
`32`	`32`	`ChinaProvincesURL: "http://localhost:8090/iserver/services/map-ChinaProvinces/rest/maps/ChinaProvinces",`
`33`	`33`	`californiaURL: "http://localhost:8090/iserver/services/map-mvt-California/rest/maps/California",`
`34`	`34`	`distributedAnalysisURL:"http://localhost:8090/iserver/services/distributedanalyst/rest/v1/jobs",`
`35`		`- webPrintingURL: "http://localhost:8091/iserver/services/webprinting/rest/v1/webprinting"`
	`35`	`+ webPrintingURL: "http://localhost:8090/iserver/services/webprinting/rest/v1/webprinting"`
`36`	`36`	`}`