q-koa 10.6.5 → 10.6.7

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

@@ -39,6 +39,27 @@ exports.query = {
   is_mock: false,
   defaultValue: {},
   sortOrder: 4,
+  set: function (value) {
+    try {
+      const dataValue = typeof value === 'object' ? value : JSON.parse(value)
+      this.setDataValue('query', dataValue)
+    } catch {
+      throw new Error('query值不合法')
+    }
+  },
+  get: function () {
+    try {
+      const value = this.getDataValue('query')
+      const dataValue =
+        typeof value === 'object' ? value || {} : JSON.parse(value)
+      return dataValue
+    } catch {
+      return {}
+    }
+  },
+  extra: {
+    type: 'json-editor',
+  },
 }
 
 exports.post = {
@@ -48,4 +69,25 @@ exports.post = {
   is_mock: false,
   defaultValue: {},
   sortOrder: 5,
+  set: function (value) {
+    try {
+      const dataValue = typeof value === 'object' ? value : JSON.parse(value)
+      this.setDataValue('post', dataValue)
+    } catch {
+      throw new Error('post值不合法')
+    }
+  },
+  get: function () {
+    try {
+      const value = this.getDataValue('post')
+      const dataValue =
+        typeof value === 'object' ? value || {} : JSON.parse(value)
+      return dataValue
+    } catch {
+      return {}
+    }
+  },
+  extra: {
+    type: 'json-editor',
+  },
 }

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

@@ -23,6 +23,27 @@ exports.header = {
   comment: 'Header',
   allowNull: false,
   defaultValue: {},
+  set: function (value) {
+    try {
+      const dataValue = typeof value === 'object' ? value : JSON.parse(value)
+      this.setDataValue('header', dataValue)
+    } catch {
+      throw new Error('header值不合法')
+    }
+  },
+  get: function () {
+    try {
+      const value = this.getDataValue('header')
+      const dataValue =
+        typeof value === 'object' ? value || {} : JSON.parse(value)
+      return dataValue
+    } catch {
+      return {}
+    }
+  },
+  extra: {
+    type: 'json-editor',
+  },
 }
 
 exports.body = {
@@ -30,6 +51,27 @@ exports.body = {
   comment: '参数',
   allowNull: false,
   defaultValue: {},
+  set: function (value) {
+    try {
+      const dataValue = typeof value === 'object' ? value : JSON.parse(value)
+      this.setDataValue('body', dataValue)
+    } catch {
+      throw new Error('body值不合法')
+    }
+  },
+  get: function () {
+    try {
+      const value = this.getDataValue('body')
+      const dataValue =
+        typeof value === 'object' ? value || {} : JSON.parse(value)
+      return dataValue
+    } catch {
+      return {}
+    }
+  },
+  extra: {
+    type: 'json-editor',
+  },
 }
 
 exports.message = {

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

@@ -16,6 +16,27 @@ exports.query = {
   is_mock: false,
   defaultValue: {},
   sortOrder: 2,
+  set: function (value) {
+    try {
+      const dataValue = typeof value === 'object' ? value : JSON.parse(value)
+      this.setDataValue('query', dataValue)
+    } catch {
+      throw new Error('query值不合法')
+    }
+  },
+  get: function () {
+    try {
+      const value = this.getDataValue('query')
+      const dataValue =
+        typeof value === 'object' ? value || {} : JSON.parse(value)
+      return dataValue
+    } catch {
+      return {}
+    }
+  },
+  extra: {
+    type: 'json-editor',
+  },
 }
 
 exports.post = {
@@ -25,6 +46,27 @@ exports.post = {
   is_mock: false,
   defaultValue: {},
   sortOrder: 3,
+  set: function (value) {
+    try {
+      const dataValue = typeof value === 'object' ? value : JSON.parse(value)
+      this.setDataValue('post', dataValue)
+    } catch {
+      throw new Error('post值不合法')
+    }
+  },
+  get: function () {
+    try {
+      const value = this.getDataValue('post')
+      const dataValue =
+        typeof value === 'object' ? value || {} : JSON.parse(value)
+      return dataValue
+    } catch {
+      return {}
+    }
+  },
+  extra: {
+    type: 'json-editor',
+  },
 }
 
 exports.is_diy_router = {

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

@@ -133,7 +133,6 @@ exports.extra = {
     try {
       const dataValue = typeof value === 'object' ? value : JSON.parse(value)
       this.setDataValue('extra', dataValue)
-      console.log(dataValue)
     } catch {
       throw new Error('extra值不合法')
     }

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

@@ -552,8 +552,17 @@ exports.copyOther = async (ctx) => {
   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])
+    const result = await axios
+      .post(
+        url,
+        {},
+        {
+          headers: {
+            'Client-Type': 0,
+          },
+        }
+      )
+      .then((res) => res.data)
     if (result.code === 200) {
       await app.model[list[i]].sync({
         force: true,

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

@@ -267,13 +267,12 @@ exports.checkLogin = async (ctx) => {
   const { config: _config } = ctx.request.body
   const config = _config || 'weixin_mp'
   const appConfig = getConfig(app)
-  const { app_id } = await appConfig.getObject(config)
   if (ctx.request[`${appName}-user`] && ctx.request[`${appName}-user`].id) {
     const h5_user_include = config.includes('h5')
       ? {
           model: app.model.h5_user,
           where: {
-            appid: app_id,
+            appid: (await appConfig.getObject(config)).app_id,
           },
           attributes: {
             exclude: ['created_at', 'updated_at', 'createdid'],
@@ -286,7 +285,7 @@ exports.checkLogin = async (ctx) => {
       ? {
           model: app.model.mp_user,
           where: {
-            appid: app_id,
+            appid: (await appConfig.getObject(config)).app_id,
           },
         }
       : {
@@ -297,8 +296,8 @@ exports.checkLogin = async (ctx) => {
       {
         model: app.model.github_user,
       },
-      h5_user_include,
-      mp_user_include,
+      config === 'weixin_h5' ? h5_user_include : {},
+      config === 'weixin_mp' ? mp_user_include : {},
       {
         model: app.model.toutiao_user,
       },

package/package.json

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

package/core/file/plugins/routes/config 2.js

@@ -1,17 +0,0 @@
-module.exports = {
-  name: '后台导航',
-  belongs: 'auth',
-  multiple: false,
-  availableSort: true,
-  order: [],
-  select: [],
-  excludes: [],
-  limit: 40,
-  defaultOrder: [{ sort: 'ascending', type: 'sortOrder' }],
-  comment: {},
-  sortOrder: 1,
-  reference: [],
-  excludeAuth: [],
-  initList: [],
-  personal: [{ key: 'init_routes', name: '初始化', width: 200, common: true }],
-}