q-koa 13.8.25 → 13.8.26

package/core/file/plugins/app/controller.js

@@ -7,7 +7,6 @@ exports.login = async (ctx) => {
   const appConfig = getConfig(app)
   const { is_dev } = await appConfig.getObject('base')
   const { uuid } = ctx.request.body
-  console.log(uuid)
   if (!app.attributes.user.uuid) throw new Error(`没有uuid字段`)
 
   const hasUser = await app.model.user.findOne({

package/core/file/plugins/douyin/controller.js

@@ -92,12 +92,12 @@ exports.login_callback = async (ctx) => {
   const rest = userInfoResult.data
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(rest, 'nickname', null),
-      avatar: lodash.get(rest, 'avatar', null),
-      country: lodash.get(rest, 'country', null),
-      city: lodash.get(rest, 'city', null),
-      province: lodash.get(rest, 'province', null),
-      gender: lodash.get(rest, 'gender', null),
+      nick_name: rest.nickname ?? null,
+      avatar: rest.avatar ?? null,
+      country: rest.country ?? null,
+      city: rest.city ?? null,
+      province: rest.province ?? null,
+      gender: rest.gender ?? null,
       openid: rest.open_id,
       user_id: user_id ? Number(user_id) : null,
       access_token: access_token || '',
@@ -207,7 +207,6 @@ exports.createImg = async (ctx) => {
   // const result = await axios.get(url, {
   //   client_key: app_id,
   // }).then(res => res.data)
-  console.log('失败先检查client_key')
   const img = qr.image(url, {
     size: 2,
   })

package/core/file/plugins/toutiao/controller.js

@@ -98,18 +98,17 @@ exports.login = async (ctx) => {
 
   if (!openid) {
     const msg = `找不到openid, errcode:${res.errcode} app_id:${app_id} app_secrect:${app_secrect}`
-    console.log(msg)
-    throw new Error('头条登录失败')
+    throw new Error(msg)
   }
 
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(rest, 'nickName', null),
-      avatar: lodash.get(rest, 'avatarUrl', null),
-      country: lodash.get(rest, 'country', null),
-      city: lodash.get(rest, 'city', null),
-      province: lodash.get(rest, 'province', null),
-      gender: lodash.get(rest, 'gender', null),
+      nick_name: rest.nickName ?? null,
+      avatar: rest.avatarUrl ?? null,
+      country: rest.country ?? null,
+      city: rest.city ?? null,
+      province: rest.province ?? null,
+      gender: rest.gender ?? null,
       openid,
       user_id: lodash.get(ctx.request, `${appName}-user.id`, null),
     },

package/core/file/plugins/weixin/controller.js

@@ -338,10 +338,10 @@ exports.mp_login = async (ctx) => {
 
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(rest, 'nickName', null),
-      avatar: lodash.get(rest, 'avatarUrl', null),
+      nick_name: rest.nickName ?? null,
+      avatar: rest.avatarUrl ?? null,
       openid,
-      unionid: lodash.get(res, 'unionid', null),
+      unionid: res.unionid ?? null,
       appid: app_id,
       user_id: lodash.get(ctx.request, `${appName}-user.id`, null),
     },
@@ -368,6 +368,7 @@ exports.mp_login = async (ctx) => {
    */
 
   const openIdUser = await app.model.mp_user.findOne({
+    attributes: ['id', 'user_id', 'openid'],
     where: {
       openid: post.openid,
     },
@@ -375,14 +376,12 @@ exports.mp_login = async (ctx) => {
 
   let uid
   if (openIdUser) {
-    await app.model.mp_user.update(
-      lodash.omit(post, openIdUser.user_id ? ['user_id'] : []),
-      {
-        where: {
-          openid: post.openid,
-        },
-      }
-    )
+    const { user_id: _omit, ...updatePost } = post
+    await app.model.mp_user.update(updatePost, {
+      where: {
+        openid: post.openid,
+      },
+    })
     if (app.attributes.user.mp_openid) {
       app.model.user.update(
         {
@@ -428,8 +427,7 @@ exports.mp_login = async (ctx) => {
           )
         })
       } catch (e) {
-        console.log('mp_user.create出错了', { ...post })
-        throw new Error(e)
+        throw e
       }
     }
   }
@@ -606,7 +604,6 @@ exports.h5_login_callback = async (ctx) => {
     new Promise((resolve, reject) => {
       client.getAccessToken(c, (err, result) => {
         if (err) {
-          console.log('err===', err)
           return reject(err.data)
         }
         return resolve(result.data)
@@ -616,15 +613,14 @@ exports.h5_login_callback = async (ctx) => {
 
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(data, 'nickname', null),
-      avatar: lodash.get(data, 'headimgurl', null),
+      nick_name: data.nickname ?? null,
+      avatar: data.headimgurl ?? null,
       openid: data.openid,
       appid: app_id,
       user_id: user_id ? Number(user_id) : null,
     },
     (item) => item !== null
   )
-  console.log('post', post)
   /**
    * 查询是否已经有openid
    *
@@ -644,6 +640,7 @@ exports.h5_login_callback = async (ctx) => {
    */
 
   const openIdUser = await app.model.h5_user.findOne({
+    attributes: ['id', 'user_id', 'openid'],
     where: {
       openid: post.openid,
     },
@@ -743,26 +740,23 @@ exports.h5_login_info_callback = async (ctx) => {
     new Promise((resolve, reject) => {
       client.getUserByCode(c, (err, result) => {
         if (err) {
-          console.log('err===', err)
           return reject(err.data)
         }
         return resolve(result)
       })
     })
   const data = await getUserByCode(`${code}`)
-  console.log('========', data)
 
   const post = lodash.pickBy(
     {
-      nick_name: lodash.get(data, 'nickname', null),
-      avatar: lodash.get(data, 'headimgurl', null),
+      nick_name: data.nickname ?? null,
+      avatar: data.headimgurl ?? null,
       openid: data.openid,
       appid: app_id,
       user_id: user_id ? Number(user_id) : null,
     },
     (item) => item !== null
   )
-  console.log('post', post)
   /**
    * 查询是否已经有openid
    *
@@ -782,6 +776,7 @@ exports.h5_login_info_callback = async (ctx) => {
    */
 
   const openIdUser = await app.model.h5_user.findOne({
+    attributes: ['id', 'user_id', 'openid'],
     where: {
       openid: post.openid,
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "q-koa",
-  "version": "13.8.25",
+  "version": "13.8.26",
   "description": "",
   "main": "index.js",
   "scripts": {