ee-core 1.1.8 → 1.1.9

package/lib/eeApp.js

@@ -26,8 +26,8 @@ class EeApp extends BaseApp {
     
     process.env.EE_SOCKET_PORT = socketPort;
     process.env.EE_WEB_PORT = webPort;
-    this.coreLogger.info('[ee-core:EeApp] [createPorts] socket port:', socketPort);
-    this.coreLogger.info('[ee-core:EeApp] [createPorts] web port:', webPort);
+    //this.coreLogger.info('[ee-core:EeApp] [createPorts] socket port:', socketPort);
+    //this.coreLogger.info('[ee-core:EeApp] [createPorts] web port:', webPort);
     
     // 更新db配置
     this.config.socketServer.port = socketPort;
@@ -206,7 +206,7 @@ class EeApp extends BaseApp {
    * 主页面
    */
   loadMainUrl (type, url) {
-    this.logger.info('main page is env: %s, type: %s, url: %s', this.config.env, type, url);
+    this.logger.info('main page is env: %s, type: %s, App running at: %s', this.config.env, type, url);
     this.electron.mainWindow.loadURL(url);
   }  
 

package/lib/socket/io.js

@@ -4,6 +4,7 @@ const IoServer = require('socket.io');
 const IoClient = require('socket.io-client');
 //const socketServer = require('./socketServer');
 const socketClient = require('./socketClient');
+const Koa = require('koa');
 
 const EeSocket = {
   getServer: () => {
@@ -18,5 +19,6 @@ const EeSocket = {
 module.exports = {
   IoServer,
   IoClient,
-  EeSocket
+  EeSocket,
+  Koa
 };

package/package.json

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

package/utils/index.js

@@ -8,6 +8,9 @@ const is = require('is-type-of');
 const co = require('co');
 const utility = require('utility');
 
+/**
+ * 创建文件夹
+ */
 exports.mkdir = function(dirpath, dirname) {
   // 判断是否是第一次调用
   if (typeof dirname === 'undefined') {
@@ -30,6 +33,9 @@ exports.mkdir = function(dirpath, dirname) {
   }
 };
 
+/**
+ * 修改文件权限
+ */
 exports.chmodPath = function(path, mode) {
   let files = [];
   if (fs.existsSync(path)) {
@@ -131,6 +137,29 @@ exports.getSocketChannel = function() {
   return constant.socketIo.channel;
 }
 
+/**
+ * 获取 额外资源目录
+ */
+exports.getExtraResourcesDir = function() {
+  const cdb = this.getCoreDB();
+  const config = cdb.getItem('config');
+  const execDir = config.execDir;
+
+  // 资源路径不同
+  let dir = '';
+  if (config.isPackaged) {
+    // 打包后  execDir为 应用程序 exe\dmg\dep软件所在目录；打包前该值是项目根目录
+    dir = path.join(execDir, "resources", "extraResources");
+  } else {
+    // 打包前
+    dir = path.join(execDir, "build", "extraResources");
+  }
+  return dir;
+}
+
+/**
+ * 执行一个函数
+ */
 exports.callFn = async function (fn, args, ctx) {
   args = args || [];
   if (!is.function(fn)) return;