ee-core 2.1.0 → 2.1.1-beta.2

package/README.md

@@ -1,2 +1,5 @@
-# ee-core
-ee core
+## ee-core
+A simple, cross-platform, enterprise-level desktop software development framework
+
+## document
+[Quick Start](https://www.kaka996.com/pages/85c531/)

package/config/config.default.js

@@ -149,6 +149,7 @@ module.exports = appInfo => {
     coreLogger: {},
     allowDebugAtProd: false,
     enablePerformanceTimer: false,
+    rotator: 'none',
   };
 
   /**

package/log/index.js

@@ -1,20 +1,35 @@
+const dayjs = require('dayjs');
 const Logger = require('./logger');
 const EELoggers = Symbol('EeApplication#EELoggers');
+let LogDate = 0;
 
 const Log = {
   /**
    * 创建日志实例
    */
-  create (config) {
+  create(config) {
+    this._delCache();
     const eeLog = Logger.create(config);
 
     return eeLog;
   },
 
+  /**
+   * delete cache
+   */
+  _delCache() {
+    let now = parseInt(dayjs().format('YYYYMMDD'));
+    if (LogDate != now) {
+      LogDate = now;
+      this[EELoggers] = null;
+    }
+  },
+
   /**
    * logger
    */
   get logger() {
+    this._delCache();
     if (!this[EELoggers]) {
       this[EELoggers] = Logger.create();
     }
@@ -26,6 +41,7 @@ const Log = {
    * coreLogger
    */
   get coreLogger () {
+    this._delCache();
     if (!this[EELoggers]) {
       this[EELoggers] = Logger.create();
     }

package/log/logger.js

@@ -1,7 +1,10 @@
 const Loggers = require('egg-logger').EggLoggers;
 const assert = require('assert');
+const dayjs = require('dayjs');
+const path = require('path');
 const Ps = require('../ps');
 const Conf = require('../config');
+let LogDate = 0;
 
 module.exports = {
 
@@ -30,6 +33,7 @@ module.exports = {
           coreLogger: {},
           allowDebugAtProd: false,
           enablePerformanceTimer: false,
+          rotator: 'none',
         },
         customLogger: {}
       }
@@ -42,12 +46,36 @@ module.exports = {
       opt.logger = config.logger;
       opt.customLogger = config.customLogger;
     }
-    //console.log('log---------', config);
+    // console.log('log---------', opt);
 
     assert(Object.keys(opt).length != 0, `logger config is null`);
 
+    let rotateType = opt.logger.rotator;
+    if (rotateType == 'day') {
+      this._rotateByDay(opt);
+    }
+
     const loggers = new Loggers(opt);
 
     return loggers;
   },
+
+  /**
+   * 按天分割
+   */
+  _rotateByDay(logOpt) {
+    let now = parseInt(dayjs().format('YYYYMMDD'));
+    if (LogDate != now) {
+      LogDate = now;
+      let appLogName = logOpt.logger.appLogName;
+      let coreLogName = logOpt.logger.coreLogName;
+      let errorLogName = logOpt.logger.errorLogName;
+      let appLogExtname = path.extname(appLogName);
+      let coreLogExtname = path.extname(coreLogName);
+      let errorLogExtname = path.extname(errorLogName);
+      logOpt.logger.appLogName = path.basename(appLogName, appLogExtname) + '-' + now + appLogExtname;
+      logOpt.logger.coreLogName = path.basename(coreLogName, coreLogExtname) + '-' + now + coreLogExtname;
+      logOpt.logger.errorLogName = path.basename(errorLogName, errorLogExtname) + '-' + now + errorLogExtname;
+    }
+  },  
 };

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "ee-core",
-  "version": "2.1.0",
+  "version": "2.1.1-beta.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
+    "publish-beta": "npm publish --tag beta",
+    "publish": "npm publish",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",
@@ -14,13 +16,14 @@
   "dependencies": {
     "agentkeepalive": "^4.2.0",
     "bytenode": "^1.3.6",
+    "dayjs": "^1.11.7",
     "debug": "^4.3.3",
     "egg-errors": "^2.3.0",
     "egg-logger": "^2.7.1",
     "fs-extra": "^10.0.0",
     "globby": "^10.0.0",
     "is-type-of": "^1.2.1",
-    "javascript-obfuscator": "^4.0.0",
+    "javascript-obfuscator": "^4.0.2",
     "koa": "^2.13.4",
     "koa-body": "^5.0.0",
     "koa-convert": "^2.0.0",
@@ -30,8 +33,8 @@
     "mkdirp": "^2.1.3",
     "semver": "^7.3.8",
     "serialize-javascript": "^6.0.1",
-    "socket.io": "^4.4.1",
-    "socket.io-client": "^4.4.1",
+    "socket.io": "^4.6.1",
+    "socket.io-client": "^4.6.1",
     "urllib": "^2.38.0"
   },
   "devDependencies": {}