q-koa 13.4.1 → 13.4.3

package/core/app.js

@@ -23,7 +23,23 @@ const jwt = require('jsonwebtoken')
 const verify = util.promisify(jwt.verify)
 const fsExtra = require('fs-extra')
 const { getObject, getAppConfig, formatLiteralObj } = require('./file/utils')
-
+const redisVirtual = {
+  hSet: () => {
+    console.log('redisVirtual hSet')
+  },
+  hGet: () => {
+    console.log('redisVirtual hGet')
+  },
+  set: () => {
+    console.log('redisVirtual set')
+  },
+  get: () => {
+    console.log('redisVirtual get')
+  },
+  publish: () => {
+    console.log('redisVirtual publish')
+  },
+}
 const restc = require('./restc')
 const APP_DIR = 'app'
 const PLUGINS_DIR = 'plugins'
@@ -467,6 +483,7 @@ class APP {
         } else {
           this.app[appName] = {
             sequelize: db,
+            redisClient: redisVirtual,
             appConfig: _.defaultsDeep(
               configExist ? require(path.resolve(__dirname, configPath)) : {},
               this.config.app,
@@ -686,7 +703,53 @@ class APP {
                 const indexes = _.cloneDeep(
                   _.get(this.app[appName].config[folder], 'indexList', [])
                 )
+                let hookList = _.cloneDeep(
+                  _.get(this.app[appName].config[folder], 'hookList', [])
+                )
+                if (
+                  hookList.some((h) =>
+                    ['afterDestroy', 'beforeDestroy'].includes(h)
+                  ) &&
+                  !hookList.includes('beforeBulkDestroy')
+                ) {
+                  hookList = [...hookList, 'beforeBulkDestroy']
+                }
+                let reduceHook = {}
+                for (let i = 0; i < hookList.length; i++) {
+                  const hook = hookList[i]
+                  reduceHook = {
+                    ...reduceHook,
+                    [hook]: (target, t) => {
+                      if (['beforeBulkDestroy'].includes(hook)) {
+                        target.individualHooks = true
+                      }
+                      try {
+                        this.app[appName].service &&
+                          this.app[appName].service[folder] &&
+                          this.app[appName].service[folder][hook] &&
+                          this.app[appName].service[folder][hook]({
+                            app: this.app[appName],
+                            model: folder,
+                            hook,
+                            ...(target.toJSON
+                              ? {
+                                  target: target.toJSON(),
+                                }
+                              : {
+                                  target,
+                                }),
+                            ...t,
+                          })
+                      } catch (e) {
+                        console.log(e)
+                      }
 
+                      if (['beforeBulkDestroy'].includes(hook)) {
+                        return target
+                      }
+                    },
+                  }
+                }
                 const instance = this.app[appName].sequelize.define(
                   folder,
                   attributes,
@@ -701,6 +764,7 @@ class APP {
                       plural: `${folder}s`,
                     },
                     hooks: {
+                      ...reduceHook,
                       beforeCreate: (res, t) => {
                         try {
                           if (folder === 'log') {
@@ -1120,7 +1184,7 @@ class APP {
           } = ctx.request.body
           if (['findOne', 'findAll', 'findAndCountAll'].includes(fn)) {
             if (!_.isEmpty(other)) {
-              throw new Error('参数不合理，条件需要放在where里')
+              throw new Error('参数不合理')
             }
           }
 

package/core/config.js

@@ -7,6 +7,7 @@ module.exports = {
     dir: 'public',
   },
   is_check_admin: false,
+  is_token_name: true,
   log: {
     request: true,
   },
@@ -67,6 +68,7 @@ module.exports = {
         'log/create',
         'log/upsert',
         'auto/minute',
+        'auto/second',
       ].every((item) => {
         return !ctx.request.url.includes(item)
       })

package/core/file/plugins/administrator/config.js

@@ -3,7 +3,7 @@ module.exports = {
   belongs: 'auth',
   multiple: false,
   order: [],
-  select: [],
+  select: ['name'],
   excludes: ['query', 'post'],
   reference: [
     {

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

@@ -24,9 +24,15 @@ exports.login = async (ctx) => {
     result = hasUser
   }
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,

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

@@ -439,12 +439,15 @@ exports.verify = async (ctx) => {
   ctx.SUCCESS(result)
 }
 
-const expressFn = async ({ app, express_number: _express_number }) => {
+const expressFn = async ({ app, express_number: _express_number, mobile }) => {
   const appConfig = getConfig(app)
-  const { app_code, express_mobile } = await appConfig.getObject('express')
+  const { app_code, express_mobile: default_express_mobile } =
+    await appConfig.getObject('express')
 
   const express_number = _express_number.replace(/\t/, '').trim()
 
+  const express_mobile = mobile || default_express_mobile
+
   const lastFour = express_mobile
     .split('')
     .slice(express_mobile.length - 4, express_mobile.length)
@@ -501,7 +504,7 @@ const expressFn = async ({ app, express_number: _express_number }) => {
 exports.express = async (ctx) => {
   const { app } = getAppByCtx(ctx)
 
-  const { express_number } = ctx.request.body
+  const { express_number, mobile } = ctx.request.body
 
   if (Array.isArray(express_number)) {
     const result = await Promise.all(
@@ -518,6 +521,7 @@ exports.express = async (ctx) => {
     const result = await expressFn({
       app,
       express_number,
+      mobile,
     })
 
     return ctx.SUCCESS(result)
@@ -674,3 +678,66 @@ exports.gpt = async (ctx) => {
   })
   await sleep(1000000)
 }
+
+exports.copyDB = async (ctx) => {
+  const { app, appName: currentAppName } = getAppByCtx(ctx)
+  const {
+    host = '',
+    ori_appname = '',
+    break_list = [],
+    limit = 3000,
+  } = ctx.request.body
+  if (!host) {
+    throw new Error(`?host`)
+  }
+  const list = Object.keys(app.model)
+  const appName = ori_appname || currentAppName
+
+  for (const model of list) {
+    if (break_list.includes(model)) {
+      console.log(`跳过`)
+      continue
+    }
+    const count = await app.model[model].count()
+    if (count > 0) {
+      console.log(`有数据，跳过`)
+      continue
+    }
+    await app.model[model].sync({
+      force: true,
+    })
+    const url = `${host}/${appName}/${model}/findAll`
+    for (let i = 0; i < 10000; i++) {
+      console.log(`page-${i}`)
+      const { code, data } = await axios
+        .post(url, {
+          offset: i * limit,
+          limit,
+          where: {
+            id: {
+              $gt: 0,
+            },
+          },
+          ...(model === 'setting'
+            ? {
+                raw: true,
+              }
+            : {}),
+          autoInclude: false,
+        })
+        .then((res) => res.data)
+
+      if (code !== 200) {
+        break
+      }
+      await app.model[model].bulkCreate(data)
+      if (data.length < limit) {
+        break
+      }
+    }
+
+    console.log(`${model}结束`)
+  }
+
+  ctx.SUCCESS('ok')
+}

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

@@ -147,9 +147,15 @@ exports.login_callback = async (ctx) => {
     ],
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     h5_user: result.h5_user
       ? {
           openid: result.h5_user && result.h5_user.openid,

package/core/file/plugins/model/model.js

@@ -219,3 +219,10 @@ exports.alias = {
     return name + model
   },
 }
+
+exports.hookList = {
+  type: Sequelize.JSON,
+  comment: 'hook',
+  allowNull: false,
+  defaultValue: [],
+}

package/core/file/plugins/model/service.js

@@ -111,6 +111,7 @@ exports.loadModel = async ({ app, appName }) => {
         deleteCheckList: config.deleteCheckList,
         bulkCreateList: config.bulkCreateList,
         indexList: config.indexList,
+        hookList: config.hookList,
         list: attributes.map((attr, index) => {
           const name = attr.match(/exports.(.*)=/)[1].trim()
           let defaultValue = ''

package/core/file/plugins/model_attributes/config.js

@@ -3,7 +3,14 @@ module.exports = {
   belongs: 'auth',
   multiple: false,
   order: [],
-  select: [],
+  select: [
+    {
+      key: 'model_id',
+    },
+    {
+      key: 'name',
+    },
+  ],
   excludes: [],
   defaultOrder: [],
   comment: {},

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

@@ -157,3 +157,47 @@ exports.html = async (ctx) => {
   </body>
   </html>`
 }
+
+exports.getList = async (ctx, _data) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const { type = 'is_custom' } = _data || ctx.request.body
+
+  const settingList = await app.model.setting.findAll({
+    where: {
+      $or: [
+        {
+          is_front: true,
+        },
+        type
+          ? {
+              extra: {
+                [type]: true,
+              },
+            }
+          : null,
+      ].filter(Boolean),
+    },
+    attributes: {
+      exclude: [
+        'name',
+        'created_at',
+        'updated_at',
+        'createdid',
+        'is_cache',
+        'is_front',
+        'is_control',
+        'extra',
+      ],
+    },
+  })
+
+  const payLoad = settingList.map((item) => {
+    return lodash.omit(item.toJSON(), [
+      'type',
+      item.parent_id === 0 ? '' : 'id',
+    ])
+  })
+  ctx.SUCCESS(payLoad)
+  return payLoad
+}

package/core/file/plugins/setting/model.js

@@ -141,7 +141,13 @@ exports.extra = {
   sortOrder: 9,
   set: function (value) {
     try {
-      const dataValue = typeof value === 'object' ? value : JSON.parse(value)
+      const dataValue =
+        value === null
+          ? {}
+          : typeof value === 'object'
+          ? value
+          : JSON.parse(value)
+
       this.setDataValue('extra', dataValue)
     } catch {
       throw new Error('extra值不合法')

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

@@ -230,12 +230,19 @@ exports.customRouter = async (ctx) => {
   return list
 }
 
-exports.showTables = async (ctx) => {
+exports.showTables = async (ctx, _data) => {
   const { app, appName } = getAppByCtx(ctx)
+  const { omit = [] } = _data || ctx.request.body
 
+  const mapFn = (item) => {
+    if (omit.length === 0) return item
+    return lodash.omit(item.toJSON ? item.toJSON() : item, omit)
+  }
   if (app.cache && app.cache.get('showTables')) {
-    ctx.SUCCESS(app.cache.get('showTables'))
-    return app.cache.get('showTables')
+    const cacheResult = app.cache.get('showTables')
+    const payLoad = cacheResult.map(mapFn)
+    ctx.SUCCESS(payLoad)
+    return payLoad
   }
 
   const pluginDir = path.resolve(
@@ -315,7 +322,13 @@ exports.showTables = async (ctx) => {
       // 可排序字段
       order: lodash.get(target, 'order', []),
       // 默认排序
-      defaultOrder: lodash.get(target, 'defaultOrder', []),
+      defaultOrder: getValueByModelName(
+        target,
+        'defaultOrder',
+        [],
+        model,
+        _model
+      ),
       // 下拉筛选
       select: getValueByModelName(target, 'select', [], model, _model),
       // 是否可以选择批量删除
@@ -356,19 +369,25 @@ exports.showTables = async (ctx) => {
       // can be mock boolean
       mock,
       // reference model query
-      referenceSelect: lodash.get(target, 'referenceSelect', []),
+      referenceSelect: getValueByModelName(
+        target,
+        'referenceSelect',
+        [],
+        model,
+        _model
+      ),
       // 是否可以选择批量删除
       availableSort: lodash.get(target, 'availableSort', false),
       // 用于后台管理不要查询太多数据，常用于表多的model
       autoData: lodash.get(target, 'autoData', null),
       // 有些model需要前置查询其它model数据
-      initList: lodash.get(target, 'initList', []),
+      initList: getValueByModelName(target, 'initList', [], model, _model),
       // 有些table需要前置查询数据
       initTableList: lodash.get(target, 'initTableList', []),
       // 局部更新列表
       editInline: lodash.get(target, 'editInline', {}),
       // 有些model需要前置查询其它model数据
-      comment: lodash.get(target, 'comment', {}),
+      comment: getValueByModelName(target, 'comment', {}, model, _model),
       // 默认查询，覆盖之前
       modelQuery: lodash.get(target, 'modelQuery', {}),
       // 默认更新，覆盖之前
@@ -386,9 +405,10 @@ exports.showTables = async (ctx) => {
     }
   })
 
-  ctx.SUCCESS(models)
-  app.cache && app.cache.set('showTables', models)
-  return models
+  const payLoad = models.map(mapFn)
+  ctx.SUCCESS(payLoad)
+  app.cache && app.cache.set('showTables', models.map(mapFn))
+  return payLoad
 }
 
 exports.getTable = async (ctx) => {

package/core/file/plugins/system/service.js

@@ -80,6 +80,7 @@ exports.initData = async ({ includes, excludes, app, ctx }) => {
             const omit = data && data.omit ? data.omit : []
             const pick = data && data.pick ? data.pick : []
             const cacheData = app.cache.get(`${model}`) || []
+
             const cacheList = cacheData
               .map((i) => (i.toJSON ? i.toJSON() : i))
               .filter((c) => {

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

@@ -160,10 +160,15 @@ exports.login = async (ctx) => {
       ...app.include.user,
     ],
   })
+  const is_token_name = app.appConfig.is_token_name
 
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,

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

@@ -8,6 +8,8 @@ exports.login = async (ctx) => {
 
   const config = _config || ctx.request.header.config || 'weixin_mp'
 
+  const is_token_name = app.appConfig.is_token_name
+
   const where =
     process.env.NODE_ENV !== 'production'
       ? {
@@ -41,7 +43,11 @@ exports.login = async (ctx) => {
   if (_config === 'none') {
     const tokenResult = {
       id: result.id,
-      name: result.name,
+      ...(is_token_name
+        ? {
+            name: result.name,
+          }
+        : {}),
     }
     const token = await app.sign({
       user: tokenResult,
@@ -192,7 +198,11 @@ exports.login = async (ctx) => {
 
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -315,11 +325,12 @@ exports.checkLogin = async (ctx) => {
   const config = _config || 'weixin_mp'
   const appConfig = getConfig(app)
   if (ctx.request[`${appName}-user`] && ctx.request[`${appName}-user`].id) {
+    const { app_id: appid } = await appConfig.getObject(config)
     const h5_user_include = config.includes('h5')
       ? {
           model: app.model.h5_user,
           where: {
-            appid: (await appConfig.getObject(config)).app_id,
+            appid,
           },
           attributes: {
             exclude: ['created_at', 'updated_at', 'createdid'],
@@ -332,7 +343,7 @@ exports.checkLogin = async (ctx) => {
       ? {
           model: app.model.mp_user,
           where: {
-            appid: (await appConfig.getObject(config)).app_id,
+            appid,
           },
         }
       : {
@@ -428,9 +439,15 @@ exports.checkLogin = async (ctx) => {
       }
     }
 
+    const is_token_name = app.appConfig.is_token_name
+
     const tokenResult = {
       id: result.id,
-      name: result.name,
+      ...(is_token_name
+        ? {
+            name: result.name,
+          }
+        : {}),
       mp_user: result.mp_user
         ? {
             openid: result.mp_user && result.mp_user.openid,
@@ -451,6 +468,7 @@ exports.checkLogin = async (ctx) => {
           }
         : {}),
     }
+
     const token = await app.sign({
       user: tokenResult,
     })

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

@@ -130,9 +130,15 @@ exports.mp_getPhone = async (ctx) => {
     ].filter((item) => item.model),
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -251,9 +257,15 @@ exports.mp_getPhoneNew = async (ctx) => {
     ].filter((item) => item.model),
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -492,9 +504,15 @@ exports.mp_login = async (ctx) => {
 
   if (!(result && result.id)) throw new Error('登录失败')
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -671,9 +689,15 @@ exports.h5_login_callback = async (ctx) => {
     ].filter((item) => item.model),
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -805,9 +829,15 @@ exports.h5_login_info_callback = async (ctx) => {
     ].filter((item) => item.model),
   })
 
+  const is_token_name = app.appConfig.is_token_name
+
   const tokenResult = {
     id: result.id,
-    name: result.name,
+    ...(is_token_name
+      ? {
+          name: result.name,
+        }
+      : {}),
     mp_user: result.mp_user
       ? {
           openid: result.mp_user && result.mp_user.openid,
@@ -2044,6 +2074,7 @@ exports.getCommentInfo = async (ctx, _data) => {
   const {
     content: {
       orderInfo: { busiOrderId },
+      content,
     },
   } = info
 
@@ -2060,6 +2091,7 @@ exports.getCommentInfo = async (ctx, _data) => {
   const result = {
     prefix,
     order_id,
+    content,
   }
   ctx.SUCCESS(result)
   return result

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

@@ -687,7 +687,7 @@ exports.pc_pay = async ({
   pay_config = 'weixin_pay',
   out_trade_no: _out_trade_no,
   is_admin = false,
-  type = 'SCAN-WEIXIN',
+  type = 'PC-WEIXIN',
   prefix = '',
 }) => {
   if (!ctx) throw new Error('?ctx')

package/core/file/services/weixinMP.js

@@ -65,6 +65,12 @@ const getShipTemplateUrl =
 const uploadShipUrl =
   'https://api.weixin.qq.com/wxa/sec/order/upload_shipping_info?access_token=%s'
 
+const uploadPreShipUrl =
+  'https://api.weixin.qq.com/wxa/sec/order/opspecialorder?access_token=%s'
+
+const getShipOrderListUrl =
+  'https://api.weixin.qq.com/wxa/sec/order/get_order_list?access_token=%s'
+
 const setMsgJumpPathUrl =
   'https://api.weixin.qq.com/wxa/sec/order/set_msg_jump_path?access_token=%s'
 
@@ -786,6 +792,44 @@ module.exports = class Singleton {
     return result
   }
 
+  async uploadPreShip(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(uploadPreShipUrl, access_token)
+
+    const result = await axios
+      .post(url, {
+        ...payLoad,
+      })
+      .then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.uploadPreShip(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
+  async getShipOrderList(payLoad) {
+    const access_token = await this.getAccessToken()
+    const url = util.format(getShipOrderListUrl, access_token)
+
+    const result = await axios
+      .post(url, {
+        ...payLoad,
+      })
+      .then((res) => res.data)
+    if (result.errcode) {
+      if (result.errcode === 40001) {
+        cache.reset()
+        return await this.getShipOrderList(payLoad)
+      }
+      throw new Error(`${result.errcode};${result.errmsg}`)
+    }
+    return result
+  }
+
   async uploadImage(payLoad) {
     const access_token = await this.getAccessToken()
     const { upload_type, resp_type, ...rest } = payLoad

package/package.json

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