@shun-js/user 0.3.8 → 0.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shun-js/user",
-  "version": "0.3.8",
+  "version": "0.4.0",
   "description": "user",
   "keywords": [
     "shun.js",
@@ -34,5 +34,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "47da7a9c11787350795ddd69747acc5fc2437134"
+  "gitHead": "7e605c386a8e569bac8d94872603e2fcda2b3ae0"
 }

package/server/model/UserInfoModel.js

@@ -0,0 +1,48 @@
+// sql
+const sql = require('../sql/UserInfoSQL.js');
+
+/**
+ * getUserInfoById
+ * @param {*} req
+ * @param {*} res
+ * @param {*} id
+ * @returns
+ */
+exports.getUserInfoById = async (req, res, id) => {
+  const methodName = 'getUserInfoById';
+
+  // get user item
+  try {
+    return await req.db.query(sql.getUserInfoById, [id]);
+  } catch (error) {
+    const msg = '获取用户信息失败！';
+    req.logger.error(methodName, msg, error.name, error.message);
+    res.jsonFail(msg);
+  }
+};
+
+/**
+ * addUserInfo
+ * @param {*} req
+ * @param {*} res
+ * @param {*} userItemId
+ * @param {*} githubUserinfo
+ * @returns
+ */
+exports.addUserInfo = async (req, res, userItemId, githubUserinfo) => {
+  const methodName = 'addUserInfo';
+
+  // add user item
+  try {
+    // add user
+    const params = [userItemId, githubUserinfo.login, githubUserinfo.avatar_url, githubUserinfo.email];
+    await req.db.query(sql.addUserInfo, params);
+
+    // r
+    return true;
+  } catch (error) {
+    const msg = '添加用户失败！';
+    req.logger.error(methodName, msg, error.name, error.message);
+    res.jsonFail(msg);
+  }
+};

package/server/model/UserItemModel.js

@@ -43,7 +43,7 @@ exports.addUserItem = async (req, res, mobile) => {
     req.logger.info(methodName, 'encryptPassword', encryptPassword);
 
     // add user
-    const addUserItemRes = await req.db.query(sql.addUserItem, [mobile, encryptPassword, global.QZ_CONFIG.user.from]);
+    const addUserItemRes = await req.db.query(sql.addUserItem, [mobile, encryptPassword, req.body.from || 'null']);
 
     // userItem
     const userItem = {

package/server/service/UserGithubService.js

@@ -1,3 +1,6 @@
+// model
+const { getUserInfoById, addUserInfo } = require('../model/UserInfoModel.js');
+
 // github
 const { getGithubUserinfo } = require('../util/github.js');
 
@@ -38,6 +41,14 @@ exports.userGithub = async (req, res) => {
   if (!userItem) return;
   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 addUserInfoRes = await addUserInfo(req, res, userItem.id, githubUserinfo);
+    if (!addUserInfoRes) return;
+  }
+
   // r
   const finalUser = {
     userid: userItem.id,

package/server/sql/UserInfoSQL.js

@@ -0,0 +1,17 @@
+exports.getUserInfoById = `
+select 
+  * 
+from 
+  t_user_info 
+where 
+  user_item_id=1
+and 
+  del_tag='0'
+`;
+
+exports.addUserInfo = `
+insert into 
+  t_user_info 
+values
+  (null, ?, ?, ?, ?, now(), '0')
+`;