增加中间件 路由配置

README.md

@@ -16,7 +16,7 @@
 
 ## 技术栈
 
-nodejs + express + mongodb + es6/7 + mocha + bluebird + ejs + bootstrap
+nodejs + express + mongodb + mongoose + es6/7 + mocha + bluebird + ejs + bootstrap
 
 
 # 项目运行
@@ -38,7 +38,7 @@ npm run dev  访问: http://localhost:3000
 
 # 部署
 
-部署服务器采用百度应用引擎BAE基础版
+部署服务器--百度应用引擎BAE基础版
 
 部署方式：[百度BAE部署](https://cloud.baidu.com/doc/BAE/GUIGettingStarted.html) 
 
@@ -46,6 +46,7 @@ npm run dev  访问: http://localhost:3000
 
 
 
+
 # 目标功能
 
 - [ ] 静态数据
@@ -76,3 +77,70 @@ npm run dev  访问: http://localhost:3000
 - [ ] 调用微信支付
 - [ ] 后台管理系统
 - [ ] 部署上线
+
+
+# 项目布局
+.
+├── config                                  // 配置文件目录
+│   ├── default.js                          // 默认配置
+│   └── production.js                       // 生产环节配置文件
+├── controller                              // 负责路由操作的具体执行
+│   ├── bos
+│   ├── eus
+│   ├── food.js
+│   ├── member
+│   ├── payapi
+│   ├── promotion
+│   ├── shopping
+│   ├── ugc
+│   ├── v1
+│   ├── v2
+│   ├── v3
+│   └── v4
+├── logs                                    // 日志文件
+│   └── success.log
+├── middlewares                             // 路由中间件
+│   └── userStatus.js
+├── models                                  // 数据模型
+│   ├── bos
+│   ├── eus
+│   ├── food.js
+│   ├── member
+│   ├── payapi
+│   ├── promotion
+│   ├── shopping
+│   ├── ugc
+│   ├── v1
+│   ├── v2
+│   ├── v3
+│   └── v4
+├── mongodb                                  // 连接 mongodb
+│   └── db.js
+├── public                                   // 静态资源目录
+│   ├── css
+│   ├── elm                                  // 前端项目地址
+│   ├── img
+│   └── js
+├── routes                                   // 路由控制中心
+│   ├── bos.js
+│   ├── eus.js
+│   ├── home.js
+│   ├── index.js
+│   ├── member.js
+│   ├── payapi.js
+│   ├── promotion.js
+│   ├── shopping.js
+│   ├── ugc.js
+│   ├── v1.js
+│   ├── v2.js
+│   ├── v3.js
+│   └── v4.js
+├─── test                                    // 测试
+├─── views                                   // 后台管理系统页面
+├── .babelrc                                 // 配置babel
+├── .gitignore                               // 设置忽略文件
+├── app.conf                                 // 百度BAE部署所需配置文件
+├── app.js                                   // 基础配置
+├── index.js                                 // 入口
+├── package.json                             // 配置文件
+.

app.js

@@ -2,10 +2,74 @@ import express from 'express';
 import db from './mongodb/db.js';
 import config from 'config-lite';
 import router from './routes/index.js';
+import session from 'express-session';
+import connectMongo from 'connect-mongo';
+import flash from 'connect-flash';
+import winston from 'winston';
+import expressWinston from 'express-winston';
+import path from 'path';
+
+
 const app = express();
 
-app.use(express.static('./public'))
+app.all('*', (req, res, next) => {
+  	res.header("Access-Control-Allow-Origin", "*");
+  	res.header("Access-Control-Allow-Headers", "Content-Type, Authorization, X-Requested-With");
+  	res.header("Access-Control-Allow-Methods","PUT,POST,GET,DELETE,OPTIONS");
+  	res.header("X-Powered-By",' 3.2.1')
+  	if(req.method=="OPTIONS") res.send(200);/*让options请求快速返回*/
+  	else  next();
+});
+
+app.use(express.static('./public'));
+app.use(flash());
+const MongoStore = connectMongo(session);
+
+app.use(session({
+	name: config.session.name,
+  	secret: config.session.secret,
+  	resave: true,
+  	saveUninitialized: false,
+  	cookie: config.session.cookie,
+  	store: new MongoStore({
+    	url: config.url
+  	})
+}))
+
+app.use((req, res, next) => {
+  res.locals.user = req.session.user;
+  res.locals.success = req.flash('success').toString();
+  res.locals.error = req.flash('error').toString();
+  next();
+});
+
+app.use(expressWinston.logger({
+  transports: [
+    new (winston.transports.Console)({
+      json: true,
+      colorize: true
+    }),
+    new winston.transports.File({
+      filename: 'logs/success.log'
+    })
+  ]
+}));
 
 router(app);
 
-app.listen(config.port)
+app.use(expressWinston.errorLogger({
+  transports: [
+    new winston.transports.Console({
+      json: true,
+      colorize: true
+    }),
+    new winston.transports.File({
+      filename: 'logs/error.log'
+    })
+  ]
+}));
+
+app.use((err, req, res, next) => {
+	res.send('未找到当前路由');
+});
+app.listen(config.port);

config/default.js

@@ -2,5 +2,14 @@
 
 export default {
 	port: 3000,
-	url: 'mongodb://localhost:27017/bae'
+	url: 'mongodb://localhost:27017/elm',
+	session: {
+		name: 'elm',
+		secret: 'elm',
+		cookie: {
+			httpOnly: true,
+		    secure:   false,
+		    maxAge:   365 * 24 * 60 * 60 * 1000,
+		}
+	}
 }

logs/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

middlewares/userStatus.js

@@ -0,0 +1,22 @@
+'use strict';
+
+class UserStatus {
+	constructor(){
+		
+	}
+	login(req, res, next){
+		/*
+		已登陆则返回
+		 */
+		if (req.session.user) {
+			req.flash('error', '已登录');
+			res.redirect('back'); 
+		}else{
+			req.flash('error', '未登录');
+			res.redirect('/signin');
+		}
+		next();
+	}
+}
+
+export default new UserStatus();

mongodb/db.js

@@ -2,7 +2,7 @@
 
 import mongoose from 'mongoose';
 import config from 'config-lite';
-mongoose.connect(config.url);
+mongoose.connect(config.url, {server:{auto_reconnect:true}});
 mongoose.Promise = global.Promise;
 
 const db = mongoose.connection;
@@ -11,74 +11,14 @@ db.once('open' ,() => {
 	console.log('连接数据成功')
 })
 
-export default db;
-
-
-// var mongoose = require('mongoose');
-// var util = require("util");
-
-// function MongooseKeeper() {
-//     this.db = mongoose.createConnection();
-//     this.open_count = 0;
-// }
-// MongooseKeeper.prototype.config = function(conf) {
-//     // body...
-//     var options = {
-//         db: { native_parser: true },
-//         server: {
-//             poolSize:4
-//         }
-//     };
-
+db.on('error', function(error) {
+    console.error('Error in MongoDb connection: ' + error);
+    mongoose.disconnect();
+});
 
-//     var constr = "";
-//     if(process.env.MONGO_DB_STR){
-//         constr = process.env.MONGO_DB_STR ;
-//     }
-//     else{
-//         //'mongodb://user:pass@localhost:port/database'
-//         constr = util.format('mongodb://%s:%s@%s:%d/%s', conf.userid,conf.password,conf.host,conf.port,conf.database);
-//     }
-//     this.dbUri = constr;
-//     this.options = options;
-  
-// }
-// MongooseKeeper.prototype.open =function() {
+db.on('close', function() {
+    console.log('数据库断开，重新连接数据库');
+    mongoose.connect(config.url, {server:{auto_reconnect:true}});
+});
 
-//     this.open_count++;
-//     if(this.open_count ==1 && this.db.readyState == 0)
-//     {        
-//         this.db.open(this.dbUri,this.options,function() {
-//             // body...
-//             console.log("db opened");
-//         });
-//     }
-// }
-// MongooseKeeper.prototype.close =function() {
-
-//     this.open_count--;
-//     if(this.open_count == 0 )
-//     {
-//         this.db.close(function(){
-//             console.log("db closed");
-//         });
-//     }
-  
-
-
-// }
-// MongooseKeeper.prototype.use = function(action,callback) {
-//     //OPEN
-//     var self = this;
-//     self.open();
-//     action.call(null,function() {
-//         //CLOSE
-//         console.log("正在访问的数据库请求量"+self.open_count);
-//         self.close();
-//         callback.apply(null, arguments);
-//         //DONE
-//         self =null;
-//     })
-// };
-
-// exports = module.exports = new MongooseKeeper();
+export default db;

package.json

@@ -12,7 +12,7 @@
     "type": "git",
     "url": "https://github.com/bailicangdu/node-elm"
   },
