From 5237b14dc0fea4010324ff2889245f37f0baa94c Mon Sep 17 00:00:00 2001 From: chenos Date: Mon, 4 Jan 2021 13:17:16 +0800 Subject: [PATCH] feat: improve migrate cli --- packages/app/src/api/app.ts | 99 +++++++++++ packages/app/src/api/migrate.ts | 215 +----------------------- packages/app/src/api/migrations/init.ts | 214 +++++++++++++++++++++++ 3 files changed, 316 insertions(+), 212 deletions(-) create mode 100644 packages/app/src/api/app.ts create mode 100644 packages/app/src/api/migrations/init.ts diff --git a/packages/app/src/api/app.ts b/packages/app/src/api/app.ts new file mode 100644 index 000000000..4490b842d --- /dev/null +++ b/packages/app/src/api/app.ts @@ -0,0 +1,99 @@ +import Api from '../../../server/src'; +import dotenv from 'dotenv'; +import path from 'path'; +import actions from '../../../actions/src'; +import associated from '../../../actions/src/middlewares/associated'; +import { Op } from 'sequelize'; + +const sync = { + force: false, + alter: { + drop: false, + }, +}; + +console.log('process.env.NOCOBASE_ENV', process.env.NOCOBASE_ENV); + +dotenv.config(); + +const api = Api.create({ + database: { + username: process.env.DB_USER, + password: process.env.DB_PASSWORD, + database: process.env.DB_DATABASE, + host: process.env.DB_HOST, + port: process.env.DB_PORT, + dialect: process.env.DB_DIALECT, + dialectOptions: { + charset: 'utf8mb4', + collate: 'utf8mb4_unicode_ci', + }, + logging: false, + define: {}, + sync, + }, + resourcer: { + prefix: '/api', + }, +}); + +api.resourcer.use(associated); +api.resourcer.registerActionHandlers({...actions.common, ...actions.associate}); + +api.resourcer.use(async (ctx: actions.Context, next) => { + const token = ctx.get('Authorization').replace(/^Bearer\s+/gi, ''); + // console.log('user check', ctx.action.params.actionName); + // const { actionName } = ctx.action.params; + if (!token) { + return next(); + } + const User = ctx.db.getModel('users'); + const user = await User.findOne({ + where: { + token, + }, + }); + if (!user) { + return next(); + } + ctx.state.currentUser = user; + // console.log('ctx.state.currentUser', ctx.state.currentUser); + await next(); +}); + +api.resourcer.use(async (ctx: actions.Context, next) => { + const { actionName, resourceField, resourceName, fields = {} } = ctx.action.params; + const table = ctx.db.getTable(resourceField ? resourceField.options.target : resourceName); + // ctx.state.developerMode = {[Op.not]: null}; + ctx.state.developerMode = false; + if (table && table.hasField('developerMode') && ctx.state.developerMode === false) { + ctx.action.setParam('filter.developerMode', ctx.state.developerMode); + } + if (table && ['get', 'list'].includes(actionName)) { + const except = fields.except || []; + const appends = fields.appends || []; + for (const [name, field] of table.getFields()) { + if (field.options.hidden) { + except.push(field.options.name); + } + if (field.options.appends) { + appends.push(field.options.name); + } + } + if (except.length) { + ctx.action.setParam('fields.except', except); + } + if (appends.length) { + ctx.action.setParam('fields.appends', appends); + } + console.log('ctx.action.params.fields', ctx.action.params.fields, except, appends); + } + await next(); +}); + +api.registerPlugin('plugin-collections', [path.resolve(__dirname, '../../../plugin-collections'), {}]); +api.registerPlugin('plugin-pages', [path.resolve(__dirname, '../../../plugin-pages'), {}]); +api.registerPlugin('plugin-users', [path.resolve(__dirname, '../../../plugin-users'), {}]); +api.registerPlugin('plugin-file-manager', [path.resolve(__dirname, '../../../plugin-file-manager'), {}]); + +export default api; diff --git a/packages/app/src/api/migrate.ts b/packages/app/src/api/migrate.ts index 2aece5ae7..5dedebada 100644 --- a/packages/app/src/api/migrate.ts +++ b/packages/app/src/api/migrate.ts @@ -1,214 +1,5 @@ -import Api from '../../../server/src'; -import dotenv from 'dotenv'; -import path from 'path'; -import Database, { Model } from '@nocobase/database'; -import actions from '../../../actions/src'; -import associated from '../../../actions/src/middlewares/associated'; -console.log(process.argv); +const args = process.argv; +const fileName: string = args.pop(); -const clean = true; - -const sync = { - force: clean, - alter: { - drop: clean, - }, -}; - -dotenv.config(); - -const api = Api.create({ - database: { - username: process.env.DB_USER, - password: process.env.DB_PASSWORD, - database: process.env.DB_DATABASE, - host: process.env.DB_HOST, - port: process.env.DB_PORT, - dialect: process.env.DB_DIALECT, - dialectOptions: { - charset: 'utf8mb4', - collate: 'utf8mb4_unicode_ci', - }, - logging: false, - define: {}, - sync, - }, - resourcer: { - prefix: '/api', - }, -}); - -api.resourcer.use(associated); -api.resourcer.registerActionHandlers({...actions.common, ...actions.associate}); - -const data = [ - { - title: '后台应用', - path: '/', - type: 'layout', - template: 'TopMenuLayout', - sort: 10, - children: [ - { - title: '仪表盘', - type: 'page', - path: '/dashboard', - icon: 'DashboardOutlined', - template: 'page1', - sort: 20, - showInMenu: true, - }, - { - title: '数据', - type: 'layout', - path: '/collections', - icon: 'DatabaseOutlined', - template: 'SideMenuLayout', - sort: 30, - showInMenu: true, - children: [ - // { - // title: '页面3', - // type: 'page', - // path: '/collections/page3', - // icon: 'dashboard', - // template: 'page3', - // sort: 40, - // }, - // { - // title: '页面4', - // type: 'page', - // path: '/collections/page4', - // icon: 'dashboard', - // template: 'page4', - // sort: 50, - // }, - ] - }, - { - title: '用户', - type: 'layout', - path: '/users', - icon: 'TeamOutlined', - template: 'SideMenuLayout', - sort: 70, - showInMenu: true, - children: [ - { - title: '用户管理', - type: 'collection', - path: '/users/users', - icon: 'UserOutlined', - template: 'collection', - collection: 'users', - sort: 80, - showInMenu: true, - }, - ] - }, - { - title: '配置', - type: 'layout', - path: '/settings', - icon: 'SettingOutlined', - template: 'SideMenuLayout', - sort: 90, - showInMenu: true, - children: [ - { - title: '页面与菜单', - type: 'collection', - collection: 'pages', - path: '/settings/pages', - icon: 'MenuOutlined', - sort: 100, - developerMode: true, - showInMenu: true, - }, - { - title: '数据表配置', - type: 'collection', - collection: 'collections', - path: '/settings/collections', - icon: 'TableOutlined', - sort: 110, - showInMenu: true, - }, - ] - }, - ], - }, - { - title: '登录页面', - path: '/login', - type: 'page', - inherit: false, - template: 'login', - order: 120, - }, - { - title: '注册页面', - path: '/register', - type: 'page', - inherit: false, - template: 'register', - order: 130, - } -]; - -api.registerPlugin('plugin-collections', [path.resolve(__dirname, '../../../plugin-collections'), {}]); -api.registerPlugin('plugin-pages', [path.resolve(__dirname, '../../../plugin-pages'), {}]); -api.registerPlugin('plugin-users', [path.resolve(__dirname, '../../../plugin-users'), {}]); -api.registerPlugin('plugin-file-manager', [path.resolve(__dirname, '../../../plugin-file-manager'), {}]); - -(async () => { - await api.loadPlugins(); - const database: Database = api.database; - await database.sync({ - // tables: ['collections', 'fields', 'actions', 'views', 'tabs'], - }); - const [Collection, Page, User] = database.getModels(['collections', 'pages', 'users']); - const tables = database.getTables([]); - for (let table of tables) { - await Collection.import(table.getOptions(), { update: true, migrate: false }); - } - await Page.import(data); - const user = await User.findOne({ - where: { - username: "admin", - }, - }); - if (!user) { - await User.create({ - nickname: "超级管理员", - password: "admin", - username: "admin", - token: "38979f07e1fca68fb3d2", - }); - } - const Storage = database.getModel('storages'); - // await Storage.create({ - // title: '本地存储', - // name: `local`, - // type: 'local', - // baseUrl: process.env.LOCAL_STORAGE_BASE_URL, - // default: true - // }); - await Storage.create({ - name: `ali-oss`, - type: 'ali-oss', - baseUrl: process.env.STORAGE_BASE_URL, - options: { - region: process.env.ALIYUN_OSS_REGION,// 'oss-cn-beijing', - accessKeyId: process.env.ALIYUN_OSS_ACCESS_KEY_ID,// 'LTAI4GEGDJsdGantisvSaz47', - accessKeySecret: process.env.ALIYUN_OSS_ACCESS_KEY_SECRET,//'cDFaOUwigps7ohRmsfBFXGDxNm8uIq', - bucket: process.env.ALIYUN_OSS_BUCKET, //'nocobase' - }, - default: true - }); - await database.getModel('collections').import(require('./collections/example').default); - await database.getModel('collections').import(require('./collections/authors').default); - await database.getModel('collections').import(require('./collections/books').default); - await database.close(); -})(); +require(`./migrations/${fileName}`); diff --git a/packages/app/src/api/migrations/init.ts b/packages/app/src/api/migrations/init.ts new file mode 100644 index 000000000..b6592c382 --- /dev/null +++ b/packages/app/src/api/migrations/init.ts @@ -0,0 +1,214 @@ +import Api from '../../../../server/src'; +import dotenv from 'dotenv'; +import path from 'path'; +import Database, { Model } from '@nocobase/database'; +import actions from '../../../../actions/src'; +import associated from '../../../../actions/src/middlewares/associated'; + +console.log(process.argv); + +const clean = true; + +const sync = { + force: clean, + alter: { + drop: clean, + }, +}; + +dotenv.config(); + +const api = Api.create({ + database: { + username: process.env.DB_USER, + password: process.env.DB_PASSWORD, + database: process.env.DB_DATABASE, + host: process.env.DB_HOST, + port: process.env.DB_PORT, + dialect: process.env.DB_DIALECT, + dialectOptions: { + charset: 'utf8mb4', + collate: 'utf8mb4_unicode_ci', + }, + logging: false, + define: {}, + sync, + }, + resourcer: { + prefix: '/api', + }, +}); + +api.resourcer.use(associated); +api.resourcer.registerActionHandlers({...actions.common, ...actions.associate}); + +const data = [ + { + title: '后台应用', + path: '/', + type: 'layout', + template: 'TopMenuLayout', + sort: 10, + children: [ + { + title: '仪表盘', + type: 'page', + path: '/dashboard', + icon: 'DashboardOutlined', + template: 'page1', + sort: 20, + showInMenu: true, + }, + { + title: '数据', + type: 'layout', + path: '/collections', + icon: 'DatabaseOutlined', + template: 'SideMenuLayout', + sort: 30, + showInMenu: true, + children: [ + // { + // title: '页面3', + // type: 'page', + // path: '/collections/page3', + // icon: 'dashboard', + // template: 'page3', + // sort: 40, + // }, + // { + // title: '页面4', + // type: 'page', + // path: '/collections/page4', + // icon: 'dashboard', + // template: 'page4', + // sort: 50, + // }, + ] + }, + { + title: '用户', + type: 'layout', + path: '/users', + icon: 'TeamOutlined', + template: 'SideMenuLayout', + sort: 70, + showInMenu: true, + children: [ + { + title: '用户管理', + type: 'collection', + path: '/users/users', + icon: 'UserOutlined', + template: 'collection', + collection: 'users', + sort: 80, + showInMenu: true, + }, + ] + }, + { + title: '配置', + type: 'layout', + path: '/settings', + icon: 'SettingOutlined', + template: 'SideMenuLayout', + sort: 90, + showInMenu: true, + children: [ + { + title: '页面与菜单', + type: 'collection', + collection: 'pages', + path: '/settings/pages', + icon: 'MenuOutlined', + sort: 100, + developerMode: true, + showInMenu: true, + }, + { + title: '数据表配置', + type: 'collection', + collection: 'collections', + path: '/settings/collections', + icon: 'TableOutlined', + sort: 110, + showInMenu: true, + }, + ] + }, + ], + }, + { + title: '登录页面', + path: '/login', + type: 'page', + inherit: false, + template: 'login', + order: 120, + }, + { + title: '注册页面', + path: '/register', + type: 'page', + inherit: false, + template: 'register', + order: 130, + } +]; + +api.registerPlugin('plugin-collections', [path.resolve(__dirname, '../../../plugin-collections'), {}]); +api.registerPlugin('plugin-pages', [path.resolve(__dirname, '../../../plugin-pages'), {}]); +api.registerPlugin('plugin-users', [path.resolve(__dirname, '../../../plugin-users'), {}]); +api.registerPlugin('plugin-file-manager', [path.resolve(__dirname, '../../../plugin-file-manager'), {}]); + +(async () => { + await api.loadPlugins(); + const database: Database = api.database; + await database.sync({ + // tables: ['collections', 'fields', 'actions', 'views', 'tabs'], + }); + const [Collection, Page, User] = database.getModels(['collections', 'pages', 'users']); + const tables = database.getTables([]); + for (let table of tables) { + await Collection.import(table.getOptions(), { update: true, migrate: false }); + } + await Page.import(data); + const user = await User.findOne({ + where: { + username: "admin", + }, + }); + if (!user) { + await User.create({ + nickname: "超级管理员", + password: "admin", + username: "admin", + token: "38979f07e1fca68fb3d2", + }); + } + const Storage = database.getModel('storages'); + // await Storage.create({ + // title: '本地存储', + // name: `local`, + // type: 'local', + // baseUrl: process.env.LOCAL_STORAGE_BASE_URL, + // default: true + // }); + await Storage.create({ + name: `ali-oss`, + type: 'ali-oss', + baseUrl: process.env.STORAGE_BASE_URL, + options: { + region: process.env.ALIYUN_OSS_REGION,// 'oss-cn-beijing', + accessKeyId: process.env.ALIYUN_OSS_ACCESS_KEY_ID,// 'LTAI4GEGDJsdGantisvSaz47', + accessKeySecret: process.env.ALIYUN_OSS_ACCESS_KEY_SECRET,//'cDFaOUwigps7ohRmsfBFXGDxNm8uIq', + bucket: process.env.ALIYUN_OSS_BUCKET, //'nocobase' + }, + default: true + }); + await database.getModel('collections').import(require('./collections/example').default); + await database.getModel('collections').import(require('./collections/authors').default); + await database.getModel('collections').import(require('./collections/books').default); + await database.close(); +})();