Skip to content

Commit e0cc58d

Browse files
zhurczhurc
committed
新增统一授权管理器SecurityManager，并修改原有的授权实现，并添加示例 review by songyumeng
1 parent f34b7fe commit e0cc58d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+4583
-1669
lines changed

‎build/build.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,25 @@ function init() {
3535
$('#deplist li')[0].className = 'active';
3636
for (var openlayersModule in openlayersModules) {
3737
var title = openlayersModules[openlayersModule].title;
38-
addGroup('openlayers', title, openlayersModules[openlayersModule].description, $('#openlayersselect')[0]);
38+
addGroup('openlayers', openlayersModule, title, openlayersModules[openlayersModule].description, $('#openlayersselect')[0]);
3939
for (var module in openlayersModules[openlayersModule]) {
4040
if (module === 'title' || module === 'description') {
4141
continue;
4242
}
43-
addModule(module, $('#openlayers_' + title)[0], false, openlayersModules[openlayersModule][module].name);
43+
addModule(module, $('#openlayers_' + openlayersModule)[0], false, openlayersModules[openlayersModule][module].name);
4444
}
45+
$('#openlayers_' + openlayersModule).append($("<div style='clear:both;'></div>"));
4546
}
4647
for (var leafletModule in leafletModules) {
4748
var title = leafletModules[leafletModule].title;
48-
addGroup('leaflet', title, leafletModules[leafletModule].description, $('#leafletselect')[0]);
49+
addGroup('leaflet', leafletModule, title, leafletModules[leafletModule].description, $('#leafletselect')[0]);
4950
for (var module in leafletModules[leafletModule]) {
5051
if (module === 'title' || module === 'description') {
5152
continue;
5253
}
53-
addModule(module, $('#leaflet_' + title)[0], false, leafletModules[leafletModule][module].name);
54+
addModule(module, $('#leaflet_' + leafletModule)[0], false, leafletModules[leafletModule][module].name);
5455
}
56+
$('#leaflet_' + leafletModule).append($("<div style='clear:both;'></div>"));
5557
}
5658
updateCommand();
5759

@@ -78,9 +80,9 @@ function cancelChecked(clientName) {
7880
}
7981
}
8082

81-
function addGroup(client, title, description, div) {
83+
function addGroup(client, id, title, description, div) {
8284
var ul = document.createElement('ul');
83-
ul.id = client + '_' + title;
85+
ul.id = client + '_' + id;
8486
ul.className = 'deplist';
8587
var container = document.createElement('div');
8688
container.className = "contents";

‎build/deps.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ var deps = {
1313
"style": [
1414
"./src/common/style/CartoCSS.js"
1515
],
16+
"security": [
17+
"./src/common/security/SecurityManager.js"
18+
],
1619
// "iManager" : [],
1720
"online": [
1821
"./src/common/online/Online.js"
@@ -87,6 +90,7 @@ var deps = {
8790
"./src/common/iServer/KernelDensityJobsService.js",
8891
"./src/common/iServer/BuildCacheJobsService.js",
8992
]
93+
9094
},
9195

9296
"leaflet": {
@@ -177,7 +181,20 @@ var deps = {
177181
"src": [
178182
"./src/leaflet/services/ProcessingJobsService.js"
179183
]
184+
},
185+
"iPortal": {
186+
"name": "iPortal服务",
187+
"src": [
188+
"./src/common/iPortal/iPortal.js"
189+
]
190+
},
191+
"Online": {
192+
"name": "Online服务",
193+
"src": [
194+
"./src/common/online/Online.js"
195+
]
180196
}
197+
181198
},
182199

183200
"overlay": {

‎dist/iclient9-leaflet.js‎

Lines changed: 2172 additions & 1029 deletions
Large diffs are not rendered by default.

‎dist/iclient9-openlayers.js‎

Lines changed: 1061 additions & 549 deletions
Large diffs are not rendered by default.

‎examples/leaflet/config.js‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,14 @@ var exampleConfig = {
235235
thumbnail: "l_iPortalWebmap.png",
236236
fileName: "iPortalWebmap"
237237
}]
238+
},
239+
"ip_security": {
240+
name: "安全",
241+
content: [{
242+
name: "安全认证",
243+
thumbnail: "l_iportalSecurity.png",
244+
fileName: "iPortalSecurity"
245+
}]
238246
}
239247
}
240248
},
@@ -248,6 +256,14 @@ var exampleConfig = {
248256
thumbnail: "l_onlineWebmap.png",
249257
fileName: "onlineWebmap"
250258
}]
259+
},
260+
"ol_security": {
261+
name: "安全",
262+
content: [{
263+
name: "安全认证",
264+
thumbnail: "l_onlineSecurity.png",
265+
fileName: "onlineSecurity"
266+
}]
251267
}
252268
}
253269
},

0 commit comments

Comments
 (0)