q-koa 11.5.0 → 11.5.3

package/core/app.js

@@ -42,7 +42,7 @@ const {
   miLimit,
 } = require('./middlewares')
 const Validator = require('./validator')
-const { ServiceError } = require('./errors')
+const { ServiceError, TransactionError } = require('./errors')
 
 let spinner
 
@@ -1933,6 +1933,7 @@ APP.Random = Random
 
 APP.Validator = Validator
 APP.ServiceError = ServiceError
+APP.TransactionError = TransactionError
 APP.moment = moment
 
 global.moment = moment
@@ -1941,6 +1942,7 @@ global.lodash = _
 
 global.Validator = Validator
 global.ServiceError = ServiceError
+global.TransactionError = TransactionError
 
 APP.sleep = (time) => new Promise((resolve) => setTimeout(resolve, time * 1000))
 

package/core/errors.js

@@ -5,4 +5,13 @@ class ServiceError extends Error {
   }
 }
 
+class TransactionError extends Error {
+  constructor(message) {
+    super(message)
+    this.type = 'transaction'
+  }
+}
+
 exports.ServiceError = ServiceError
+
+exports.TransactionError = TransactionError

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

@@ -12,8 +12,9 @@ const cache = new LRU({
 })
 
 exports.initModel = async (ctx) => {
-  const { app } = getAppByCtx(ctx)
+  const { app, appName } = getAppByCtx(ctx)
   const { model, option } = ctx.request.body
+
   const config = option
     ? {
         [option]: true,
@@ -39,6 +40,34 @@ exports.initModel = async (ctx) => {
     if (Object.keys(app.model[model]).length === 0) {
       return ctx.ERROR('请检查，model为空')
     }
+    if (app.appConfig.productionHost) {
+      const { data: productionModel } = await axios
+        .post(
+          `${app.appConfig.productionHost}/${appName}/system/getTable`,
+          {
+            model,
+          },
+          {
+            headers: {
+              'client-type': 0,
+            },
+          }
+        )
+        .then((res) => res.data)
+      const findList = Object.keys(productionModel).filter((key) => {
+        return (
+          !['id', 'created_at', 'createdid', 'updated_at'].includes(key) &&
+          !Object.keys(app.attributes[model]).includes(key)
+        )
+      })
+      if (findList.length > 0) {
+        return ctx.ERROR(
+          `${model} 线上字段 ${findList.join(
+            '/'
+          )} 不能被删除，请先修改线上model.js`
+        )
+      }
+    }
     const result = await app.model[model].sync(config)
     return ctx.SUCCESS(result)
   } else {

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

@@ -214,6 +214,7 @@ exports.qr_code = async ({
   scene,
   is_oss = false,
   config = 'weixin_mp',
+  width = 200,
 }) => {
   const appConfig = getConfig(app)
   const { app_id, app_secrect } = await appConfig.getObject(config)
@@ -230,6 +231,7 @@ exports.qr_code = async ({
       page,
       is_hyaline,
       scene,
+      width,
     })
     const qr_image = `https://${
       site_host || 'api.kuashou.com'
@@ -252,6 +254,7 @@ exports.qr_code = async ({
       page,
       is_hyaline,
       scene,
+      width,
     })
     const client = new OSS({
       accessKeyId,

package/package.json

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