Skip to content

Commit b358de0

Browse files
zhurczhurc
committed
fix iPortal 安全认证统一使用SecurityManager；improve readme
1 parent c836fa0 commit b358de0

8 files changed

Lines changed: 65 additions & 63 deletions

File tree

‎README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,12 @@
22

33
SuperMap iClient for JavaScript 是一套由 JavaScript 语言编写的 GIS 客户端应用开发包， 支持多源数据地图，支持多终端，跨浏览器， 通过本产品可快速实现浏览器上美观、流畅的地图呈现。
44

5+
## 简介
6+
* 官网：[http://iclient.supermapol.com](http://iclient.supermapol.com)
7+
8+
* 源码：[https://git.oschina.net/isupermap/iClient9](https://git.oschina.net/isupermap/iClient9)
9+
10+
## 许可
11+
[ Apache License 2.0 ](./LICENSE)
12+
513
---

‎dist/iclient9-leaflet.js‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3059,7 +3059,7 @@ SuperMap.Request = {
30593059

30603060
get: function (url, params, options) {
30613061
var type = 'GET';
3062-
url = this._appendUrlTokenParameter(url);
3062+
url = this._processUrl(url);
30633063
url = SuperMap.Util.urlAppend(url, this._getParameterString(params || {}));
30643064
if (url.length <= 2000) {
30653065
if (SuperMap.Support.cors) {
@@ -3075,7 +3075,7 @@ SuperMap.Request = {
30753075

30763076
delete: function (url, params, options) {
30773077
var type = 'DELETE';
3078-
url = this._appendUrlTokenParameter(url);
3078+
url = this._processUrl(url);
30793079
url = SuperMap.Util.urlAppend(url, this._getParameterString(params || {}));
30803080
if (url.length <= 2000 && SuperMap.Support.cors) {
30813081
return this._fetch(url, params, options, type);
@@ -3084,11 +3084,11 @@ SuperMap.Request = {
30843084
},
30853085

30863086
post: function (url, params, options) {
3087-
return this._fetch(this._appendUrlTokenParameter(url), params, options, 'POST');
3087+
return this._fetch(this._processUrl(url), params, options, 'POST');
30883088
},
30893089

30903090
put: function (url, params, options) {
3091-
return this._fetch(this._appendUrlTokenParameter(url), params, options, 'PUT');
3091+
return this._fetch(this._processUrl(url), params, options, 'PUT');
30923092
},
30933093

30943094
_postSimulatie: function (type, url, params, options) {
@@ -3097,11 +3097,16 @@ SuperMap.Request = {
30973097
return this.post(url, params, options);
30983098
},
30993099

3100-
_appendUrlTokenParameter: function (url) {
3101-
url = (url.indexOf('.json') === -1 && url.indexOf("?") === -1) ? (url + '.json') : url;
3102-
if (SuperMap.Credential.CREDENTIAL && SuperMap.Credential.CREDENTIAL.getUrlParameters()) {
3103-
var separator = url.indexOf("?") > -1 ? "&" : "?";
3104-
url += separator + SuperMap.Credential.CREDENTIAL.getUrlParameters();
3100+
_processUrl: function (url) {
3101+
if (url.indexOf('.json') === -1) {
3102+
if (url.indexOf("?") < 0) {
3103+
url += '.json'
3104+
} else {
3105+
var urlArrays = url.split("?");
3106+
if (urlArrays.length === 2) {
3107+
url = urlArrays[0] + ".json?" + urlArrays[1]
3108+
}
3109+
}
31053110
}
31063111
return url;
31073112
},
@@ -12183,18 +12188,12 @@ var iPortalService = __webpack_require__(189);
1218312188
var iPortalMap = __webpack_require__(187);
1218412189
SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
1218512190

12186-
initialize: function (iportalUrl, token) {
12191+
initialize: function (iportalUrl) {
1218712192
this.iportalUrl = iportalUrl;
12188-
this.token = token;
1218912193
},
1219012194

1219112195
load: function () {
12192-
var me = this;
12193-
return SuperMap.Request.get(me.iportalUrl + '/web').then(function (result) {
12194-
if (result) {
12195-
SuperMap.Credential.CREDENTIAL = new SuperMap.Credential(me.token, 'token');
12196-
}
12197-
});
12196+
return SuperMap.Request.get(this.iportalUrl + '/web');
1219812197
},
1219912198

1220012199
queryServices: function (queryParams) {
@@ -12219,7 +12218,7 @@ SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
1221912218
var mapRetult = {};
1222012219
var maps = [];
1222112220
result.content.map(function (mapJsonObj) {
12222-
maps.push(new iPortalMap(mapsUrl+"/"+mapJsonObj.id, mapJsonObj));
12221+
maps.push(new iPortalMap(mapsUrl + "/" + mapJsonObj.id, mapJsonObj));
1222312222
});
1222412223
mapRetult.content = maps;
1222512224
mapRetult.currentPage = result.currentPage;
@@ -12228,8 +12227,7 @@ SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
1222812227
mapRetult.totalPage = result.totalPage;
1222912228
return mapRetult;
1223012229
});
12231-
},
12232-
12230+
}
1223312231
});
1223412232

1223512233
module.exports = SuperMap.iPortal;

‎dist/iclient9-leaflet.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/iclient9-openlayers.js‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2991,7 +2991,7 @@ SuperMap.Request = {
29912991

29922992
get: function (url, params, options) {
29932993
var type = 'GET';
2994-
url = this._appendUrlTokenParameter(url);
2994+
url = this._processUrl(url);
29952995
url = SuperMap.Util.urlAppend(url, this._getParameterString(params || {}));
29962996
if (url.length <= 2000) {
29972997
if (SuperMap.Support.cors) {
@@ -3007,7 +3007,7 @@ SuperMap.Request = {
30073007

30083008
delete: function (url, params, options) {
30093009
var type = 'DELETE';
3010-
url = this._appendUrlTokenParameter(url);
3010+
url = this._processUrl(url);
30113011
url = SuperMap.Util.urlAppend(url, this._getParameterString(params || {}));
30123012
if (url.length <= 2000 && SuperMap.Support.cors) {
30133013
return this._fetch(url, params, options, type);
@@ -3016,11 +3016,11 @@ SuperMap.Request = {
30163016
},
30173017

30183018
post: function (url, params, options) {
3019-
return this._fetch(this._appendUrlTokenParameter(url), params, options, 'POST');
3019+
return this._fetch(this._processUrl(url), params, options, 'POST');
30203020
},
30213021

30223022
put: function (url, params, options) {
3023-
return this._fetch(this._appendUrlTokenParameter(url), params, options, 'PUT');
3023+
return this._fetch(this._processUrl(url), params, options, 'PUT');
30243024
},
30253025

30263026
_postSimulatie: function (type, url, params, options) {
@@ -3029,11 +3029,16 @@ SuperMap.Request = {
30293029
return this.post(url, params, options);
30303030
},
30313031

3032-
_appendUrlTokenParameter: function (url) {
3033-
url = (url.indexOf('.json') === -1 && url.indexOf("?") === -1) ? (url + '.json') : url;
3034-
if (SuperMap.Credential.CREDENTIAL && SuperMap.Credential.CREDENTIAL.getUrlParameters()) {
3035-
var separator = url.indexOf("?") > -1 ? "&" : "?";
3036-
url += separator + SuperMap.Credential.CREDENTIAL.getUrlParameters();
3032+
_processUrl: function (url) {
3033+
if (url.indexOf('.json') === -1) {
3034+
if (url.indexOf("?") < 0) {
3035+
url += '.json'
3036+
} else {
3037+
var urlArrays = url.split("?");
3038+
if (urlArrays.length === 2) {
3039+
url = urlArrays[0] + ".json?" + urlArrays[1]
3040+
}
3041+
}
30373042
}
30383043
return url;
30393044
},
@@ -10216,18 +10221,12 @@ var iPortalService = __webpack_require__(90);
1021610221
var iPortalMap = __webpack_require__(88);
1021710222
SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
1021810223

10219-
initialize: function (iportalUrl, token) {
10224+
initialize: function (iportalUrl) {
1022010225
this.iportalUrl = iportalUrl;
10221-
this.token = token;
1022210226
},
1022310227

1022410228
load: function () {
10225-
var me = this;
10226-
return SuperMap.Request.get(me.iportalUrl + '/web').then(function (result) {
10227-
if (result) {
10228-
SuperMap.Credential.CREDENTIAL = new SuperMap.Credential(me.token, 'token');
10229-
}
10230-
});
10229+
return SuperMap.Request.get(this.iportalUrl + '/web');
1023110230
},
1023210231

1023310232
queryServices: function (queryParams) {
@@ -10252,7 +10251,7 @@ SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
1025210251
var mapRetult = {};
1025310252
var maps = [];
1025410253
result.content.map(function (mapJsonObj) {
10255-
maps.push(new iPortalMap(mapsUrl+"/"+mapJsonObj.id, mapJsonObj));
10254+
maps.push(new iPortalMap(mapsUrl + "/" + mapJsonObj.id, mapJsonObj));
1025610255
});
1025710256
mapRetult.content = maps;
1025810257
mapRetult.currentPage = result.currentPage;
@@ -10261,8 +10260,7 @@ SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
1026110260
mapRetult.totalPage = result.totalPage;
1026210261
return mapRetult;
1026310262
});
10264-
},
10265-
10263+
}
1026610264
});
1026710265

1026810266
module.exports = SuperMap.iPortal;

‎dist/iclient9-openlayers.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/leaflet/iPortalSecurity.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ <h4>iPortal SecurityManager使用示例</h4>
226226
$(document).ready(function () {
227227
$("#loginUrl_iportal").val("http://support.supermap.com.cn:8092");
228228
$("#tokenServiceUrl_iportal").val("http://support.supermap.com.cn:8092/web/services/32");
229-
$("#token_iportal").val("_Bo_ksR9DC56MvnAXc6ligdO5NO-6z9mC_1hJ3XOiajRUlrjfNXBHWcYNpjWj9CVOCU-7Vl5xXERO4SwcMUTXq3eiWaCWGCSNAEZZN6gK4epw8b_0j0QCpHXh1m9CUOy");
229+
$("#token_iportal").val("_Bo_ksR9DC56MvnAXc6liuhAdWmmt1SuoLX758QIeBJUvteLqHqUeeHnQ6OU0i0VBoN5FjNP_SOQ2o1xyudBjA..");
230230

231231
$("#serviceUrl_iportal").val("http://support.supermap.com.cn:8099/s3h4sgb3/iserver/services/map-china400/rest/maps/China");
232232
$('#key_iportal').val("ZlQAFd5VSxSECMuvCToUQ6ja");

‎src/common/iPortal/iPortal.js‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,12 @@ var iPortalService = require('./iPortalService');
66
var iPortalMap = require('./iPortalMap');
77
SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
88

9-
initialize: function (iportalUrl, token) {
9+
initialize: function (iportalUrl) {
1010
this.iportalUrl = iportalUrl;
11-
this.token = token;
1211
},
1312

1413
load: function () {
15-
var me = this;
16-
return SuperMap.Request.get(me.iportalUrl + '/web').then(function (result) {
17-
if (result) {
18-
SuperMap.Credential.CREDENTIAL = new SuperMap.Credential(me.token, 'token');
19-
}
20-
});
14+
return SuperMap.Request.get(this.iportalUrl + '/web');
2115
},
2216

2317
queryServices: function (queryParams) {
@@ -42,7 +36,7 @@ SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
4236
var mapRetult = {};
4337
var maps = [];
4438
result.content.map(function (mapJsonObj) {
45-
maps.push(new iPortalMap(mapsUrl+"/"+mapJsonObj.id, mapJsonObj));
39+
maps.push(new iPortalMap(mapsUrl + "/" + mapJsonObj.id, mapJsonObj));
4640
});
4741
mapRetult.content = maps;
4842
mapRetult.currentPage = result.currentPage;
@@ -51,8 +45,7 @@ SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
5145
mapRetult.totalPage = result.totalPage;
5246
return mapRetult;
5347
});
54-
},
55-
48+
}
5649
});
5750

5851
module.exports = SuperMap.iPortal;

‎src/common/util/Request.js‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ SuperMap.Request = {
2626

2727
get: function (url, params, options) {
2828
var type = 'GET';
29-
url = this._appendUrlTokenParameter(url);
29+
url = this._processUrl(url);
3030
url = SuperMap.Util.urlAppend(url, this._getParameterString(params || {}));
3131
if (url.length <= 2000) {
3232
if (SuperMap.Support.cors) {
@@ -42,7 +42,7 @@ SuperMap.Request = {
4242

4343
delete: function (url, params, options) {
4444
var type = 'DELETE';
45-
url = this._appendUrlTokenParameter(url);
45+
url = this._processUrl(url);
4646
url = SuperMap.Util.urlAppend(url, this._getParameterString(params || {}));
4747
if (url.length <= 2000 && SuperMap.Support.cors) {
4848
return this._fetch(url, params, options, type);
@@ -51,11 +51,11 @@ SuperMap.Request = {
5151
},
5252

5353
post: function (url, params, options) {
54-
return this._fetch(this._appendUrlTokenParameter(url), params, options, 'POST');
54+
return this._fetch(this._processUrl(url), params, options, 'POST');
5555
},
5656

5757
put: function (url, params, options) {
58-
return this._fetch(this._appendUrlTokenParameter(url), params, options, 'PUT');
58+
return this._fetch(this._processUrl(url), params, options, 'PUT');
5959
},
6060

6161
_postSimulatie: function (type, url, params, options) {
@@ -64,11 +64,16 @@ SuperMap.Request = {
6464
return this.post(url, params, options);
6565
},
6666

67-
_appendUrlTokenParameter: function (url) {
68-
url = (url.indexOf('.json') === -1 && url.indexOf("?") === -1) ? (url + '.json') : url;
69-
if (SuperMap.Credential.CREDENTIAL && SuperMap.Credential.CREDENTIAL.getUrlParameters()) {
70-
var separator = url.indexOf("?") > -1 ? "&" : "?";
71-
url += separator + SuperMap.Credential.CREDENTIAL.getUrlParameters();
67+
_processUrl: function (url) {
68+
if (url.indexOf('.json') === -1) {
69+
if (url.indexOf("?") < 0) {
70+
url += '.json'
71+
} else {
72+
var urlArrays = url.split("?");
73+
if (urlArrays.length === 2) {
74+
url = urlArrays[0] + ".json?" + urlArrays[1]
75+
}
76+
}
7277
}
7378
return url;
7479
},

0 commit comments

Comments
 (0)