add sass

Dockerfile

@@ -14,4 +14,4 @@ EXPOSE 80
 
 # ENTRYPOINT ["node", "app.js"]
 # CMD forever start --minUptime 1000 --spinSleepTime 1000 app.js
-CMD npm start
+CMD SESSION_SECRET='sfinaingaqingfgJLKDLIEQPSOPVCX' npm start

app.js

@@ -5,6 +5,7 @@ var favicon = require('serve-favicon');
 var logger = require('morgan');
 var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
+var sass = require('node-sass-middleware');
 var moment = require('moment');
 //设置时区
 var timezone = require('moment-timezone');
@@ -18,9 +19,29 @@ var logUtils = require('./utils/logUtils');
 var netease = require('./routes/netease');
 //JsonBird version 1.0
 var v1 = require('./routes/v1');
+//test
+var test = require('./routes/test');
 
 var app = express();
-//app.listen(process.env.PORT || 5000);
+// view engine setup
+app.set('views', path.join(__dirname, 'views'));
+app.set('view engine', 'pug');
+app.enable('trust proxy');
+// uncomment after placing your favicon in /public
+//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
+app.use(logger('dev'));
+app.use(bodyParser.json());
+app.use(bodyParser.urlencoded({ extended: false }));
+app.use(cookieParser());
+//配置 sass
+app.use(sass({
+    src: __dirname + '/static/sass',
+    dest: __dirname + '/static/css',
+    indentedSyntax: true,
+    sourceMap: true
+}));
+//静态文件访问路径
+app.use('/static/', express.static(path.join(__dirname, 'static')));
 
 /***
  * 全局过滤，统计和日志
@@ -74,23 +95,14 @@ app.all('*', function(req, res, next) {
     next();
 
 });
-// view engine setup
-app.set('views', path.join(__dirname, 'views'));
-app.set('view engine', 'pug');
-app.enable('trust proxy');
-// uncomment after placing your favicon in /public
-//app.use(favicon(path.join(__dirname, 'public', 'favicon.ico')));
-app.use(logger('dev'));
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: false }));
-app.use(cookieParser());
-//静态文件访问路径
-app.use('/static/', express.static(path.join(__dirname, 'public')));
 
 app.use('/', welcome);
+app.use('/test', test);
 app.use('/v1', v1);
 app.use('/netease', netease);
 
+
+
 // catch 404 and forward to error handler
 app.use(function(req, res, next) {
     var err = new Error('Not Found');

bin/www

@@ -15,8 +15,6 @@ var http = require('http');
 var port = normalizePort(process.env.PORT || '3000');
 app.set('port', port);
 
-console.log("SESSION_SECRET:" + process.env.SESSION_SECRET);
-
 /**
  * Create HTTP server.
  */

package.json

@@ -1,38 +1,41 @@
 {
-    "name": "JsonBird",
-    "version": "1.0.0",
-    "description": "A Remote Json Agent Service",
-    "author": "xCss",
-    "license": "MIT",
-    "private": true,
-    "scripts": {
-        "start": "node ./bin/www"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/xCss/JsonBird.git"
-    },
-    "keywords": [
-        "JsonBird",
-        "JsonProxy"
-    ],
-    "bugs": {
-        "url": "https://github.com/xCss/JsonBird/issues"
-    },
-    "readme": "./readme.md",
-    "homepage": "https://github.com/xCss/JsonBird#readme",
-    "dependencies": {
-        "body-parser": "~1.15.1",
-        "cookie-parser": "~1.4.3",
-        "debug": "~2.2.0",
-        "express": "~4.13.4",
-        "express-generator": "^4.13.4",
-        "moment": "^2.15.0",
-        "moment-timezone": "^0.5.5",
-        "morgan": "~1.7.0",
-        "mysql": "^2.11.1",
-        "pug": "^2.0.0-beta6",
-        "request": "^2.74.0",
-        "serve-favicon": "~2.3.0"
-    }
-}
+  "name": "JsonBird",
+  "version": "1.0.0",
+  "description": "A Remote Json Agent Service",
+  "author": "xCss",
+  "license": "MIT",
+  "private": true,
+  "scripts": {
+    "start": "node ./bin/www"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/xCss/JsonBird.git"
+  },
+  "keywords": [
+    "JsonBird",
+    "JsonProxy"
+  ],
+  "bugs": {
+    "url": "https://github.com/xCss/JsonBird/issues"
+  },
+  "readme": "./readme.md",
+  "homepage": "https://github.com/xCss/JsonBird#readme",
+  "dependencies": {
+    "bcryptjs": "^2.3.0",
+    "body-parser": "~1.15.1",
+    "cookie-parser": "~1.4.3",
+    "debug": "~2.2.0",
+    "express": "~4.13.4",
+    "express-generator": "^4.13.4",
+    "moment": "^2.15.0",
+    "moment-timezone": "^0.5.5",
+    "morgan": "~1.7.0",
+    "mysql": "^2.11.1",
+    "node-sass": "^3.10.0",
+    "node-sass-middleware": "^0.9.8",
+    "pug": "^2.0.0-beta6",
+    "request": "^2.74.0",
+    "serve-favicon": "~2.3.0"
+  }
+}

