Commit caa6d152 authored by ganjingcun's avatar ganjingcun

deck demo

parent 2f640781
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
"express": "~4.14.0", "express": "~4.14.0",
"formidable": "^1.1.1", "formidable": "^1.1.1",
"jade": "~1.11.0", "jade": "~1.11.0",
"lodash": "^4.17.4",
"moment": "^2.18.1", "moment": "^2.18.1",
"morgan": "~1.7.0", "morgan": "~1.7.0",
"node-schedule": "^1.2.1", "node-schedule": "^1.2.1",
......
...@@ -8,6 +8,7 @@ var eventproxy = require('eventproxy') ...@@ -8,6 +8,7 @@ var eventproxy = require('eventproxy')
var utils = require('../utils/utils') var utils = require('../utils/utils')
var sqlite3 = require('sqlite3').verbose(); var sqlite3 = require('sqlite3').verbose();
var moment = require('moment') var moment = require('moment')
var _ = require('lodash')
var config = require('../db.config') var config = require('../db.config')
var cardinfo = require('../cardinfo') var cardinfo = require('../cardinfo')
...@@ -473,10 +474,19 @@ router.get('/deckinfo', function (req, res) { ...@@ -473,10 +474,19 @@ router.get('/deckinfo', function (req, res) {
console.log(sql); console.log(sql);
client.query(sql, function (err, result) { client.query(sql, function (err, result) {
done() done()
response.history = result.rows response.history = result.rows
sql = `SELECT * from deck_demo where name = '${resName}' order by create_time desc`
console.log(sql);
client.query(sql, function (err, result) {
done()
response.demo = _.map(result.rows, function (row) {
row.create_time = moment(row.create_time).format('YYYY-MM-DD')
return row
})
res.json(response); res.json(response);
}); });
});
} }
}); });
...@@ -490,6 +500,50 @@ var file = require("./file.js"); ...@@ -490,6 +500,50 @@ var file = require("./file.js");
router.post('/upload', file.upload); router.post('/upload', file.upload);
router.get('/download/:id', file.download); router.get('/download/:id', file.download);
//卡组范例提交
router.post('/deckdemo', function (req, res) {
let author = req.body.user;
let title = req.body.title;
let name = req.body.name;
let img_url = req.body.url;
let file = req.body.file || "";
pool.connect(function (err, client, done) {
if (err) {
return console.error('error fetching client from pool', err);
}
var now = moment().format('YYYY-MM-DD HH:mm')
var sql = `insert into deck_demo (name, author, url, title, file, create_time) values (
'${name}',
'${author}',
'${img_url}',
'${title}',
'${file}',
'${now}'
)`;
console.log(sql);
client.query(sql, function (err, result) {
done();
var response = {};
if (err) {
response.code = 500;
} else {
response.code = 200;
}
res.json(response);
});
});
})
router.post('/deckinfo', function (req, res) { router.post('/deckinfo', function (req, res) {
let author = req.body.user; let author = req.body.user;
......
...@@ -15,9 +15,6 @@ exports.upload = function (req, res, next) { ...@@ -15,9 +15,6 @@ exports.upload = function (req, res, next) {
return res.status(500).send('upload image fail!') return res.status(500).send('upload image fail!')
} }
console.log(files)
console.log(files.file.path)
var response = {}; var response = {};
if (err) { if (err) {
response.code = 500; response.code = 500;
...@@ -25,6 +22,7 @@ exports.upload = function (req, res, next) { ...@@ -25,6 +22,7 @@ exports.upload = function (req, res, next) {
response.code = 200; response.code = 200;
response.path = files.file.path; response.path = files.file.path;
} }
res.json(response); res.json(response);
}); });
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment