diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 74a9a124..05e792cd 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -17,16 +17,16 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^1.0.2", "axios": "^1.4.0", + "node-forge": "^1.3.1", + "qs": "^6.11.2" + }, + "devDependencies": { + "reflect-metadata": "^0.1.13", + "@certd/acme-client": "^1.0.2", "dayjs": "^1.11.7", "lodash": "^4.17.21", "log4js": "^6.9.1", - "node-forge": "^1.3.1", - "qs": "^6.11.2", - "reflect-metadata": "^0.1.13" - }, - "devDependencies": { "@types/chai": "^4.3.5", "@types/lodash": "^4.14.194", "@types/mocha": "^10.0.1", diff --git a/packages/core/pipeline/rollup.config.js b/packages/core/pipeline/rollup.config.js index e0a4ae6a..79d1fe15 100644 --- a/packages/core/pipeline/rollup.config.js +++ b/packages/core/pipeline/rollup.config.js @@ -34,5 +34,6 @@ module.exports = { "log4js", "@midwayjs/core", "@midwayjs/decorator", + "reflect-metadata", ], }; diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index bdd84e5e..90eb323f 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -21,6 +21,7 @@ "mig": "typeorm migration:create -n name" }, "dependencies": { + "reflect-metadata": "^0.1.13", "kubernetes-client": "^9.0.0", "@certd/acme-client": "^1.0.2", "@certd/pipeline": "^1.0.2", diff --git a/packages/ui/certd-server/src/config/config.default.ts b/packages/ui/certd-server/src/config/config.default.ts index 81ff01b1..d93134a0 100644 --- a/packages/ui/certd-server/src/config/config.default.ts +++ b/packages/ui/certd-server/src/config/config.default.ts @@ -3,6 +3,7 @@ import { FlywayHistory } from 'midway-flyway-js/dist/entity'; import { MidwayConfig } from '@midwayjs/core'; import { UserEntity } from '../modules/authority/entity/user'; +import { PipelineEntity } from '../modules/pipeline/entity/pipeline'; export default { // use for cookie sign key, should change to your own and keep security @@ -33,7 +34,14 @@ export default { logging: true, // 配置实体模型 或者 entities: '/entity', - entities: ['**/modules/*/entity/*.ts', FlywayHistory, UserEntity], + entities: [ + '**/modules/*/entity/*.ts', + '**/entity/*.js', + '**/entity/*.d.ts', + PipelineEntity, + FlywayHistory, + UserEntity, + ], }, }, }, diff --git a/packages/ui/certd-server/src/configuration.ts b/packages/ui/certd-server/src/configuration.ts index 8f4306c3..439d3cbc 100644 --- a/packages/ui/certd-server/src/configuration.ts +++ b/packages/ui/certd-server/src/configuration.ts @@ -14,11 +14,10 @@ import { GlobalExceptionMiddleware } from './middleware/global-exception'; import { PreviewMiddleware } from './middleware/preview'; import { AuthorityMiddleware } from './middleware/authority'; -import * as pipeline from './plugins/pipeline'; import * as cron from './plugins/cron'; @Configuration({ - imports: [koa, orm, cache, flyway, validateComp, pipeline, cron], + imports: [koa, orm, cache, flyway, validateComp, cron], importConfigs: [ { default: defaultConfig,