@gingkoo/base-server 0.0.2-alpha.8 → 0.0.3-alpha.1

package/app.js

@@ -15,9 +15,11 @@ const router = require('./backend/router');
 class App {
   /**
    * @param {string} optinos.timeout 超时时间 默认 30s
+   * @param {boolean} optinos.closeSocket 是否关闭socket 默认 false 不关闭
    * @param {(app: any, express: any) => void} optinos.middleware 注册中间件
    * @param {(app: any, express: any) => void} optinos.beforeRoutes 在前面注册路由
    * @param {(app: any, express: any) => void} optinos.afterRoutes 在后面注册路由
+   * @param {(server: any, app: any, express: any) => void} optinos.expandServer 扩展 server
    */
   constructor(options = {}) {
     this.options = options;
@@ -27,10 +29,17 @@ class App {
 
     this.connectDB();
     this.middleware();
+
+    if (!options.closeSocket) {
+      this.listenSocket();
+    }
+
     this.routes();
     this.schedule();
 
-    this.listenSocket();
+    if (this.options.expandServer) {
+      this.options.expandServer(this.httpServer, this.app, express);
+    }
   }
 
   // 连接数据库
@@ -50,7 +59,11 @@ class App {
     this.app.use(cors);
     this.app.use(response);
     this.app.use((req, res, next) => {
-      if (~req.path.indexOf('/sse')) {
+      let ignoreCompressionPath = config.ignoreCompressionPath;
+      if (
+        Array.isArray(ignoreCompressionPath) &&
+        ignoreCompressionPath.find((v) => ~req.path.indexOf(v))
+      ) {
         return next();
       }
 

package/backend/common/logger/index.js

@@ -23,6 +23,13 @@ const appenders = {
     compress: false,
     numBackups: 7,
   },
+  userlog: {
+    type: 'dateFile',
+    filename: path.join(config.app.home, 'logs', 'user.log'),
+    pattern: 'yyyy-MM-dd.log',
+    compress: false,
+    numBackups: 7,
+  },
 
   infolog: {
     type: 'dateFile',
@@ -59,6 +66,10 @@ const categories = {
     appenders: ['console', 'wslog'],
     level: 'debug',
   },
+  userlog: {
+    appenders: ['console', 'userlog'],
+    level: 'debug',
+  },
 
   schedulelog: {
     appenders: ['console', 'schedulelog'],

package/backend/common/middleware/auth.js

@@ -1,6 +1,7 @@
 'use strict';
 const jwt = require('../../utils/jwt');
 const config = require('../../config/index');
+const { userlog } = require('../logger');
 const { loginType, getLoginMethod } = require('../services/login');
 
 // 后端登录
@@ -102,8 +103,10 @@ function setTokenCookies(res, token) {
   expires.setDate(expires.getDate() + config.jwt.exp);
 
   if (config.jwt.domain) {
+    userlog.info(`domain: ${config.jwt.domain}`);
     return res.cookie('X-Token', token, { expires, domain: config.jwt.domain });
   } else {
+    userlog.info('不用 domain');
     return res.cookie('X-Token', token, { expires });
   }
 }

package/backend/common/socket.js

@@ -1,7 +1,7 @@
 const config = require('../config/index');
 
 class Socket {
-  scokets = config.scoket.files;
+  scokets = config.scoket?.files?.() || [];
   constructor(io) {
     this.io = io;
     this.dispenseNamespace();

package/backend/common/wechat/services/auth.js

@@ -1,6 +1,7 @@
 var httpclient = require('node-httpclient');
 var util = require('../../../utils/util');
 const jwt = require('../../../utils/jwt');
+const config = require('../../../config/index');
 const { logger } = require('../../logger');
 const userService = require('../../services/user');
 const configService = require('../../services/generalConfig');
@@ -16,7 +17,10 @@ const ginfoServices = require('../../ginfo/index');
 const getRedirectUrl = async (userAgent) => {
   let auth_redirect_url = '';
   let data = await configService.getFromConfig({ GROUP_ID: 'qywx' });
-  let { qywx_AgentID, qywx_APPID, qywx_REDIRECT } = data;
+  let { qywx_AgentID, qywx_APPID } = data;
+
+  let qywx_REDIRECT = config.app.qywx_redirect_uri || data.qywx_REDIRECT;
+
   // qywx_REDIRECT = http://gingkoo.com/teams
   let redirect_uri = `${qywx_REDIRECT}/wechat/auth/oauth/qywx/callback`;
 

package/backend/config/index.js

@@ -29,6 +29,7 @@ function gConfig() {
       app: {
         home: path.resolve('app_home'), // 资源存放的磁盘位置 （绝对路径）
         redirect_uri: '',
+        qywx_redirect_uri: '',
       },
 
       jwt: {
@@ -42,7 +43,9 @@ function gConfig() {
       },
 
       scoket: {
-        files: [],
+        files: () => {
+          return [];
+        },
         config: {},
       },
 
@@ -54,6 +57,13 @@ function gConfig() {
       site: {
         title: '',
       },
+      ignoreCompressionPath: [],
+
+      frontend_config: {
+        load_type: 'iframe', // iframe | micro app
+        home_mode: 'menu', // menu 菜单模式 ｜ page 单页面模式
+        home_url: '', // page 模式地址
+      },
     },
     serverConfig,
   );

package/backend/routers/app.js

@@ -3,6 +3,7 @@ var express = require('express');
 const nodemailer = require('nodemailer');
 const bcrypt = require('bcryptjs');
 const config = require('../config');
+const { userlog } = require('../../backend/common/logger');
 const jwt = require('../utils/jwt');
 const { checkLogin, setTokenCookies } = require('../common/middleware/auth');
 const { join, readFileContent } = require('../utils/path');
@@ -43,6 +44,8 @@ router.post('/login', async (req, res) => {
     userid: userinfo?.USER_ID,
   });
 
+  userlog.info(`用户：${userinfo?.USER_ID} 登录成功，token: ${token}`);
+
   setTokenCookies(res, token);
   res.sendOk({
     token,

package/backend/routers/module.js

@@ -46,16 +46,17 @@ router.get('/getMenu', async function (req, res) {
   if (!Array.isArray(modules)) {
     return res.sendOk([]);
   }
-  let member = await servicesServices.getSystemPower();
+  // TODO. 这里用写死成员过滤 teams-system 感觉不合适 先注释掉
+  // let member = await servicesServices.getSystemPower();
 
-  if (!Array.isArray(member)) member = [];
+  // if (!Array.isArray(member)) member = [];
 
-  member = member.filter((v) => v?.userid);
+  // member = member.filter((v) => v?.userid);
   // modules = modules.filter((v) => member.includes(userid) || v.MODULE_ID !== 'teams-system');
 
   // 先过滤掉权限
-  // let permissionModules = await userPermissionModules(userid);
-  // modules = modules.filter((v) => permissionModules.includes(v.MODULE_ID));
+  let permissionModules = await userPermissionModules(userid);
+  modules = modules.filter((v) => permissionModules.includes(v.MODULE_ID));
 
   let data = await Promise.all(
     modules.map(async (v) => {

package/backend/routers/team/routers/teaminfo.js

@@ -17,11 +17,11 @@ router.get('/', async function (req, res) {
 
 router.put('/', async function (req, res) {
   let param = req.body;
-  const { error, results } = teaminfoService.modifyTeamInfo(param);
+  const [error] = await teaminfoService.modifyTeamInfo(param);
   if (error) {
-    return res.sendErr(error);
+    return res.sendErr(error?.message || '');
   }
-  return res.sendOk('');
+  res.sendOk();
 });
 
 module.exports = router;

package/backend/routers/team/services/teaminfo.js

@@ -12,8 +12,8 @@ const teaminfoService = {
     const { sql, params } = await updateSqlBuilder(entity.IDM_ORGS, param, {
       ORG_ID: global.orgid,
     });
-    let result = await sqlExecutor(sql, params);
-    return result;
+    let { error } = await sqlExecutor(sql, params);
+    return [error];
   },
 };
 

package/backend/space.js

@@ -2,6 +2,7 @@
 var express = require('express');
 const { checkLogin, authCheck } = require('./common/middleware/auth');
 const { loginType, getLoginMethod } = require('./common/services/login');
+const config = require('./config');
 const automateRouter = require('./routers/automate');
 const app = require('./routers/app');
 const users = require('./routers/user');
@@ -46,6 +47,7 @@ router.get('/config', async function (req, res) {
   res.sendOk({
     loginUrl,
     logo,
+    ...config.frontend_config,
   });
 });