@gingkoo/base-server 0.0.2-alpha.3 → 0.0.2-alpha.31

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',
@@ -31,7 +38,7 @@ const appenders = {
     compress: true,
     numBackups: 7,
   },
-  scheduleLog: {
+  schedulelog: {
     type: 'dateFile',
     filename: path.join(config.app.home, 'logs', 'schedule.log'),
     pattern: 'yyyy-MM-dd.log',
@@ -59,9 +66,13 @@ const categories = {
     appenders: ['console', 'wslog'],
     level: 'debug',
   },
+  userlog: {
+    appenders: ['console', 'userlog'],
+    level: 'debug',
+  },
 
   schedulelog: {
-    appenders: ['console', 'scheduleLog'],
+    appenders: ['console', 'schedulelog'],
     level: 'debug', // 指定等级
   },
   ...config.logger.categories,

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');
 
 // 后端登录
@@ -17,11 +18,9 @@ async function authCheck(req, res, next) {
     let { userid, exp } = data;
     if (userid) {
       req.headers['x-userid'] = userid;
-      let expires = new Date();
-      expires.setDate(expires.getDate() + 3);
       if (exp + 30 * 60 > Math.floor(Date.now() / 1000)) {
         let token = jwt.generateToken(tokenData);
-        res.cookie('X-Token', token, { expires });
+        setTokenCookies(res, token);
       }
     }
     return next();
@@ -55,11 +54,9 @@ function checkLogin(req, res, next) {
     let { userid, exp } = data;
     if (userid) {
       req.headers['x-userid'] = userid;
-      let expires = new Date();
-      expires.setDate(expires.getDate() + 3);
       if (exp + 30 * 60 > Math.floor(Date.now() / 1000)) {
         let token = jwt.generateToken(tokenData);
-        res.cookie('X-Token', token, { expires });
+        setTokenCookies(res, token);
       }
     }
     return next();
@@ -101,9 +98,23 @@ function userAppAuthCheck(req, res, next) {
   return next();
 }
 
+function setTokenCookies(res, token) {
+  let expires = new Date();
+  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 });
+  }
+}
+
 module.exports = {
   authCheck,
   checkLogin,
   appAuthCheck,
   userAppAuthCheck,
+  setTokenCookies,
 };

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/routers/auth.js

@@ -4,6 +4,7 @@ const path = require('path');
 const express = require('express');
 const config = require('../../../config/index');
 
+const { setTokenCookies } = require('../../middleware/auth');
 const authServices = require('../services/auth');
 const ginfoServices = require('../../ginfo/index');
 const userService = require('../../services/user');
@@ -185,7 +186,7 @@ router.get('/oauth/qywx/callback', async function (req, res) {
   let expires = new Date();
   expires.setDate(expires.getDate() + 3);
 
-  res.cookie('X-Token', token, { expires }).redirect(301, redirect_uri);
+  setTokenCookies(res, token).redirect(301, redirect_uri);
 });
 
 router.get('/gettoken', async function (req, res) {

package/backend/config/index.js

@@ -32,8 +32,9 @@ function gConfig() {
       },
 
       jwt: {
-        exp: 60 * 60 * 24 * 3, // 过期时间
+        exp: 3, // 过期时间
         auth_cert: '', // 加盐
+        domain: '', // token cookie 存放域名
       },
 
       proxy: {
@@ -41,7 +42,9 @@ function gConfig() {
       },
 
       scoket: {
-        files: [],
+        files: () => {
+          return [];
+        },
         config: {},
       },
 

package/backend/routers/app.js

@@ -3,8 +3,9 @@ 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 } = require('../common/middleware/auth');
+const { checkLogin, setTokenCookies } = require('../common/middleware/auth');
 const { join, readFileContent } = require('../utils/path');
 const userService = require('../common/services/user');
 const generalConfig = require('../common/services/generalConfig');
@@ -43,11 +44,9 @@ router.post('/login', async (req, res) => {
     userid: userinfo?.USER_ID,
   });
 
-  let expires = new Date();
-  expires.setDate(expires.getDate() + 3);
-
-  res.cookie('X-Token', token, { expires });
+  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/utils/jwt.js

@@ -4,7 +4,7 @@ const config = require('../config');
 // 生成token
 function generateToken(data, forever = false, cert = config?.jwt?.auth_cert) {
   let created = Math.floor(Date.now() / 1000);
-  let exp = created + config.jwt.exp;
+  let exp = created + 60 * 60 * 24 * config.jwt.exp;
   if (forever) {
     exp = created + 60 * 60 * 24 * 365 * 10; // 10 年
   }