delete some libs; modify gulp dev step

Author: functions

app.js

@@ -2,11 +2,11 @@ var path = require('path');
 var express = require('express');
 var app = express();
 
+// 静态资源目录；  TODO: 静态资源推荐走 CDN 
 app.use('/static', express.static(path.join(__dirname, 'static')));
 
-app.get('/', function (req, res) {
-  res.send('Hello World!');
-});
+// 首页
+app.get('/', require('server/js/controller/pageController').homepage);
 
 var server = app.listen(8888, function () {
   var port = server.address().port;

gulpfile.js

@@ -1,6 +1,7 @@
 var Path = require('path');
 var gulp = require('gulp');
 var clean = require('gulp-clean');
+var config = require('./resource/config.json');
 
 /**************************
  *          webpack       *
@@ -25,38 +26,18 @@ gulp.task('webpack-dev-server', function() {
     var webpack = require('webpack');
 
     new WebpackDevServer(webpack(webpackConfig), {
+        contentBase: config.devServerUrl,
         publicPath: webpackConfig.output.publicPath,
         hot: true,
         noInfo: false,
         historyApiFallback: true,
-        proxy: [{
-            path: /^\/f\//,
-            ignorePath: true,
-            target: 'http://127.0.0.1:3000/html/index.html'
-        }]
-    }).listen(3000, 'localhost', function(err, result) {
+        proxy: { '*': config.devServerUrl }
+    }).listen(3000, 'localhost', function(err) {
         if (err) console.log(err);
         console.log('Listening at localhost:3000');
+        open('http://127.0.0.1:3000/webpack-dev-server/');
     });
 });
-/**************************
- *  webpack build libs    *
- **************************/
-gulp.task('clean-libs', function() {
-    var dir = Path.join('static', 'libs', '*.min.*');
-    return gulp.src(dir)
-               .pipe(clean());
-});
-gulp.task('webpack-build-libs', ['clean-libs'], function() {
-    var webpackConfig = require('./webpack.libs.js');
-    var gulpWebpack = require('gulp-webpack');
-    var dir = Path.join('static', 'libs');
-
-    return gulp
-        .src(dir)
-        .pipe(gulpWebpack(webpackConfig))
-        .pipe(gulp.dest(dir));
-});
 /**************************
  *      copy profiles     *
  **************************/
@@ -66,16 +47,12 @@ gulp.task('copyProfile', function() {
     if (allowEnv.indexOf(env) === -1) {
         env = allowEnv[0];
     }
-    return gulp.src(Path.join(__dirname, 'src', 'profiles', env, '*'))
+    return gulp.src(Path.join(__dirname, 'profiles', env, '*'))
                .pipe(gulp.dest(Path.join(__dirname, 'resource')));
 });
 /**************************
  *          Main          *
  **************************/
-gulp.task('default', function() {
-    console.info('demo');
-});
 gulp.task('dev', ['copyProfile', 'webpack-dev-server']);
-gulp.task('libs', ['webpack-build-libs']);
 gulp.task('beta', ['webpack']);
 gulp.task('prod', ['webpack']);

package.json

@@ -16,7 +16,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "antd": "^1.6.4",
     "body-parser": "^1.13.3",
     "codemirror": "^5.16.0",
     "cookie-parser": "^1.3.5",

server/profiles/beta/config.json renamed to profiles/beta/config.json

@@ -1,5 +1,5 @@
 {
-    "env": "local",
+    "env": "beta",
 
     "mysql": {
         "host" : "localhost",
@@ -10,5 +10,9 @@
         "writeLog" : false
     },
 
-    "feUrl": ""
+    "feUrl": "",
+
+    "devServerUrl": "http://127.0.0.1:8888",
+
+    "appRun": 8888
 }

server/profiles/prod/config.json renamed to profiles/dev/config.json

@@ -1,5 +1,5 @@
 {
-    "env": "local",
+    "env": "dev",
 
     "mysql": {
         "host" : "localhost",
@@ -10,5 +10,8 @@
         "writeLog" : false
     },
 
-    "feUrl": ""
+    "feUrl": "http://127.0.0.1:3000",
+    "devServerUrl": "http://127.0.0.1:8888",
+
+    "appRun": 8888
 }

server/profiles/dev/config.json renamed to profiles/prod/config.json

@@ -1,5 +1,5 @@
 {
-    "env": "local",
+    "env": "prod",
 
     "mysql": {
         "host" : "localhost",
@@ -10,5 +10,9 @@
         "writeLog" : false
     },
 
-    "feUrl": "http://127.0.0.1:3000"
+    "feUrl": "",
+
+    "devServerUrl": "http://127.0.0.1:8888",
+
+    "appRun": 8888
 }

server/js/controller/pageController.js

@@ -1,66 +1,13 @@
 /**
  * 页面入口的
- * @Author yuanqin.wang
- * @Date 2016-03-31
  */
 var config = require('../../../resource/config.json');
 var qzzUrl = config.qzzUrl;
-/*@Controller*/
-module.exports = {
-    /*@Autowired("../service/loginService")*/
-    loginService: null,
 
 
-    /*@RequestMapping("/")*/
-    index: function(req, res) {
-        renderView (res, 'index');
-        res.end("");
-    },
-    /*@RequestMapping("/404")*/
-    error: function(req, res) {
-        res.render('error');
-        res.end("");
-    },
-    /*@RequestMapping([{url: "/data"},{url: "/data/{menu}/{channel}/{page}"},{url: "/data/{menu}/{channel}"},{url: "/data/{menu}"}])*/
-    data: function(req, res) {
-        renderView (res, 'index');
-        res.end("");
-    },
-    /*@RequestMapping("/healthcheck.html")*/
-    healthcheck: function(req, res) {
-        res.write("200");
+module.exports = {
+    homepage: function(req, res) {
+        res.render('index', { qzzUrl: qzzUrl });
         res.end("");
-    },
-    /*@RequestMapping([{url: "/admin"}, {url: "/admin/{menu}"}, {url: "/admin/{menu}/{submenu}"}])*/
-    admin: function(req, res) {
-        var path = req.path;
-        // 检查是否已经登录
-        if (this.loginService.isLogin(req)) {
-            renderView (res, 'admin');
-            res.end();
-        } else {
-            // 没有登录
-            // 如果当前是登录页, 则渲染登录页
-            if (path === '/admin/login') {
-                res.render('login');
-                res.end();
-            } 
-            // 如果是登录验证接口
-            else if (path === '/admin') {
-                // 调用登录验证接口
-                this.loginService.doLogin(req, res);
-            }
-            else {
-                // 跳转到奥登录页
-                res.redirect(301, '/admin/login');
-            }
-        }
     }
-
-};
-
-
-
-function renderView (res, view) {
-    res.render(view, { qzzUrl: qzzUrl });
-}
+};

server/js/dao/db.js

@@ -50,7 +50,7 @@ var connect = {
     }
 };
 
-exports.query = function(sql, data) {
+exports.execSQL = function(sql, data) {
     return new Promise(function(resolve, reject){
         connect.mysql(CONNECT_CONFIG, sql, data, function(result){
             if (result.error) {