From 152783fe8e98ba29fc4d22ef82bbc1cd7aa006b4 Mon Sep 17 00:00:00 2001 From: "luk.lu" Date: Wed, 9 Oct 2019 10:55:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AF=B9=20configSec.js?= =?UTF-8?q?=20=E7=9A=84=E9=9C=80=E6=B1=82=EF=BC=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E5=B5=8C=E5=85=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ConfigBasic.js | 17 ++++++++--------- package.json | 2 +- src/store/modules/login.js | 3 +-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ConfigBasic.js b/ConfigBasic.js index 8158bb2..846fd5d 100644 --- a/ConfigBasic.js +++ b/ConfigBasic.js @@ -1,22 +1,21 @@ module.exports = { - protocol: 'http', - host: 'localhost', + protocol: 'https', + host: 'server.vic.yuanjin.net', port: undefined, // 如果使用 https 协议,必须填写以下内容,或在命令行参数中设置: sslType: 'file', // file|greenlock sslDomainList: [], - sslKey: 'ssl/privkey.pem', // ssl key file, - sslCert: 'ssl/fullchain.pem', // ssl cert file, - sslCA: 'ssl/client-cert.pem', // ssl ca file, - + sslKey: '/etc/letsencrypt/live/server.vic.yuanjin.net/privkey.pem', // ssl key file, + sslCert: '/etc/letsencrypt/live/server.vic.yuanjin.net/fullchain.pem', // ssl cert file, + sslCA: '/etc/letsencrypt/live/server.vic.yuanjin.net/cert.pem', // ssl ca file, deploy: { type: 'web', - host: '', // 待部署到的主机 + host: 'server.vic.yuanjin.net', // 待部署到的主机 port: '22', // 带部署到的主机的 SSH 端口 - dir: '/home/tic/node.console.web', // 待部署到的目录路径 + dir: '/home/adot/vic-admin', // 待部署到的目录路径 dist: 'dist', // 待部署到的文件夹 - user: 'tic', // 登录用户名 + user: 'adot', // 登录用户名 password: '', // 登录用户密码 key: `${process.env.HOME}/.ssh/id_rsa`, // 登录用户私钥文件 }, diff --git a/package.json b/package.json index 0bd0391..03c7360 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "deploy": "node ./node_modules/deployer/deploy.js", "daemon": "cross-env NODE_ENV=production node server.js", "daemon.sup": "cross-env NODE_ENV=production supervisor -i data.log,node_modules,dist -- server.js", - "daemon.pm2": "cross-env NODE_ENV=production pm2 start server.js -name node.console.web", + "daemon.pm2": "cross-env NODE_ENV=production pm2 start server.js --name vic.admin", "lint": "vue-cli-service lint", "test:unit": "vue-cli-service test:unit" }, diff --git a/src/store/modules/login.js b/src/store/modules/login.js index c1b09b0..5dd1ac4 100644 --- a/src/store/modules/login.js +++ b/src/store/modules/login.js @@ -5,7 +5,6 @@ import _ from 'lodash' import ticCrypto from 'tic.crypto' import axios from 'axios' import * as Ticrypto from 'tic.crypto' -import { tokenSec } from '../../../configSec' export default { namespaced: true, @@ -51,7 +50,7 @@ export default { const passwd = Ticrypto.hash(state.passwd) const ts = Date.now() const path = '/admin/in' - const sig = ticCrypto.hash(ts + path + tokenSec, { hasher: 'md5' }) + const sig = ticCrypto.hash(ts + path + 'LimitSaltLOL8080', { hasher: 'md5' }) let result = await axios.post('admin/in', { name: state.username, passwd }, { headers: { ts, sig } }) commit('updateSign', false) if (result.data.code === 0) { From f336d7392bf29746adb6ec7f44862cecd1da9bcb Mon Sep 17 00:00:00 2001 From: "luk.lu" Date: Wed, 9 Oct 2019 10:56:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8=206084?= =?UTF-8?q?2=20=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ConfigBasic.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ConfigBasic.js b/ConfigBasic.js index 846fd5d..a16db79 100644 --- a/ConfigBasic.js +++ b/ConfigBasic.js @@ -1,7 +1,7 @@ module.exports = { protocol: 'https', host: 'server.vic.yuanjin.net', - port: undefined, + port: 60842, // 如果使用 https 协议,必须填写以下内容,或在命令行参数中设置: sslType: 'file', // file|greenlock sslDomainList: [],