@gingkoo/base-server 0.0.1-alpha.1 → 0.0.1-alpha.2

package/app.js

@@ -15,7 +15,8 @@ const router = require('./backend/router');
 class App {
   /**
    * @param {string} optinos.timeout 超时时间 默认 30s
-   * @param {(app: any) => void} optinos.routes
+   * @param {(app: any, express: any) => void} optinos.beforeRoutes 在前面注册路由
+   * @param {(app: any, express: any) => void} optinos.afterRoutes 在后面注册路由
    */
   constructor(options = {}) {
     this.options = options;
@@ -65,10 +66,13 @@ class App {
   }
 
   routes() {
-    if (this.options.routes) {
-      this.options.routes(this.app);
+    if (this.options.beforeRoutes) {
+      this.options.beforeRoutes(this.app, express);
     }
     this.app.use('/', router);
+    if (this.options.afterRoutes) {
+      this.options.afterRoutes(this.app, express);
+    }
   }
 
   listenSocket() {

package/backend/router.js

@@ -27,6 +27,33 @@ router.use('/fss', fss);
 router.use('/wechat', wechat);
 router.use('/space', space);
 
+// 前端
+router.use('/static', express.static(path.join(__dirname, '../static')));
+
+if (config.isProd) {
+  router.use('/', express.static(path.join(__dirname, '../dist')));
+} else {
+  router.use(
+    '/',
+    createProxyMiddleware({
+      target: 'http://127.0.0.1:2000',
+      changeOrigin: false,
+      ws: true,
+      pathRewrite: {
+        '^/': '',
+      },
+      onProxyReq: function (proxyReq, req, res) {
+        if (req.body) {
+          let bodyData = JSON.stringify(req.body);
+          proxyReq.setHeader('Content-Type', 'application/json');
+          proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));
+          proxyReq.write(bodyData);
+        }
+      },
+    }),
+  );
+}
+
 // 反向代理
 if (Array.isArray(config?.proxy?.targets)) {
   config.proxy.targets.forEach((element) => {
@@ -46,8 +73,8 @@ if (Array.isArray(config?.proxy?.targets)) {
             let tokenData = jwt.verifyToken(req.cookies['X-Token']);
             if (tokenData) {
               proxyReq.setHeader('X-Token', req.cookies['X-Token']);
-              proxyReq.setHeader('X-UserId', tokenData['userid']);
-              proxyReq.setHeader('X-OrgId', tokenData['orgid']);
+              tokenData?.data?.userid && proxyReq.setHeader('X-UserId', tokenData.data.userid);
+              // proxyReq.setHeader('X-OrgId', tokenData['orgid']);
             } else {
               proxyReq.removeHeader('X-UserId');
             }
@@ -66,31 +93,4 @@ if (Array.isArray(config?.proxy?.targets)) {
   });
 }
 
-// 前端
-router.use('/static', express.static(path.join(__dirname, '../static')));
-
-if (config.isProd) {
-  router.use('/', express.static('dist'));
-} else {
-  router.use(
-    '/',
-    createProxyMiddleware({
-      target: 'http://127.0.0.1:2000',
-      changeOrigin: false,
-      ws: true,
-      pathRewrite: {
-        '^/': '',
-      },
-      onProxyReq: function (proxyReq, req, res) {
-        if (req.body) {
-          let bodyData = JSON.stringify(req.body);
-          proxyReq.setHeader('Content-Type', 'application/json');
-          proxyReq.setHeader('Content-Length', Buffer.byteLength(bodyData));
-          proxyReq.write(bodyData);
-        }
-      },
-    }),
-  );
-}
-
 module.exports = router;