更新目录结构：新增src/

更新task:pakcage任务

Author: hong-boy

tomato/README.md

@@ -1,21 +1,51 @@
 ## koa2 + Vue2.0
 
-### 目录说明
----
-├─app                                                                                                                                                                                                                                                                                                              
-│  ├─controller                                                                                                                                                                                                                                                                                                   
-│  ├─routes                                                                                                                                                                                                                                                                                                       
-│  └─util                                                                                                                                                                                                                                                                                                         
-├─bin                                                                                                                                                                                                                                                                                                              
-├─config                                                                                                                                                                                                                                                                                                           
-│  ├─build                                                                                                                                                                                                                                                                                                        
-│  └─env                                                                                                                                                                                                                                                                                                          
-├─dist                                                                                                                                                                                                                                                                                                             
-├─logs                                                                                                                                                                                                                                                                                                             
-├─test                                                                                                                                                                                                                                                                                                             
-└─views 
+* 环境依赖
+* 开始
+* 目录结构说明
+* 目标
+
+### 环境依赖
+* Nodejs 7或者babel编译
 
+### 开始
+* 安装依赖：```npm install```
+* 启动：```npm run start```
+* webpack实时编译：```npm run watch```
+* 生产环境打包：```npm run pkg```
+* 单元测试：```npm test```
+* 代码覆盖率：```npm run test:cover```
+
+### 目录结构说明
+```
+---
+├─bin  
+├─config  
+│  ├─build  
+│  ├─env  
+│  ├─passport  
+│  ├─privs  
+│  └─session  
+├─coverage  
+├─dist  
+├─logs  
+├─src  
+│  ├─app  
+│  │  ├─bean  
+│  │  ├─controller  
+│  │  ├─route  
+│  │  └─util  
+│  └─views  
+│      ├─assets  
+│      │  ├─image  
+│      │  └─less  
+│      ├─components  
+│      │  ├─common  
+│      ├─routes  
+│      └─utils  
+└─test  
 ---
+```
 
 ### 目标
 1. Vue2作为视图层，Koa2作为控制层

tomato/bin/startup

@@ -0,0 +1,88 @@
+#!/usr/bin/env node
+
+/**
+ * Module dependencies.
+ */
+
+var app = require('../src/app');
+var http = require('http');
+var conf = require('../config/env.js');
+var logger = require('./util/Logger').logger('startup.js');
+
+/**
+ * Get port from environment and store in Express.
+ */
+
+var port = normalizePort(conf.port);
+// app.set('port', port);
+
+/**
+ * Create HTTP server.
+ */
+
+var server = http.createServer(app.callback());
+
+/**
+ * Listen on provided port, on all network interfaces.
+ */
+
+server.listen(port);
+server.on('error', onError);
+server.on('listening', onListening);
+
+/**
+ * Normalize a port into a number, string, or false.
+ */
+
+function normalizePort(val) {
+    var port = parseInt(val, 10);
+
+    if (isNaN(port)) {
+        // named pipe
+        return val;
+    }
+
+    if (port >= 0) {
+        // port number
+        return port;
+    }
+
+    return false;
+}
+
+/**
+ * Event listener for HTTP server "error" event.
+ */
+
+function onError(error) {
+    if (error.syscall !== 'listen') {
+        throw error;
+    }
+
+    var bind = typeof port === 'string'
+        ? 'Pipe ' + port
+        : 'Port ' + port;
+
+    // handle specific listen errors with friendly messages
+    switch (error.code) {
+        case 'EACCES':
+            console.error(bind + ' requires elevated privileges');
+            process.exit(1);
+            break;
+        case 'EADDRINUSE':
+            console.error(bind + ' is already in use');
+            process.exit(1);
+            break;
+        default:
+            throw error;
+    }
+}
+
+/**
+ * Event listener for HTTP server "listening" event.
+ */
+
+function onListening() {
+    let protocol = 'http';
+    logger.info(`Server is ready! Visit on ${protocol}://localhost:${port}${conf.project}`);
+}

tomato/bin/startup.js

