修改iportal的登录方式

songyumeng · songyumeng · commit 4c98fa2af1d2 · 2017-09-11T17:11:50.000+08:00
diff --git a/dist/iclient-classic.js b/dist/iclient-classic.js
diff --git a/dist/iclient-classic.min.js b/dist/iclient-classic.min.js
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
diff --git a/dist/iclient9-leaflet.min.js b/dist/iclient9-leaflet.min.js
diff --git a/dist/iclient9-mapboxgl.js b/dist/iclient9-mapboxgl.js
diff --git a/dist/iclient9-mapboxgl.min.js b/dist/iclient9-mapboxgl.min.js
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
diff --git a/dist/iclient9-openlayers.min.js b/dist/iclient9-openlayers.min.js
diff --git a/dist/include-leaflet.js b/dist/include-leaflet.js
@@ -52,7 +52,7 @@
             inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");
         }
         if (!inArray(excludes, 'iclient9-leaflet')) {
-            inputScript("../../dist/iclient9-leaflet.min.js");
+            inputScript("../../dist/iclient9-leaflet.js");
         }
         if (inArray(includes, 'iclient9-leaflet-css')) {
             inputCSS("../../dist/iclient9-leaflet.min.css");
diff --git a/examples/classic/SummaryMeshJobService.html b/examples/classic/SummaryMeshJobService.html
@@ -112,7 +112,7 @@ <h3 class="panel-title">点聚合分析</h3>
 
     var processingService = new SuperMap.REST.ProcessingService(processingsUrl);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
     $("#type").change(function (e) {
         if (e.target.selectedIndex === 0) {
diff --git a/examples/classic/SummaryRegionJobService.html b/examples/classic/SummaryRegionJobService.html
@@ -149,7 +149,7 @@ <h3 class="panel-title">区域汇总分析</h3>
 
     var processingService = new SuperMap.REST.ProcessingService(processingsUrl);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
     $("#standardSummaryFields").change(function (e) {
diff --git a/examples/classic/kernelDensityJobService.html b/examples/classic/kernelDensityJobService.html
@@ -135,7 +135,7 @@ <h3 class="panel-title">密度分析</h3>
 
     var processingService = new SuperMap.REST.ProcessingService(processingsUrl);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
     function getQuery() {
diff --git a/examples/classic/singleObjectQueryJobService.html b/examples/classic/singleObjectQueryJobService.html
@@ -80,7 +80,7 @@ <h3 class='panel-title'>单对象查询分析</h3>
 
     var processingService = new SuperMap.REST.ProcessingService(processingsUrl);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
     bindClick();
diff --git a/examples/classic/vectorClipJobService.html b/examples/classic/vectorClipJobService.html
@@ -75,7 +75,7 @@ <h3 class='panel-title'>矢量裁剪分析</h3>
 
     var processingService = new SuperMap.REST.ProcessingService(processingsUrl);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
     bindClick();
diff --git a/examples/leaflet/SummaryMeshJobService.html b/examples/leaflet/SummaryMeshJobService.html
@@ -77,7 +77,7 @@
     });
     var processingService = new L.supermap.processingService(processingUrl);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken("http://117.122.248.69:8090", token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
 
diff --git a/examples/leaflet/SummaryRegionJobService.html b/examples/leaflet/SummaryRegionJobService.html
@@ -100,7 +100,7 @@
     });
     var processingService = new L.supermap.processingService(processingUrl);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken("http://117.122.248.69:8090", token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
 
diff --git a/examples/leaflet/iPortalSecurity.html b/examples/leaflet/iPortalSecurity.html
@@ -36,12 +36,28 @@ <h4>iPortal SecurityManager使用示例</h4>
                                 <div class="form-group">
                                     <label for="loginUrl_iportal" class="col-md-2 control-label">服务地址</label>
                                     <div class="col-md-8">
-                                        <input type="text" class="form-control" id="loginUrl_iportal" placeholder="服务域名/IP+端口">
+                                        <input type="text" class="form-control" id="loginUrl_iportal"
+                                               placeholder="服务域名/IP+端口">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="username_iportal" class="col-md-2 control-label">用户名</label>
+
+                                    <div class="col-md-8">
+                                        <input type="text" class="form-control" id="username_login">
+                                    </div>
+                                </div>
+                                <div class="form-group">
+                                    <label for="password_iportal" class="col-md-2 control-label">密码</label>
+
+                                    <div class="col-md-8">
+                                        <input type="password" class="form-control" id="password_login">
                                     </div>
                                 </div>
                                 <div class="form-group">
                                     <div class="col-md-12 text-center">
                                         <a class="btn btn-success" onclick="loginPortal()">登录</a>
+                                        <a class="btn btn-success" onclick="logoutPortal()">登出</a>
                                     </div>
                                 </div>
                             </fieldset>
@@ -60,7 +76,8 @@ <h4>iPortal SecurityManager使用示例</h4>
                                 <div class="form-group">
                                     <label for="serviceUrlToken_iportal" class="col-md-2 control-label">服务地址</label>
                                     <div class="col-md-8">
-                                        <input type="text" class="form-control" id="serviceUrlToken_iportal" placeholder="服务域名/IP+端口">
+                                        <input type="text" class="form-control" id="serviceUrlToken_iportal"
+                                               placeholder="服务域名/IP+端口">
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -130,7 +147,8 @@ <h4>iPortal SecurityManager使用示例</h4>
                                 <div class="form-group">
                                     <label for="tokenServiceUrl_iportal" class="col-md-2 control-label">服务地址</label>
                                     <div class="col-md-8">
-                                        <input type="text" class="form-control" id="tokenServiceUrl_iportal" placeholder="http://localhost:8090/web/services/32">
+                                        <input type="text" class="form-control" id="tokenServiceUrl_iportal"
+                                               placeholder="http://localhost:8090/web/services/32">
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -158,7 +176,8 @@ <h4>iPortal SecurityManager使用示例</h4>
                                 <div class="form-group">
                                     <label for="serviceUrl_iportal" class="col-md-2 control-label">服务地址</label>
                                     <div class="col-md-8">
-                                        <input type="text" class="form-control" id="serviceUrl_iportal" placeholder="iPortal私有地图服务地址">
+                                        <input type="text" class="form-control" id="serviceUrl_iportal"
+                                               placeholder="iPortal私有地图服务地址">
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -221,7 +240,7 @@ <h4>iPortal SecurityManager使用示例</h4>
 <script>
 
     $(document).ready(function () {
-        $("#loginUrl_iportal").val("http://support.supermap.com.cn:8092");
+        $("#loginUrl_iportal").val("http://localhost:8090/iportal");
         $("#tokenServiceUrl_iportal").val("http://support.supermap.com.cn:8092/web/services/32");
         $("#token_iportal").val("_Bo_ksR9DC56MvnAXc6liuhAdWmmt1SuoLX758QIeBJUvteLqHqUeeHnQ6OU0i0VBoN5FjNP_SOQ2o1xyudBjA..");
 
@@ -234,10 +253,24 @@ <h4>iPortal SecurityManager使用示例</h4>
     /*登录*/
     function loginPortal() {
         var loginUrl = $("#loginUrl_iportal").val();
+        var userName = $('#username_login').val();
+        var password = $('#password_login').val();
         if (!checkUrl(loginUrl)) {
             return;
         }
-        SuperMap.SecurityManager.loginPortal(loginUrl, true);
+        SuperMap.SecurityManager.loginiPortal(loginUrl, userName, password).then(function (result) {
+            if(result.succeed)
+                window.alert("登录成功")
+        });
+    }
+    /*登出*/
+    function logoutPortal() {
+        var loginUrl = $("#loginUrl_iportal").val();
+        SuperMap.SecurityManager.logoutiPortal(loginUrl).then(function (succeed) {
+            if (succeed) {
+                window.alert("登出成功")
+            }
+        });
     }
 
 
diff --git a/examples/leaflet/kernelDensityJobService.html b/examples/leaflet/kernelDensityJobService.html
@@ -101,7 +101,7 @@
 
     var processingService = new L.supermap.processingService(processingUrl);
     if (! window.isLocal) {
-        SuperMap.SecurityManager.registerToken("http://117.122.248.69:8090", token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
 
diff --git a/examples/leaflet/singleObjectQueryJobService.html b/examples/leaflet/singleObjectQueryJobService.html
@@ -24,7 +24,7 @@
     L.supermap.tiledMapLayer(mapURL).addTo(map);
     processingService = L.supermap.processingService(processingUrl);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken("http://117.122.248.69:8090", token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
     initForm();
     bindClick();
diff --git a/examples/leaflet/vectorClipJobService.html b/examples/leaflet/vectorClipJobService.html
@@ -24,7 +24,7 @@
     L.supermap.tiledMapLayer(mapURL).addTo(map);
     processingService = L.supermap.processingService(processingUrl);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken("http://117.122.248.69:8090", token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
     initForm();
     bindClick();
diff --git a/examples/openlayers/SummaryMeshJobService.html b/examples/openlayers/SummaryMeshJobService.html
@@ -120,7 +120,7 @@ <h3 class="panel-title">点聚合分析</h3>
     info.setMap(map);
     map.addControl(info);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
     function getQuery() {
diff --git a/examples/openlayers/SummaryRegionJobService.html b/examples/openlayers/SummaryRegionJobService.html
@@ -161,7 +161,7 @@ <h3 class="panel-title">区域汇总分析</h3>
     info.setMap(map);
     map.addControl(info);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
     function getQuery() {
diff --git a/examples/openlayers/kernelDensityJobService.html b/examples/openlayers/kernelDensityJobService.html
@@ -132,7 +132,7 @@ <h3 class="panel-title">密度分析</h3>
     info.setMap(map);
     map.addControl(info);
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
     function getQuery() {
diff --git a/examples/openlayers/singleObjectQueryJobService.html b/examples/openlayers/singleObjectQueryJobService.html
@@ -95,7 +95,7 @@ <h3 class='panel-title'>单对象查询分析</h3>
     }
 
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
     function queryJobs() {
diff --git a/examples/openlayers/vectorClipJobService.html b/examples/openlayers/vectorClipJobService.html
@@ -72,7 +72,7 @@ <h3 class='panel-title'>矢量裁剪分析</h3>
     initForm();
     bindClick();
     if (!window.isLocal) {
-        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
+        SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);
     }
 
     function initForm() {
diff --git a/src/common/iServer/ProcessingServiceBase.js b/src/common/iServer/ProcessingServiceBase.js
@@ -94,9 +94,9 @@ export default class ProcessingServiceBase extends CommonServiceBase {
                         return response.json();
                     }).then(function (job) {
                     me.events.triggerEvent("processRunning", {id: job.id, state: job.state});
-                    if (job.state.runState === 'LOST') {
+                    if (job.state.runState === 'LOST' || job.state.runState === 'KILLED'|| job.state.runState === 'FAILED') {
                         clearInterval(id);
-                        me.events.triggerEvent("processFailed", {error: job.state.errorMsg});
+                        me.events.triggerEvent("processFailed", {error: job.state.errorMsg, state: job.state.runState});
                     }
                     if (job.state.runState === 'FINISHED' && job.setting.serviceInfo) {
                         clearInterval(id);
diff --git a/src/common/security/SecurityManager.js b/src/common/security/SecurityManager.js
@@ -132,10 +132,42 @@ SuperMap.SecurityManager = {
      * @param url -{string} 网站地址
      * @param newTab -{boolean}是否新窗口打开
      */
-    loginPortal: function (url, newTab) {
+    loginiPortal: function (url, username, password) {
         var end = url.substr(url.length - 1, 1);
-        url += end === "/" ? "web/login" : "/web/login";
-        this._open(url, newTab);
+        url += end === "/" ? "web/login.json" : "/web/login.json";
+        var loginInfo = {
+            username: username && username.toString(),
+            password: password && password.toString()
+        };
+        loginInfo = JSON.stringify(loginInfo);
+        var requestOptions = {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+            },
+            withCredentials: true
+        };
+        return FetchRequest.post(url, loginInfo, requestOptions).then(function (response) {
+            return response.json();
+        });
+
+    },
+    logoutiPortal: function (url) {
+        var end = url.substr(url.length - 1, 1);
+        url += end === "/" ? "services/security/logout" : "/services/security/logout";
+
+        var requestOptions = {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+            },
+            withCredentials: true,
+            withoutFormatSuffix: true
+        };
+        return FetchRequest.get(url, "", requestOptions).then(function () {
+            return true;
+        }).catch(function () {
+            return false;
+        });
+
     },
 
     /**
diff --git a/src/common/security/ServerInfo.js b/src/common/security/ServerInfo.js
@@ -40,8 +40,8 @@ export default class ServerInfo {
         if (!this.server) {
             console.error('server url require is not  undefined')
         }
-        var patten = /http:\/\/([^\/]+)/i;
-        this.server = this.server.match(patten)[0];
+       // var patten = /http:\/\/([^\/]+)/i;
+        //this.server = this.server.match(patten)[0];
 
         var tokenServiceSuffix = "/services/security/tokens.json";
         if (this.type === ServerType.ISERVER && this.server.indexOf("iserver") < 0) {
diff --git a/src/common/util/FetchRequest.js b/src/common/util/FetchRequest.js
@@ -23,6 +23,7 @@ export var FetchRequest = SuperMap.FetchRequest = {
     },
 
     get: function (url, params, options) {
+        options = options||{};
         var type = 'GET';
         url = this._processUrl(url,options);
         url = SuperMap.Util.urlAppend(url, this._getParameterString(params || {}));
@@ -39,6 +40,7 @@ export var FetchRequest = SuperMap.FetchRequest = {
     },
 
     delete: function (url, params, options) {
+        options = options||{};
         var type = 'DELETE';
         url = this._processUrl(url,options);
         url = SuperMap.Util.urlAppend(url, this._getParameterString(params || {}));
@@ -49,10 +51,12 @@ export var FetchRequest = SuperMap.FetchRequest = {
     },
 
     post: function (url, params, options) {
+        options = options||{};
         return this._fetch(this._processUrl(url,options), params, options, 'POST');
     },
 
     put: function (url, params, options) {
+        options = options||{};
         return this._fetch(this._processUrl(url,options), params, options, 'PUT');
     },
     urlIsLong : function (url){
@@ -83,7 +87,7 @@ export var FetchRequest = SuperMap.FetchRequest = {
             return url;
         }
 
-        if (url.indexOf('.json') === -1) {
+        if (url.indexOf('.json') === -1 && !options.withoutFormatSuffix) {
             if (url.indexOf("?") < 0) {
                 url += '.json'
             } else {
diff --git a/src/leaflet/services/ServiceBase.js b/src/leaflet/services/ServiceBase.js
@@ -1,4 +1,5 @@
 ﻿import L from "leaflet";
+import "../core/Base"
 
 /**
  * @class L.supermap.ServiceBase
diff --git a/test/common/security/SecurityManagerSpec.js b/test/common/security/SecurityManagerSpec.js

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`inputScript("http://cdn.bootcss.com/elasticsearch/13.0.1/elasticsearch.min.js");`
`53`	`53`	`}`
`54`	`54`	`if (!inArray(excludes, 'iclient9-leaflet')) {`
`55`		`- inputScript("../../dist/iclient9-leaflet.min.js");`
	`55`	`+ inputScript("../../dist/iclient9-leaflet.js");`
`56`	`56`	`}`
`57`	`57`	`if (inArray(includes, 'iclient9-leaflet-css')) {`
`58`	`58`	`inputCSS("../../dist/iclient9-leaflet.min.css");`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ <h3 class="panel-title">点聚合分析</h3>`
`112`	`112`
`113`	`113`	`var processingService = new SuperMap.REST.ProcessingService(processingsUrl);`
`114`	`114`	`if (!window.isLocal) {`
`115`		`- SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);`
	`115`	`+ SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090/iserver', token);`
`116`	`116`	`}`
`117`	`117`	`$("#type").change(function (e) {`
`118`	`118`	`if (e.target.selectedIndex === 0) {`