ee-core 2.0.1 → 2.0.2

package/addon/index.js

@@ -14,7 +14,7 @@ const Addon = {
     }
 
     if (!this[EEAddon].has(name)) {
-      this[EEAddon][name] = obj;
+      this[EEAddon].set(name, obj);
     }
   },
 
@@ -22,7 +22,7 @@ const Addon = {
    * 获取插件对象
    */  
   get(name) {
-    let addon = this[EEAddon].has(name) ? this[EEAddon][name]: null;
+    let addon = this[EEAddon].has(name) ? this[EEAddon].get(name): null;
     return addon;
   },  
 }  

package/ee/baseApp.js

@@ -7,7 +7,6 @@ const HttpClient = require('../httpclient');
 const HTTPCLIENT = Symbol('EeApplication#httpclient');
 const LOGGERS = Symbol('EeApplication#loggers');
 const Log = require('../log');
-const Storage = require('../storage');
 const Conf = require('../config');
 
 class BaseApp extends EeAppCore {
@@ -75,15 +74,6 @@ class BaseApp extends EeAppCore {
   get coreLogger() {
     return this.getLogger('coreLogger');
   }
-
-  /**
-   * @class core存储模块
-   * @since 1.0.0
-   */
-  getCoreDB () {
-    const db = Storage.connection('system');
-    return db;
-  }
   
   /**
    * @class curl

package/httpclient/index.js

@@ -3,7 +3,7 @@ const HttpsAgent = require('agentkeepalive').HttpsAgent;
 const urllib = require('urllib');
 const ms = require('humanize-ms');
 const { FrameworkBaseError } = require('egg-errors');
-const Storage = require('../storage');
+const Conf = require('../config');
 const Log = require('../log');
 
 class HttpClientError extends FrameworkBaseError {
@@ -16,8 +16,7 @@ class HttpClient extends urllib.HttpClient2 {
   constructor(options = {}) {
 
     if (Object.keys(options).length == 0) {
-      const sysConfig = this._getCoreDB().getItem('config');
-      options = sysConfig.httpclient;
+      options = Conf.getValue('httpclient');
     }
 
     const config = Object.assign({

package/log/logger.js

@@ -1,7 +1,7 @@
 const Loggers = require('egg-logger').EggLoggers;
 const assert = require('assert');
 const Ps = require('../ps');
-const Storage = require('../storage');
+const Conf = require('../config');
 
 module.exports = {
 
@@ -33,7 +33,7 @@ module.exports = {
         },
         customLogger: {}
       }
-      const sysConfig = this._getCoreDB().getItem('config');
+      const sysConfig = Conf.all();
       opt = Object.assign(defaultConfig, {
         logger: sysConfig.logger,
         customLogger: sysConfig.customLogger || {}
@@ -50,12 +50,4 @@ module.exports = {
 
     return loggers;
   },
-
-  /**
-   * 获取 coredb
-   */
-  _getCoreDB() {
-    const coreDB = Storage.connection('system');
-    return coreDB;
-  }
 };

package/oldUtils/index.js

@@ -7,8 +7,8 @@ const UtilsJson = require('../utils/json');
 const UtilsPs = require('../ps');
 const UtilsHelper = require('../utils/helper');
 const Copy = require('../utils/copyto');
-const Storage = require('../storage');
-const Constants = require('../const');
+const Conf = require('../config');
+const Channel = require('../const/channel');
 
 /**
  * other module
@@ -26,20 +26,11 @@ exports.getPackage = function() {
   return json;
 };
 
-/**
- * 获取 coredb
- */
-exports.getCoreDB = function() {
-  const coreDB = Storage.connection('system');
-  return coreDB;
-}
-
 /**
  * 获取 ee配置
  */
 exports.getEeConfig = function() {
-  const cdb = this.getCoreDB();
-  const config = cdb.getItem('config');
+  const config = Conf.all();
 
   return config;
 }
@@ -48,8 +39,7 @@ exports.getEeConfig = function() {
  * 获取 app version
  */
 exports.getAppVersion = function() {
-  const cdb = this.getCoreDB();
-  const v = cdb.getItem('config').appVersion;
+  const v = Conf.all().appVersion;
   return v;
 }
 
@@ -57,8 +47,7 @@ exports.getAppVersion = function() {
  * 获取 插件配置
  */
 exports.getAddonConfig = function() {
-  const cdb = this.getCoreDB();
-  const cfg = cdb.getItem('config').addons;
+  const cfg = Conf.all().addons;
   return cfg;
 }
 
@@ -66,8 +55,7 @@ exports.getAddonConfig = function() {
  * 获取 mainServer配置
  */
 exports.getMainServerConfig = function() {
-  const cdb = this.getCoreDB();
-  const cfg = cdb.getItem('config').mainServer;
+  const cfg = Conf.all().mainServer;
   return cfg;
 }
 
@@ -75,8 +63,7 @@ exports.getMainServerConfig = function() {
  * 获取 httpServer配置
  */
 exports.getHttpServerConfig = function() {
-  const cdb = this.getCoreDB();
-  const cfg = cdb.getItem('config').httpServer;
+  const cfg = Conf.all().httpServer;
   return cfg;
 }
 
@@ -84,8 +71,7 @@ exports.getHttpServerConfig = function() {
  * 获取 socketServer配置
  */
 exports.getSocketServerConfig = function() {
-  const cdb = this.getCoreDB();
-  const cfg = cdb.getItem('config').socketServer;
+  const cfg = Conf.all().socketServer;
   return cfg;
 }
 
@@ -93,8 +79,7 @@ exports.getSocketServerConfig = function() {
  * 获取 socketio port
  */
 exports.getSocketPort = function() {
-  const cdb = this.getCoreDB();
-  const port = cdb.getItem('config').socketServer.port;
+  const port = Conf.all().socketServer.port;
   return parseInt(port);
 }
 
@@ -102,5 +87,5 @@ exports.getSocketPort = function() {
  * 获取 socket channel
  */
 exports.getSocketChannel = function() {
-  return Constants.socketIo.channel;
+  return Channel.socketIo.partySoftware;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "ee core",
   "main": "index.js",
   "scripts": {

package/ps/index.js

@@ -89,7 +89,7 @@ exports.processType = function() {
 };
 
 /**
- * 获取数据存储路径
+ * 获取home路径
  */
 exports.getHomeDir = function () {
   return process.env.EE_HOME;
@@ -164,13 +164,6 @@ exports.getAppUserDataDir = function() {
   return process.env.EE_APP_USER_DATA;
 }
 
-/**
- * 获取数据存储路径
- */
-exports.getHomeDir = function () {
-  return process.env.EE_HOME;
-}
-
 /**
  * 获取 exec目录
  */

package/utils/index.js

@@ -1,6 +1,4 @@
 const path = require('path');
-const Storage = require('../storage');
-const Constants = require('../const');
 const Ps = require('../ps');
 const UtilsJson = require('./json');
 
@@ -13,74 +11,5 @@ exports.getPackage = function() {
   return json;
 };
 
-/**
- * 获取 coredb
- */
-exports.getCoreDB = function() {
-  const coreDB = Storage.connection('system');
-  return coreDB;
-}
-
-/**
- * 获取 ee配置
- */
-exports.getEeConfig = function() {
-  const cdb = this.getCoreDB();
-  const config = cdb.getItem('config');
-
-  return config;
-}
-
-/**
- * 获取 app version
- */
-exports.getAppVersion = function() {
-  const cdb = this.getCoreDB();
-  const v = cdb.getItem('config').appVersion;
-  return v;
-}
-
-/**
- * 获取 插件配置
- */
-exports.getAddonConfig = function() {
-  const cdb = this.getCoreDB();
-  const cfg = cdb.getItem('config').addons;
-  return cfg;
-}
-
-/**
- * 获取 mainServer配置
- */
-exports.getMainServerConfig = function() {
-  const cdb = this.getCoreDB();
-  const cfg = cdb.getItem('config').mainServer;
-  return cfg;
-}
-
-/**
- * 获取 httpServer配置
- */
-exports.getHttpServerConfig = function() {
-  const cdb = this.getCoreDB();
-  const cfg = cdb.getItem('config').httpServer;
-  return cfg;
-}
-
-/**
- * 获取 socketServer配置
- */
-exports.getSocketServerConfig = function() {
-  const cdb = this.getCoreDB();
-  const cfg = cdb.getItem('config').socketServer;
-  return cfg;
-}
-
-/**
- * 获取 socket channel
- */
-exports.getSocketChannel = function() {
-  return Constants.socketIo.channel;
-}