diff --git a/docker/run/docker-compose.yaml b/docker/run/docker-compose.yaml index 2a7fc179..2b8c2e1c 100644 --- a/docker/run/docker-compose.yaml +++ b/docker/run/docker-compose.yaml @@ -13,6 +13,6 @@ services: # 要拉起的服务们 - "7001:7001" environment: - TZ=Asia/Shanghai - - CERTD_AUTH_JWT_KEY=changeme + - certd_auth_jwt_secret=changeme #注意修改成你的自定义密钥 ↑↑↑↑↑ diff --git a/packages/ui/certd-server/src/config/config.default.ts b/packages/ui/certd-server/src/config/config.default.ts index 7e157df7..11839c36 100644 --- a/packages/ui/certd-server/src/config/config.default.ts +++ b/packages/ui/certd-server/src/config/config.default.ts @@ -6,11 +6,10 @@ import { UserEntity } from '../modules/authority/entity/user'; import { PipelineEntity } from '../modules/pipeline/entity/pipeline'; //import { logger } from '../utils/logger'; // load .env file in process.cwd -import _ from 'lodash'; -import { load } from './loader'; +import { mergeConfig } from './loader'; + const development = { - // use for cookie sign key, should change to your own and keep security - keys: 'certd666', + keys: '', koa: { port: 7001, }, @@ -66,15 +65,12 @@ const development = { scriptDir: join(__dirname, '../../db/migration'), }, - biz: { + auth: { jwt: { secret: 'certd666', expire: 7 * 24 * 60, //单位秒 }, - authOnly: { - ignoreUrls: ['/', '/public', '/api/login', '/api/register'], - }, }, } as MidwayConfig; -_.merge(development, load('development')); +mergeConfig(development, 'development'); export default development; diff --git a/packages/ui/certd-server/src/config/config.preview.ts b/packages/ui/certd-server/src/config/config.preview.ts index 0b9d2e38..7e5a68a2 100644 --- a/packages/ui/certd-server/src/config/config.preview.ts +++ b/packages/ui/certd-server/src/config/config.preview.ts @@ -1,6 +1,5 @@ import { MidwayConfig } from '@midwayjs/core'; -import { load } from './loader'; -import _ from 'lodash'; +import { mergeConfig } from './loader'; const preview = { /** @@ -11,6 +10,5 @@ const preview = { }, } as MidwayConfig; -_.merge(preview, load('preview')); - +mergeConfig(preview, 'preview'); export default preview; diff --git a/packages/ui/certd-server/src/config/config.production.ts b/packages/ui/certd-server/src/config/config.production.ts index 52fa630e..747b999b 100644 --- a/packages/ui/certd-server/src/config/config.production.ts +++ b/packages/ui/certd-server/src/config/config.production.ts @@ -1,6 +1,6 @@ import { MidwayConfig } from '@midwayjs/core'; -import { load } from './loader'; -import _ from 'lodash'; +import { mergeConfig } from './loader'; + const production = { /** * 演示环境 @@ -10,6 +10,5 @@ const production = { }, } as MidwayConfig; -_.merge(production, load('production')); - +mergeConfig(production, 'production'); export default production; diff --git a/packages/ui/certd-server/src/config/loader.ts b/packages/ui/certd-server/src/config/loader.ts index 68940d6e..007860d1 100644 --- a/packages/ui/certd-server/src/config/loader.ts +++ b/packages/ui/certd-server/src/config/loader.ts @@ -1,5 +1,6 @@ import path from 'path'; import _ from 'lodash'; + const yaml = require('js-yaml'); const fs = require('fs'); @@ -24,3 +25,12 @@ export function load(env = '') { _.merge(doc, parseEnv()); return doc; } + +export function mergeConfig(config: any, envType: string) { + _.merge(config, load(envType)); + const keys = _.get(config, 'auth.jwt.secret'); + if (keys) { + config.keys = keys; + } + return config; +} diff --git a/packages/ui/certd-server/src/middleware/authority.ts b/packages/ui/certd-server/src/middleware/authority.ts index c3a4a698..a3755d47 100644 --- a/packages/ui/certd-server/src/middleware/authority.ts +++ b/packages/ui/certd-server/src/middleware/authority.ts @@ -11,7 +11,7 @@ import { logger } from '../utils/logger'; */ @Provide() export class AuthorityMiddleware implements IWebMiddleware { - @Config('biz.jwt.secret') + @Config('keys') private secret: string; @Inject() webRouterService: MidwayWebRouterService; diff --git a/packages/ui/certd-server/src/modules/login/service/login-service.ts b/packages/ui/certd-server/src/modules/login/service/login-service.ts index 456c869c..379e634f 100644 --- a/packages/ui/certd-server/src/modules/login/service/login-service.ts +++ b/packages/ui/certd-server/src/modules/login/service/login-service.ts @@ -14,7 +14,7 @@ export class LoginService { userService: UserService; @Inject() roleService: RoleService; - @Config('biz.jwt') + @Config('auth.jwt') private jwt: any; /**