From f7723e1c6056d7f98029d03ffb7ba517b565a67e Mon Sep 17 00:00:00 2001
From: "luk.lu" <luk.lu@faronear.org>
Date: Tue, 6 Jul 2021 10:34:06 +0800
Subject: [PATCH] bugfix: change sol.basetool to so.nettool; remove
 Multer-related code because this is just a simple static web server.

---
 package.json |  4 +---
 server.js    | 27 ++-------------------------
 2 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 79322dd..1e4663e 100644
--- a/package.json
+++ b/package.json
@@ -24,11 +24,9 @@
     "http-proxy": "^1.17.0",
     "method-override": "^2.3.10",
     "morgan": "^1.9.0",
-    "multer": "^1.4.2",
     "serve-favicon": "^2.5.0",
     "sol.enviconfig": "git+https://git.faronear.org/npm/sol.enviconfig",
-    "sol.basetool": "git+https://git.faronear.org/npm/sol.basetool",
-    "sol.webtoken": "git+https://git.faronear.org/npm/sol.webtoken",
+    "sol.nettool": "git+https://git.faronear.org/npm/sol.nettool",
     "vhost": "^3.0.2"
   },
   "devDependencies": {
diff --git a/server.js b/server.js
index 979a90a..7a3550c 100644
--- a/server.js
+++ b/server.js
@@ -1,7 +1,6 @@
 const fs = require('fs')
 const path = require('path')
-const tool = require('sol.basetool')
-const webtoken = require('sol.webtoken')
+const nettool = require('sol.nettool')
 const express = require('express')
 
 const wo = (global.wo = { 
@@ -53,28 +52,6 @@ if (typeof wo.envi.ssl === 'string') {
   server.use(require('body-parser').urlencoded({ extended: false }))
   server.use(require('cookie-parser')())
   server.use(require('compression')())
-  const Multer = require('multer')
-  server.use(
-    Multer({
-      //dest:'./File/', // 这样，不能自定义文件名。
-      storage: Multer.diskStorage({
-        destination: function (req, file, cb) {
-          // 如果直接提供字符串，Multer会负责创建该目录。如果提供函数，你要负责确保该目录存在。
-          let folder = './upload/' // 目录是相对于本应用的入口js的，即相对于 server.js 的位置。
-          cb(null, folder)
-        },
-        filename: function (req, file, cb) {
-          // 注意，req.body 也许还没有信息，因为这取决于客户端发送body和file的顺序。
-          let ext = file.originalname.replace(/^.*\.(\w+)$/, '$1')
-          let _passtokenSource = webtoken.verifyToken(req.headers._passtoken, wo.envi.tokenKey) || {}
-          let filename = `${req.path.replace(/^\/api\d*/, '')}_${_passtokenSource.uuid}_${Date.now()}.${ext}`
-          cb(null, filename)
-        },
-      }),
-      //fileFilter:function(req, file, cb) {},
-      limits: { fileSize: 10485760 },
-    }).single('file')
-  )
 
   /*** 路由 ***/
   // vhost 匹配了域名，就执行；不匹配，就next()
@@ -110,7 +87,7 @@ if (typeof wo.envi.ssl === 'string') {
 
   /*** 启动 Web 服务 ***/
   let webServer
-  let ipv4 = tool.getMyIp()
+  let ipv4 = nettool.getMyIp()
   let portHttp = wo.envi.port || 80
   let portHttps = wo.envi.port || 443
   if ('http' === wo.envi.protocol) {