q-koa 10.5.0 → 10.5.2

package/core/app.js

@@ -362,15 +362,16 @@ class APP {
       )
 
       try {
-        const db = connectDatabase(appName)(this.config.db)
+        const dbName = this.config.db.name || appName
+        const db = connectDatabase(dbName)(this.config.db)
         if (!is_dev) {
           if (!dbFlag) {
-            console.log(chalk.green(`检查${appName}数据库`))
+            console.log(chalk.green(`检查${dbName}数据库`))
             await db.authenticate()
             dbFlag = true
           }
         } else {
-          console.log(chalk.green(`检查${appName}数据库`))
+          console.log(chalk.green(`检查${dbName}数据库`))
           await db.authenticate()
         }
         const configPath = `${rootDirectory}/${APP_DIR}/${appName}/config.js`
@@ -956,6 +957,7 @@ class APP {
             excludeInclude,
             raw = false,
             is_split = false,
+            autoInclude = true,
             omit = [],
             ...other
           } = ctx.request.body
@@ -1008,7 +1010,10 @@ class APP {
                 ? _.uniqWith(
                     [
                       ...strInclude,
-                      ...app[appName].include[controller].filter((item) => {
+                      ...(autoInclude
+                        ? app[appName].include[controller]
+                        : []
+                      ).filter((item) => {
                         return !strInclude.some(
                           (i) =>
                             (i.model && i.model.getName()) ===
@@ -1023,7 +1028,9 @@ class APP {
             myInclude = null
           } else {
             myInclude = app[appName].include
-              ? app[appName].include[controller]
+              ? autoInclude
+                ? app[appName].include[controller]
+                : []
               : null
           }
 

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

@@ -527,3 +527,52 @@ exports.mockPay = async (ctx) => {
   })
   ctx.SUCCESS('ok')
 }
+
+exports.copyOther = async (ctx) => {
+  const { app, appName } = getAppByCtx(ctx)
+
+  const { model, source } = ctx.request.body
+  if (!model) return ctx.ERROR('model?')
+  if (!source) return ctx.ERROR('source? https://www.kuashou.com/kuashou')
+  let list = []
+  if (Array.isArray(model)) {
+    list = model
+  } else {
+    if (model !== 'all') {
+      list = [model]
+    } else {
+      const result = await app.sequelize.showAllSchemas()
+      list = result.map((item) => item[`Tables_in_${appName}`])
+    }
+  }
+
+  const prefix = `${source}`
+  let successList = []
+  let failList = []
+  for (let i = 0; i < list.length; i++) {
+    const url = `${prefix}/${list[i]}/findAll`
+
+    const result = await axios.post(url).then((res) => res.data)
+    console.log(list[i])
+    if (result.code === 200) {
+      await app.model[list[i]].sync({
+        force: true,
+      })
+      try {
+        await app.model[list[i]].bulkCreate(
+          result.data.map((i) => lodash.omitBy(i, lodash.isNull)),
+          {}
+        )
+        successList = [...successList, list[i]]
+      } catch (e) {
+        console.log(e.message)
+        failList = [...failList, list[i]]
+      }
+    } else {
+      console.log(url, result.data)
+      failList = [...failList, list[i]]
+      continue
+    }
+  }
+  ctx.SUCCESS({ successList, failList })
+}

package/package.json

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