fix 站点示例显示错误问题 review by songyumeng

zhurc · zhurc · commit 78b79912705d · 2017-05-23T11:07:43.000+08:00
diff --git a/dist/iclient9-leaflet.js b/dist/iclient9-leaflet.js
@@ -1387,7 +1387,7 @@ SuperMap.ServiceBase = SuperMap.Class({
                 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;
         }
diff --git a/dist/iclient9-openlayers.js b/dist/iclient9-openlayers.js
@@ -1343,7 +1343,7 @@ SuperMap.ServiceBase = SuperMap.Class({
                 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;
         }
diff --git a/examples/leaflet/onlineWebmap.html b/examples/leaflet/onlineWebmap.html
@@ -7,7 +7,7 @@
 </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>
diff --git a/src/common/iServer/ServiceBase.js b/src/common/iServer/ServiceBase.js
@@ -244,7 +244,7 @@ SuperMap.ServiceBase = SuperMap.Class({
                 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;
         }

Original file line number	Diff line number	Diff line change
`@@ -1387,7 +1387,7 @@ SuperMap.ServiceBase = SuperMap.Class({`
`1387`	`1387`	`credential = value ? new SuperMap.Credential(value, "key") : null;`
`1388`	`1388`	`break;`
`1389`	`1389`	`default:`
`1390`		`- value = SuperMap.SecurityManager.getToken(restUrl);`
	`1390`	`+ value = SuperMap.SecurityManager.getToken(keyUrl);`
`1391`	`1391`	`credential = value ? new SuperMap.Credential(value, "token") : null;`
`1392`	`1392`	`break;`
`1393`	`1393`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1343,7 +1343,7 @@ SuperMap.ServiceBase = SuperMap.Class({`
`1343`	`1343`	`credential = value ? new SuperMap.Credential(value, "key") : null;`
`1344`	`1344`	`break;`
`1345`	`1345`	`default:`
`1346`		`- value = SuperMap.SecurityManager.getToken(restUrl);`
	`1346`	`+ value = SuperMap.SecurityManager.getToken(keyUrl);`
`1347`	`1347`	`credential = value ? new SuperMap.Credential(value, "token") : null;`
`1348`	`1348`	`break;`
`1349`	`1349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ SuperMap.ServiceBase = SuperMap.Class({`
`244`	`244`	`credential = value ? new SuperMap.Credential(value, "key") : null;`
`245`	`245`	`break;`
`246`	`246`	`default:`
`247`		`- value = SuperMap.SecurityManager.getToken(restUrl);`
	`247`	`+ value = SuperMap.SecurityManager.getToken(keyUrl);`
`248`	`248`	`credential = value ? new SuperMap.Credential(value, "token") : null;`
`249`	`249`	`break;`
`250`	`250`	`}`