【bug】1) WMTS服务获取失败的问题，传入crateditialKey，请求问题导致

       2) 区分请求，有些带上crateditialKey。
（reviewed by yuzy）
【bug】1) online主站同域下的服务，webp判断请求自动带上json。导致请求判断错误
  （reviewed by chengl）

Author: Yuki-Zhao

src/openlayers/mapping/WebMap.js

@@ -81,8 +81,9 @@ const dpiConfig = {
  * @param {string} [options.credentialValue] - 凭证密钥对应的值，credentialKey和credentialValue必须一起使用
  * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie
  * @param {boolean} [options.excludePortalProxyUrl] - server传递过来的url是否带有代理
- * @param {Object} [options.serviceProxy] - iportal服务代理信息
+ * @param {Object} [options.serviceProxy] - iportal内置代理信息, 仅矢量瓦片图层上图才会使用
  * @param {string} [options.tiandituKey] - 天地图的key
+ * @param {string} [options.proxy] - 代理地址，当域名不一致，请求会加上代理。避免跨域
  * @param {function} [options.mapSetting.mapClickCallback] - 地图被点击的回调函数
  * @param {function} [options.mapSetting.overlays] - 地图的overlayer
  * @param {function} [options.mapSetting.controls] - 地图的控件
@@ -105,6 +106,7 @@ export class WebMap extends Observable {
         this.excludePortalProxyUrl = options.excludePortalProxyUrl || false;
         this.serviceProxy = options.serviceProxy || null;
         this.tiandituKey = options.tiandituKey;
+        this.proxy = options.proxy;
         //计数叠加图层，处理过的数量（成功和失败都会计数）
         this.layerAdded = 0;
         this.events = new Events(this, null, ["updateDataflowFeature"], true);
@@ -423,7 +425,7 @@ export class WebMap extends Observable {
             source = me.createWMSSource(baseLayerInfo);
             me.addSpecToMap(source);
         } else if(baseLayerType === "WMTS"){
-            FetchRequest.get(me.getRequestUrl(url), null, {
+            FetchRequest.get(me.getRequestUrl(url, true), null, {
                 withCredentials: this.withCredentials
             }).then(function (response) {
                 return response.text();
@@ -1162,7 +1164,7 @@ export class WebMap extends Observable {
         } else {
             url += splitStr + '/1.0.0/WMTSCapabilities.xml';
         }
-        return this.getRequestUrl(url);
+        return this.getRequestUrl(url, true);
     }
 
     /**
@@ -1172,10 +1174,10 @@ export class WebMap extends Observable {
      * @param {Object} layerInfo - 图层信息。
      * @param {function} callback - 获得wmts图层参数执行的回调函数
      */
-    getWmtsInfo(layerInfo, callback, mapInfo) {
+    getWmtsInfo(layerInfo, callback) {
         let that = this;
         let options = {
-            withCredentials: true,
+            withCredentials: that.withCredentials,
             withoutFormatSuffix: true
         };
         const isKvp = !layerInfo.requestEncoding || layerInfo.requestEncoding === 'KVP';
@@ -1240,11 +1242,7 @@ export class WebMap extends Observable {
                 layerInfo.unit = "m";
                 layerInfo.layerFormat = layerFormat;
                 layerInfo.matrixIds = matrixIds;
-                if(mapInfo){
-                    callback && callback(mapInfo, null, true, that);
-                }else{
-                    callback && callback(layerInfo);
-                }
+                callback && callback(layerInfo);
             }
         }).catch(function (error) {
             that.errorCallback && that.errorCallback(error, 'getWmtsFaild', that.map)
@@ -1730,7 +1728,7 @@ export class WebMap extends Observable {
     getDataflowInfo(layerInfo, success, faild) {
         let that = this;
         let url = layerInfo.url, token;
-        let requestUrl = that.getRequestUrl(`${url}.json`)
+        let requestUrl = that.getRequestUrl(`${url}.json`, false);
         if(layerInfo.credential && layerInfo.credential.token) {
             token = layerInfo.credential.token;
             requestUrl+= `?token=${token}`;
@@ -3519,10 +3517,12 @@ export class WebMap extends Observable {
      * @private
      * @function ol.supermap.WebMap.prototype.getRootUrl
      * @description 获取请求地址
+     * @param {string} url 请求的地址
+     * @param {boolean} 请求是否带上Credential.
      * @returns {Promise<T | never>} 请求地址
      */
-    getRequestUrl(url) {
-        this.formatUrlWithCredential(url);
+    getRequestUrl(url, excludeCreditial) {
+        url =  excludeCreditial ? url : this.formatUrlWithCredential(url);
         //如果传入进来的url带了代理则不需要处理
         if(this.excludePortalProxyUrl) {
             return;
@@ -3549,8 +3549,11 @@ export class WebMap extends Observable {
      * @description 获取代理地址
      * @returns {Promise<T | never>} 代理地址
      */
-    getProxy() {
-        return this.server + 'apps/viewer/getUrlResource.json?url=';
+    getProxy(type) {
+        if(!type) {
+            type = 'json';
+        }
+        return this.proxy || this.server + `apps/viewer/getUrlResource.${type}?url=`;
     }
 
     /**
@@ -4236,9 +4239,17 @@ export class WebMap extends Observable {
             return false;
         } 
         url = token ? `${url}/tileImage.webp?token=${token}` : `${url}/tileImage.webp`;
-        url = this.getRequestUrl(url);
+        let isSameDomain = CommonUtil.isInTheSameDomain(url), excledeCreditial;
+        if(isSameDomain && !token) {
+            // online上服务域名一直，要用token值
+            excledeCreditial = false;  
+        } else {
+            excledeCreditial = true; 
+        }
+        url = this.getRequestUrl(url, excledeCreditial);
         return FetchRequest.get(url, null, {
-            withCredentials: this.withCredentials
+            withCredentials: this.withCredentials,
+            withoutFormatSuffix: true
         }).then(function (response) {
             if(response.status !== 200) {
                 throw response.status;