ee-core 1.2.7-beta.1 → 1.2.7-beta.4

package/tools/codeCompress.js

@@ -1,204 +1,204 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const fsPro = require('fs-extra');
-const UglifyJS = require('uglify-js');
-
-class CodeCompress {
-  constructor() {
-    const directory = [
-      'app',
-      'electron',
-      'config'
-    ];
-    this.dirs = [];
-
-    this.basePath = process.cwd();
-    this.backupCodeDir = path.join(this.basePath, 'run', 'backup_code');
-
-    // 检查存在的目录
-    for (let i = 0; i < directory.length; i++) {
-      let codeDirPath = path.join(this.basePath, directory[i]);
-      if (fs.existsSync(codeDirPath)) {
-        this.dirs.push(directory[i]);
-      }
-    }
-    console.log('dirs:', this.dirs);
-  }
-
-  /**
-   * 备份 app、electron目录代码
-   */
-  backup () {
-    console.log('[ee-core] [code_compress] [backup] start');
-    this.rmBackup();
-
-    for (let i = 0; i < this.dirs.length; i++) {
-      // check code dir
-      let codeDirPath = path.join(this.basePath, this.dirs[i]);
-      if (!fs.existsSync(codeDirPath)) {
-        console.log('[ee-core] [code_compress] [backup] ERROR: %s is not exist', codeDirPath);
-        return
-      }
-
-      // copy
-      let targetDir = path.join(this.backupCodeDir, this.dirs[i]);
-      console.log('[ee-core] [code_compress] [backup] targetDir:', targetDir);
-      if (!fs.existsSync(targetDir)) {
-        this.mkdir(targetDir);
-        this.chmodPath(targetDir, '777');
-      }
-
-      fsPro.copySync(codeDirPath, targetDir);
-    }
-    console.log('[ee-core] [code_compress] [backup] success');
-  }
-
-  /**
-   * 还原代码
-   */
-  restore () {
-    console.log('[ee-core] [code_compress] [restore] start');
-    for (let i = 0; i < this.dirs.length; i++) {
-      let codeDirPath = path.join(this.backupCodeDir, this.dirs[i]);
-      let targetDir = path.join(this.basePath, this.dirs[i]);
-      fsPro.copySync(codeDirPath, targetDir);
-    }
-    console.log('[ee-core] [code_compress] [restore] success');
-  };
-
-  /**
-   * 压缩代码
-   */
-  compress () {
-    console.log('[ee-core] [code_compress] [compress] start');
-    for (let i = 0; i < this.dirs.length; i++) {
-      let codeDirPath = path.join(this.basePath, this.dirs[i]);
-      this.compressLoop(codeDirPath);
-    }
-    console.log('[ee-core] [code_compress] [compress] success');
-  };
-
-  compressLoop (dirPath) {
-    let files = [];
-    if (fs.existsSync(dirPath)) {
-      files = fs.readdirSync(dirPath);
-      files.forEach((file, index) => {
-        let curPath = dirPath + '/' + file;        
-        if (fs.statSync(curPath).isDirectory()) {
-          this.compressLoop(curPath);
-        } else {
-          if (path.extname(curPath) === '.js') {
-            this.miniFile(curPath);
-          }
-        }
-      });
-    }
-  }
-
-  miniFile (file) {
-    let code = fs.readFileSync(file, "utf8");
-    const options = {
-      mangle: {
-        toplevel: false,
-      },
-    };
-    
-    let result = UglifyJS.minify(code, options);
-    fs.writeFileSync(file, result.code, "utf8"); 
-  }
-
-  /**
-   * 格式化参数
-   */
-  formatArgvs () {
-    // argv
-    let argvs = [];
-    for (let i = 0; i < process.argv.length; i++) {
-      const tmpArgv = process.argv[i]
-      if (tmpArgv.indexOf('--') !== -1) {
-        argvs.push(tmpArgv.substring(2))
-      }
-    }
-    return argvs;
-  }
-
-  /**
-   * 移除备份
-   */
-  rmBackup () {
-    if (fs.existsSync(this.backupCodeDir)) {
-      fs.rmSync(this.backupCodeDir, {recursive: true, force: true});
-    }
-    return;
-  }
-
-  /**
-   * 检查文件是否存在
-   */
-  fileExist (filePath) {
-    try {
-      return fs.statSync(filePath).isFile();
-    } catch (err) {
-      return false;
-    }
-  };
-
-  mkdir (dirpath, dirname) {
-    // 判断是否是第一次调用
-    if (typeof dirname === 'undefined') {
-      if (fs.existsSync(dirpath)) {
-        return;
-      }
-      this.mkdir(dirpath, path.dirname(dirpath));
-    } else {
-      // 判断第二个参数是否正常，避免调用时传入错误参数
-      if (dirname !== path.dirname(dirpath)) {
-        this.mkdir(dirpath);
-        return;
-      }
-      if (fs.existsSync(dirname)) {
-        fs.mkdirSync(dirpath);
-      } else {
-        this.mkdir(dirname, path.dirname(dirname));
-        fs.mkdirSync(dirpath);
-      }
-    }
-  };
-
-  chmodPath (path, mode) {
-    let files = [];
-    if (fs.existsSync(path)) {
-      files = fs.readdirSync(path);
-      files.forEach((file, index) => {
-        const curPath = path + '/' + file;
-        if (fs.statSync(curPath).isDirectory()) {
-          this.chmodPath(curPath, mode); // 递归删除文件夹
-        } else {
-          fs.chmodSync(curPath, mode);
-        }
-      });
-      fs.chmodSync(path, mode);
-    }
-  };
-}
-
-const compress = () => {
-  const cc = new CodeCompress();
-  cc.backup();
-  cc.compress();
-}
-
-const restore = () => {
-  const cc = new CodeCompress();
-  cc.restore();
-}
-
-module.exports = {
-  compress,
-  restore
-};
-
-
-
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+const UglifyJS = require('uglify-js');
+
+class CodeCompress {
+  constructor() {
+    const directory = [
+      'app',
+      'electron',
+      'config'
+    ];
+    this.dirs = [];
+
+    this.basePath = process.cwd();
+    this.backupCodeDir = path.join(this.basePath, 'run', 'backup_code');
+
+    // 检查存在的目录
+    for (let i = 0; i < directory.length; i++) {
+      let codeDirPath = path.join(this.basePath, directory[i]);
+      if (fs.existsSync(codeDirPath)) {
+        this.dirs.push(directory[i]);
+      }
+    }
+    console.log('dirs:', this.dirs);
+  }
+
+  /**
+   * 备份 app、electron目录代码
+   */
+  backup () {
+    console.log('[ee-core] [code_compress] [backup] start');
+    this.rmBackup();
+
+    for (let i = 0; i < this.dirs.length; i++) {
+      // check code dir
+      let codeDirPath = path.join(this.basePath, this.dirs[i]);
+      if (!fs.existsSync(codeDirPath)) {
+        console.log('[ee-core] [code_compress] [backup] ERROR: %s is not exist', codeDirPath);
+        return
+      }
+
+      // copy
+      let targetDir = path.join(this.backupCodeDir, this.dirs[i]);
+      console.log('[ee-core] [code_compress] [backup] targetDir:', targetDir);
+      if (!fs.existsSync(targetDir)) {
+        this.mkdir(targetDir);
+        this.chmodPath(targetDir, '777');
+      }
+
+      fsPro.copySync(codeDirPath, targetDir);
+    }
+    console.log('[ee-core] [code_compress] [backup] success');
+  }
+
+  /**
+   * 还原代码
+   */
+  restore () {
+    console.log('[ee-core] [code_compress] [restore] start');
+    for (let i = 0; i < this.dirs.length; i++) {
+      let codeDirPath = path.join(this.backupCodeDir, this.dirs[i]);
+      let targetDir = path.join(this.basePath, this.dirs[i]);
+      fsPro.copySync(codeDirPath, targetDir);
+    }
+    console.log('[ee-core] [code_compress] [restore] success');
+  };
+
+  /**
+   * 压缩代码
+   */
+  compress () {
+    console.log('[ee-core] [code_compress] [compress] start');
+    for (let i = 0; i < this.dirs.length; i++) {
+      let codeDirPath = path.join(this.basePath, this.dirs[i]);
+      this.compressLoop(codeDirPath);
+    }
+    console.log('[ee-core] [code_compress] [compress] success');
+  };
+
+  compressLoop (dirPath) {
+    let files = [];
+    if (fs.existsSync(dirPath)) {
+      files = fs.readdirSync(dirPath);
+      files.forEach((file, index) => {
+        let curPath = dirPath + '/' + file;        
+        if (fs.statSync(curPath).isDirectory()) {
+          this.compressLoop(curPath);
+        } else {
+          if (path.extname(curPath) === '.js') {
+            this.miniFile(curPath);
+          }
+        }
+      });
+    }
+  }
+
+  miniFile (file) {
+    let code = fs.readFileSync(file, "utf8");
+    const options = {
+      mangle: {
+        toplevel: false,
+      },
+    };
+    
+    let result = UglifyJS.minify(code, options);
+    fs.writeFileSync(file, result.code, "utf8"); 
+  }
+
+  /**
+   * 格式化参数
+   */
+  formatArgvs () {
+    // argv
+    let argvs = [];
+    for (let i = 0; i < process.argv.length; i++) {
+      const tmpArgv = process.argv[i]
+      if (tmpArgv.indexOf('--') !== -1) {
+        argvs.push(tmpArgv.substring(2))
+      }
+    }
+    return argvs;
+  }
+
+  /**
+   * 移除备份
+   */
+  rmBackup () {
+    if (fs.existsSync(this.backupCodeDir)) {
+      fs.rmSync(this.backupCodeDir, {recursive: true, force: true});
+    }
+    return;
+  }
+
+  /**
+   * 检查文件是否存在
+   */
+  fileExist (filePath) {
+    try {
+      return fs.statSync(filePath).isFile();
+    } catch (err) {
+      return false;
+    }
+  };
+
+  mkdir (dirpath, dirname) {
+    // 判断是否是第一次调用
+    if (typeof dirname === 'undefined') {
+      if (fs.existsSync(dirpath)) {
+        return;
+      }
+      this.mkdir(dirpath, path.dirname(dirpath));
+    } else {
+      // 判断第二个参数是否正常，避免调用时传入错误参数
+      if (dirname !== path.dirname(dirpath)) {
+        this.mkdir(dirpath);
+        return;
+      }
+      if (fs.existsSync(dirname)) {
+        fs.mkdirSync(dirpath);
+      } else {
+        this.mkdir(dirname, path.dirname(dirname));
+        fs.mkdirSync(dirpath);
+      }
+    }
+  };
+
+  chmodPath (path, mode) {
+    let files = [];
+    if (fs.existsSync(path)) {
+      files = fs.readdirSync(path);
+      files.forEach((file, index) => {
+        const curPath = path + '/' + file;
+        if (fs.statSync(curPath).isDirectory()) {
+          this.chmodPath(curPath, mode); // 递归删除文件夹
+        } else {
+          fs.chmodSync(curPath, mode);
+        }
+      });
+      fs.chmodSync(path, mode);
+    }
+  };
+}
+
+const compress = () => {
+  const cc = new CodeCompress();
+  cc.backup();
+  cc.compress();
+}
+
+const restore = () => {
+  const cc = new CodeCompress();
+  cc.restore();
+}
+
+module.exports = {
+  compress,
+  restore
+};
+
+
+

