uu

Author: shawn2016

package.json

@@ -9,7 +9,7 @@
     "start": "npm run clear && cross-env NODE_ENV=development webpack-dev-server --config webpack.config.dev.babel.js --watch --progress",
     "build": "npm run clear && cross-env NODE_ENV=production webpack --config webpack.config.prod.babel.js --progress",
     "build:server": "npm run clear:server && cross-env NODE_ENV=production webpack  --config  webpack.config.server.babel.js --colors --progress",
-    "build:ssr": "npm run build && npm run build:server && pm2 start processes.json"
+    "build:ssr": "npm run build && npm run build:server && pm2 start pm2Config.json"
   },
   "author": "shawn",
   "license": "MIT",

processes.json renamed to pm2Config.json

@@ -8,7 +8,7 @@
   "error_file": "./log/node-app/node-app.stderr.log",
   "out_file": "./log/node-app.stdout.log",
   "pid_file": "pids/node-geo-api.pid",
-  "instances": 0,
+  "instances": 6,
   "min_uptime": "200s",
   "max_restarts": 10,
   "max_memory_restart": "1M",

server/SSR/src/server.js

@@ -17,7 +17,7 @@ global.location = window.location
 global.history = window.history
 global.sessionStorage = window.sessionStorage
 const DOCS_PATH = '../../../dist';
-const PORT = 8090;
+const PORT = 8070;
 const IP_ADRESS = 'localhost';
 const app = express();
 let templateHtml = fs.readFileSync(path.join(__dirname, `${DOCS_PATH}/assets/index.html`), 'utf8')

src/config/prod.env.js

@@ -1,3 +1,3 @@
 export default {
-  domain: "'http://test-api.rswallet.com:7046'"
+  domain: "'https://www.easy-mock.com/mock/59ccc101a0ab222a113ab3d9'"
 }

src/config/test.env.js

@@ -1,3 +1,3 @@
 export default { 
-    domain: "'http://test-api.rswallet.com:7046'"
+    domain: "'https://www.easy-mock.com/mock/59ccc101a0ab222a113ab3d9'"
   }

src/reduxes/store/index.js

@@ -5,7 +5,7 @@ import middleware from 'reduxes/middleware'
 import reducers, { injectStore } from 'reduxes/reducers'
 
 
-const finalCreateStore = compose(applyMiddleware(thunk, middleware), window.devToolsExtension ? window.devToolsExtension() : f => f, )(createStore)
+const finalCreateStore = compose(applyMiddleware(thunk, middleware), )(createStore)
 let store
 // window.devToolsExtension ? window.devToolsExtension() : f => f,
 store = finalCreateStore(reducers)

webpack.config.dev.babel.js

@@ -71,6 +71,7 @@ module.exports = {
         new webpack.HotModuleReplacementPlugin(),
         new webpack.NamedModulesPlugin(),
         new webpack.DefinePlugin({
+            NODE_ENV: process.env.NODE_ENV,
             __ENV__: process.env.NODE_ENV == 'production' ? prodApiConfig : process.env.NODE_ENV == 'development' ? devApiConfig : process.env.NODE_ENV == 'test' ? testApiConfig : devApiConfig
         }),
         extractSass

webpack.config.prod.babel.js

@@ -75,9 +75,6 @@ module.exports = {
         new HtmlWebpackPlugin({
             template: path.join(__dirname, './src/index.html')
         }),
-        new webpack.DefinePlugin({
-            __ENV__: process.env.NODE_ENV == 'production' ? prodApiConfig : process.env.NODE_ENV == 'development' ? devApiConfig : process.env.NODE_ENV == 'test' ? testApiConfig : devApiConfig
-        }),
         // 压缩JS代码,CSS 没有被压缩到
         new webpack.optimize.UglifyJsPlugin({
             output: {
@@ -91,10 +88,9 @@ module.exports = {
         }),
         new webpack.IgnorePlugin(/vertx/),
         new webpack.DefinePlugin({
-            'process.env': {
-                'NODE_ENV': JSON.stringify(process.env.NODE_ENV)
-            }
-        })
+            NODE_ENV: process.env.NODE_ENV,
+            __ENV__: process.env.NODE_ENV == 'production' ? prodApiConfig : process.env.NODE_ENV == 'development' ? devApiConfig : process.env.NODE_ENV == 'test' ? testApiConfig : devApiConfig
+        }),
     ],
     resolve: {
         extensions: ['.js', '.md', '.txt'],

webpack.config.server.babel.js

@@ -2,6 +2,9 @@ import path from 'path'
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import webpack from 'webpack';
 import CompressionPlugin from 'compression-webpack-plugin'
+import devApiConfig from './src/config/dev.env'
+import testApiConfig from './src/config/test.env'
+import prodApiConfig from './src/config/prod.env'
 var ignore = new webpack.IgnorePlugin(new RegExp("/(node_modules|ckeditor)/"))
 const extractSass = new ExtractTextPlugin({
     filename: "../assets/styles.[hash].css",
@@ -29,6 +32,10 @@ module.exports = {
             threshold: 10240,
             minRatio: 0.8
         }),
+        new webpack.DefinePlugin({
+            NODE_ENV: process.env.NODE_ENV,
+            __ENV__: process.env.NODE_ENV == 'production' ? prodApiConfig : process.env.NODE_ENV == 'development' ? devApiConfig : process.env.NODE_ENV == 'test' ? testApiConfig : devApiConfig
+        }),
     ],
     module: {
         rules: [