@gingkoo/base-server 0.0.3-alpha.2 → 0.0.4-alpha.1

package/app.js

@@ -34,12 +34,12 @@ class App {
       this.listenSocket();
     }
 
-    this.routes();
-    this.schedule();
-
     if (this.options.expandServer) {
       this.options.expandServer(this.httpServer, this.app, express);
     }
+
+    this.routes();
+    this.schedule();
   }
 
   // 连接数据库

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

@@ -229,10 +229,20 @@ router.get('/config', async function (req, res) {
   if (!data) {
     return res.sendErr('获取配置失败');
   }
+
+  let { qywx_AgentID, qywx_APPID, qywx_REDIRECT } = data;
+
+  config.oauth?.wechat?.qywx_redirect_uri &&
+    (qywx_REDIRECT = config.oauth.wechat.qywx_redirect_uri);
+
+  config.oauth?.wechat?.agentid && (qywx_AgentID = config.oauth.wechat.agentid);
+
+  config.oauth?.wechat?.appid && (qywx_APPID = config.oauth.wechat.appid);
+
   res.sendOk({
-    appid: data.qywx_APPID,
-    agentid: data.qywx_AgentID,
-    redirect_uri: data.qywx_REDIRECT,
+    appid: qywx_APPID,
+    agentid: qywx_AgentID,
+    redirect_uri: qywx_REDIRECT,
   });
 });
 

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

@@ -17,9 +17,15 @@ 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 } = data;
+  let { qywx_AgentID, qywx_APPID, qywx_REDIRECT } = data;
 
-  let qywx_REDIRECT = config.app.qywx_redirect_uri || data.qywx_REDIRECT;
+  // 如果配置文件有 则用配置文件
+  config.oauth?.wechat?.qywx_redirect_uri &&
+    (qywx_REDIRECT = config.oauth.wechat.qywx_redirect_uri);
+
+  config.oauth?.wechat?.agentid && (qywx_AgentID = config.oauth.wechat.agentid);
+
+  config.oauth?.wechat?.appid && (qywx_APPID = config.oauth.wechat.appid);
 
   // qywx_REDIRECT = http://gingkoo.com/teams
   let redirect_uri = `${qywx_REDIRECT}/wechat/auth/oauth/qywx/callback`;