routes/index.js → routes/test.js

@@ -3,7 +3,7 @@ var router = express.Router();
 
 /* GET home page. */
 router.get('/', function(req, res, next) {
-  res.render('index', { title: 'Express' });
+    res.render('test', { title: 'Express' });
 });
 
-module.exports = router;
+module.exports = router;

static/sass/test.scss

@@ -0,0 +1,3 @@
+* {
+    display: flex;
+}

utils/dbUtils.js

@@ -1,9 +1,13 @@
 //https://github.com/mysqljs/mysql#readme
 var mysql = require('mysql');
+var bcrypt = require('bcryptjs');
 //获取数据库配置
 var config = require('../configs/config').mysql_dev;
 //使用连接池
 var pool = mysql.createPool(config);
+//SESSION_SECRET
+var sessionSECRET = process.env.SESSION_SECRET || "faFJDSLNFFJLsEknnqWSDlweifsNIW";
+console.log(sessionSECRET);
 //公共连接设置
 var commonFormat = function(callback) {
     pool.getConnection(function(err, connection) {
@@ -26,6 +30,11 @@ var commonFormat = function(callback) {
 module.exports = {
     //添加/修改数据
     set: function(params) {
+        var password = '12345' + sessionSECRET;
+        var salt = bcrypt.genSaltSync(10);
+        var hash = bcrypt.hashSync(password, salt);
+        console.log(hash);
+        console.log(bcrypt.compareSync(password + 'x', hash));
         // var sql = 'select 1+1 as test';
         // pool.query(sql, function(err, rows, fields) {
         //     console.log(err);
@@ -33,13 +42,13 @@ module.exports = {
         //     console.log(fields);
         // });
         var sql = 'select MD5("123456") as calc';
-        commonFormat(function(err, connection) {
-            connection.query(sql, { id: 1 + 1 }, function(err, rows) {
-                //console.log(err);
-                console.log(rows);
-                console.log(rows.length)
-            });
-        });
+        // commonFormat(function(err, connection) {
+        //     connection.query(sql, { id: 1 + 1 }, function(err, rows) {
+        //         //console.log(err);
+        //         console.log(rows);
+        //         console.log(rows.length)
+        //     });
+        // });
     },
     //获取数据
     get: function(key) {

utils/logUtils.js

@@ -1,7 +1,7 @@
 var storage = require('./dbUtils');
 module.exports = {
     print: function(params) {
-        //storage.set({});
+        storage.set({});
         var arr = ['-------------------------------------'];
         // var date = new Date();
         // var month = date.getMonth() + 1;

views/index.pug

@@ -1,5 +0,0 @@
-extends layout
-
-block content
-  h1= title
-  p Welcome to #{title}

views/test.pug

@@ -0,0 +1,12 @@
+doctype html
+html
+  head
+    title= title
+    link(rel='stylesheet', href='/static/css/style.css')
+    link(rel='stylesheet', href='/static/css/test.css')
+    meta( name="viewport",content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0")
+    meta( name="author",content="xCss xioveliu@gmail.com")
+  body 
+      h1= title
+      p Welcome to #{title}
+