q-koa 11.8.2 → 11.8.5

package/core/file/plugins/douyin_user/config.js

@@ -3,13 +3,21 @@ module.exports = {
   belongs: 'page',
   multiple: false,
   availableSort: false,
-  order: ["created_at"],
-  select: [{"key":"user_id"},{"key":"nick_name"}],
+  order: ['created_at'],
+  select: [{ key: 'user_id' }, { key: 'nick_name' }],
   excludes: [],
   limit: 20,
   defaultOrder: [{ sort: 'descending', type: 'id' }],
-  comment: {"created_at":"创建时间"},
+  comment: { created_at: '创建时间' },
   sortOrder: 1,
   reference: [],
   excludeAuth: [],
+  indexList: [
+    {
+      name: 'openid',
+      unique: true,
+      fields: ['openid'],
+    },
+    { fields: ['user_id'] },
+  ],
 }

package/core/file/plugins/h5_user/config.js

@@ -16,4 +16,12 @@ module.exports = {
   sortOrder: 1,
   reference: [],
   excludeAuth: [],
+  indexList: [
+    {
+      name: 'openid',
+      unique: true,
+      fields: ['openid'],
+    },
+    { fields: ['user_id'] },
+  ],
 }

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

@@ -7,7 +7,7 @@ exports.openid = {
   is_mock: false,
   defaultValue: '',
   sortOrder: 1,
-  unique: true,
+  unique: ['openid'],
 }
 
 exports.user_id = {

package/core/file/plugins/open_user/config.js

@@ -0,0 +1,23 @@
+module.exports = {
+  name: '微信开放平台用户',
+  belongs: 'page',
+  multiple: false,
+  availableSort: false,
+  order: ['created_at'],
+  select: [{ key: 'user_id' }, { key: 'nick_name' }],
+  excludes: [],
+  limit: 20,
+  defaultOrder: [{ sort: 'descending', type: 'id' }],
+  comment: { created_at: '创建时间' },
+  sortOrder: 1,
+  reference: [],
+  excludeAuth: [],
+  indexList: [
+    {
+      name: 'openid',
+      unique: true,
+      fields: ['openid'],
+    },
+    { fields: ['user_id'] },
+  ],
+}

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

@@ -0,0 +1,59 @@
+const { Sequelize, Random } = require('q-koa')
+
+exports.openid = {
+  type: Sequelize.STRING,
+  comment: 'openid',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 1,
+  unique: ['openid'],
+}
+
+exports.user_id = {
+  type: Sequelize.MEDIUMINT.UNSIGNED,
+  comment: '用户',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: 0,
+  sortOrder: 2,
+  hasOne: true,
+}
+
+exports.nick_name = {
+  type: Sequelize.STRING,
+  comment: '昵称',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 3,
+}
+
+exports.avatar = {
+  type: Sequelize.STRING(1000),
+  comment: '头像',
+  allowNull: false,
+  is_mock: false,
+  defaultValue: '',
+  sortOrder: 8,
+}
+
+exports.appid = {
+  type: Sequelize.STRING,
+  comment: 'app_id',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 10,
+  mock: () => Random.ctitle(),
+}
+
+exports.unionid = {
+  type: Sequelize.STRING,
+  comment: 'unionid',
+  allowNull: false,
+  is_mock: true,
+  defaultValue: '',
+  sortOrder: 11,
+  mock: () => Random.ctitle(),
+}

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

@@ -28,12 +28,17 @@ const compareIndex = (tableIndexList, modelIndexList = [], model) => {
         return !(
           ((i.name.startsWith(model) &&
             i.fields.every((f) => i.name.includes(f))) ||
-            modelIndexList.some((m) => m.name === i.name)) &&
-          modelIndexList.some((m) => isSameArray(m.fields, i.fields, true))
+            modelIndexList
+              .filter((i) => i.name !== 'PRIMARY')
+              .some((m) => m.name === i.name)) &&
+          modelIndexList
+            .filter((i) => i.name !== 'PRIMARY')
+            .some((m) => isSameArray(m.fields, i.fields, true))
         )
       }).length === 0 &&
     tableIndexList.filter((i) => i.name !== 'PRIMARY').length ===
-      modelIndexList.length
+      modelIndexList.filter((i) => i.name !== 'PRIMARY').length
+
   return flag
 }
 
@@ -726,7 +731,7 @@ exports.checkIndex = async (ctx) => {
             ...res,
             [current]: {
               isSame,
-              tableIndexList,
+              indexList: tableIndexList.filter((i) => i.name !== 'PRIMARY'),
             },
           }
         }
@@ -746,7 +751,9 @@ exports.checkIndex = async (ctx) => {
     const isSame = compareIndex(tableIndexList, modelIndexList, model)
     return ctx.SUCCESS({
       isSame,
-      ...(isSame ? {} : { tableIndexList }),
+      ...(isSame
+        ? {}
+        : { indexList: tableIndexList.filter((i) => i.name !== 'PRIMARY') }),
     })
   }
 }

package/core/file/plugins/toutiao_user/config.js

@@ -3,13 +3,21 @@ module.exports = {
   belongs: 'page',
   multiple: false,
   availableSort: false,
-  order: ["created_at"],
-  select: [{"key":"user_id"},{"key":"nick_name"}],
+  order: ['created_at'],
+  select: [{ key: 'user_id' }, { key: 'nick_name' }],
   excludes: [],
   limit: 20,
   defaultOrder: [{ sort: 'descending', type: 'id' }],
-  comment: {"created_at":"创建时间"},
+  comment: { created_at: '创建时间' },
   sortOrder: 1,
   reference: [],
   excludeAuth: [],
+  indexList: [
+    {
+      name: 'openid',
+      unique: true,
+      fields: ['openid'],
+    },
+    { fields: ['user_id'] },
+  ],
 }

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

@@ -4,7 +4,7 @@ exports.openid = {
   type: Sequelize.STRING,
   comment: 'openid',
   allowNull: false,
-  unique: true,
+  unique: ['openid'],
 }
 
 exports.nick_name = {

package/package.json

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