egovamap 0.35.48 → 0.35.50

package/egovamap/egovagis.js

@@ -1,5 +1,6 @@
 import EGovaMMSMap from "./egovamms";
 import MapUtils from "./mapUtils";
+import aesUtils from './utils/aesUtils';
 var scene = null;
 
 function getCookie(name) {
@@ -15,6 +16,13 @@ function setCookie(name, value) {
     window.document.cookie = name + "=" + value;
 }
 
+function trimEnd(str,c){
+    var rg = new RegExp(c);
+    var i = str.length;
+    while (rg.test(str.charAt(--i)));
+    return str.slice(0, i + 1);
+}
+
 function checkGisServerURL(url, callback) {
     if (!url) return;
 
@@ -182,6 +190,11 @@ var EGovaGISMap = function (
                 var gisServerURL = (context.gisServerURL = gisurl);
                 var gisProxyURL = context.gisServerURL + "/home/gis/proxy.htm";
                 var misServerURL = context.rootPath;
+                if(context.encrypt) {
+                    gisServerURL = aesUtils.egovaEncrypt(trimEnd(context.gisServerURL,"/"), '5E6178C574F953CF', new Date);
+                    gisProxyURL = aesUtils.egovaEncrypt(trimEnd(context.gisServerURL,"/") + '/home/gis/proxy.htm', '5E6178C574F953CF', new Date);
+                    misServerURL = aesUtils.egovaEncrypt(misServerURL, '5E6178C574F953CF', new Date);
+                }
                 var url =
                     context.rootPath +
                     context.assetsPath +
@@ -199,6 +212,9 @@ var EGovaGISMap = function (
                     misServerURL +
                     "&humanID=" +
                     context.humanID;
+                if(context.encrypt) {
+                    url += "&encrypt=true";
+                }
                 if (mapConfig != undefined && mapConfig.params != undefined) {
                     for (var item in mapConfig.params) {
                         url +=

package/egovamap/egovagisviewer.js

@@ -711,12 +711,12 @@ var EGovaGISMap = function (
         mouseMoveCallback
     ) {
         if (scene == null) return;
-        var cb = function (type, data) {
+        var cb = function (type, data, layerName) {
             if (callback && type == "locateFeatureByIDsCallback") {
                 callback(data);
             }
             if (mouseMoveCallback && type != "locateFeatureByIDsCallback") {
-                mouseMoveCallback(type, data);
+                mouseMoveCallback(type, data, layerName);
             }
         };
         that.callMap(

package/egovamap/utils/aesUtils.js

@@ -0,0 +1,128 @@
+import cryptojs from "crypto-js";
+
+var lvLength = 16;
+var randomIvBit = "RANDOM_IV";
+var isInitAesParam = false;
+var DEC_CODE = "5E6178C574F953CF";
+var AESUtils = function () {};
+
+AESUtils.egovaEncrypt = function (data, aesKey, cbciv) {
+  if (aesKey == "" || cbciv == "" || aesKey == null || cbciv == null) {
+    return data;
+  }
+  // 不推荐使用固定IV向量值，建议使用随机IV向量值
+  if (randomIvBit) {
+    cbciv = AESUtils.genRandomIv();
+  }
+  // 加密选项
+  var CBCOptions = {
+    iv: cryptojs.enc.Utf8.parse(cbciv),
+    mode: cryptojs.mode.CBC,
+    padding: cryptojs.pad.Pkcs7,
+  };
+  var utf8AesKey = cryptojs.enc.Utf8.parse(aesKey);
+  var secretData = cryptojs.enc.Utf8.parse(data);
+  var encrypted = cryptojs.AES.encrypt(secretData, utf8AesKey, CBCOptions);
+  if (randomIvBit) {
+    return randomIvBit + cbciv + encrypted.toString();
+  } else {
+    return encrypted.toString();
+  }
+};
+AESUtils.egovaDecrypt = function (data) {
+  var iv;
+  var str;
+  if (data.indexOf(randomIvBit) > -1) {
+    iv = data.substring(randomIvBit.length, randomIvBit.length + lvLength);
+    str = data.substring(randomIvBit.length + lvLength);
+  } else {
+    // MIS的加密工具，init是异步，兼容没有初始化aesUtils时的加密参数
+    iv = new Date();
+    str = data;
+  }
+  var CBCOptions = {
+    iv: cryptojs.enc.Utf8.parse(iv),
+    mode: cryptojs.mode.CBC,
+    padding: cryptojs.pad.Pkcs7,
+  };
+  var decrypt = cryptojs.AES.decrypt(
+    str,
+    cryptojs.enc.Utf8.parse(DEC_CODE),
+    CBCOptions
+  );
+  return decrypt.toString(cryptojs.enc.Utf8).toString() || data;
+};
+
+AESUtils.randomString = function (randomLen, min, max) {
+  var str = "",
+    range = min,
+    arr = [
+      "a",
+      "b",
+      "c",
+      "d",
+      "e",
+      "f",
+      "g",
+      "h",
+      "i",
+      "j",
+      "k",
+      "l",
+      "m",
+      "n",
+      "o",
+      "p",
+      "q",
+      "r",
+      "s",
+      "t",
+      "u",
+      "v",
+      "w",
+      "x",
+      "y",
+      "z",
+      "A",
+      "B",
+      "C",
+      "D",
+      "E",
+      "F",
+      "G",
+      "H",
+      "I",
+      "J",
+      "K",
+      "L",
+      "M",
+      "N",
+      "O",
+      "P",
+      "Q",
+      "R",
+      "S",
+      "T",
+      "U",
+      "V",
+      "W",
+      "X",
+      "Y",
+      "Z",
+    ];
+  // 随机产生
+  if (randomLen) {
+    range = Math.round(Math.random() * (max - min)) + min;
+  }
+  for (var i = 0; i < range; i++) {
+    var pos = Math.round(Math.random() * (arr.length - 1));
+    str += arr[pos];
+  }
+  return str;
+};
+
+AESUtils.genRandomIv = function () {
+  return AESUtils.randomString(false, lvLength);
+};
+
+export default AESUtils;