q-koa 13.3.7 → 13.3.9

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

@@ -646,6 +646,10 @@ exports.gpt = async (ctx) => {
       statusCode = 500
       ctx.response.status = statusCode
     }
+
+    if (e.response.status === 400) {
+      throw new Error(e.response.data.message)
+    }
     throw new Error(e.message)
   })
 

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

@@ -29,3 +29,16 @@ exports.clearWeixin = async (ctx) => {
     })
   )
 }
+
+exports.push = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const { message = '测试通知' } = ctx.request.body
+
+  await app.service.log.push({
+    app,
+    message,
+  })
+
+  ctx.SUCCESS('ok')
+}

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

@@ -104,9 +104,10 @@ exports.countAndMaxId = async (ctx, _data) => {
 
   const mapper = {
     TINYINT: 255,
-    SMALLINIT: 65535,
+    SMALLINT: 65535,
     MEDIUMINT: 16777215,
     INT: 4294967295,
+    BIGINT: 18446744073709551615,
   }
   let availableId = 0
   for (const _type in mapper) {
@@ -188,6 +189,9 @@ exports.initModel = async (ctx) => {
             }
           )
           .then((res) => res.data)
+          .catch((e) => {
+            return Promise.resolve({})
+          })
         if (code === 200) {
           const findList = Object.keys(productionModel || {}).filter((key) => {
             return (
@@ -990,8 +994,10 @@ exports.changeIdType = async (ctx) => {
 
   const mapper = {
     INTEGER: 'INT',
+    SMALLINT: 'SMALLINT',
     TINYINT: 'TINYINT',
     MEDIUMINT: 'MEDIUMINT',
+    BIGINT: 'BIGINT',
   }
   if (!mapper[idType]) return ctx.ERROR(`not accept ${idType}`)
 
@@ -1002,19 +1008,43 @@ exports.changeIdType = async (ctx) => {
 
   const query = `ALTER TABLE \`${model}\` MODIFY COLUMN id ${updateTo} NOT NULL AUTO_INCREMENT`
 
-  const target = lodash.pickBy(app.attributes, (obj) => `${model}_id` in obj)
-
+  const target = lodash.pickBy(app.attributes, (obj) => {
+    return (
+      `${model}_id` in obj ||
+      Object.keys(obj).some(
+        (k) => obj[k].belongsTo && obj[k].belongsTo === model
+      )
+    )
+  })
+  // console.log('target', app.attributes.store_balance_date)
   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) {
-      error_message = `请先处理好${_model}的字段类型${model}_id，当前是${
-        _res[`${model}_id`].type
-      }`
-      console.error(error_message)
-      flag = false
+    if (_res[`${model}_id`]) {
+      if (
+        updateTo !== _res[`${model}_id`].type &&
+        !['JSON'].includes(_res[`${model}_id`].type)
+      ) {
+        error_message = `请先处理好${_model}的字段类型${model}_id，当前是${
+          _res[`${model}_id`].type
+        }`
+        console.error(error_message)
+        flag = false
+      }
+    } else {
+      const targetAttribute = lodash.pickBy(app.attributes[_model], (obj) => {
+        return obj.belongsTo && obj.belongsTo === model
+      })
+
+      if (updateTo !== _res[Object.keys(targetAttribute)[0]].type) {
+        error_message = `请先处理好${_model}的字段类型${
+          Object.keys(targetAttribute)[0]
+        }，当前是${_res[Object.keys(targetAttribute)[0]].type}`
+        console.error(error_message)
+        flag = false
+      }
     }
   }
   if (obj.type === updateTo) {
@@ -1027,6 +1057,6 @@ exports.changeIdType = async (ctx) => {
   // ctx.SUCCESS(query)
 
   const result = await app.sequelize.query(query)
-
+  console.log('更新成功')
   ctx.SUCCESS(result)
 }

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

@@ -1917,11 +1917,11 @@ exports.getUserPortrait = async (ctx) => {
   ctx.SUCCESS(result)
 }
 
-exports.getVisitTrend = async (ctx) => {
+exports.getVisitTrend = async (ctx, _data) => {
   const { app, appName } = getAppByCtx(ctx)
   const appConfig = getConfig(app)
 
-  const { config = 'weixin_mp', type = 'day', date } = ctx.request.body
+  const { config = 'weixin_mp', type = 'day', date } = _data || ctx.request.body
   const { app_id, app_secrect } = await appConfig.getObject(config)
 
   const diff = moment().hour() > 8 ? -1 : -2
@@ -1963,8 +1963,17 @@ exports.getVisitTrend = async (ctx) => {
   weixinMp.init()
 
   const result = await weixinMp.getVisitTrend({ ...obj, type })
-  await app.model.weixin_visit.create(result.list[0])
+  if (result && result.list && result.list[0]) {
+    await app.model.weixin_visit.create(result.list[0])
+  } else {
+    return app.controller.weixin.getVisitTrend(ctx, {
+      type,
+      date: moment(date).add(-1, 'days').format('YYYYMMDD'),
+    })
+  }
+
   ctx.SUCCESS(result)
+  return result
 }
 
 exports.getCommentInfo = async (ctx, _data) => {

package/package.json

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