【update】1) 修复ut 2）webmap请求数据的时候，有token也带上token. （reviewed by songym）

Author: Yuki-Zhao

src/openlayers/mapping/WebMap.js

@@ -867,6 +867,9 @@ export class WebMap extends ol.Observable {
                     if((layer.layerType === "MARKER") || (dataSource && (!dataSource.accessType || dataSource.accessType === 'DIRECT'))) {
                         //原来二进制文件
                         let url = `${that.server}web/datas/${serverId}/content.json?pageSize=9999999&currentPage=1`;
+                        if(that.credentialValue) {
+                            url = `${url}&${that.credentialKey}=${that.credentialValue}`;
+                        }
                         FetchRequest.get(url, null, {
                             withCredentials: this.withCredentials
                         }).then(function (response) {

test/openlayers/mapping/WebMapSpec.js

@@ -12,6 +12,7 @@ import {
 import {
     Util
 } from '../../../src/openlayers/core/Util';
+import {StyleUtils} from "../../../src/openlayers/core/StyleUtils";
 
 describe('openlayers_WebMap', () => {
     var originalTimeout, testDiv, webMap;
@@ -424,6 +425,7 @@ describe('openlayers_WebMap', () => {
         });
         spyOn(options, 'successCallback');
         var datavizWebmap = new WebMap(id, options);
+        spyOn(datavizWebmap, 'createGraphicLayer');
 
         setTimeout(() => {
             expect(datavizWebmap.server).toBe(server);
@@ -433,9 +435,9 @@ describe('openlayers_WebMap', () => {
 
             expect(datavizWebmap.mapParams.title).toBe("无标题");
             expect(datavizWebmap.mapParams.description).toBe('');
+            expect(datavizWebmap.createGraphicLayer).toHaveBeenCalled();
             expect(options.successCallback).toHaveBeenCalled();
             expect(datavizWebmap.map.getLayers().getArray()[0].getProperties().name).toBe('高德地图');
-            expect(datavizWebmap.map.getLayers().getArray()[1].getProperties().name).toBe('浙江省高等院校(1)');
             done();
         }, 1000)
     });
@@ -457,6 +459,7 @@ describe('openlayers_WebMap', () => {
             return Promise.resolve();
         });
         spyOn(options, 'successCallback');
+
         var datavizWebmap = new WebMap(id, options);
 
         setTimeout(() => {