package/tools/replaceDist.js

@@ -1,78 +1,76 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const fsPro = require('fs-extra');
-
-/**
- * 资源替换
- */
-
- module.exports = {
-  
-  /**
-   * 执行
-   */  
-  run () {
-    console.log('[ee-core] [replace_dist] 开始移动资源');
-    const homeDir = process.cwd();
-
-    // argv
-    let distDir = '';
-    for (let i = 0; i < process.argv.length; i++) {
-      const tmpArgv = process.argv[i]
-      if (tmpArgv.indexOf('--dist_dir=') !== -1) {
-        distDir = tmpArgv.substring(11)
-      }
-    }
-    console.log('tmpArgv:', tmpArgv);
-    console.log('distDir:', distDir);
-    return;
-    const fileExist = (filePath) => {
-      try {
-        return fs.statSync(filePath).isFile();
-      } catch (err) {
-        console.error('[ee-core] [replace_dist] ERROR ', err);
-        return false;
-      }
-    };
-    
-    const sourceDir = path.join(homeDir, distDir);
-    const targetDir = path.join(homeDir, 'app', 'public');
-    const sourceIndexFile = path.join(sourceDir, 'index.html');
-    const targetIndexFile = path.join(homeDir, 'app', 'view', 'index.ejs');
-    
-    if (!fileExist(sourceIndexFile)) {
-      console.error('[ee-core] [replace_dist] ERROR 前端资源不存在，请构建!!!');
-      return
-    }
-    
-    // 复制到ee资源目录
-    const eeResourceDir = path.join(homeDir, 'public', 'dist');
-
-    // 清空历史资源
-    fs.rmdirSync(eeResourceDir, {recursive: true});
-    console.log('[ee-core] [replace_dist] 清空历史资源:', eeResourceDir);
-
-    fsPro.copySync(sourceDir, eeResourceDir);
-    console.log('[ee-core] [replace_dist] 复制资源到:', eeResourceDir);
-
-    // 复制到egg资源目录
-    if (fs.existsSync(targetDir)) {
-      console.log('[ee-core] [replace_dist] 重置egg资源：', targetDir);
-      fs.rmdirSync(targetDir, {recursive: true});
-      
-      console.log('[ee-core] [replace_dist] 复制资源到egg:', sourceDir);
-      fsPro.copySync(sourceDir, targetDir);
-      
-      // replace ejs
-      fsPro.copySync(sourceIndexFile, targetIndexFile);
-      console.log('[ee-core] [replace_dist] 替换 egg index.ejs');
-    }
-
-    console.log('[ee-core] [replace_dist] 结束');
-  }
-}
-
-
-
+'use strict';
+
+const path = require('path');
+const fs = require('fs');
+const fsPro = require('fs-extra');
+
+/**
+ * 资源替换
+ */
+
+ module.exports = {
+  
+  /**
+   * 执行
+   */  
+  run () {
+    console.log('[ee-core] [replace_dist] 开始移动资源');
+    const homeDir = process.cwd();
+
+    // argv
+    let distDir = '';
+    for (let i = 0; i < process.argv.length; i++) {
+      let tmpArgv = process.argv[i]
+      if (tmpArgv.indexOf('--dist_dir=') !== -1) {
+        distDir = tmpArgv.substring(11)
+      }
+    }
+ 
+    const fileExist = (filePath) => {
+      try {
+        return fs.statSync(filePath).isFile();
+      } catch (err) {
+        console.error('[ee-core] [replace_dist] ERROR ', err);
+        return false;
+      }
+    };
+    
+    const sourceDir = path.join(homeDir, distDir);
+    const targetDir = path.join(homeDir, 'app', 'public');
+    const sourceIndexFile = path.join(sourceDir, 'index.html');
+    const targetIndexFile = path.join(homeDir, 'app', 'view', 'index.ejs');
+    
+    if (!fileExist(sourceIndexFile)) {
+      console.error('[ee-core] [replace_dist] ERROR 前端资源不存在，请构建!!!');
+      return
+    }
+    
+    // 复制到ee资源目录
+    const eeResourceDir = path.join(homeDir, 'public', 'dist');
+
+    // 清空历史资源
+    fs.rmdirSync(eeResourceDir, {recursive: true});
+    console.log('[ee-core] [replace_dist] 清空历史资源:', eeResourceDir);
+
+    fsPro.copySync(sourceDir, eeResourceDir);
+    console.log('[ee-core] [replace_dist] 复制资源到:', eeResourceDir);
+
+    // 复制到egg资源目录
+    if (fs.existsSync(targetDir)) {
+      console.log('[ee-core] [replace_dist] 重置egg资源：', targetDir);
+      fs.rmdirSync(targetDir, {recursive: true});
+      
+      console.log('[ee-core] [replace_dist] 复制资源到egg:', sourceDir);
+      fsPro.copySync(sourceDir, targetDir);
+      
+      // replace ejs
+      fsPro.copySync(sourceIndexFile, targetIndexFile);
+      console.log('[ee-core] [replace_dist] 替换 egg index.ejs');
+    }
+
+    console.log('[ee-core] [replace_dist] 结束');
+  }
+}
+
+
+

