ee-core 1.5.1 → 1.5.2-beta.2

package/tools/replaceDist.js

@@ -1,61 +1,61 @@
-'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 sourceIndexFile = path.join(sourceDir, 'index.html');
-    
-    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);
-
-    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 sourceIndexFile = path.join(sourceDir, 'index.html');
+    
+    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);
+
+    console.log('[ee-core] [replace_dist] 结束');
+  }
+}
+
+
+

package/utils/common.js

@@ -1,91 +1,91 @@
-'use strict';
-
-/**
- * ee-core使用
- */
-
-const fs = require('fs');
-const path = require('path');
-
-/**
- * 版本号比较
- */
-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.mkdir = function(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);
-    }
-  }
-};
-
-/**
- * 修改文件权限
- */
-exports.chmodPath = function(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);
-  }
-};
-
-/**
- * 获取数据存储路径
- */
-exports.getStorageDir = function () {
-  let env = process.env.EE_SERVER_ENV;
-  const appDir = env === 'local' || env === 'unittest' ? process.env.EE_HOME : process.env.EE_APP_USER_DATA;
-  const storageDir = path.join(appDir, 'data');
-  return storageDir;
+'use strict';
+
+/**
+ * ee-core使用
+ */
+
+const fs = require('fs');
+const path = require('path');
+
+/**
+ * 版本号比较
+ */
+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.mkdir = function(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);
+    }
+  }
+};
+
+/**
+ * 修改文件权限
+ */
+exports.chmodPath = function(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);
+  }
+};
+
+/**
+ * 获取数据存储路径
+ */
+exports.getStorageDir = function () {
+  let env = process.env.EE_SERVER_ENV;
+  const appDir = env === 'local' || env === 'unittest' ? process.env.EE_HOME : process.env.EE_APP_USER_DATA;
+  const storageDir = path.join(appDir, 'data');
+  return storageDir;
 }