-  "author": "",
+  "author": "cangdu",
   "license": "ISC",
   "dependencies": {
     "babel": "^6.23.0",
@@ -24,8 +24,10 @@
     "bluebird": "^3.5.0",
     "config-lite": "^1.5.0",
     "connect-flash": "^0.1.1",
+    "connect-mongo": "^1.3.2",
     "express": "^4.15.2",
     "express-session": "^1.15.2",
+    "express-winston": "^2.3.0",
     "formidable": "^1.1.1",
     "marked": "^0.3.6",
     "moment": "^2.18.1",
@@ -33,7 +35,8 @@
     "mongoose": "^4.9.3",
     "pm2": "^2.4.3",
     "sha1": "^1.1.1",
-    "supervisor": "^0.12.0"
+    "supervisor": "^0.12.0",
+    "winston": "^2.3.1"
   },
   "devDependencies": {
     "babel-plugin-transform-async-to-generator": "^6.24.1",

public/elm/static/css/app.css

@@ -0,0 +1 @@
+a,article,aside,b,body,button,dd,div,dl,dt,figcaption,figure,footer,h1,h2,h3,h4,h5,h6,header,i,input,li,nav,p,section,select,span,textarea,ul{padding:0;margin:0;list-style:none;font-style:normal;text-decoration:none;border:none;color:#333;box-sizing:border-box;font-family:Microsoft Yahei,sans-serif;-webkit-tap-highlight-color:transparent;-webkit-font-smoothing:antialiased}a:focus,article:focus,aside:focus,b:focus,body:focus,button:focus,dd:focus,div:focus,dl:focus,dt:focus,figcaption:focus,figure:focus,footer:focus,h1:focus,h2:focus,h3:focus,h4:focus,h5:focus,h6:focus,header:focus,i:focus,input:focus,li:focus,nav:focus,p:focus,section:focus,select:focus,span:focus,textarea:focus,ul:focus{outline:none}::-webkit-scrollbar{width:0;height:0;background-color:#f5f5f5}::-webkit-scrollbar-track{-webkit-box-shadow:inset 0 0 1px transparent;border-radius:10px;background-color:#f5f5f5}::-webkit-scrollbar-thumb{border-radius:10px;-webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);background-color:#555}input[type=button],input[type=reset],input[type=search],input[type=submit],textarea{-webkit-appearance:none}body,html{height:100%;width:100%;background-color:#f5f5f5}.clear:after{content:'';display:block;clear:both}.clear{zoom:1}.back_img{background-repeat:no-repeat;background-size:100% 100%}.margin{margin:0 auto}.left{float:left}.right{float:right}.hide{display:none}.show{display:block}.ellipsis{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.paddingTop{padding-top:1.95rem}.router-fade-enter-active,.router-fade-leave-active{-webkit-transition:opacity .3s;transition:opacity .3s}.router-fade-enter,.router-fade-leave-active{opacity:0}

routes/bos.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/eus.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/home.js

@@ -6,9 +6,21 @@ const router = express.Router();
 
 router.get('/', async (req, res) => {
 	
-	const foods = await Food.findOne();
+	let foods = await Food.findOne();
+	if(!foods){
+		const test = new Food({name: '测试'});
+		try{
+			await test.save();
+			foods = await Food.findOne();
+		}catch(err){
+			throw new Error(err);
+		}
+	}
 	res.send(foods.toString());
 	
 });
 
+router.get('/a', (req, res, next) => {
+	res.json({a: 1111})
+})
 export default router;

routes/member.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/payapi.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/promotion.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/shopping.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/ugc.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/v1.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/v2.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/v3.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

routes/v4.js

@@ -0,0 +1,4 @@
+'use strict';
+
+import express from 'express';
+const router = express.Router();

views/home.ejs

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+	<meta charset="UTF-8">
+	<title>首页</title>
+</head>
+<body>
+	
+</body>
+</html>