package/utils/common.js

@@ -1,30 +1,30 @@
-
-/**
- * 版本号比较
- */
-exports.compareVersion = function (v1, v2) {
-  v1 = v1.split('.')
-  v2 = v2.split('.')
-  const len = Math.max(v1.length, v2.length)
-
-  while (v1.length < len) {
-    v1.push('0')
-  }
-  while (v2.length < len) {
-    v2.push('0')
-  }
-  
-  for (let i = 0; i < len; i++) {
-    const num1 = parseInt(v1[i])
-    const num2 = parseInt(v2[i])
-
-    if (num1 > num2) {
-      return 1
-    } else if (num1 < num2) {
-      return -1
-    }
-  }
-
-  return 0
-}
-
+
+/**
+ * 版本号比较
+ */
+exports.compareVersion = function (v1, v2) {
+  v1 = v1.split('.')
+  v2 = v2.split('.')
+  const len = Math.max(v1.length, v2.length)
+
+  while (v1.length < len) {
+    v1.push('0')
+  }
+  while (v2.length < len) {
+    v2.push('0')
+  }
+  
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i])
+    const num2 = parseInt(v2[i])
+
+    if (num1 > num2) {
+      return 1
+    } else if (num1 < num2) {
+      return -1
+    }
+  }
+
+  return 0
+}
+