system-clients 1.8.31-cr → 1.8.33-cr

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "1.8.31-cr",
+  "version": "1.8.33-cr",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {
@@ -32,12 +32,13 @@
     "babel-preset-es2015": "^6.0.0",
     "babel-preset-stage-2": "^6.0.0",
     "chai": "^3.5.0",
+    "co": "^4.6.0",
     "connect-history-api-fallback": "^1.1.0",
     "cross-env": "^1.0.7",
     "cross-spawn": "^2.1.5",
+    "crypto-js": "^4.2.0",
     "css-loader": "^0.23.0",
     "eslint": "^2.0.0",
-    "co": "^4.6.0",
     "eslint-config-standard": "^5.1.0",
     "eslint-friendly-formatter": "^1.2.2",
     "eslint-loader": "^1.3.0",
@@ -78,7 +79,6 @@
     "style-loader": "^0.20.3",
     "url-loader": "^0.5.7",
     "vue-client": "1.20.101-cr",
-    "crypto-js": "^4.1.1",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/components/server/Login.vue

@@ -134,10 +134,67 @@
 <script>
   import co from 'co'
   import $ from 'jquery'
+  import CryptoJS from 'crypto-js'
+
+  // 添加防调试代码
+  const antiDebug = () => {
+    // 禁用右键
+    document.oncontextmenu = function() { return false; }
+    
+    // 禁用F12
+    document.onkeydown = function(e) {
+      if (e.keyCode === 123) { // F12
+        return false;
+      }
+    }
+    
+    // 检测开发者工具
+    let devtools = function() {};
+    devtools.toString = function() {
+      this.opened = true;
+    }
+    
+    // 使用更温和的检测方式
+    setInterval(() => {
+      console.log('%c', devtools);
+      if (devtools.opened) {
+        devtools.opened = false;
+        // 只在首次检测到开发者工具时刷新一次
+        if (!window.hasRefreshed) {
+          window.hasRefreshed = true;
+          window.location.reload();
+        }
+      }
+    }, 2000); // 降低检测频率到2秒一次
+  }
+
+  // 密码加密函数
+  const encryptPassword = (password) => {
+    // 使用时间戳作为盐值，增加随机性
+    const timestamp = new Date().getTime();
+    const salt = CryptoJS.SHA256(timestamp.toString()).toString();
+    // 使用PBKDF2进行密码加密
+    const key = CryptoJS.PBKDF2(password, salt, {
+      keySize: 256/32,
+      iterations: 1000
+    });
+    return {
+      password: key.toString(),
+      salt: salt,
+      timestamp: timestamp
+    };
+  }
 
   let saveGen = function *(self) {
     try {
-      yield self.$login.login(self.model.ename, self.model.password)
+      // 加密密码
+      const encryptedData = encryptPassword(self.model.password);
+      
+      // 发送加密后的数据
+      yield self.$login.login(self.model.ename, encryptedData.password, {
+        salt: encryptedData.salt,
+        timestamp: encryptedData.timestamp
+      })
       yield self.$appdata.load()
 
       yield self.$getConfig(self, 'Login')
@@ -215,6 +272,15 @@
   export default {
     title: '登录',
     async ready () {
+      // 启用防调试
+      antiDebug();
+      
+      // 清除控制台
+      console.clear();
+      
+      // 禁用复制
+      document.onselectstart = function() { return false; }
+      
       if (this.$login && this.getUrlCompileParames('code')) {
         let url = `${this.config.token}?code=${this.getUrlCompileParames('code')}&client_id=ceshi&client_secret=34c5160b77074c18a27b42996ecd3c0f&grant_type=authorization_code&redirect_uri=${this.config.redirect_uri}`
         let getMacs = await this.$resetpost(url, {}, {
@@ -441,7 +507,6 @@
       //   $('form').fadeIn(500)
       //   this.picLyanzhengma = ''
       //   this.createCode()
-      //   this.deliver = {password: '', newpassword: '', affirmpassword: ''}
       // },
       // resetPassword () {
       //   if (!this.deliver.newpassword || !this.deliver.affirmpassword) {

package/src/plugins/EncryptUtil.js

@@ -1,30 +1,30 @@
-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'
+
+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
+    }
+  }
+}