nodes + go 重构完

configuration.json

@@ -18,15 +18,15 @@
 			"imagePath" : "/images",
 			"cssPath"   : "/styles"
 		},
-		"env"      : "development",
-		"useProxy" : true,
-		"port"     : 8012
+		"env"        : "development",
+		"useProxy"   : true,
+		"port"       : 8010,
+		"staticPort" : 8011
 	},
 	"go": {
 		"Debug"               : true,
 		"URL"                 : "http://wemall.shen100.com",
-		"Port"                : 8010,
-		"StaticPort"          : 8011,
+		"Port"                : 8012,
 		"MaxOrder"            : 10000,
 		"MinOrder"            : 0,
 		"PageSize"            : 20,
@@ -48,7 +48,7 @@
 		"todayOrderCount": "/admin/order/todaycount",
 		"todayOrderSale": "/admin/order/todaysale",
 		"totalOrderCount": "/admin/order/totalcount",
-		"totalSale": "/admin/order/totalsale",
+		"totalSale": "/admin/order/totalsale"
 	},
 	"docs": {
 		"github": "https://xxx.com/shen100"

nginx/wemall.shen100.conf

@@ -1,11 +1,15 @@
-upstream wemallApp {
+upstream wemallNodejs {
     server 127.0.0.1:8010;
 }
 
 upstream wemallStaticServ {
     server 127.0.0.1:8011;
 }
 
+upstream wemallApp {
+    server 127.0.0.1:8012;
+}
+
 server {
     listen       80;
     server_name wemall.shen100.com;
@@ -20,6 +24,13 @@ server {
     #root         /root/nowamagic_venv/nowamagic_pj;
 
     location / {
+        proxy_pass  http://wemallNodejs;
+        proxy_set_header   Host             $host;
+        proxy_set_header   X-Real-IP        $remote_addr;
+        proxy_set_header   X-Forwarded-For  $proxy_add_x_forwarded_for;
+    }
+
+    location /api {
         proxy_pass  http://wemallApp;
         proxy_set_header   Host             $host;
         proxy_set_header   X-Real-IP        $remote_addr;

nodejs/config/index.js

@@ -9,6 +9,7 @@ var config = {
 	env          : configData.nodejs.env,
 	useProxy     : configData.nodejs.useProxy,
 	port         : configData.nodejs.port,
+	staticPort   : configData.nodejs.staticPort,
 	page: {
 		title     : configData.nodejs.page.title,
 		sitePath  : configData.nodejs.page.sitePath,
@@ -40,3 +41,5 @@ var config = {
 		}
 	}
 }())
+
+module.exports = config;

nodejs/helpers/index.js

@@ -0,0 +1,8 @@
+var helpers = {
+	json: function(data) {
+        data = data || {};
+        return JSON.stringify(data);
+    }
+};
+
+module.exports = helpers;

staticServ.js → nodejs/staticServ.js

@@ -10,7 +10,7 @@ var webpack              = require('webpack');
 var webpackDevMiddleware = require('webpack-dev-middleware');
 var webpackHotMiddleware = require('webpack-hot-middleware');
 var webpackConfig        = require('./webpack.config');
-var appConfig            = require('./appconfig');
+var config               = require('./config');
 var compiler             = webpack(webpackConfig);
 
 var app = express();
@@ -52,6 +52,6 @@ app.use(function(err, req, res, next) {
     res.render('error');
 });
 
-server.listen(appConfig.server.StaticPort, function() {
-    console.log('StaticServ running at ' + appConfig.server.URL);
+server.listen(config.staticPort, function() {
+    console.log('StaticServ running at :' + config.staticPort);
 });

nodejs/utils/index.js

@@ -31,9 +31,7 @@ var EnvUtil = {
         errors = errors.join('\n  ');
         console.error('\x1B[31mERROR: ' + packages.name + ' is unable to start due to missing dependencies:\x1B[0m\n  ' + errors);
         console.error('\x1B[32m\nPlease run `npm install` and try starting ' + packages.name + ' again.');
-        var github = config.docs.github;
-        var docStr = '\x1B[32mHelp and documentation can be found at ${github}\x1B[0m\n';
-        console.error(docStr);
+        console.error('\x1B[32mHelp and documentation can be found at ' + config.docs.github + '\x1B[0m\n');
         return false;
     }
 };

nodejs/webpack.config.js

@@ -7,14 +7,18 @@ var config                   = require('./config');
 var hotMiddleware            = 'webpack-hot-middleware/client?reload=true';
 var jsPath                   = config.page.jsPath;
 
+console.log(123456);
+
+
 function getEntryMap() {
     var entryArr = [
         'admin/app'
     ];
     var entryMap = {};
     entryArr.forEach(function(key) {
-        entryMap[key] = ['babel-polyfill', '../static/javascripts/' + key + '.js', hotMiddleware];
+        entryMap[key] = ['babel-polyfill', './static/javascripts/' + key + '.js', hotMiddleware];
     });
+
     entryMap['vendor'] = [
         'react', 
         'react-dom',
@@ -27,10 +31,10 @@ function getEntryMap() {
 var config = {
     entry: getEntryMap(),
     output: {
-        publicPath    : config.page.sitePath + '/',
-        filename      : '.' + jsPath + '/[name].js',
+        publicPath    : '/',
+        filename      : './javascripts/[name].js',
         path          : path.resolve(__dirname, './dist/app/client'),
-        chunkFilename : '.' + jsPath + '/[name].js',
+        chunkFilename : './javascripts/[name].js'
     },
     module: {
         loaders: [
@@ -52,7 +56,7 @@ var config = {
     plugins: [
         new webpack.optimize.CommonsChunkPlugin({
             name: 'vendor', 
-            filename: '.' + jsPath + '/vendor.bundle.js'
+            filename:  './javascripts/vendor.bundle.js'
         }),
         new BellOnBundlerErrorPlugin(),
         new webpack.optimize.OccurrenceOrderPlugin(),