From ebab1a3122d8fb045bda32ebf8b4c7ab75697a5d Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Sun, 24 Jan 2021 11:59:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=8E=89=20so.base=EF=BC=8C=E6=8D=A2?= =?UTF-8?q?=E7=94=A8=20npm/sysconfig=20=E5=92=8C=20webtoken?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 5 +++-- server.js | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 783d1fd..11ab2af 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,9 @@ "morgan": "^1.9.0", "multer": "^1.4.2", "serve-favicon": "^2.5.0", - "so.base": "git+https://git.faronear.org/so/so.base", - "vhost": "^3.0.2" + "sysconfig": "git+https://git.faronear.org/npm/sysconfig", + "vhost": "^3.0.2", + "webtoken": "git+https://git.faronear.org/npm/webtoken" }, "devDependencies": { "cross-env": "^7.0.2", diff --git a/server.js b/server.js index 1a95122..eb1d31e 100644 --- a/server.js +++ b/server.js @@ -14,7 +14,7 @@ const Config = Object.assign( ], */ }, - require('so.base/Config.js') + require('sysconfig') ) if (typeof Config.ssl === 'string') { Config.ssl = eval(`(${Config.ssl})`) @@ -25,7 +25,7 @@ if (typeof Config.ssl === 'string') { const express = require('express') const server = express() - const webToken = require('so.base/Webtoken') + const webtoken = require('webtoken') /*** 通用中间件 ***/ server.use(require('morgan')('development' === server.get('env') ? 'dev' : 'combined')) @@ -46,7 +46,7 @@ if (typeof Config.ssl === 'string') { filename: function (req, file, cb) { // 注意,req.body 也许还没有信息,因为这取决于客户端发送body和file的顺序。 let ext = file.originalname.replace(/^.*\.(\w+)$/, '$1') - let _passtokenSource = webToken.verifyToken(req.headers._passtoken, Config.tokenKey) || {} + let _passtokenSource = webtoken.verifyToken(req.headers._passtoken, Config.tokenKey) || {} let filename = `${req.path.replace(/^\/api\d*/, '')}_${_passtokenSource.uuid}_${Date.now()}.${ext}` cb(null, filename) },