q-koa 13.3.1 → 13.3.2

package/core/app.js

@@ -163,9 +163,12 @@ class APP {
         return ctx.ERROR('error')
       }
       const appName = url.split('/')[1]
-      if (!appName || !(ctx.app[appName] && ctx.app[appName].appConfig)) {
-        return ctx.ERROR('error')
+      if (appName !== '.well-known') {
+        if (!appName || !(ctx.app[appName] && ctx.app[appName].appConfig)) {
+          return ctx.ERROR('error')
+        }
       }
+
       const { secret, whiteList, _whiteList, tokenKey, expiresIn } =
         ctx.app[appName] && ctx.app[appName].appConfig
           ? ctx.app[appName].appConfig.jwt
@@ -536,7 +539,10 @@ class APP {
     if (this.config.router) {
       this.config.router(router)
     }
-    router.post('*', () => {
+    router.get('/.well-known/pki-validation/fileauth.txt', (ctx) => {
+      ctx.body = this.config.fileauth || '没找到config里的fileauth'
+    })
+    router.post('*', (ctx) => {
       throw new Error('接口路径不符合规范')
     })
     this.app.use(router.routes()).use(router.allowedMethods())
@@ -961,6 +967,23 @@ class APP {
         return ctx.SUCCESS(await app[appName].mock[controller]())
       }
 
+      if (fn === 'groupCount') {
+        if (!ctx.request.body.group) throw new Error('必须要有group')
+        const result = await app[appName].model[controller].findAll({
+          attributes: [
+            ctx.request.body.group,
+            [
+              Sequelize.fn('count', Sequelize.col(ctx.request.body.group)),
+              'count',
+            ],
+          ],
+          group: [ctx.request.body.group],
+          where: ctx.request.body.where,
+          order: [[Sequelize.literal('count'), 'DESC']],
+        })
+        ctx.SUCCESS(result)
+        return
+      }
       if (
         !_.get(app, `${appName}.model.${controller}.${fn}`) &&
         !_.get(app, `${appName}.controller.${controller}.${fn}`)

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

@@ -90,7 +90,8 @@ exports.permission_id = {
   defaultValue: [],
   sortOrder: 5,
   get: function () {
-    return this.getDataValue('permission_id') === null
+    return this.getDataValue('permission_id') === null ||
+      !Array.isArray(this.getDataValue('permission_id'))
       ? []
       : this.getDataValue('permission_id')
   },

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

@@ -1005,15 +1005,15 @@ exports.changeIdType = async (ctx) => {
   const target = lodash.pickBy(app.attributes, (obj) => `${model}_id` in obj)
 
   console.log(`即将更新${model}的ID类型为${updateTo}`)
+  let error_message = ''
   let flag = true
   for (const _model of Object.keys(target)) {
     const _res = await app.sequelize.getQueryInterface().describeTable(_model)
     if (updateTo !== _res[`${model}_id`].type) {
-      console.error(
-        `请先处理好${_model}的字段类型${model}_id，当前是${
-          _res[`${model}_id`].type
-        }`
-      )
+      error_message = `请先处理好${_model}的字段类型${model}_id，当前是${
+        _res[`${model}_id`].type
+      }`
+      console.error(error_message)
       flag = false
     }
   }
@@ -1022,7 +1022,7 @@ exports.changeIdType = async (ctx) => {
   }
 
   if (!flag) {
-    return ctx.ERROR('更新失败')
+    return ctx.ERROR(error_message)
   }
   // ctx.SUCCESS(query)
 

package/package.json

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