Compare commits

...

10 Commits

Author SHA1 Message Date
xiaojunnuo bae5a04dcc v1.39.14 2026-05-12 00:21:06 +08:00
xiaojunnuo 7146570392 build: prepare to build 2026-05-12 00:06:37 +08:00
xiaojunnuo ae88f85d8e chore: 1 2026-05-12 00:06:02 +08:00
xiaojunnuo a362860137 fix: 修复阿里云订阅流水线创建对话框无法获取阿里订单列表的bug 2026-05-11 23:47:48 +08:00
xiaojunnuo c966896522 fix: 修复启动时报密钥备份不存在的问题 2026-05-11 22:31:11 +08:00
xiaojunnuo 5f88da1985 build: release 2026-05-11 10:26:12 +08:00
xiaojunnuo 043b80a298 chore: 1 2026-05-11 09:41:47 +08:00
xiaojunnuo ed0da28896 Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2026-05-11 09:40:22 +08:00
xiaojunnuo 61a0d69d58 chore: 打包报错, 固定pnpm@10.33.4 2026-05-11 09:39:04 +08:00
xiaojunnuo d8f132919d chore: 1 2026-05-08 15:50:28 +08:00
39 changed files with 289 additions and 178 deletions
+7
View File
@@ -3,6 +3,13 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
### Bug Fixes
* 修复阿里云订阅流水线创建对话框无法获取阿里订单列表的bug ([a362860](https://github.com/certd/certd/commit/a362860137bfb7072893c844fe775edc46070ee1))
* 修复启动时报密钥备份不存在的问题 ([c966896](https://github.com/certd/certd/commit/c9668965226af6b54e0e576931dcba8b3d188ef3))
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Bug Fixes
+1 -1
View File
@@ -9,5 +9,5 @@
}
},
"npmClient": "pnpm",
"version": "1.39.13"
"version": "1.39.14"
}
+4
View File
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/publishlab/node-acme-client/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/acme-client
## [1.39.13](https://github.com/publishlab/node-acme-client/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+2 -2
View File
@@ -3,7 +3,7 @@
"description": "Simple and unopinionated ACME client",
"private": false,
"author": "nmorsman",
"version": "1.39.13",
"version": "1.39.14",
"type": "module",
"module": "./dist/index.js",
"main": "./dist/index.js",
@@ -18,7 +18,7 @@
"types"
],
"dependencies": {
"@certd/basic": "^1.39.13",
"@certd/basic": "^1.39.14",
"@peculiar/x509": "^1.11.0",
"asn1js": "^3.0.5",
"axios": "^1.9.0",
+4
View File
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/basic
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+1 -1
View File
@@ -1 +1 @@
00:21
00:06
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/basic",
"private": false,
"version": "1.39.13",
"version": "1.39.14",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
+4
View File
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/pipeline
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Bug Fixes
+3 -3
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/pipeline",
"private": false,
"version": "1.39.13",
"version": "1.39.14",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -19,8 +19,8 @@
"compile": "tsc --skipLibCheck --watch"
},
"dependencies": {
"@certd/basic": "^1.39.13",
"@certd/plus-core": "^1.39.13",
"@certd/basic": "^1.39.14",
"@certd/plus-core": "^1.39.14",
"dayjs": "^1.11.7",
"lodash-es": "^4.17.21",
"reflect-metadata": "^0.1.13"
+4
View File
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/lib-huawei
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/lib-huawei",
"private": false,
"version": "1.39.13",
"version": "1.39.14",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
"types": "./dist/d/index.d.ts",
+4
View File
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/lib-iframe
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/lib-iframe",
"private": false,
"version": "1.39.13",
"version": "1.39.14",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
+4
View File
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/jdcloud
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@certd/jdcloud",
"version": "1.39.13",
"version": "1.39.14",
"description": "jdcloud openApi sdk",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
+4
View File
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/lib-k8s
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/lib-k8s",
"private": false,
"version": "1.39.13",
"version": "1.39.14",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -19,7 +19,7 @@
"compile": "tsc --skipLibCheck --watch"
},
"dependencies": {
"@certd/basic": "^1.39.13",
"@certd/basic": "^1.39.14",
"@kubernetes/client-node": "0.21.0"
},
"devDependencies": {
+6
View File
@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
### Bug Fixes
* 修复启动时报密钥备份不存在的问题 ([c966896](https://github.com/certd/certd/commit/c9668965226af6b54e0e576931dcba8b3d188ef3))
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+6 -6
View File
@@ -1,6 +1,6 @@
{
"name": "@certd/lib-server",
"version": "1.39.13",
"version": "1.39.14",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -29,11 +29,11 @@
],
"license": "AGPL",
"dependencies": {
"@certd/acme-client": "^1.39.13",
"@certd/basic": "^1.39.13",
"@certd/pipeline": "^1.39.13",
"@certd/plugin-lib": "^1.39.13",
"@certd/plus-core": "^1.39.13",
"@certd/acme-client": "^1.39.14",
"@certd/basic": "^1.39.14",
"@certd/pipeline": "^1.39.14",
"@certd/plugin-lib": "^1.39.14",
"@certd/plus-core": "^1.39.14",
"@midwayjs/cache": "3.14.0",
"@midwayjs/core": "3.20.11",
"@midwayjs/i18n": "3.20.13",
@@ -1,4 +1,4 @@
import { Init, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
import { Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
import { Encryptor, SysSecret, SysSettingsService } from '../../../system/index.js';
/**
@@ -12,8 +12,7 @@ export class EncryptService {
@Inject()
sysSettingService: SysSettingsService;
@Init()
async init() {
async doInit() {
const secret: SysSecret = await this.sysSettingService.getSecret();
this.encryptor = new Encryptor(secret.encryptSecret);
}
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@certd/midway-flyway-js",
"version": "1.39.13",
"version": "1.39.14",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/plugin-cert
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+5 -5
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/plugin-cert",
"private": false,
"version": "1.39.13",
"version": "1.39.14",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -18,10 +18,10 @@
"compile": "tsc --skipLibCheck --watch"
},
"dependencies": {
"@certd/acme-client": "^1.39.13",
"@certd/basic": "^1.39.13",
"@certd/pipeline": "^1.39.13",
"@certd/plugin-lib": "^1.39.13",
"@certd/acme-client": "^1.39.14",
"@certd/basic": "^1.39.14",
"@certd/pipeline": "^1.39.14",
"@certd/plugin-lib": "^1.39.14",
"psl": "^1.9.0",
"punycode.js": "^2.3.1"
},
+4
View File
@@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
**Note:** Version bump only for package @certd/plugin-lib
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Performance Improvements
+5 -5
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/plugin-lib",
"private": false,
"version": "1.39.13",
"version": "1.39.14",
"type": "module",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
@@ -23,10 +23,10 @@
"@alicloud/pop-core": "^1.7.10",
"@alicloud/tea-util": "^1.4.11",
"@aws-sdk/client-s3": "^3.964.0",
"@certd/acme-client": "^1.39.13",
"@certd/basic": "^1.39.13",
"@certd/pipeline": "^1.39.13",
"@certd/plus-core": "^1.39.13",
"@certd/acme-client": "^1.39.14",
"@certd/basic": "^1.39.14",
"@certd/pipeline": "^1.39.14",
"@certd/plus-core": "^1.39.14",
"@kubernetes/client-node": "0.21.0",
"ali-oss": "^6.22.0",
"basic-ftp": "^5.0.5",
+3 -3
View File
@@ -10,9 +10,9 @@ FROM node:22-alpine3.21 AS builder
WORKDIR /workspace/
COPY . /workspace/
# armv7 目前只能用node18 pnpm9不支持node18,所以pnpm只能用8.15.7版本
# https://github.com/nodejs/docker-node/issues/1946
RUN npm install -g pnpm
# pnpm v11打包会报错([ERR_PNPM_IGNORED_BUILDS] Ignored build scripts),暂时固定10.33.4版本
# https://pnpm.io/zh/migration
RUN npm install -g pnpm@10.33.4
#RUN cd /workspace/certd-client && pnpm install && npm run build
RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf
+6
View File
@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
### Bug Fixes
* 修复阿里云订阅流水线创建对话框无法获取阿里订单列表的bug ([a362860](https://github.com/certd/certd/commit/a362860137bfb7072893c844fe775edc46070ee1))
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Bug Fixes
+8 -8
View File
@@ -1,6 +1,6 @@
{
"name": "@certd/ui-client",
"version": "1.39.13",
"version": "1.39.14",
"private": true,
"scripts": {
"dev": "vite --open",
@@ -34,11 +34,11 @@
"@aws-sdk/s3-request-presigner": "^3.964.0",
"@certd/vue-js-cron-light": "^4.0.14",
"@ctrl/tinycolor": "^4.1.0",
"@fast-crud/editor-code": "^1.27.8",
"@fast-crud/fast-crud": "^1.27.8",
"@fast-crud/fast-extends": "^1.27.8",
"@fast-crud/ui-antdv4": "^1.27.8",
"@fast-crud/ui-interface": "^1.27.8",
"@fast-crud/editor-code": "^1.28.1",
"@fast-crud/fast-crud": "^1.28.1",
"@fast-crud/fast-extends": "^1.28.1",
"@fast-crud/ui-antdv4": "^1.28.1",
"@fast-crud/ui-interface": "^1.28.1",
"@iconify/tailwind": "^1.2.0",
"@iconify/vue": "^4.1.1",
"@manypkg/get-packages": "^2.2.2",
@@ -106,8 +106,8 @@
"zod-defaults": "^0.1.3"
},
"devDependencies": {
"@certd/lib-iframe": "^1.39.13",
"@certd/pipeline": "^1.39.13",
"@certd/lib-iframe": "^1.39.14",
"@certd/pipeline": "^1.39.14",
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"@types/chai": "^4.3.12",
@@ -74,7 +74,6 @@ const props = defineProps<
uploadCert?: UploadCertProps;
} & ComponentPropsType
>();
debugger;
const emit = defineEmits<{
"update:value": any;
}>();
@@ -141,8 +140,7 @@ const getOptions = async () => {
}
}
}
message.value = "";
message.value = "获取中...";
hasError.value = false;
loading.value = true;
const pageNo = pagerRef.value.pageNo;
@@ -11,7 +11,17 @@ export type MergeScriptContext = {
export function useReference(formItem: any) {
if (formItem.mergeScript) {
const ctx = {
compute,
compute: (opts: any) => {
const func = (context: any) => {
let form = context.form || {};
form = form.input || form.body || form.access || form;
return opts({
...context,
form,
});
};
return compute(func);
},
asyncCompute,
computed,
};
@@ -94,9 +94,15 @@ export function setRunnableIds(pipeline: any) {
return JSON.parse(content);
}
export function useCertPipelineCreator() {
export function useCertPipelineCreator({ formWrapperRef }: { formWrapperRef: Ref<any> }) {
const { t } = useI18n();
const { openCrudFormDialog } = useFormWrapper();
function open(opts: any) {
return new Promise((resolve, reject) => {
formWrapperRef.value.open(opts);
});
}
const { openCrudFormDialog } = useFormWrapper({ open });
const pluginStore = usePluginStore();
const settingStore = useSettingStore();
@@ -111,10 +117,10 @@ export function useCertPipelineCreator() {
// inputs[inputKey].form.show = true;
const inputDefine = cloneDeep(certPlugin.input[inputKey]);
if (inputDefine.maybeNeed) {
moreParams.push(inputKey);
moreParams.push("input." + inputKey);
}
useReference(inputDefine);
inputs[inputKey] = {
inputs["input." + inputKey] = {
title: inputDefine.title,
form: {
...inputDefine,
@@ -135,17 +141,19 @@ export function useCertPipelineCreator() {
const DEFAULT_RENEW_DAYS = settingStore.sysPublic.defaultCertRenewDays || settingStore.sysPublic.defaultWillExpireDays || 20;
merge(inputs, {
renewDays: {
"input.renewDays": {
form: {
value: DEFAULT_RENEW_DAYS,
},
},
});
const initialForm = req.initialForm || {};
initialForm.type = certPlugin.name;
return {
crudOptions: {
form: {
initialForm: req.initialForm || {},
initialForm: initialForm,
doSubmit,
wrapper: {
wrapClassName: "cert_pipeline_create_form",
@@ -164,44 +172,6 @@ export function useCertPipelineCreator() {
},
},
columns: {
// certApplyPlugin: {
// title: t("certd.plugin.selectTitle"),
// type: "dict-select",
// dict: dict({
// data: [
// { value: "CertApply", label: "JS-ACME" },
// { value: "CertApplyLego", label: "Lego-ACME" },
// { value: "CertApplyGetFormAliyun", label: "Aliyun-Order" },
// ],
// }),
// form: {
// order: 0,
// value: "CertApply",
// helper: {
// render: () => {
// return (
// <ul>
// <li>{t("certd.plugin.jsAcme")}</li>
// <li>{t("certd.plugin.legoAcme")}</li>
// <li>{t("certd.plugin.aliyunOrder")}</li>
// </ul>
// );
// },
// },
// valueChange: {
// handle: async ({ form, value }) => {
// const config = await pluginStore.getPluginConfig({
// name: value,
// type: "builtIn",
// });
// if (config.sysSetting?.input) {
// merge(form, config.sysSetting.input);
// }
// },
// immediate: true,
// },
// },
// },
...inputs,
triggerCron: {
title: t("certd.pipelineForm.triggerCronTitle"),
@@ -346,20 +316,20 @@ export function useCertPipelineCreator() {
await checkPipelineLimit();
//设置系统初始值
const initialForm: any = {};
const initialForm: any = { input: {} };
const pluginSysConfig = await pluginStore.getPluginConfig({ name: req.pluginName, type: "builtIn" });
if (pluginSysConfig.sysSetting?.input) {
for (const key in pluginSysConfig.sysSetting?.input) {
initialForm[key] = pluginSysConfig.sysSetting?.input[key];
initialForm.input[key] = pluginSysConfig.sysSetting?.input[key];
}
}
async function doSubmit({ form }: any) {
// const certDetail = readCertDetail(form.cert.crt);
// 添加certd pipeline
const pluginInput = omit(form, ["triggerCron", "notification", "notificationTarget", "notificationWhen", "certApplyPlugin", "groupId"]);
const pluginInput = form.input;
let pipeline: any = {
title: form.domains[0] + "证书自动化",
title: pluginInput.domains[0] + "证书自动化",
runnableType: "pipeline",
stages: [
{
@@ -50,6 +50,7 @@
<div>{{ t("certd.applyCertificate") }}</div>
</template>
</fs-crud>
<fs-form-wrapper ref="formWrapperRef"></fs-form-wrapper>
</fs-page>
</template>
@@ -90,10 +91,9 @@ function onActionbarMoreItemClick(req: { key: string; item: any }) {
openCertApplyDialog({ key: req.key, title: req.item?.title });
}
const certdFormRef = ref<typeof CertdForm>();
const currentPluginRef = ref();
provide("getCurrentPluginDefine", () => {
return currentPluginRef.value;
return currentPluginRef;
});
const addMorePipelineBtns = computed(() => {
@@ -104,7 +104,9 @@ const addMorePipelineBtns = computed(() => {
{ key: "BatchAddPipeline", title: t("certd.pipelinePage.batchAddPipeline"), icon: "ion:duplicate" },
];
});
const { openAddCertdPipelineDialog } = useCertPipelineCreator();
const formWrapperRef = ref<any>();
const { openAddCertdPipelineDialog } = useCertPipelineCreator({ formWrapperRef });
function openCertApplyDialog(req: { key: string; title: string }) {
if (req.key === "AddPipeline") {
crudExpose.openAdd({});
+6
View File
@@ -3,6 +3,12 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
## [1.39.14](https://github.com/certd/certd/compare/v1.39.13...v1.39.14) (2026-05-11)
### Bug Fixes
* 修复启动时报密钥备份不存在的问题 ([c966896](https://github.com/certd/certd/commit/c9668965226af6b54e0e576931dcba8b3d188ef3))
## [1.39.13](https://github.com/certd/certd/compare/v1.39.12...v1.39.13) (2026-05-10)
### Bug Fixes
+14 -14
View File
@@ -1,6 +1,6 @@
{
"name": "@certd/ui-server",
"version": "1.39.13",
"version": "1.39.14",
"description": "fast-server base midway",
"private": true,
"type": "module",
@@ -53,20 +53,20 @@
"@aws-sdk/client-sts": "^3.990.0",
"@azure/arm-dns": "^5.1.0",
"@azure/identity": "^4.13.1",
"@certd/acme-client": "^1.39.13",
"@certd/basic": "^1.39.13",
"@certd/commercial-core": "^1.39.13",
"@certd/acme-client": "^1.39.14",
"@certd/basic": "^1.39.14",
"@certd/commercial-core": "^1.39.14",
"@certd/cv4pve-api-javascript": "^8.4.2",
"@certd/jdcloud": "^1.39.13",
"@certd/lib-huawei": "^1.39.13",
"@certd/lib-k8s": "^1.39.13",
"@certd/lib-server": "^1.39.13",
"@certd/midway-flyway-js": "^1.39.13",
"@certd/pipeline": "^1.39.13",
"@certd/plugin-cert": "^1.39.13",
"@certd/plugin-lib": "^1.39.13",
"@certd/plugin-plus": "^1.39.13",
"@certd/plus-core": "^1.39.13",
"@certd/jdcloud": "^1.39.14",
"@certd/lib-huawei": "^1.39.14",
"@certd/lib-k8s": "^1.39.14",
"@certd/lib-server": "^1.39.14",
"@certd/midway-flyway-js": "^1.39.14",
"@certd/pipeline": "^1.39.14",
"@certd/plugin-cert": "^1.39.14",
"@certd/plugin-lib": "^1.39.14",
"@certd/plugin-plus": "^1.39.14",
"@certd/plus-core": "^1.39.14",
"@google-cloud/dns": "^5.3.1",
"@google-cloud/publicca": "^1.3.0",
"@huaweicloud/huaweicloud-sdk-cdn": "^3.1.185",
@@ -9,7 +9,7 @@ import { AutoPrint } from "./auto-print.js";
@Autoload()
@Scope(ScopeEnum.Request, { allowDowngrade: true })
export class AutoRegister {
export class AutoARegister { //这个A是必须,让他排在第一个 进行init,否则会被其他init模块抢先注册导致报错
@Inject()
autoInitSite: AutoInitSite;
@@ -1,5 +1,5 @@
import { logger } from '@certd/basic';
import { PlusService, SysInstallInfo, SysPrivateSettings, SysSettingsService } from '@certd/lib-server';
import { EncryptService, PlusService, SysInstallInfo, SysPrivateSettings, SysSettingsService } from '@certd/lib-server';
import { Config, Inject, Provide, Scope, ScopeEnum } from '@midwayjs/core';
import crypto from 'crypto';
import { nanoid } from 'nanoid';
@@ -22,6 +22,10 @@ export class AutoInitSite {
@Inject()
safeService: SafeService;
@Inject()
encryptService: EncryptService;
async init() {
logger.info('初始化站点开始');
await this.startOptimizeDb();
@@ -50,6 +54,8 @@ export class AutoInitSite {
//加载一次密钥
await this.sysSettingsService.getSecret();
//初始化加密服务
await this.encryptService.doInit();
// 授权许可
try {
+123 -62
View File
@@ -238,7 +238,7 @@ importers:
version: link:../basic
'@certd/plus-core':
specifier: ^1.39.13
version: link:../../pro/plus-core
version: 1.39.13
dayjs:
specifier: ^1.11.7
version: 1.11.13
@@ -516,7 +516,7 @@ importers:
version: link:../../plugins/plugin-lib
'@certd/plus-core':
specifier: ^1.39.13
version: link:../../pro/plus-core
version: 1.39.13
'@midwayjs/cache':
specifier: 3.14.0
version: 3.14.0
@@ -768,7 +768,7 @@ importers:
version: link:../../core/pipeline
'@certd/plus-core':
specifier: ^1.39.13
version: link:../../pro/plus-core
version: 1.39.13
'@kubernetes/client-node':
specifier: 0.21.0
version: 0.21.0
@@ -1152,20 +1152,20 @@ importers:
specifier: ^4.1.0
version: 4.1.0
'@fast-crud/editor-code':
specifier: ^1.27.8
version: 1.27.8
specifier: ^1.28.1
version: 1.28.1
'@fast-crud/fast-crud':
specifier: ^1.27.8
version: 1.27.8(vue@3.5.14(typescript@5.9.3))
specifier: ^1.28.1
version: 1.28.1(vue@3.5.14(typescript@5.9.3))
'@fast-crud/fast-extends':
specifier: ^1.27.8
version: 1.27.8(aws-crt@1.26.2)(vue@3.5.14(typescript@5.9.3))
specifier: ^1.28.1
version: 1.28.1(aws-crt@1.26.2)(vue@3.5.14(typescript@5.9.3))
'@fast-crud/ui-antdv4':
specifier: ^1.27.8
version: 1.27.8
specifier: ^1.28.1
version: 1.28.1
'@fast-crud/ui-interface':
specifier: ^1.27.8
version: 1.27.8
specifier: ^1.28.1
version: 1.28.1
'@iconify/tailwind':
specifier: ^1.2.0
version: 1.2.0
@@ -1580,7 +1580,7 @@ importers:
version: link:../../core/basic
'@certd/commercial-core':
specifier: ^1.39.13
version: link:../../pro/commercial-core
version: 1.39.13(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.9.3))
'@certd/cv4pve-api-javascript':
specifier: ^8.4.2
version: 8.4.2
@@ -1610,10 +1610,10 @@ importers:
version: link:../../plugins/plugin-lib
'@certd/plugin-plus':
specifier: ^1.39.13
version: link:../../pro/plugin-plus
version: 1.39.13
'@certd/plus-core':
specifier: ^1.39.13
version: link:../../pro/plus-core
version: 1.39.13
'@google-cloud/dns':
specifier: ^5.3.1
version: 5.3.1
@@ -3033,9 +3033,18 @@ packages:
'@better-scroll/zoom@2.5.1':
resolution: {integrity: sha512-aGvFY5ooeZWS4RcxQLD+pGLpQHQxpPy0sMZV3yadcd2QK53PK9gS4Dp+BYfRv8lZ4/P2LoNEhr6Wq1DN6+uPlA==}
'@certd/commercial-core@1.39.13':
resolution: {integrity: sha512-AvHmxpgWdYt/QQBEGLA4ASa1YUcXN0jUAHo7sUu2Czon+jpP16YDo328kUsPAhtY4DMzUj1Ozr7HI2n/O81CQQ==}
'@certd/cv4pve-api-javascript@8.4.2':
resolution: {integrity: sha512-udGce7ewrVl4DmZvX+17PjsnqsdDIHEDatr8QP0AVrY2p+8JkaSPW4mXCKiLGf82C9K2+GXgT+qNIqgW7tfF9Q==}
'@certd/plugin-plus@1.39.13':
resolution: {integrity: sha512-Q7ddg3NMj6ikT1hnxUxxmFOOkAwDa1RWZsocZashNDXcQkyTGCLg596EIxtuNDKTJa/7Ggb4zHLrkY9OOdEcNg==}
'@certd/plus-core@1.39.13':
resolution: {integrity: sha512-5VpUKrt18pK048Z6n5M8R3REUomKkKiID6IfDK8zYlIErSrDofsOuDwUPEofuJM7gZQ8Ovkc6l14KLhSvjLvnw==}
'@certd/vue-js-cron-core@6.0.3':
resolution: {integrity: sha512-kqzoAMhYz9j6FGNWEODRYtt4NpUEUwjpkU89z5WVg2tCtOcI5VhwyUGOd8AxiBCRfd6PtXvzuqw85PaOps9wrQ==}
@@ -3675,20 +3684,20 @@ packages:
resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
'@fast-crud/editor-code@1.27.8':
resolution: {integrity: sha512-NOIFFMNR+ZZ3dikp6U/V2zDcWcaT+bIq6hV9953keSjLMtbbOcn9PDw/oByac7TXy8l0jCI+4Ee89OepRGqa9Q==}
'@fast-crud/editor-code@1.28.1':
resolution: {integrity: sha512-5BCN916KQ3zn1TbAQJiTdhonBN4i8NWCCYKateuBWnaOM7B7zgULC3+Jncn1JlAnCaH7L+7iYwf8r/XNC0DT7w==}
'@fast-crud/fast-crud@1.27.8':
resolution: {integrity: sha512-yv1tg9qxNwFVnvmo882l2fdL0q6tghg5QQ7S5dsjm7wRf4IxFWqLHOnBor7GUbo+fGBxJK5H8DQsK/HB2De/nA==}
'@fast-crud/fast-crud@1.28.1':
resolution: {integrity: sha512-E9XwwQsNkP77kqLTJyqy/k1i7KD7cnw6FkJt3fTMl1OsBjp09TY3a4OXEfcsJsk+q/l8/9HzQRDBDhDIcWkROA==}
'@fast-crud/fast-extends@1.27.8':
resolution: {integrity: sha512-C9Lc4n/mZp8M5xT+8031rnTh518jfpHsww9PXXnV7XJM/Nleo04rP2rDH5e+J8MVSsZRC5j93TfIjhcLDc/JYg==}
'@fast-crud/fast-extends@1.28.1':
resolution: {integrity: sha512-HK2bktH+PYKJlPeTgO9MTIofdpe9g3s2eaBodGo6A7LgXp9U9aTHbfJJsRxzh8DTM8igi71gHg45bTL3DMLYuQ==}
'@fast-crud/ui-antdv4@1.27.8':
resolution: {integrity: sha512-nig8zAq6DbJNuQ6PkrDJjpNfH2B2R0LDE9foW1krtk1bM5nzn5bIAvJ5MHcVxFYiOwqgzke/m6h7RGquPLbLjg==}
'@fast-crud/ui-antdv4@1.28.1':
resolution: {integrity: sha512-qJinotmWmbd4WdZlkaVv/eRqzbTgIWWQyQgZMK7LlOmRe/83ZpXcq45hap0+pH5UD7ZJrKA5RIIgGFp5+ihvvg==}
'@fast-crud/ui-interface@1.27.8':
resolution: {integrity: sha512-qsTHI7QBmgxlO8ZOoTBKN7zZOUhaYyCtPIUQ5/VJiaBhsWDsQMQTn/7rhPXU5WNpjtfdR2cFW7MgTemVmiDvDQ==}
'@fast-crud/ui-interface@1.28.1':
resolution: {integrity: sha512-HUUO/SObmkAYnQdSETa4Z+M1YMJvzgQWBmy453iPKApTCxf2hEv4Alj/KuajZuP2sxFNzvsMdaUyAO6vWRBaDw==}
'@fidm/asn1@1.0.4':
resolution: {integrity: sha512-esd1jyNvRb2HVaQGq2Gg8Z0kbQPXzV9Tq5Z14KNIov6KfFD6PTaRIO8UpcsYiTNzOqJpmyzWgVTrUwFV3UF4TQ==}
@@ -14004,14 +14013,14 @@ snapshots:
'@aws-sdk/core@3.810.0':
dependencies:
'@aws-sdk/types': 3.804.0
'@smithy/core': 3.20.0
'@smithy/node-config-provider': 4.3.7
'@smithy/property-provider': 4.2.7
'@smithy/protocol-http': 5.3.7
'@smithy/signature-v4': 5.3.7
'@smithy/smithy-client': 4.10.2
'@smithy/types': 4.11.0
'@smithy/util-middleware': 4.2.7
'@smithy/core': 3.23.0
'@smithy/node-config-provider': 4.3.8
'@smithy/property-provider': 4.2.8
'@smithy/protocol-http': 5.3.8
'@smithy/signature-v4': 5.3.8
'@smithy/smithy-client': 4.11.3
'@smithy/types': 4.12.0
'@smithy/util-middleware': 4.2.8
fast-xml-parser: 4.4.1
tslib: 2.8.1
@@ -14364,15 +14373,15 @@ snapshots:
'@aws-sdk/core': 3.810.0
'@aws-sdk/types': 3.804.0
'@aws-sdk/util-arn-parser': 3.804.0
'@smithy/core': 3.20.0
'@smithy/node-config-provider': 4.3.7
'@smithy/protocol-http': 5.3.7
'@smithy/signature-v4': 5.3.7
'@smithy/smithy-client': 4.10.2
'@smithy/types': 4.11.0
'@smithy/core': 3.23.0
'@smithy/node-config-provider': 4.3.8
'@smithy/protocol-http': 5.3.8
'@smithy/signature-v4': 5.3.8
'@smithy/smithy-client': 4.11.3
'@smithy/types': 4.12.0
'@smithy/util-config-provider': 4.2.0
'@smithy/util-middleware': 4.2.7
'@smithy/util-stream': 4.5.8
'@smithy/util-middleware': 4.2.8
'@smithy/util-stream': 4.5.12
'@smithy/util-utf8': 4.2.0
tslib: 2.8.1
@@ -14404,9 +14413,9 @@ snapshots:
'@aws-sdk/core': 3.810.0
'@aws-sdk/types': 3.804.0
'@aws-sdk/util-endpoints': 3.808.0
'@smithy/core': 3.20.0
'@smithy/protocol-http': 5.3.7
'@smithy/types': 4.11.0
'@smithy/core': 3.23.0
'@smithy/protocol-http': 5.3.8
'@smithy/types': 4.12.0
tslib: 2.8.1
'@aws-sdk/middleware-user-agent@3.964.0':
@@ -14547,10 +14556,10 @@ snapshots:
'@aws-sdk/crt-loader': 3.810.0
'@aws-sdk/signature-v4-multi-region': 3.810.0
'@aws-sdk/types': 3.804.0
'@smithy/querystring-parser': 4.2.7
'@smithy/signature-v4': 5.3.7
'@smithy/types': 4.11.0
'@smithy/util-middleware': 4.2.7
'@smithy/querystring-parser': 4.2.8
'@smithy/signature-v4': 5.3.8
'@smithy/types': 4.12.0
'@smithy/util-middleware': 4.2.8
tslib: 2.8.1
transitivePeerDependencies:
- bufferutil
@@ -14562,9 +14571,9 @@ snapshots:
dependencies:
'@aws-sdk/middleware-sdk-s3': 3.810.0
'@aws-sdk/types': 3.804.0
'@smithy/protocol-http': 5.3.7
'@smithy/signature-v4': 5.3.7
'@smithy/types': 4.11.0
'@smithy/protocol-http': 5.3.8
'@smithy/signature-v4': 5.3.8
'@smithy/types': 4.12.0
tslib: 2.8.1
'@aws-sdk/signature-v4-multi-region@3.964.0':
@@ -14602,7 +14611,7 @@ snapshots:
'@aws-sdk/types@3.804.0':
dependencies:
'@smithy/types': 4.11.0
'@smithy/types': 4.12.0
tslib: 2.8.1
'@aws-sdk/types@3.957.0':
@@ -14626,8 +14635,8 @@ snapshots:
'@aws-sdk/util-endpoints@3.808.0':
dependencies:
'@aws-sdk/types': 3.804.0
'@smithy/types': 4.11.0
'@smithy/util-endpoints': 3.2.7
'@smithy/types': 4.12.0
'@smithy/util-endpoints': 3.2.8
tslib: 2.8.1
'@aws-sdk/util-endpoints@3.957.0':
@@ -14675,8 +14684,8 @@ snapshots:
dependencies:
'@aws-sdk/middleware-user-agent': 3.810.0
'@aws-sdk/types': 3.804.0
'@smithy/node-config-provider': 4.3.7
'@smithy/types': 4.11.0
'@smithy/node-config-provider': 4.3.8
'@smithy/types': 4.12.0
tslib: 2.8.1
optionalDependencies:
aws-crt: 1.26.2
@@ -15564,12 +15573,64 @@ snapshots:
dependencies:
'@better-scroll/core': 2.5.1
'@certd/commercial-core@1.39.13(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.9.3))':
dependencies:
'@certd/basic': link:packages/core/basic
'@certd/lib-server': link:packages/libs/lib-server
'@certd/pipeline': link:packages/core/pipeline
'@certd/plus-core': 1.39.13
'@midwayjs/core': 3.20.11
'@midwayjs/koa': 3.20.13
'@midwayjs/logger': 3.4.2
'@midwayjs/swagger': 3.20.11
'@midwayjs/typeorm': 3.20.11
dayjs: 1.11.13
typeorm: 0.3.24(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.9.3))
transitivePeerDependencies:
- '@google-cloud/spanner'
- '@sap/hana-client'
- babel-plugin-macros
- better-sqlite3
- hdb-pool
- ioredis
- mongodb
- mssql
- mysql2
- oracledb
- pg
- pg-native
- pg-query-stream
- redis
- reflect-metadata
- sql.js
- sqlite3
- supports-color
- ts-node
- typeorm-aurora-data-api-driver
'@certd/cv4pve-api-javascript@8.4.2':
dependencies:
debug: 4.4.3(supports-color@8.1.1)
transitivePeerDependencies:
- supports-color
'@certd/plugin-plus@1.39.13':
dependencies:
'@certd/basic': link:packages/core/basic
'@certd/pipeline': link:packages/core/pipeline
'@certd/plugin-lib': link:packages/plugins/plugin-lib
'@certd/plus-core': 1.39.13
crypto-js: 4.2.0
dayjs: 1.11.13
form-data: 4.0.2
jsrsasign: 11.1.0
querystring: 0.2.1
'@certd/plus-core@1.39.13':
dependencies:
'@certd/basic': link:packages/core/basic
dayjs: 1.11.13
'@certd/vue-js-cron-core@6.0.3':
dependencies:
mustache: 4.2.0
@@ -16081,14 +16142,14 @@ snapshots:
'@eslint/js@8.57.0': {}
'@fast-crud/editor-code@1.27.8':
'@fast-crud/editor-code@1.28.1':
dependencies:
js-yaml: 4.1.0
lodash-es: 4.17.21
monaco-editor: 0.52.2
monaco-yaml: 5.4.0(monaco-editor@0.52.2)
'@fast-crud/fast-crud@1.27.8(vue@3.5.14(typescript@5.9.3))':
'@fast-crud/fast-crud@1.28.1(vue@3.5.14(typescript@5.9.3))':
dependencies:
'@iconify/types': 2.0.0
file-saver: 2.0.5
@@ -16098,7 +16159,7 @@ snapshots:
transitivePeerDependencies:
- vue
'@fast-crud/fast-extends@1.27.8(aws-crt@1.26.2)(vue@3.5.14(typescript@5.9.3))':
'@fast-crud/fast-extends@1.28.1(aws-crt@1.26.2)(vue@3.5.14(typescript@5.9.3))':
dependencies:
'@aws-sdk/client-s3': 3.964.0(aws-crt@1.26.2)
'@aws-sdk/s3-request-presigner': 3.964.0
@@ -16128,9 +16189,9 @@ snapshots:
- utf-8-validate
- vue
'@fast-crud/ui-antdv4@1.27.8': {}
'@fast-crud/ui-antdv4@1.28.1': {}
'@fast-crud/ui-interface@1.27.8':
'@fast-crud/ui-interface@1.28.1':
dependencies:
lodash-es: 4.17.21
+1 -1
View File
@@ -1 +1 @@
23:28
10:26