删掉 so.base,换用 npm/sysconfig 和 webtoken

This commit is contained in:
陆柯 2021-01-24 11:59:03 +08:00
parent 4aab66a02f
commit ebab1a3122
2 changed files with 6 additions and 5 deletions

View File

@ -15,8 +15,9 @@
"morgan": "^1.9.0", "morgan": "^1.9.0",
"multer": "^1.4.2", "multer": "^1.4.2",
"serve-favicon": "^2.5.0", "serve-favicon": "^2.5.0",
"so.base": "git+https://git.faronear.org/so/so.base", "sysconfig": "git+https://git.faronear.org/npm/sysconfig",
"vhost": "^3.0.2" "vhost": "^3.0.2",
"webtoken": "git+https://git.faronear.org/npm/webtoken"
}, },
"devDependencies": { "devDependencies": {
"cross-env": "^7.0.2", "cross-env": "^7.0.2",

View File

@ -14,7 +14,7 @@ const Config = Object.assign(
], ],
*/ */
}, },
require('so.base/Config.js') require('sysconfig')
) )
if (typeof Config.ssl === 'string') { if (typeof Config.ssl === 'string') {
Config.ssl = eval(`(${Config.ssl})`) Config.ssl = eval(`(${Config.ssl})`)
@ -25,7 +25,7 @@ if (typeof Config.ssl === 'string') {
const express = require('express') const express = require('express')
const server = express() const server = express()
const webToken = require('so.base/Webtoken') const webtoken = require('webtoken')
/*** 通用中间件 ***/ /*** 通用中间件 ***/
server.use(require('morgan')('development' === server.get('env') ? 'dev' : 'combined')) server.use(require('morgan')('development' === server.get('env') ? 'dev' : 'combined'))
@ -46,7 +46,7 @@ if (typeof Config.ssl === 'string') {
filename: function (req, file, cb) { filename: function (req, file, cb) {
// 注意req.body 也许还没有信息因为这取决于客户端发送body和file的顺序。 // 注意req.body 也许还没有信息因为这取决于客户端发送body和file的顺序。
let ext = file.originalname.replace(/^.*\.(\w+)$/, '$1') 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}` let filename = `${req.path.replace(/^\/api\d*/, '')}_${_passtokenSource.uuid}_${Date.now()}.${ext}`
cb(null, filename) cb(null, filename)
}, },