@@ -86,6 +92,11 @@ const getAccessToken = async (corpsecret = '') => {
   let data = await configService.getFromConfig({ GROUP_ID: 'qywx' });
   let { qywx_APPID, qywx_APPKEY } = data;
 
+  // 如果配置文件有 则用配置文件
+  config.oauth?.wechat?.appkey && (qywx_APPKEY = config.oauth.wechat.appkey);
+
+  config.oauth?.wechat?.appid && (qywx_APPID = config.oauth.wechat.appid);
+
   params = {
     corp_id: qywx_APPID,
     corpsecret: corpsecret || qywx_APPKEY,

package/backend/config/index.js

@@ -59,14 +59,60 @@ function gConfig() {
       },
       ignoreCompressionPath: [],
 
-      frontend_config: {
-        load_type: 'iframe', // iframe | micro app
-        home_mode: 'menu', // menu 菜单模式 ｜ page 单页面模式
-        home_url: '', // page 模式地址
+      oauth: {
+        login_type: '', // wechat or account （空则是 查表）
+        quick_login_list: ['wechat'], // 快速登录 给前端 账号密码登录页面展示的
+        wechat: {
+          qywx_redirect_uri: '', // 企业微信授权登录回调地址，一般是 https://gingkoo.com/xxx
+          appid: '',
+          appkey: '',
+          agentid: '',
+        },
+        account_login_url: '', // 账号密码登录地址，空则查表
       },
 
-      oauth: {
-        account_login_url: '',
+      frontend_config: {
+        logo: '', // logo 地址
+        title: '', // 网站标题
+        homepage: {
+          load_type: 'iframe', // iframe | micro_app
+          url: '', // 首页地址
+        },
+        header: {
+          show: false, // 是否线上头部
+          notice: {
+            show: true,
+            trigger: 'hover',
+          },
+          setting: {
+            show: true,
+          },
+          theme: {
+            show: true,
+            trigger: 'hover',
+            default: 'classics',
+          },
+          i18n: {
+            show: true,
+            trigger: 'hover',
+            default: 'zh-CN',
+          },
+          account: {
+            show: true,
+            trigger: 'click',
+            showName: false,
+            showLoginOut: true,
+          },
+        },
+        left_menu: {
+          show: true, // 是否线上左侧菜单
+        },
+        login: {
+          title: '', // 标题
+          desc: '', // 描述
+          banner: '', // 图片地址
+          banner_color: '', // banner 区域背景色
+        },
       },
     },
     serverConfig,

package/backend/router.js

@@ -40,7 +40,7 @@ if (config.isProd) {
   router.use(
     '/',
     createProxyMiddleware({
-      target: 'http://127.0.0.1:2000',
+      target: 'http://127.0.0.1:1001',
       changeOrigin: false,
       ws: true,
       pathRewrite: {
@@ -58,42 +58,58 @@ if (config.isProd) {
   );
 }
 
+function onProxy(o_path, target, pathRewrite) {
+  router.use(
+    o_path,
+    createProxyMiddleware({
+      target,
+      changeOrigin: false,
+      ws: true,
+      pathRewrite,
+      onProxyReq: function (proxyReq, req) {
+        if ('X-Token' in req.cookies) {
+          let tokenData = jwt.verifyToken(req.cookies['X-Token']);
+          if (tokenData) {
+            proxyReq.setHeader('X-Token', req.cookies['X-Token']);
+            tokenData?.data?.userid && proxyReq.setHeader('X-UserId', tokenData.data.userid);
+            // proxyReq.setHeader('X-OrgId', tokenData['orgid']);
+          } else {
+            proxyReq.removeHeader('X-UserId');
+          }
+        } else {
+          proxyReq.removeHeader('X-UserId');
+        }
+        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) => {
-    let pathRewrite = {};
-    if (element.rewrite) {
-      pathRewrite['^' + element.path] = element.rewrite || '';
+    let o_path = element.path;
+
+    if (Array.isArray(o_path) && o_path.length) {
+      o_path.forEach((p) => {
+        let pathRewrite = {};
+        if (element.rewrite) {
+          pathRewrite['^' + p] = element.rewrite || '';
+        }
+        onProxy(p, element.host, pathRewrite);
+      });
+    } else {
+      let pathRewrite = {};
+      if (element.rewrite) {
+        pathRewrite['^' + element.path] = element.rewrite || '';
+      }
+      onProxy(o_path, element.host, pathRewrite);
     }
-    router.use(
-      element.path,
-      createProxyMiddleware({
-        target: element.host,
-        changeOrigin: false,
-        ws: true,
-        pathRewrite: pathRewrite,
-        onProxyReq: function (proxyReq, req) {
-          if ('X-Token' in req.cookies) {
-            let tokenData = jwt.verifyToken(req.cookies['X-Token']);
-            if (tokenData) {
-              proxyReq.setHeader('X-Token', req.cookies['X-Token']);
-              tokenData?.data?.userid && proxyReq.setHeader('X-UserId', tokenData.data.userid);
-              // proxyReq.setHeader('X-OrgId', tokenData['orgid']);
-            } else {
-              proxyReq.removeHeader('X-UserId');
-            }
-          } else {
-            proxyReq.removeHeader('X-UserId');
-          }
-          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);
-          }
-        },
-      }),
-    );
   });
 }
 

package/backend/space.js

@@ -35,19 +35,30 @@ router.use('/team', checkLogin, team);
 router.use('/pages', authCheck, pages);
 
 router.get('/config', async function (req, res) {
-  let logo = await configService.getTeamLogo();
+  let logo = config.frontend_config?.logo || '';
+  if (!logo) {
+    logo = await configService.getTeamLogo();
+  }
 
-  let loginUrl = '';
+  let login_url = '';
   if ((await getLoginMethod()) === loginType.wechat) {
-    loginUrl = '/wechat/auth';
+    login_url = '/wechat/auth';
   } else {
-    loginUrl = '/#/login';
+    login_url = '/#/login';
+  }
+
+  // 如果有配置按配置嘞
+  if (config.oauth?.login_type === 'wechat') {
+    login_url = '/wechat/auth';
+  }
+  if (config.oauth?.login_type === 'account') {
+    login_url = '/#/login';
   }
 
   res.sendOk({
-    loginUrl,
-    logo,
     ...config.frontend_config,
+    login_url,
+    logo,
   });
 });