@shun-js/user 0.4.2 → 0.4.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/user",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "user",
   "keywords": [
     "shun.js",
@@ -34,5 +34,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "e1d550be00818ca0da0e1f89cfe81a6df70123ed"
+  "gitHead": "2defaa9089506eb53bcae4d248d281b98465e6ad"
 }

package/server/model/UserInfoModel.js

@@ -2,18 +2,18 @@
 const sql = require('../sql/UserInfoSQL.js');
 
 /**
- * getUserInfoById
+ * isUserInfoExists
  * @param {*} req
  * @param {*} res
  * @param {*} id
  * @returns
  */
-exports.getUserInfoById = async (req, res, id) => {
-  const methodName = 'getUserInfoById';
+exports.isUserInfoExists = async (req, res, id) => {
+  const methodName = 'isUserInfoExists';
 
   // get user item
   try {
-    return await req.db.query(sql.getUserInfoById, [id]);
+    return await req.db.query(sql.isUserInfoExists, [id]);
   } catch (error) {
     const msg = '获取用户信息失败！';
     req.logger.error(methodName, msg, error.name, error.message);
@@ -46,3 +46,31 @@ exports.addUserInfo = async (req, res, userItemId, githubUserinfo) => {
     res.jsonFail(msg);
   }
 };
+
+/**
+ * getUserInfoById
+ * @param {*} req
+ * @param {*} res
+ * @param {*} id
+ * @returns
+ */
+exports.getUserInfoById = async (req, res, id) => {
+  const methodName = 'getUserInfoById';
+
+  // get user item
+  try {
+    const getUserInfoByIdRes = await req.db.query(sql.getUserInfoById, [id]);
+    if (getUserInfoByIdRes.length !== 1) {
+      const msg = '用户信息长度非1！';
+      req.logger.error(methodName, msg);
+      res.jsonFail(msg);
+      return;
+    }
+
+    return getUserInfoByIdRes[0];
+  } catch (error) {
+    const msg = '获取用户信息失败！';
+    req.logger.error(methodName, msg, error.name, error.message);
+    res.jsonFail(msg);
+  }
+};

package/server/service/UserGithubService.js

@@ -1,5 +1,5 @@
 // model
-const { getUserInfoById, addUserInfo } = require('../model/UserInfoModel.js');
+const { addUserInfo, isUserInfoExists } = require('../model/UserInfoModel.js');
 
 // github
 const { getGithubUserinfo } = require('../util/github.js');
@@ -42,9 +42,9 @@ exports.userGithub = async (req, res) => {
   req.logger.info(methodName, 'github login or reg ok');
 
   // user info
-  const getUserInfoByIdRes = await getUserInfoById(req, res, userItem.id);
-  if (!getUserInfoByIdRes) return;
-  if (getUserInfoByIdRes.length === 0) {
+  const isUserInfoExistsRes = await isUserInfoExists(req, res, userItem.id);
+  if (!isUserInfoExistsRes) return;
+  if (isUserInfoExistsRes.length === 0) {
     const addUserInfoRes = await addUserInfo(req, res, userItem.id, githubUserinfo);
     if (!addUserInfoRes) return;
   }

package/server/service/UserInfoService.js

@@ -1,6 +1,9 @@
 // model
 const { getUserInfoById } = require('../model/UserInfoModel.js');
 
+// util
+const { getUserAccessToken } = require('../util/user.js');
+
 /**
  * userInfo
  * @param {*} req
@@ -23,6 +26,10 @@ exports.userInfo = async (req, res) => {
   const getUserInfoByIdRes = await getUserInfoById(req, res, userid);
   if (!getUserInfoByIdRes) return;
 
+  // access token
+  const accessToken = await getUserAccessToken(req, userid);
+  getUserInfoByIdRes.accessToken = accessToken;
+
   // r
   res.jsonSuccess('登录成功！', getUserInfoByIdRes);
 };

package/server/sql/UserInfoSQL.js

@@ -1,12 +1,13 @@
-exports.getUserInfoById = `
+exports.isUserInfoExists = `
 select 
-  * 
+  1 
 from 
   t_user_info 
 where 
   user_item_id=?
 and 
   del_tag='0'
+LIMIT 1
 `;
 
 exports.addUserInfo = `
@@ -15,3 +16,15 @@ insert into
 values
   (null, ?, ?, ?, ?, now(), '0')
 `;
+
+exports.getUserInfoById = `
+select 
+  * 
+from 
+  t_user_info 
+where 
+  user_item_id=?
+and 
+  del_tag='0'
+LIMIT 1
+`;

package/server/util/user.js

@@ -1,5 +1,5 @@
 // qiao
-const { AESEncrypt } = require('qiao-encode');
+const { AESEncrypt, uuid } = require('qiao-encode');
 
 // model
 const { getUserItemByName, addUserItem } = require('../model/UserItemModel.js');
@@ -60,3 +60,21 @@ exports.loginORRegUser = async (req, res, mobileOREmail) => {
   // r
   return userItem;
 };
+
+/**
+ * getUserAccessToken
+ * @param {*} req
+ * @param {*} userid
+ * @returns
+ */
+exports.getUserAccessToken = async (req, userid) => {
+  // get
+  const acKey = `ac-${userid}`;
+  const accessToken = await req.redis.get(acKey);
+  if (accessToken) return accessToken;
+
+  // set
+  const newAccessToken = uuid();
+  await req.redis.set(acKey, newAccessToken);
+  return newAccessToken;
+};