Merge branch 'master' of https://git.oschina.net/isupermap/iClient9

Author: caoxinke

dist/iclient9-leaflet.js

@@ -1324,27 +1324,26 @@ SuperMap.ServiceBase = SuperMap.Class({
  * @param url
  */
  getCredential: function (url) {
- var restUrl = this._clipUrlRestString(url);
- var credential, value;
+ var keyUrl = url, credential, value;
  switch (this.serverType) {
  case SuperMap.ServerType.ISERVER:
- value = SuperMap.SecurityManager.getToken(restUrl);
+ value = SuperMap.SecurityManager.getToken(keyUrl);
  credential = value ? new SuperMap.Credential(value, "token") : null;
  break;
  case SuperMap.ServerType.IPORTAL:
- value = SuperMap.SecurityManager.getToken(restUrl);
+ value = SuperMap.SecurityManager.getToken(keyUrl);
  credential = value ? new SuperMap.Credential(value, "token") : null;
  if (!credential) {
- value = SuperMap.SecurityManager.getKey(restUrl);
+ value = SuperMap.SecurityManager.getKey(keyUrl);
  credential = value ? new SuperMap.Credential(value, "key") : null;
  }
  break;
  case SuperMap.ServerType.ONLINE:
- value = SuperMap.SecurityManager.getKey(restUrl);
+ value = SuperMap.SecurityManager.getKey(keyUrl);
  credential = value ? new SuperMap.Credential(value, "key") : null;
  break;
  default:
- value = SuperMap.SecurityManager.getToken(restUrl);
+ value = SuperMap.SecurityManager.getToken(keyUrl);
  credential = value ? new SuperMap.Credential(value, "token") : null;
  break;
  }
@@ -1474,23 +1473,6 @@ SuperMap.ServiceBase = SuperMap.Class({
  this.events.triggerEvent("processFailed", {error: error});
  },
 
- /**
- * 截取url rest路径
- * @param url
- * @private
- */
- _clipUrlRestString: function (url) {
- if (!url) {
- return url;
- }
- var patten = /http:\/\/(.*\/rest)/i;
- var restStr = url.match(patten)[0];
- if (restStr.indexOf("rest") < 1) {
- return url;
- }
- return restStr;
- },
-
  CLASS_NAME: "SuperMap.ServiceBase"
 });
 module.exports = SuperMap.ServiceBase;
@@ -6089,15 +6071,23 @@ SuperMap.SecurityManager = {
 
  _getTokenStorageKey: function (url) {
  var patten = /http:\/\/([^\/]+)/i;
- return url.match(patten)[0];
+ var result = url.match(patten);
+ if (!result) {
+ return url;
+ }
+ return result[0];
  },
 
  _getUrlRestString: function (url) {
  if (!url) {
  return url;
  }
  var patten = /http:\/\/(.*\/rest)/i;
- return url.match(patten)[0];
+ var result = url.match(patten);
+ if (!result) {
+ return url;
+ }
+ return result[0];
  }
 
 };

dist/iclient9-openlayers.js

@@ -61,10 +61,7 @@ <h4>Online SecurityManager使用示例</h4>
  </div>
 
  <div class="col-md-12 text-center">
- <a class="btn btn-success" onclick="requestOnlineKeyService()">直接访问</a>
- <a class="btn btn-success" onclick="registerOnlineKeyAndRequestService()">key授权访问</a>
- <a class="btn btn-success" onclick="setDefaultOnlineValue()">填充默认值</a>
- <a class="btn btn-success" onclick="resetOnlineKey()">清空凭据</a>
+ <a class="btn btn-success" onclick="registerOnlineKeyAndRequestService()">访问</a>
  </div>
  </fieldset>
  </form>
@@ -94,13 +91,9 @@ <h4>Online SecurityManager使用示例</h4>
  <input type="text" class="form-control" id="mapKey_online">
  </div>
  </div>
- <div class="form-group">
- <div class="col-md-12" id="online_map" style=" height: 200px;"></div>
- </div>
  <div class="form-group">
  <div class="col-md-12 text-center">
- <a class="btn btn-success" onclick="setDefaultOnlineMapValue()">填充默认值</a>
- <a class="btn btn-success" onclick="showMapWithOnlineKey()">key授权出图</a>
+ <a class="btn btn-success" onclick="showMapWithOnlineKey()">出图</a>
  </div>
  </div>
  </fieldset>
@@ -110,12 +103,28 @@ <h4>Online SecurityManager使用示例</h4>
  </div>
  </td>
  </tr>
+ <tr>
+ <td colspan="3">
+ <div class="row">
+ <div class="col-md-12 text-center">
+ <div class="col-md-12" id="online_map" style=" height: 300px;"></div>
+ </div>
+ </div>
+ </td>
+ </tr>
  </tbody>
  </table>
  </div>
 </div>
 <script>
 
+ $(document).ready(function () {
+ $("#serviceUrl_online").val("http://www.supermapol.com/iserver/services/bsaq89v0/rest/maps/World");
+ $('#key_online').val("Ie2kriXZZz9GPevFDBQzgLRf");
+ $("#serviceUrlMap_online").val("http://www.supermapol.com/iserver/services/bsaq89v0/rest/maps/World");
+ $('#mapKey_online').val("Ie2kriXZZz9GPevFDBQzgLRf");
+ });
+
  /*登录*/
  function loginOnline() {
  var href = window.location.href;
@@ -146,22 +155,10 @@ <h4>Online SecurityManager使用示例</h4>
  if (!checkUrl(serviceUrl)) {
  return;
  }
+ SuperMap.SecurityManager.destroyKey(serviceUrl);
  SuperMap.SecurityManager.registerKey(serviceUrl, key);
  requestOnlineKeyService();
  }
- function resetOnlineKey() {
- SuperMap.SecurityManager.destroyKey(getOnlineServiceUrl());
- $('#key_online').val("");
- }
-
- function setDefaultOnlineValue() {
- $('#key_online').val("Ie2kriXZZz9GPevFDBQzgLRf");
- $("#serviceUrl_online").val("http://www.supermapol.com/iserver/services/bsaq89v0/rest/maps/World");
- }
- function setDefaultOnlineMapValue() {
- $('#mapKey_online').val("Ie2kriXZZz9GPevFDBQzgLRf");
- $("#serviceUrlMap_online").val("http://www.supermapol.com/iserver/services/bsaq89v0/rest/maps/World");
- }
 
  function getOnlineServiceUrl() {
  return $("#serviceUrl_online").val();
@@ -182,7 +179,7 @@ <h4>Online SecurityManager使用示例</h4>
  crs: L.CRS.EPSG4326,
  center: [30, 104],
  maxZoom: 18,
- zoom: 2
+ zoom: 1
  });
  L.supermap.tiledMapLayer(mapUrl, {
  serverType: SuperMap.ServerType.ONLINE

examples/leaflet/iPortalSecurity.html

@@ -7,11 +7,11 @@
 </head>
 <body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
 <div id="map" style="margin:0 auto;width: 100%;height: 100%;border: 1px solid #dddddd"></div>
-<script type="text/javascript" src="../../node_modules/leaflet/dist/leaflet-src.js"></script>
+<script type="text/javascript" src="http://cdn.bootcss.com/leaflet/1.0.3/leaflet.js"></script>
 <script type="text/javascript" src="../../dist/iclient9-leaflet.js"></script>
 
 <script>
- L.supermap.webmap(128);
+ L.supermap.webmap(75);
 </script>
 </body>
 </html>

examples/leaflet/onlineSecurity.html

@@ -1,9 +1,8 @@
-
 require('./iPortalServicesQueryParam');
 var SuperMap = require('../SuperMap');
 var Request = require('../util/Request');
 var iPortalService = require('./iPortalService');
-SuperMap.iPortal = SuperMap.Class({
+SuperMap.iPortal = SuperMap.Class(SuperMap.iPortalServiceBase, {
 
  initialize: function (iportalUrl, token) {
  this.iportalUrl = iportalUrl;
@@ -21,7 +20,7 @@ SuperMap.iPortal = SuperMap.Class({
 
  queryServices: function (queryParams) {
  var serviceUrl = this.iportalUrl + "/web/services";
- return Request.get(serviceUrl, queryParams).then(function (result) {
+ return this.request("GET", serviceUrl, queryParams).then(function (result) {
  var services = [];
  result.content.map(function (serviceJsonObj) {
  services.push(new iPortalService(serviceUrl, serviceJsonObj));
@@ -32,7 +31,7 @@ SuperMap.iPortal = SuperMap.Class({
 
  deleteServices: function (ids) {
  var serviceUrl = this.iportalUrl + "/web/services";
- return SuperMap.Request.delete(serviceUrl, {ids: ids});
+ return this.request("DELETE", serviceUrl, {ids: ids});
  }
 
 });

examples/leaflet/onlineWebmap.html

@@ -33,7 +33,10 @@ SuperMap.iPortalService = SuperMap.Class(SuperMap.iPortalServiceBase, {
  initialize: function (seviceUrl, params) {
  params = params || {};
  SuperMap.Util.extend(this, params);
- this.serviceUrl = seviceUrl + "/" + this.id;
+ this.serviceUrl = seviceUrl;
+ if (this.id) {
+ this.serviceUrl = seviceUrl + "/" + this.id;
+ }
  SuperMap.iPortalServiceBase.prototype.initialize.call(this.serviceUrl);
  },
 

src/common/iPortal/iPortal.js

@@ -225,27 +225,26 @@ SuperMap.ServiceBase = SuperMap.Class({
  * @param url
  */
  getCredential: function (url) {
- var restUrl = this._clipUrlRestString(url);
- var credential, value;
+ var keyUrl = url, credential, value;
  switch (this.serverType) {
  case SuperMap.ServerType.ISERVER:
- value = SuperMap.SecurityManager.getToken(restUrl);
+ value = SuperMap.SecurityManager.getToken(keyUrl);
  credential = value ? new SuperMap.Credential(value, "token") : null;
  break;
  case SuperMap.ServerType.IPORTAL:
- value = SuperMap.SecurityManager.getToken(restUrl);
+ value = SuperMap.SecurityManager.getToken(keyUrl);
  credential = value ? new SuperMap.Credential(value, "token") : null;
  if (!credential) {
- value = SuperMap.SecurityManager.getKey(restUrl);
+ value = SuperMap.SecurityManager.getKey(keyUrl);
  credential = value ? new SuperMap.Credential(value, "key") : null;
  }
  break;
  case SuperMap.ServerType.ONLINE:
- value = SuperMap.SecurityManager.getKey(restUrl);
+ value = SuperMap.SecurityManager.getKey(keyUrl);
  credential = value ? new SuperMap.Credential(value, "key") : null;
  break;
  default:
- value = SuperMap.SecurityManager.getToken(restUrl);
+ value = SuperMap.SecurityManager.getToken(keyUrl);
  credential = value ? new SuperMap.Credential(value, "token") : null;
  break;
  }
@@ -375,23 +374,6 @@ SuperMap.ServiceBase = SuperMap.Class({
  this.events.triggerEvent("processFailed", {error: error});
  },
 
- /**
- * 截取url rest路径
- * @param url
- * @private
- */
- _clipUrlRestString: function (url) {
- if (!url) {
- return url;
- }
- var patten = /http:\/\/(.*\/rest)/i;
- var restStr = url.match(patten)[0];
- if (restStr.indexOf("rest") < 1) {
- return url;
- }
- return restStr;
- },
-
  CLASS_NAME: "SuperMap.ServiceBase"
 });
 module.exports = SuperMap.ServiceBase;

src/common/iPortal/iPortalService.js

@@ -67,10 +67,11 @@ SuperMap.OnlineData = SuperMap.Class(SuperMap.OnlineServiceBase, {
  var me = this;
  options = options || {};
  SuperMap.Util.extend(me, options);
- if (serviceRootUrl) {
+ me.serviceUrl = serviceRootUrl;
+ if (me.id) {
  me.serviceUrl = serviceRootUrl + "/" + me.id;
- SuperMap.OnlineServiceBase.prototype.initialize.call(me.serviceUrl);
  }
+ SuperMap.OnlineServiceBase.prototype.initialize.call(me.serviceUrl);
  },
 
  //通过url请求获取该服务完整信息

src/common/iServer/ServiceBase.js

@@ -159,15 +159,23 @@ SuperMap.SecurityManager = {
 
  _getTokenStorageKey: function (url) {
  var patten = /http:\/\/([^\/]+)/i;
- return url.match(patten)[0];
+ var result = url.match(patten);
+ if (!result) {
+ return url;
+ }
+ return result[0];
  },
 
  _getUrlRestString: function (url) {
  if (!url) {
  return url;
  }
  var patten = /http:\/\/(.*\/rest)/i;
- return url.match(patten)[0];
+ var result = url.match(patten);
+ if (!result) {
+ return url;
+ }
+ return result[0];
  }
 
 };