Authored by 陈峰

修改生产环境配置

1 .DS_Store 1 .DS_Store
2 .idea 2 .idea
3 app/build/bundle 3 app/build/bundle
4 -server/public/  
5 node_modules/ 4 node_modules/
6 5
7 *.log 6 *.log
8 .eslintcache 7 .eslintcache
9 -app/bundle  
  8 +app/bundle
  9 +server/public/*.html
@@ -5,10 +5,10 @@ module.exports = { @@ -5,10 +5,10 @@ module.exports = {
5 env: { 5 env: {
6 NODE_ENV: '"production"' 6 NODE_ENV: '"production"'
7 }, 7 },
8 - index: path.resolve(__dirname, './bundle/index.html'), 8 + index: path.resolve(__dirname, '../../server/public/index.html'),
9 assetsRoot: path.resolve(__dirname, './bundle'), 9 assetsRoot: path.resolve(__dirname, './bundle'),
10 assetsSubDirectory: 'static', 10 assetsSubDirectory: 'static',
11 - assetsPublicPath: '/', 11 + assetsPublicPath: 'http://shop-manage.yohobuy.com/',
12 productionSourceMap: true, 12 productionSourceMap: true,
13 productionGzip: false, 13 productionGzip: false,
14 productionGzipExtensions: ['js', 'css'], 14 productionGzipExtensions: ['js', 'css'],
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
19 "bluebird": "^3.5.0", 19 "bluebird": "^3.5.0",
20 "body-parser": "^1.17.1", 20 "body-parser": "^1.17.1",
21 "compression": "^1.6.2", 21 "compression": "^1.6.2",
  22 + "connect-history-api-fallback": "^1.3.0",
22 "connect-multiparty": "^2.0.0", 23 "connect-multiparty": "^2.0.0",
23 "cookie-parser": "^1.4.3", 24 "cookie-parser": "^1.4.3",
24 "cookie-session": "^2.0.0-beta.1", 25 "cookie-session": "^2.0.0-beta.1",
@@ -9,6 +9,7 @@ const bodyParser = require('body-parser'); @@ -9,6 +9,7 @@ const bodyParser = require('body-parser');
9 const cookieParser = require('cookie-parser'); 9 const cookieParser = require('cookie-parser');
10 const compression = require('compression'); 10 const compression = require('compression');
11 const Express = require('express'); 11 const Express = require('express');
  12 +const history = require('connect-history-api-fallback');
12 13
13 // const session = require('express-session'); 14 // const session = require('express-session');
14 const cookieSession = require('cookie-session'); 15 const cookieSession = require('cookie-session');
@@ -30,7 +31,11 @@ global.yoho = { @@ -30,7 +31,11 @@ global.yoho = {
30 apiDomain: config.apiDomain, 31 apiDomain: config.apiDomain,
31 co: global.Promise.coroutine 32 co: global.Promise.coroutine
32 }; 33 };
33 - 34 +app.use(history({
  35 + rewrites: [
  36 + { from: /\.html/, to: '/index.html'}
  37 + ]
  38 +}));
34 app.use(cookieSession({ 39 app.use(cookieSession({
35 name: 'yoho-shop', 40 name: 'yoho-shop',
36 secret: 'yoho!shop@manage', 41 secret: 'yoho!shop@manage',
@@ -41,6 +46,7 @@ app.use(cookieSession({ @@ -41,6 +46,7 @@ app.use(cookieSession({
41 46
42 app.use(compression()); 47 app.use(compression());
43 app.use(favicon(path.join(__dirname, '/favicon.ico'))); 48 app.use(favicon(path.join(__dirname, '/favicon.ico')));
  49 +app.use(Express.static(path.join(__dirname, 'public')));
44 app.use(bodyParser.json()); 50 app.use(bodyParser.json());
45 app.use(bodyParser.urlencoded({extended: false})); 51 app.use(bodyParser.urlencoded({extended: false}));
46 app.use(cookieParser()); 52 app.use(cookieParser());