maguohua преди 8 години
родител
ревизия
cf6580e0d8
променени са 4 файла, в които са добавени 76 реда и са изтрити 64 реда
  1. 1 1
      README.md
  2. 65 61
      app.js
  3. 3 1
      routes/index.js
  4. 7 1
      routes/v1.js

+ 1 - 1
README.md

@@ -119,7 +119,7 @@ npm run dev  访问: http://localhost:3000
 │   └── db.js
 ├── public                                   // 静态资源目录
 │   ├── css
-│   ├── elm                                  // 前端项目地址
+│   ├── elm                                  // 前端页面
 │   ├── img
 │   └── js
 ├── routes                                   // 路由控制中心

+ 65 - 61
app.js

@@ -1,75 +1,79 @@
 import express from 'express';
-import db from './mongodb/db.js';
+// 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';
+// 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.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(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(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((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'
-    })
-  ]
-}));
+// app.use(expressWinston.logger({
+//   transports: [
+//     new (winston.transports.Console)({
+//       json: true,
+//       colorize: true
+//     }),
+//     new winston.transports.File({
+//       filename: 'logs/success.log'
+//     })
+//   ]
+// }));
 
-router(app);
+// router(app);
 
-app.use(expressWinston.errorLogger({
-  transports: [
-    new winston.transports.Console({
-      json: true,
-      colorize: true
-    }),
-    new winston.transports.File({
-      filename: 'logs/error.log'
-    })
-  ]
-}));
+// 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.use((err, req, res, next) => {
+// 	res.send('未找到当前路由');
+// });
+// 
+app.get('/', function (req, res, next){
+	res.send('sdfsdfsdfsfsdsf')
+})
 app.listen(config.port);

+ 3 - 1
routes/index.js

@@ -1,10 +1,12 @@
 'use strict';
 
-import home from './home.js'
+import home from './home';
+import v1 from './v1'
 
 export default app => {
 	app.get('/', (req, res, next) => {
 		res.redirect('/home');
 	});
 	app.use('/home', home);
+	app.use('/v1', v1);
 }

+ 7 - 1
routes/v1.js

@@ -1,4 +1,10 @@
 'use strict';
 
 import express from 'express';
-const router = express.Router();
+const router = express.Router();
+
+router.get('/cities', (req, res, next) => {
+	res.send('2323132131')
+});
+
+export default router