diff --git a/.gitignore b/.gitignore index dfb4167..25c9f21 100755 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ selenium-debug.log *.ntvs* *.njsproj *.sln +个人博客原型.rp diff --git a/blogExpress/app.js b/blogExpress/app.js index 203f390..ac5b60d 100644 --- a/blogExpress/app.js +++ b/blogExpress/app.js @@ -19,7 +19,7 @@ app.use(express.urlencoded({ extended: false })); app.use(cookieParser()); app.use(express.static(path.join(__dirname, 'public'))); -app.use('/user', indexRouter); +app.use('/article', indexRouter); // app.use('/users', usersRouter); // catch 404 and forward to error handler diff --git a/blogExpress/bin/www b/blogExpress/bin/www index e123991..a84caf4 100755 --- a/blogExpress/bin/www +++ b/blogExpress/bin/www @@ -12,7 +12,7 @@ var http = require('http'); * Get port from environment and store in Express. */ -var port = normalizePort(process.env.PORT || '3000'); +var port = normalizePort(process.env.PORT || '3003'); app.set('port', port); /** diff --git a/blogExpress/routes/Articlesql.js b/blogExpress/routes/Articlesql.js new file mode 100644 index 0000000..efce0c6 --- /dev/null +++ b/blogExpress/routes/Articlesql.js @@ -0,0 +1,12 @@ +var table = "article"; +var Articlesql = { + insert: "INSERT INTO " + table + "(title,content,publishTime) VALUES(?,?,?)", + queryAll: + "SELECT id,title,publishTime,modifyTime,commentNum,category FROM " + + table + + "", + getUserById: "SELECT * FROM " + table + " WHERE title = ? ", + update: "update " + table + " set name=? where name=?", + delete: "delete from " + table + " where id=?" +}; +module.exports = Articlesql; diff --git a/blogExpress/routes/Usersql.js b/blogExpress/routes/Usersql.js deleted file mode 100644 index 60f74a0..0000000 --- a/blogExpress/routes/Usersql.js +++ /dev/null @@ -1,8 +0,0 @@ -var UserSQL = { - insert: 'INSERT INTO user(age,name) VALUES(?,?)', - queryAll: 'SELECT * FROM user', - getUserById: 'SELECT * FROM user WHERE age = ? ', - update:'update user set name=? where name=?', - delete:'delete from user where id=?' -}; -module.exports = UserSQL; diff --git a/blogExpress/routes/index.js b/blogExpress/routes/index.js index fd4a671..a3292d7 100644 --- a/blogExpress/routes/index.js +++ b/blogExpress/routes/index.js @@ -1,53 +1,75 @@ -var express = require('express'); +var express = require("express"); var router = express.Router(); -var mysql = require('mysql'); -var dbConfig = require('./DBconfig') -var userSQL = require('./Usersql') +var mysql = require("mysql"); +var dbConfig = require("./DBconfig"); +var Articlesql = require("./Articlesql"); +var pageId = 0 // 使用DBConfig.js的配置信息创建一个MySQL连接池 var pool = mysql.createPool(dbConfig.mysql); // 响应一个JSON数据 -var responseJSON = function (res, ret) { - if (typeof ret === 'undefined') { +var responseJSON = function(res, ret) { + if (typeof ret === "undefined") { res.json({ - code: '-200', msg: '操作失败' + code: "-200", + msg: "操作失败" }); } else { res.json(ret); } }; +// 添加文章 +router.get("/addArticle", function(req, res, next) { + // 从连接池获取连接 + pool.getConnection(function(err, connection) { + // 获取前台页面传过来的参数 + var param = req.query || req.params; + // 建立连接 增加一个用户信息 + console.log(param); + console.log(err); + var currentTime = new Date().getTime(); + console.log(currentTime); + connection.query( + Articlesql.insert, + [param.title, param.content, currentTime], + function(err, result) { + if (result) { + result = { + code: 0, + msg: "新增文章成功", + id: result.insertId + }; + } + // console.log(res) + + // 以json形式，把操作结果返回给前台页面 + responseJSON(res, result); -// 添加用户 -router.get('/addUser', function (req, res, next) { - // 从连接池获取连接 - pool.getConnection(function (err, connection) { - // 获取前台页面传过来的参数 + // 释放连接 + connection.release(); + } + ); + }); +}); +// 查询文章标题列表 +router.get("/queryTitlelist", function(req, res, next) { + pool.getConnection((err, connection) => { var param = req.query || req.params; - // 建立连接 增加一个用户信息 - console.log(param) - console.log(err) - connection.query(userSQL.delete, [param.id], function (err, result) { - console.log(err) + connection.query(Articlesql.queryAll, function(err, result) { + console.log(result); if (result) { - result = { - code: 200, - msg: '新增成功' - }; + result = { code: 0, msg: "获取文章列表成功", data: pageId++ }; } // console.log(res) - // 以json形式，把操作结果返回给前台页面 + // 以json形式，把操作结果返回给前台页面 responseJSON(res, result); - // 释放连接 + // 释放连接 connection.release(); - }); }); }); - module.exports = router; - - diff --git a/code/package-lock.json b/code/package-lock.json index a475642..ab99f30 100755 --- a/code/package-lock.json +++ b/code/package-lock.json @@ -330,6 +330,15 @@ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", "dev": true }, + "axios": { + "version": "0.18.0", + "resolved": "http://registry.npm.taobao.org/axios/download/axios-0.18.0.tgz", + "integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", + "requires": { + "follow-redirects": "1.4.1", + "is-buffer": "1.1.6" + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "http://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz", @@ -3524,6 +3533,24 @@ "readable-stream": "2.3.4" } }, + "follow-redirects": { + "version": "1.4.1", + "resolved": "http://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.4.1.tgz", + "integrity": "sha1-2BIPRRgZD1Wqxlu2/HuF/NZm1qo=", + "requires": { + "debug": "3.1.0" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz", + "integrity": "sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE=", + "requires": { + "ms": "2.0.0" + } + } + } + }, "for-in": { "version": "1.0.2", "resolved": "http://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz", @@ -5345,8 +5372,7 @@ "is-buffer": { "version": "1.1.6", "resolved": "http://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz", - "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=", - "dev": true + "integrity": "sha1-76ouqdqg16suoTqXsritUf776L4=" }, "is-builtin-module": { "version": "1.0.0", @@ -6741,8 +6767,7 @@ "ms": { "version": "2.0.0", "resolved": "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multicast-dns": { "version": "6.2.3", diff --git a/code/package.json b/code/package.json index 8b80be4..abea911 100755 --- a/code/package.json +++ b/code/package.json @@ -12,6 +12,7 @@ "build": "node build/build.js" }, "dependencies": { + "axios": "^0.18.0", "element-ui": "^2.1.0", "lodash": "^4.17.5", "marked": "^0.3.12", diff --git a/code/src/App.vue b/code/src/App.vue index ebbc9bf..96c2d92 100755 --- a/code/src/App.vue +++ b/code/src/App.vue @@ -3,9 +3,10 @@
monologueH's world!
- - 文章列表 - 个人随笔 + + 首页 + 文章列表 + 个人随笔 - + @@ -37,6 +38,7 @@ export default { methods: { handleSelect(key, keyPath) { console.log(key, keyPath); + } } }; @@ -75,7 +77,7 @@ a{ background-color: #333; > .el-menu-item,.el-submenu__title { text-align: center; - width: 150px; + width: 120px; height: 70px; line-height: 70px; color: #fff; diff --git a/code/src/main.js b/code/src/main.js index 1d662c5..63b3dea 100755 --- a/code/src/main.js +++ b/code/src/main.js @@ -1,7 +1,6 @@ // The Vue build version to load with the `import` command // (runtime-only or standalone) has been set in webpack.base.conf with an alias. import Vue from 'vue' -import App from './App' import router from './router' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' @@ -9,9 +8,16 @@ import './css/Tangerine.css' import Sjld from './components/sjld/index.js' import _ from 'lodash' import 'marked' +import Axios from 'axios' +import {request} from "./utils/request"; +import base from './utils/base' +import App from './App' + Vue.use(ElementUI,{size:'medium'}) Vue.use(Sjld) +Vue.use(base) +Vue.prototype.$axios = Axios; Vue.config.productionTip = false diff --git a/code/src/pages/articleList.vue b/code/src/pages/articleList.vue new file mode 100644 index 0000000..365debc --- /dev/null +++ b/code/src/pages/articleList.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/code/src/pages/blogArticle.vue b/code/src/pages/blogArticle.vue index c1a84f8..b7550d0 100755 --- a/code/src/pages/blogArticle.vue +++ b/code/src/pages/blogArticle.vue @@ -1,7 +1,6 @@ @@ -10,9 +9,7 @@ export default { name: "blogArticle", data() { return { - isCollapse: true, - citys:[{name:1},{name:2},{name:3}], - sheng:[{name:1},{name:2},{name:3}] + }; }, methods: { @@ -22,6 +19,6 @@ export default { - diff --git a/code/src/pages/marked.vue b/code/src/pages/marked.vue index 06c8b0c..48a09d3 100755 --- a/code/src/pages/marked.vue +++ b/code/src/pages/marked.vue @@ -2,15 +2,21 @@
- +
- +
- 保存 + + 保存 取消 @@ -21,26 +27,36 @@