From f516b0931f247b8687d4a00c056ef4322642f047 Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 26 May 2023 16:18:24 +0800
Subject: [PATCH] chore: jwt key

---
 docker/run/build.sh                                   | 7 +++++++
 docker/run/docker-compose.yaml                        | 8 ++++----
 packages/ui/certd-server/.env                         | 2 +-
 packages/ui/certd-server/src/config/config.default.ts | 3 ++-
 packages/ui/certd-server/src/configuration.ts         | 9 +--------
 5 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 docker/run/build.sh

diff --git a/docker/run/build.sh b/docker/run/build.sh
new file mode 100644
index 00000000..6e9c0954
--- /dev/null
+++ b/docker/run/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+echo "请先输入一个版本号(如 1.0.6)："
+read version
+echo "您输入的版本号是： $version"
+export TAG="$version"
+sudo -E docker compose up -d
diff --git a/docker/run/docker-compose.yaml b/docker/run/docker-compose.yaml
index db9e3841..2a7fc179 100644
--- a/docker/run/docker-compose.yaml
+++ b/docker/run/docker-compose.yaml
@@ -1,10 +1,10 @@
 version: '3.3' # 指定docker-compose 版本
 services: # 要拉起的服务们
   certd:
-    build:
-        context: ./
-        dockerfile: Dockerfile
-    image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:latest
+#    build:
+#        context: ./
+#        dockerfile: Dockerfile
+    image: registry.cn-shenzhen.aliyuncs.com/handsfree/certd:v${TAG}
     container_name: certd # 容器名
     restart: unless-stopped # 重启
     volumes: # 挂载目录
diff --git a/packages/ui/certd-server/.env b/packages/ui/certd-server/.env
index c9a4fefa..db7347dc 100644
--- a/packages/ui/certd-server/.env
+++ b/packages/ui/certd-server/.env
@@ -1 +1 @@
-CERTD_AUTH_JWT_KEYS=certd666
+CERTD_AUTH_JWT_KEY=certd666
diff --git a/packages/ui/certd-server/src/config/config.default.ts b/packages/ui/certd-server/src/config/config.default.ts
index 8e2fbf30..5d036545 100644
--- a/packages/ui/certd-server/src/config/config.default.ts
+++ b/packages/ui/certd-server/src/config/config.default.ts
@@ -5,11 +5,12 @@ import { MidwayConfig } from '@midwayjs/core';
 import { UserEntity } from '../modules/authority/entity/user';
 import { PipelineEntity } from '../modules/pipeline/entity/pipeline';
 import * as dotenv from 'dotenv';
+//import { logger } from '../utils/logger';
 // load .env file in process.cwd
 dotenv.config();
 export default {
   // use for cookie sign key, should change to your own and keep security
-  keys: process.env.CERTD_AUTH_JWT_KEYS,
+  keys: process.env.CERTD_AUTH_JWT_KEY,
   koa: {
     port: 7001,
   },
diff --git a/packages/ui/certd-server/src/configuration.ts b/packages/ui/certd-server/src/configuration.ts
index 846e3b14..280ec838 100644
--- a/packages/ui/certd-server/src/configuration.ts
+++ b/packages/ui/certd-server/src/configuration.ts
@@ -2,7 +2,7 @@ import * as validateComp from '@midwayjs/validate';
 import * as productionConfig from './config/config.production';
 import * as previewConfig from './config/config.preview';
 import * as defaultConfig from './config/config.default';
-import { Configuration, App } from '@midwayjs/decorator';
+import { App, Configuration } from '@midwayjs/decorator';
 import * as koa from '@midwayjs/koa';
 import * as orm from '@midwayjs/typeorm';
 import * as cache from '@midwayjs/cache';
@@ -15,7 +15,6 @@ import { PreviewMiddleware } from './middleware/preview';
 import { AuthorityMiddleware } from './middleware/authority';
 import * as staticFile from '@midwayjs/static-file';
 import * as cron from './plugins/cron';
-import { logger } from './utils/logger';
 
 @Configuration({
   imports: [koa, orm, cache, flyway, validateComp, cron, staticFile],
@@ -46,12 +45,6 @@ export class ContainerLifeCycle {
     // bodyparser options see https://github.com/koajs/bodyparser
     //this.app.use(bodyParser());
     //请求日志打印
-
-    setTimeout(() => {
-      console.log('heart beat ');
-      logger.info('heart beat');
-    }, 5000);
-
     this.app.useMiddleware([
       ReportMiddleware,
       //统一异常处理