【fix】修复openlayers无法对接设置了安全认证的iPortal/iServer发布的矢量瓦片服务；删除serverType review by songym

Author: luoxiao-supermap

src/classic/services/AddressMatchService.js

@@ -35,7 +35,6 @@ export class AddressMatchService extends CommonServiceBase {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
             crossOrigin: me.crossOrigin,
-            serverType: me.serverType,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,
@@ -58,7 +57,6 @@ export class AddressMatchService extends CommonServiceBase {
             proxy: me.proxy,
             withCredentials: me.withCredentials,
             crossOrigin: me.crossOrigin,
-            serverType: me.serverType,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,

src/classic/services/DatasetService.js

@@ -45,7 +45,6 @@ export class DatasetService extends CommonServiceBase {
             withCredentials: me.withCredentials,
             crossOrigin: me.crossOrigin,
             headers: me.headers,
-            serverType: me.serverType,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,
@@ -76,7 +75,6 @@ export class DatasetService extends CommonServiceBase {
             withCredentials: me.withCredentials,
             crossOrigin: me.crossOrigin,
             headers: me.headers,
-            serverType: me.serverType,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,
@@ -122,7 +120,6 @@ export class DatasetService extends CommonServiceBase {
             withCredentials: me.withCredentials,
             crossOrigin: me.crossOrigin,
             headers: me.headers,
-            serverType: me.serverType,
             eventListeners: {
                 processCompleted: callback,
                 processFailed: callback
@@ -150,7 +147,6 @@ export class DatasetService extends CommonServiceBase {
             withCredentials: me.withCredentials,
             crossOrigin: me.crossOrigin,
             headers: me.headers,
-            serverType: me.serverType,
             eventListeners: {
                 processCompleted: callback,
                 processFailed: callback

src/classic/services/DatasourceService.js

@@ -40,7 +40,6 @@ export class DatasourceService extends CommonServiceBase {
             withCredentials: me.withCredentials,
             crossOrigin: me.crossOrigin,
             headers: me.headers,
-            serverType: me.serverType,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,
@@ -70,7 +69,6 @@ export class DatasourceService extends CommonServiceBase {
             withCredentials: me.withCredentials,
             crossOrigin: me.crossOrigin,
             headers: me.headers,
-            serverType: me.serverType,
             eventListeners: {
                 scope: me,
                 processCompleted: callback,
@@ -106,7 +104,6 @@ export class DatasourceService extends CommonServiceBase {
             withCredentials: me.withCredentials,
             crossOrigin: me.crossOrigin,
             headers: me.headers,
-            serverType: me.serverType,
             eventListeners: {
                 processCompleted: callback,
                 processFailed: callback

src/classic/services/ProcessingService.js

@@ -2,9 +2,7 @@
  * This program are made available under the terms of the Apache License, Version 2.0
  * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
 import { SuperMap } from '../SuperMap';
-import { ServerType } from '../REST';
 import { SecurityManager } from '../security/SecurityManager';
-import { Credential } from '../commontypes/Credential';
 import { FetchRequest } from '../util/FetchRequest';
 
 /**
@@ -22,7 +20,6 @@ export class IPortalServiceBase {
     constructor(url, options) {
         options = options || {};
         this.serviceUrl = url;
-        this.serverType = ServerType.iPortal;
         this.CLASS_NAME = "SuperMap.iPortalServiceBase";
         this.withCredentials = options.withCredentials || false;
         this.crossOrigin = options.crossOrigin
@@ -40,67 +37,12 @@ export class IPortalServiceBase {
      */
 
     request(method, url, param, requestOptions = {headers: this.headers, crossOrigin: this.crossOrigin, withCredentials: this.withCredentials }) {
-        url = this.createCredentialUrl(url);
+        url = SecurityManager.appendCredential(url);
         return FetchRequest.commit(method, url, param, requestOptions).then(function (response) {
             return response.json();
         });
     }
-
-
-    /**
-     * @function SuperMap.iPortalServiceBase.prototype.createCredentialUrl
-     * @description 追加授权信息。
-     * @param {string} url - 创建证书 URL 地址。
-     * @returns {string} 携带 token 或 key 的新地址。
-     */
-
-    createCredentialUrl(url) {
-        var newUrl = url,
-            credential = this.getCredential();
-
-        if (credential) {
-            var endStr = newUrl.substring(newUrl.length - 1, newUrl.length);
-
-            if (newUrl.indexOf("?") > -1 && endStr === "?") {
-                newUrl += credential.getUrlParameters();
-            } else if (newUrl.indexOf("?") > -1 && endStr !== "?") {
-                newUrl += "&" + credential.getUrlParameters();
-            } else {
-                newUrl += "?" + credential.getUrlParameters();
-            }
-        }
-        return newUrl;
-    }
-
-
-    /**
-     * @function SuperMap.iPortalServiceBase.prototype.getCredential
-     * @description 获取 token。
-     * @returns {string} 返回获取的 token。
-     *
-     */
-
-    getCredential() {
-        var credential,
-            value = SecurityManager.getToken(this.serviceUrl);
-        credential = value ? new Credential(value, "token") : null;
-        if (!credential) {
-            value = this.getKey();
-            credential = value ? new Credential(value, "key") : null;
-        }
-        return credential;
-    }
-
-
-    /**
-     * @function SuperMap.iPortalServiceBase.prototype.getKey
-     * @description 其子类需要重写该方法，修改其中获取 key 的字段，存储 key 可能是服务 ID 字段，可能是 URL。
-     */
-    getKey() {
-        //return SuperMap.SecurityManager.getKey(this.id);
-        //或
-        //return SuperMap.SecurityManager.getKey(this.serviceUrl);
-    }
+ 
 
 }
 

src/common/iPortal/iPortalServiceBase.js

@@ -18,7 +18,6 @@ import {CommonServiceBase} from './CommonServiceBase';
  *        发送请求格式类似于："http://localhost:8090/iserver/services/map-ChartW/rest/maps/海图/chartFeatureInfoSpecs.json"。
  * @param {Object} options - 参数。
  * @param {Object} options.eventListeners - 事件监听器对象。有processCompleted属性可传入处理完成后的回调函数。processFailed属性传入处理失败后的回调函数。
- * @param {SuperMap.ServerType} [options.serverType=SuperMap.ServerType.ISERVER] - 服务器类型，ISERVER|IPORTAL|ONLINE。
  * @param {SuperMap.DataFormat} [options.format] - 查询结果返回格式，目前支持 iServerJSON 和 GeoJSON 两种格式，参数格式为"ISERVER","GEOJSON"。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。

src/common/iServer/ChartFeatureInfoSpecsService.js

@@ -20,7 +20,6 @@ import {GeoJSON} from '../format/GeoJSON';
  * @param {string} url - 地图查询服务访问地址。如："http://localhost:8090/iserver/services/map-ChartW/rest/maps/海图"。
  * @param {Object} options - 参数。
  * @param {Object} options.eventListeners - 事件监听器对象。有processCompleted属性可传入处理完成后的回调函数。processFailed属性传入处理失败后的回调函数。
- * @param {SuperMap.ServerType} [options.serverType=SuperMap.ServerType.ISERVER] - 服务器类型，ISERVER|IPORTAL|ONLINE。
  * @param {SuperMap.DataFormat} [options.format] - 查询结果返回格式，目前支持 iServerJSON 和 GeoJSON 两种格式。参数格式为"ISERVER","GEOJSON"。
  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
  * @param {Object} [options.headers] - 请求头。