@shun-js/user 0.3.3 → 0.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/user",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "user",
   "keywords": [
     "shun.js",
@@ -34,5 +34,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "a916a86ad6f2253239e446c2f8a9890a1fa6164d"
+  "gitHead": "ff2465fb870eea80a1447911e3bfbe8121b5ed28"
 }

package/server/service/UserItemService.js

@@ -2,10 +2,10 @@
 const { AESEncrypt } = require('qiao-encode');
 
 // model
-const { getUserItemByName, addUserItem, getUserItemById } = require('../model/UserItemModel.js');
+const { getUserItemById } = require('../model/UserItemModel.js');
 
-// feishu
-const { feishuBot } = require('@shun-js/shun-service');
+// util
+const { loginORRegUser } = require('../util/user.js');
 
 /**
  * userLogin
@@ -48,45 +48,8 @@ exports.userLogin = async (req, res) => {
   }
 
   // user item
-  const getUserItemRes = await getUserItemByName(req, res, mobile);
-  if (!getUserItemRes) return;
-
-  // reg
-  if (getUserItemRes.length !== 1) {
-    // add user
-    const addUserItemRes = await addUserItem(req, res, mobile);
-    if (!addUserItemRes) return;
-
-    // feishu
-    const finalMsg = `【提醒】success - ${methodName} - new user reg - ${addUserItemRes.id}`;
-    const feishuBotRes = await feishuBot({
-      url: global.QZ_CONFIG.feishu.url,
-      feishuUrl: global.QZ_CONFIG.feishu.feishuUrl,
-      feishuMsg: finalMsg,
-    });
-    req.logger.warn(methodName, 'feishuBotRes', feishuBotRes);
-
-    // r
-    res.jsonSuccess('登录成功！', addUserItemRes);
-    return;
-  }
-
-  // login
-  const user = getUserItemRes[0];
-  const userItem = {
-    id: user.id,
-    usertoken: AESEncrypt(mobile + user.user_item_password, global.QZ_CONFIG.encryptKey),
-    usermobile: mobile,
-  };
-
-  // feishu
-  const finalMsg = `【提醒】success - ${methodName} - user login - ${userItem.id}`;
-  const feishuBotRes = await feishuBot({
-    url: global.QZ_CONFIG.feishu.url,
-    feishuUrl: global.QZ_CONFIG.feishu.feishuUrl,
-    feishuMsg: finalMsg,
-  });
-  req.logger.warn(methodName, 'feishuBotRes', feishuBotRes);
+  const userItem = await loginORRegUser(mobile);
+  if (!userItem) return;
 
   // r
   res.jsonSuccess('登录成功！', userItem);

package/server/util/user.js

@@ -0,0 +1,62 @@
+// qiao
+const { AESEncrypt } = require('qiao-encode');
+
+// model
+const { getUserItemByName, addUserItem } = require('../model/UserItemModel.js');
+
+// feishu
+const { feishuBot } = require('@shun-js/shun-service');
+
+/**
+ * loginORRegUser
+ * @param {*} req
+ * @param {*} res
+ * @param {*} mobileOREmail
+ * @returns
+ */
+exports.loginORRegUser = async (req, res, mobileOREmail) => {
+  const methodName = 'loginORRegUser';
+
+  // user item
+  const getUserItemRes = await getUserItemByName(req, res, mobileOREmail);
+  if (!getUserItemRes) return;
+
+  // reg
+  if (getUserItemRes.length !== 1) {
+    // add user
+    const addUserItemRes = await addUserItem(req, res, mobileOREmail);
+    if (!addUserItemRes) return;
+
+    // feishu
+    const finalMsg = `【提醒】success - ${methodName} - new user reg - ${addUserItemRes.id}`;
+    const feishuBotRes = await feishuBot({
+      url: global.QZ_CONFIG.feishu.url,
+      feishuUrl: global.QZ_CONFIG.feishu.feishuUrl,
+      feishuMsg: finalMsg,
+    });
+    req.logger.warn(methodName, 'feishuBotRes', feishuBotRes);
+
+    // r
+    return addUserItemRes;
+  }
+
+  // login
+  const user = getUserItemRes[0];
+  const userItem = {
+    id: user.id,
+    usertoken: AESEncrypt(mobileOREmail + user.user_item_password, global.QZ_CONFIG.encryptKey),
+    usermobile: mobileOREmail,
+  };
+
+  // feishu
+  const finalMsg = `【提醒】success - ${methodName} - user login - ${userItem.id}`;
+  const feishuBotRes = await feishuBot({
+    url: global.QZ_CONFIG.feishu.url,
+    feishuUrl: global.QZ_CONFIG.feishu.feishuUrl,
+    feishuMsg: finalMsg,
+  });
+  req.logger.warn(methodName, 'feishuBotRes', feishuBotRes);
+
+  // r
+  return userItem;
+};