【fix】ISVJ-7398 修复带有token的restmap和叠加的数据401问题

chenxianhuii · chenxianhuii · commit 59746ba89680 · 2023-12-28T16:39:33.000+08:00
diff --git a/src/openlayers/mapping/WebMap.js b/src/openlayers/mapping/WebMap.js
@@ -1392,12 +1392,13 @@ export class WebMap extends Observable {
             withCredentials: this.withCredentials,
             withoutFormatSuffix: true
         };
+        let tempUrl = layerInfo.url;
         if (layerInfo.url.indexOf("?token=") > -1) {
-            that.credentialKey = 'token';
-            that.credentialValue = layerInfo.credential = layerInfo.url.split("?token=")[1];
+            layerInfo.credential = { token: layerInfo.url.split("?token=")[1] };
             layerInfo.url = layerInfo.url.split("?token=")[0];
         }
-        return FetchRequest.get(that.getRequestUrl(`${layerInfo.url}.json`), null, options).then(function (response) {
+        let url = this.handleJSONSuffix(tempUrl);
+        return FetchRequest.get(that.getRequestUrl(url), null, options).then(function (response) {
             return response.json();
         }).then(async function (result) {
             // layerInfo.projection = mapInfo.projection;
@@ -5163,4 +5164,16 @@ export class WebMap extends Observable {
         }
         return ['EPSG:-1000','EPSG:-1'].includes(projection);
     }
+    handleJSONSuffix(url) {
+      if(!url.includes('.json')) {
+        if (url.includes('?')) {
+          let urlArr = url.split('?');
+          urlArr[0] = urlArr[0] + ".json";
+          url = urlArr.join('?');
+        } else {
+          url = url + ".json"
+        }
+      }
+      return url;
+    }
 }
diff --git a/test/openlayers/mapping/WebMapSpec.js b/test/openlayers/mapping/WebMapSpec.js
@@ -1299,4 +1299,28 @@ describe('openlayers_WebMap', () => {
         done();
       }
   });
+
+  it('createBaseLayer-SUPERMAP_REST-token', (done) => {
+    spyOn(FetchRequest, 'get').and.callFake((url, params, options) => {
+      if (url.indexOf('map.json') > -1) {
+          var mapJson = datavizWebMap_RestMap_token;
+          return Promise.resolve(new Response(mapJson));
+      } else if (url.indexOf('content.json') > -1) {
+          expect(url.indexOf('testtoken')).toBe(-1);
+          return Promise.resolve(new Response(geojsonData));
+      } else {
+          console.log(url)
+          expect(url.indexOf('testtoken')).not.toBe(-1);
+          return Promise.resolve()
+      }
+    });
+    var datavizWebmap = new WebMap(id, {successCallback, errorCallback, server: defaultServer });
+    function successCallback(map, mapInfo, layers, baseLayer){
+      expect(baseLayer.credential).toEqual({token: 'testtoken'});
+      done();
+    }
+    function errorCallback(error) {
+      console.log(error);
+    }
+  });
 });
diff --git a/test/resources/WebMapV5.js b/test/resources/WebMapV5.js
