Merge branch 'master' of http://git.mokasz.com/zouyong/mk_framework into master

mk_framework/assets/script/mk/sdk/BuglySDK.ts

@@ -112,7 +112,7 @@ export default class BuglySDK {
         };
 
         let str = JSON.stringify(senddata);
-        str = Utils.RSAEncrypt(str);
+        str = mk.encrypt.rsaEncrypt(str);
 
         httpRequest.send(str);
     }

mk_framework/assets/script/mk/system/MKSystem.ts

@@ -5,6 +5,7 @@ import AudioSystem from "./AudioSystem";
 import DataSystem from "./DataSystem";
 import HttpSystem from "./HttpSystem";
 import LoadResUtil from "../utils/LoadResUtil";
+import { EncryptUtil } from "../utils/EncryptUtil";
 
 
 class MKSystem {
@@ -15,7 +16,11 @@ class MKSystem {
     /** 工具 */
     time: TimeUtil;
     file: FileUtil;
+<<<<<<< .mine
+    encrypt:EncryptUtil;
+=======
     loadRes:LoadResUtil;
+>>>>>>> .theirs
 
     /** SDK */
     bugly:BuglySDK;
@@ -32,6 +37,7 @@ class MKSystem {
         this.time = new TimeUtil();
         this.file = new FileUtil();
         this.loader = new LoadResUtil();
+        this.encrypt = new EncryptUtil();
 
         //sdk
         this.bugly = new BuglySDK();