diff --git a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx index 14cf462f..e18ed809 100644 --- a/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx +++ b/packages/ui/certd-client/src/views/certd/open/openkey/crud.tsx @@ -4,6 +4,8 @@ import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, EditReq, import { pipelineGroupApi } from "./api"; import dayjs from "dayjs"; import { Modal } from "ant-design-vue"; +import CertView from "/@/views/certd/pipeline/cert-view.vue"; +import { useModal } from "/@/use/use-modal"; export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet { const { t } = useI18n(); @@ -27,7 +29,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat const res = await api.AddObj(form); return res; }; - + const model = useModal(); return { crudOptions: { request: { @@ -83,13 +85,19 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat text: "测试ApiToken", async click({ row }) { const apiToken = await api.GetApiToken(row.id); - Modal.info({ + + model.success({ title: "ApiToken", + maskClosable: true, + okText: "确定", + width: 600, content: () => { return (
-
测试ApiKey如下,您可以在3分钟内使用它进行开放接口请求测试
-
{apiToken}
+
测试ApiKey如下,您可以在3分钟内使用它进行开放接口请求测试
+
+ +
); } diff --git a/packages/ui/certd-server/src/modules/open/service/open-key-service.ts b/packages/ui/certd-server/src/modules/open/service/open-key-service.ts index 341bcb23..d894e661 100644 --- a/packages/ui/certd-server/src/modules/open/service/open-key-service.ts +++ b/packages/ui/certd-server/src/modules/open/service/open-key-service.ts @@ -71,7 +71,7 @@ export class OpenKeyService extends BaseService { } else { throw new CodeException(Constants.res.openKeySignTypeError); } - if (computedSign !== sign) { + if (Buffer.from(computedSign).toString('base64') !== sign) { throw new CodeException(Constants.res.openKeySignError); } @@ -101,6 +101,6 @@ export class OpenKeyService extends BaseService { }; const content = JSON.stringify(openKey); const sign = utils.hash.md5(content + keySecret); - return Buffer.from(content).toString('base64') + '.' + sign; + return Buffer.from(content).toString('base64') + '.' + Buffer.from(sign).toString('base64'); } }