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

package/backend/config/index.js

@@ -64,6 +64,10 @@ function gConfig() {
         home_mode: 'menu', // menu 菜单模式 ｜ page 单页面模式
         home_url: '', // page 模式地址
       },
+
+      oauth: {
+        account_login_url: '',
+      },
     },
     serverConfig,
   );

package/backend/routers/app.js

@@ -7,6 +7,7 @@ const { userlog } = require('../../backend/common/logger');
 const jwt = require('../utils/jwt');
 const { checkLogin, setTokenCookies } = require('../common/middleware/auth');
 const { join, readFileContent } = require('../utils/path');
+const api = require('../utils/http');
 const userService = require('../common/services/user');
 const generalConfig = require('../common/services/generalConfig');
 const emailService = require('../common/services/email');
@@ -25,26 +26,65 @@ router.post('/login', async (req, res) => {
     res.sendErr('请输入用户名');
     return;
   }
-
-  let userinfo = await userService.getUserInfo(userId);
-  if (!userinfo?.USER_ID) {
-    res.sendErr('用户不存在');
+  if (!password) {
+    res.sendErr('请输入密码');
     return;
   }
 
-  // 判断密码
-  if (userinfo.PASSWD) {
-    let flag = await bcrypt.compare(password, userinfo.PASSWD);
-    if (!flag) {
-      return res.sendErr('密码错误');
+  let userid = null;
+  if (config?.oauth?.account_login_url) {
+    // 统一账号登录
+    let redirect_uri = config.oauth.account_login_url.format({
+      username: userId,
+      password,
+    });
+
+    let resp = await api.get({
+      url: redirect_uri,
+      headers: {
+        'Content-Type': 'application/json',
+        Authorization: `Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjp7ImFwcGlkIjoiOThndmRscm8ifSwiZXhwIjoyMDQ2NzYwNTM5LCJpYXQiOjE3MzE0MDA1Mzl9.EHZi_kvZw7CGGkQ7BoGirdRtkT6nG0pgFBCuF9wXw6I`,
+      },
+    });
+
+    // {
+    //   "access_token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJjb2RlbWFnaWMiLCJleHAiOjE3MzQwNjI2NDMsImlhdCI6MTczNDA1NTQ0MywiaXNzIjoiaWRtIiwic3ViIjoieGlsaW4uZ2FvIn0.6cZQwz2sawEFT5vaMtU_eoGx0CBBllgWhDBSNknmEZM",
+    //   "expires_in": 7200,
+    //   "token_type": "Bearer",
+    //   "user_id": "xilin.gao"
+    // }
+
+    if (resp.isError) {
+      return res.sendErr('账号或密码错误');
+    }
+
+    let { access_token, expires_in, token_type, user_id } = resp;
+    userid = user_id;
+  } else {
+    let userinfo = await userService.getUserInfo(userId);
+    if (!userinfo?.USER_ID) {
+      res.sendErr('用户不存在');
+      return;
     }
+
+    // 判断密码
+    if (userinfo.PASSWD) {
+      let flag = await bcrypt.compare(password, userinfo.PASSWD);
+      if (!flag) {
+        return res.sendErr('密码错误');
+      }
+    }
+    userid = userinfo?.USER_ID;
   }
 
+  if (!userid) {
+    return res.sendErr('用户不存在');
+  }
   let token = jwt.generateToken({
-    userid: userinfo?.USER_ID,
+    userid,
   });
 
-  userlog.info(`用户：${userinfo?.USER_ID} 登录成功，token: ${token}`);
+  userlog.info(`用户：${userid} 登录成功，token: ${token}`);
 
   setTokenCookies(res, token);
   res.sendOk({

package/backend/utils/http.js

@@ -0,0 +1,117 @@
+/**
+ * axios封装
+ * 请求拦截、相应拦截、错误统一处理
+ */
+const axios = require('axios');
+const QS = require('qs');
+
+const SuccessCode = 'OK'; // 业务code 成功的状态码
+
+axios.defaults.timeout = 60000; //请求超时时间
+axios.defaults.withCredentials = false;
+
+const HttpCodeMessage = {
+  200: '服务器成功返回请求的数据。',
+  201: '新建或修改数据成功。',
+  202: '一个请求已经进入后台排队（异步任务）。',
+  204: '删除数据成功。',
+  400: '发出的请求有错误，服务器没有进行新建或修改数据的操作。',
+  401: '用户没有权限（令牌、用户名、密码错误）。',
+  403: '用户得到授权，但是访问是被禁止的。',
+  404: '发出的请求针对的是不存在的记录，服务器没有进行操作。',
+  406: '请求的格式不可得。',
+  410: '请求的资源被永久删除，且不会再得到的。',
+  422: '当创建一个对象时，发生一个验证错误。',
+  500: '服务器发生错误，请检查服务器。',
+  502: '网关错误。',
+  503: '服务不可用，服务器暂时过载或维护。',
+  504: '网关超时。',
+};
+
+// 请求拦截器
+axios.interceptors.request.use(
+  (options) => {
+    options.headers['Content-Type'] = options.headers['Content-Type']
+      ? options.headers['Content-Type']
+      : 'application/json';
+
+    return options;
+  },
+  (error) => {
+    return Promise.reject(error);
+  },
+);
+
+// 响应拦截器
+axios.interceptors.response.use(
+  (response) => {
+    return response;
+  },
+  (error) => {
+    let errorRes = error.response || {};
+    let { status, statusText = '' } = errorRes;
+
+    return {
+      data: {
+        isError: true,
+        code: status,
+        message: HttpCodeMessage[status] || statusText,
+      },
+    };
+  },
+);
+
+const sendRequest = ({ url, method, params, headers, timeout }) => {
+  let options = {
+    url,
+    method,
+    paramsSerializer: function (params) {
+      return QS.stringify(params);
+    },
+  };
+
+  if (method == 'GET') {
+    options.params = params;
+  } else {
+    options.data = params;
+  }
+  if (headers) {
+    options.headers = headers;
+  }
+  if (timeout) {
+    options.timeout = timeout;
+  }
+
+  return new Promise((resolve, reject) => {
+    axios
+      .request(options)
+      .then((result) => {
+        resolve(result.data);
+      })
+      .catch((error) => {
+        return resolve(null);
+      })
+      .finally(() => {});
+  });
+};
+
+class BaseRequest {
+  get(options) {
+    options.method = 'GET';
+    return sendRequest(options);
+  }
+  post(options) {
+    options.method = 'POST';
+    return sendRequest(options);
+  }
+  put(options) {
+    options.method = 'PUT';
+    return sendRequest(options);
+  }
+  del(options) {
+    options.method = 'DELETE';
+    return sendRequest(options);
+  }
+}
+
+module.exports = new BaseRequest();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/base-server",
-  "version": "0.0.3-alpha.1",
+  "version": "0.0.3-alpha.2",
   "description": "",
   "main": "app.js",
   "scripts": {