system-clients 3.1.76-ls → 3.1.77-ls

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.1.76-ls",
+  "version": "3.1.77-ls",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/plugins/EncryptUtil.js

@@ -1,30 +1,53 @@
-import AesEncryptJS from 'crypto-js'
-
-export default {
-  /**
-   * AES加密
-   * @param word
-   * @returns {*}
-   */
-  AESEncrypt (word, encryKey) {
-    var key = AesEncryptJS.enc.Utf8.parse(encryKey)
-    var srcs = AesEncryptJS.enc.Utf8.parse(word)
-    var encrypted = AesEncryptJS.AES.encrypt(srcs, key, {mode: AesEncryptJS.mode.ECB, padding: AesEncryptJS.pad.Pkcs7})
-    return encrypted.toString()
-  },
-  /**
-   * AES解密
-   * @param word
-   * @returns {*}
-   */
-  AESDecrypt (word, encryKey) {
-    var key = AesEncryptJS.enc.Utf8.parse(encryKey)
-    var decrypt = AesEncryptJS.AES.decrypt(word, key, {mode: AesEncryptJS.mode.ECB, padding: AesEncryptJS.pad.Pkcs7})
-    var ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString()
-    try {
-      return JSON.parse(ret)
-    } catch (e) {
-      return ret
-    }
-  }
-}
+import AesEncryptJS from "crypto-js"
+import RsaEncryptJS from 'jsencrypt'
+
+export default {
+  /**
+   * AES加密
+   * @param word
+   * @returns {*}
+   */
+  AESEncrypt(word, encryKey){
+    var key = AesEncryptJS.enc.Utf8.parse(encryKey);
+    var srcs = AesEncryptJS.enc.Utf8.parse(word);
+    var encrypted = AesEncryptJS.AES.encrypt(srcs, key, {mode:AesEncryptJS.mode.ECB,padding: AesEncryptJS.pad.Pkcs7});
+    return encrypted.toString();
+  },
+  /**
+   * AES解密
+   * @param word
+   * @returns {*}
+   */
+  AESDecrypt(word, encryKey){
+    var key = AesEncryptJS.enc.Utf8.parse(encryKey);
+    var decrypt = AesEncryptJS.AES.decrypt(word, key, {mode:AesEncryptJS.mode.ECB,padding: AesEncryptJS.pad.Pkcs7});
+    var ret = AesEncryptJS.enc.Utf8.stringify(decrypt).toString();
+    try{
+      return JSON.parse(ret) ;
+    }catch (e){
+      return ret
+    }
+  },
+  /**
+   * RSA加密
+   * @param word
+   * @returns {*}
+   */
+  RSAEncrypt(word){
+    let encrypt = new RsaEncryptJS();
+    encrypt.setPublicKey('MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqPvovSfXcwBbW8cKMCgwqNpsYuzF8RPAPFb7LGsnVo44JhM/xxzDyzoYtdfNmtbIuKVi9PzIsyp6rg+09gbuI6UGwBZ5DWBDBMqv5MPdOF5dCQkB2Bbr5yPfURPENypUz+pBFBg41d+BC+rwRiXELwKy7Y9caD/MtJyHydj8OUwIDAQAB');
+    let resdata = encrypt.encrypt(word);
+    return resdata.toString();
+  },
+  /**
+   * RSA解密
+   * @param word
+   * @returns {*}
+   */
+  RSADecrypt(word){
+    let encrypt = new RsaEncryptJS();
+    encrypt.setPrivateKey('MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAKo++i9J9dzAFtbxwowKDCo2mxi7MXxE8A8VvssaydWjjgmEz/HHMPLOhi1182a1si4pWL0/MizKnquD7T2Bu4jpQbAFnkNYEMEyq/kw904Xl0JCQHYFuvnI99RE8Q3KlTP6kEUGDjV34EL6vBGJcQvArLtj1xoP8y0nIfJ2Pw5TAgMBAAECgYAGGB8IllMwxceLhjf6n1l0IWRH7FuHIUieoZ6k0p6rASHSgWiYNRMxfecbtX8zDAoG0QAWNi7rn40ygpR5gS1fWDAKhmnhKgQIT6wW0VmD4hraaeyP78iy8BLhlvblri2nCPIhDH5+l96v7D47ZZi3ZSOzcj89s1eS/k7/N4peEQJBAPEtGGJY+lBoCxQMhGyzuzDmgcS1Un1ZE2pt+XNCVl2b+T8fxWJH3tRRR8wOY5uvtPiK1HM/IjT0T5qwQeH8Yk0CQQC0tcv3d/bDb7bOe9QzUFDQkUSpTdPWAgMX2OVPxjdq3Sls9oA5+fGNYEy0OgyqTjde0b4iRzlD1O0OhLqPSUMfAkEAh5FIvqezdRU2/PsYSR4yoAdCdLdT+h/jGRVefhqQ/6eYUJJkWp15tTFHQX3pIe9/s6IeT/XyHYAjaxmevxAmlQJBAKSdhvQjf9KAjZKDEsa7vyJ/coCXuQUWSCMNHbcR5aGfXgE4e45UtUoIE1eKGcd6AM6LWhx3rR6xdFDpb9je8BkCQB0SpevGfOQkMk5i8xkEt9eeYP0fi8nv6eOUcK96EXbzs4jV2SAoQJ9oJegPtPROHbhIvVUmNQTbuP10Yjg59+8=');
+    let resdata = encrypt.decrypt(word);
+    return resdata.toString();
+  },
+}

package/src/plugins/GetLoginInfoService.js

@@ -191,11 +191,7 @@ let loginGen = async function (name, password, cue) {
             resolveMsg: null,
             rejectMsg: null
           }).then((req) => {
-            if (req.data.forcestate && req.data.forcestate == 1) {
-              Vue.showMessage("您被强制下线!", ['confirm']).then((res) => {
-                location.reload()
-              })
-            } else if (req.data.status == 710) {
+            if (req.data.status == 710) {
               Vue.showMessage(req.data.msg + ",您将被强制退出系统", ['confirm']).then((res) => {
                 if (res === 'confirm') {
                   location.reload()