Merge branch 'master' of https://gitlab.ezijing.com/zhangyanxin/learn-mbaOnline

server/package.json

@@ -33,6 +33,7 @@
     "body-parser": "^1.18.3",
     "child_process": "^1.0.2",
     "connect-history-api-fallback": "^1.6.0",
+    "cors": "^2.8.5",
     "express": "^4.16.4",
     "form-data": "^2.5.0",
     "multer": "^1.4.1",

server/server/controller/ProxyMonitor.js

@@ -159,6 +159,16 @@ const agentProcessor = () => {
       }).catch((e) => {
         res.setHeader('Access-Control-Allow-Origin', req.headers.origin || '*')
         res.setHeader('Access-Control-Allow-Credentials', true)
+        if (e.response && e.response.status === 404 && options.method === 'OPTIONS') {
+          res.setHeader('Access-Control-Allow-Methods', 'PUT, GET, POST, DELETE, OPTIONS')
+          res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Content-Length, Authorization, Accept, X-Requested-With, token, tenant')
+          res.setHeader('Access-Control-Max-Age', 600)
+          res.setHeader('Content-Type', 'text/plain charset=UTF-8')
+          res.setHeader('Content-Length', 0)
+          console.log(123)
+          res.status(204)
+          return
+        }
         /* 记录 请求处理时长 + 请求状态 */
         _reqTime = (new Date().getTime() - _logJson._nodeServerCurrentTime) + 'ms'
         _status = (e.response && e.response.status) || 500

server/server/routes/index.js

 const Router = require('express').Router
+var cors = require('cors')
 const router = Router()
 
 const bodyParser = require('body-parser')
@@ -12,6 +13,11 @@ const _proxy = require('../controller/ProxyMonitor')
 
 router.use(bodyParser.json({ limit: '600mb' }))
 router.use(bodyParser.urlencoded({ extended: true, limit: '600mb' }))
+router.use(cors({
+  origin: 'https://ehall2.ezijing.com/login',
+  allowedHeaders: 'Accept, Content-Type, Referer, Sec-Fetch-Dest, tenant, token, User-Agent',
+  credentials: true
+}))
 
 /* 统一API接口 */
 router.post('/api/ckeditor/img/upload', upload.any(), _ck.ckeditorUpload)