@@ -10,7 +10,7 @@ const rootdir = app.rootdir;
 const conf = {
   entry: {
     babelMain: 'babel-polyfill',
-    main: path.join(rootdir, 'views', 'main.js')
+      main: path.join(rootdir, 'src/views', 'main.js')
   },
   output: {
     path: path.join(rootdir, dist),
@@ -41,7 +41,7 @@ const conf = {
       inject: true,
       project: app.project,
       filename: 'index.html',
-      template: path.resolve(rootdir, 'views', 'index.html')
+        template: path.resolve(rootdir, 'src/views', 'index.html')
     }),
     new webpack.optimize.CommonsChunkPlugin({
       name: "common",

tomato/config/build/webpack.base.conf.js

@@ -18,10 +18,14 @@ module.exports = merge(base, {
                 warnings: false
             }
         }),
+        new webpack.optimize.CommonsChunkPlugin({
+            name: "common",
+            filename: "[name].bundle.[hash].js"
+        }),
         new webpack.DefinePlugin({
             "process.env": {
                 NODE_ENV: JSON.stringify("production")
             }
         })
     ]
-});
+});

tomato/config/build/webpack.prod.conf.js

@@ -8,6 +8,7 @@ if (process && process.env && process.env.NODE_ENV) {
 } else {
     console.info('No NODE_ENV specified! It will use [dev.conf.js] as default...');
 }
+
 configure = isProd ? require('./env/prod.conf') : require('./env/dev.conf');
 
-module.exports = configure;
+module.exports = configure;

tomato/config/env.js

@@ -3,37 +3,37 @@ let path = require('path');
 let rootdir = path.resolve(__dirname, '../../'); // 工程根路径
 const project = '/koa2';
 const conf = {
-  project: project,
-  port: 3000,
-  rootdir: rootdir,
-  debug: false, // true-开发模式 false-生产环境
-  env: process.env.NODE_ENV || 'develpoment',
-  dist: 'dist', // webpack打包输出路径
-  defaultPage: 'index.html',
-  allowedFileExtension: ['.js', '.css', '.html', '.ttf', '.woff'], // 定义允许下载的文件类型
-  log4js: {
-    level: 'debug',
-    output: path.join(rootdir, 'logs/app.log')
-  },
-  webservice: {
-    url: 'http://localhost:8001',
-    ver: '/web',
-    connectTimeout: false,
-    requestTimeout: false
-  },
-  session: {
-    key: 'sid',
-      store: undefined, // Session第三方存储
-    maxAge: 3600 * 1000, // 60mins
-    httpOnly: true,
-    path: project
-  },
-  redis: { // 通常一个项目只需配置一台redis服务器即可
-    host: '127.0.0.1',
-    port: 6379,
-    db: 15
-  },
-  store: null // 定义将项目中的常量存储于何处。null:NodeJS内存（默认） redis:Redis服务器
+    project: project,
+    port: 3000,
+    rootdir: rootdir,
+    debug: false, // true-开发模式 false-生产环境
+    env: process.env.NODE_ENV || 'develpoment',
+    dist: 'dist', // webpack打包输出路径
+    defaultPage: 'index.html',
+    allowedFileExtension: ['.js', '.css', '.html', '.ttf', '.woff'], // 定义允许下载的文件类型
+    log4js: {
+        level: 'debug',
+        output: path.join(rootdir, 'logs/app.log')
+    },
+    webservice: {
+        url: 'http://localhost:8001',
+        ver: '/web',
+        connectTimeout: false,
+        requestTimeout: false
+    },
+    session: {
+        key: 'sid',
+        store: undefined, // Session第三方存储
+        maxAge: 3600 * 1000, // 60mins
+        httpOnly: true,
+        path: project
+    },
+    redis: { // 通常一个项目只需配置一台redis服务器即可
+        host: '127.0.0.1',
+        port: 6379,
+        db: 15
+    },
+    store: null // 定义将项目中的常量存储于何处。null:NodeJS内存（默认） redis:Redis服务器
 };
 
 module.exports = conf;

tomato/config/env/base.conf.js

@@ -13,7 +13,7 @@ module.exports = deepMerge({
   },
   session: {
     key: 'prdsid',
-    store: new (require('../session/redis.store.js'))()
+      store: require('../session/redis.store.js') // 传入SessionStore类
   },
   store: 'redis'
 }, base);

tomato/config/env/prod.conf.js

@@ -2,7 +2,7 @@
 const passport = require('koa-passport');
 const lodash = require('lodash/object');
 const conf = require('../privs.js');
-const StoreUtil = require('../../app/util/Store');
+const StoreUtil = require('.././util/Store');
 const PREFIX_4_ROLE = 'koa:role';
 const MAXAGE_4_ROLE = require('../env.js').session.maxAge;