diff --git a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx index f1127c43..c97ec8b0 100644 --- a/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/pipeline/crud.tsx @@ -158,7 +158,7 @@ export default function ({ crudExpose, context: { certdFormRef } }: CreateCrudOp const files = await api.GetFiles(row.id); Modal.success({ title: "文件下载", - okText: "↑↑↑ 点击链接下载", + okText: "↑↑↑ 点击上面链接下载", content: () => { const children = []; for (const file of files) { diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index 5bbc587d..eb96f40a 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -66,7 +66,7 @@ "ssh2": "^1.15.0", "svg-captcha": "^1.4.0", "tencentcloud-sdk-nodejs": "^4.0.44", - "typeorm": "0.3.15" + "typeorm": "^0.3.20" }, "devDependencies": { "@midwayjs/mock": "^3.16.4", diff --git a/packages/ui/certd-server/src/basic/base-service.ts b/packages/ui/certd-server/src/basic/base-service.ts index 07337fad..6f42e8bd 100644 --- a/packages/ui/certd-server/src/basic/base-service.ts +++ b/packages/ui/certd-server/src/basic/base-service.ts @@ -17,7 +17,7 @@ export abstract class BaseService { async transaction(callback: (entityManager: EntityManager) => Promise) { const dataSource = this.dataSourceManager.getDataSource('default'); - await dataSource.transaction(callback); + await dataSource.transaction(callback as any); } /** diff --git a/packages/ui/certd-server/src/plugins/plugin-aliyun/access/aliyun-access.ts b/packages/ui/certd-server/src/plugins/plugin-aliyun/access/aliyun-access.ts index 248e7950..ac3eb408 100644 --- a/packages/ui/certd-server/src/plugins/plugin-aliyun/access/aliyun-access.ts +++ b/packages/ui/certd-server/src/plugins/plugin-aliyun/access/aliyun-access.ts @@ -11,7 +11,7 @@ export class AliyunAccess { component: { placeholder: 'accessKeyId', }, - helper: '注意:证书申请,需要dns解析权限;其他阿里云插件,也需要对应的权限,比如证书上传需要证书管理权限', + helper: '登录阿里云控制台->AccessKey管理页面获取。', required: true, }) accessKeyId = ''; @@ -22,6 +22,7 @@ export class AliyunAccess { }, required: true, encrypt: true, + helper: '注意:证书申请需要dns解析权限;其他阿里云插件,需要对应的权限,比如证书上传需要证书管理权限;嫌麻烦就用主账号的全量权限的accessKey', }) accessKeySecret = ''; }