lkddi/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2026-04-30 09:17:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2-dev' into v2_admin_mode

Browse Source
This commit is contained in:
xiaojunnuo
2026-02-09 18:21:01 +08:00
parent 2e3d0cc57c 02f89a9c9d
commit ad22244388
83 changed files with 776 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/libs/lib-huawei/CHANGELOG.md
+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.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
**Note:** Version bump only for package @certd/lib-huawei
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
**Note:** Version bump only for package @certd/lib-huawei
packages/libs/lib-huawei/package.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/lib-huawei",
"private": false,
"version": "1.38.7",
"version": "1.38.8",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
"types": "./dist/d/index.d.ts",
@@ -24,5 +24,5 @@
"prettier": "^2.8.8",
"tslib": "^2.8.1"
},
"gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
}
packages/libs/lib-iframe/CHANGELOG.md
+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.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
**Note:** Version bump only for package @certd/lib-iframe
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
**Note:** Version bump only for package @certd/lib-iframe
packages/libs/lib-iframe/package.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/lib-iframe",
"private": false,
"version": "1.38.7",
"version": "1.38.8",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -31,5 +31,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
}
packages/libs/lib-jdcloud/CHANGELOG.md
+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.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
**Note:** Version bump only for package @certd/jdcloud
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
**Note:** Version bump only for package @certd/jdcloud
packages/libs/lib-jdcloud/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@certd/jdcloud",
"version": "1.38.7",
"version": "1.38.8",
"description": "jdcloud openApi sdk",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
@@ -56,5 +56,5 @@
"fetch"
]
},
"gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
}
packages/libs/lib-k8s/CHANGELOG.md
+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.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
**Note:** Version bump only for package @certd/lib-k8s
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
**Note:** Version bump only for package @certd/lib-k8s
packages/libs/lib-k8s/package.json
+3 -3
View File
@@ -1,7 +1,7 @@
{
"name": "@certd/lib-k8s",
"private": false,
"version": "1.38.7",
"version": "1.38.8",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -17,7 +17,7 @@
"pub": "npm publish"
},
"dependencies": {
"@certd/basic": "^1.38.7",
"@certd/basic": "^1.38.8",
"@kubernetes/client-node": "0.21.0"
},
"devDependencies": {
@@ -32,5 +32,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
}
packages/libs/lib-server/CHANGELOG.md
+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.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
### Performance Improvements
* 支持设置默认的证书申请地址的反向代理 ([0cfb94b](https://github.com/certd/certd/commit/0cfb94b0ba6a6dc3bb0d0a81a1912068a4e6b6b6))
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
**Note:** Version bump only for package @certd/lib-server
packages/libs/lib-server/package.json
+7 -7
View File
@@ -1,6 +1,6 @@
{
"name": "@certd/lib-server",
"version": "1.38.7",
"version": "1.38.8",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -28,11 +28,11 @@
],
"license": "AGPL",
"dependencies": {
"@certd/acme-client": "^1.38.7",
"@certd/basic": "^1.38.7",
"@certd/pipeline": "^1.38.7",
"@certd/plugin-lib": "^1.38.7",
"@certd/plus-core": "^1.38.7",
"@certd/acme-client": "^1.38.8",
"@certd/basic": "^1.38.8",
"@certd/pipeline": "^1.38.8",
"@certd/plugin-lib": "^1.38.8",
"@certd/plus-core": "^1.38.8",
"@midwayjs/cache": "3.14.0",
"@midwayjs/core": "3.20.11",
"@midwayjs/i18n": "3.20.13",
@@ -64,5 +64,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
}
packages/libs/lib-server/src/system/settings/service/models.ts
+3
View File
@@ -78,6 +78,9 @@ export class SysPrivateSettings extends BaseSettings {
httpsProxy? = '';
httpProxy? = '';
reverseProxies?: Record<string, string> = {};
dnsResultOrder? = '';
commonCnameEnabled?: boolean = true;
packages/libs/lib-server/src/system/settings/service/sys-settings-service.ts
+13 -4
View File
@@ -4,10 +4,10 @@ import { Repository } from 'typeorm';
import { SysSettingsEntity } from '../entity/sys-settings.js';
import { BaseSettings, SysInstallInfo, SysPrivateSettings, SysPublicSettings, SysSecret, SysSecretBackup } from './models.js';
import { BaseService } from '../../../basic/index.js';
import { cache, logger, setGlobalProxy } from '@certd/basic';
import { getAllSslProviderDomains, setSslProviderReverseProxies } from '@certd/acme-client';
import { cache, logger, mergeUtils, setGlobalProxy } from '@certd/basic';
import * as dns from 'node:dns';
import {mergeUtils} from "@certd/basic";
import { BaseService } from '../../../basic/index.js';
import { executorQueue } from '../../basic/service/executor-queue.js';
const {merge} = mergeUtils;
/**
@@ -120,7 +120,14 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
}
async getPrivateSettings(): Promise<SysPrivateSettings> {
return await this.getSetting(SysPrivateSettings);
const res = await this.getSetting<SysPrivateSettings>(SysPrivateSettings);
const sslProviderDomains = getAllSslProviderDomains();
for (const domain of sslProviderDomains) {
if (!res.reverseProxies[domain]) {
res.reverseProxies[domain] = "";
}
}
return res
}
async savePrivateSettings(bean: SysPrivateSettings) {
@@ -145,6 +152,8 @@ export class SysSettingsService extends BaseService<SysSettingsEntity> {
if (bean.pipelineMaxRunningCount){
executorQueue.setMaxRunningCount(bean.pipelineMaxRunningCount);
}
setSslProviderReverseProxies(bean.reverseProxies);
}
async updateByKey(key: string, setting: any) {
packages/libs/midway-flyway-js/CHANGELOG.md
+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.38.8](https://github.com/certd/certd/compare/v1.38.7...v1.38.8) (2026-02-06)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.38.7](https://github.com/certd/certd/compare/v1.38.6...v1.38.7) (2026-02-05)
**Note:** Version bump only for package @certd/midway-flyway-js
packages/libs/midway-flyway-js/package.json
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "@certd/midway-flyway-js",
"version": "1.38.7",
"version": "1.38.8",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -46,5 +46,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "29d37075dd600fa4898c5e38611e09db522e32fc"
"gitHead": "4fda6cbcde3d398d7f4dc3ee7e8ea90e691098db"
}
packages/libs/midway-flyway-js/src/flyway.ts
+7 -1
View File
@@ -31,6 +31,12 @@ const DefaultLogger = {
console.error(args);
},
};
let customLogger:any = null;
export function setFlywayLogger (logger: any) {
customLogger = logger;
};
export class Flyway {
scriptDir;
flywayTableName;
@@ -43,7 +49,7 @@ export class Flyway {
this.flywayTableName = opts.flywayTableName ?? 'flyway_history';
this.baseline = opts.baseline ?? false;
this.allowHashNotMatch = opts.allowHashNotMatch ?? false;
this.logger = opts.logger || DefaultLogger;
this.logger = customLogger || opts.logger || DefaultLogger;
this.connection = opts.connection;
}
packages/libs/midway-flyway-js/src/index.ts
+1 -4
View File
@@ -1,6 +1,3 @@
// src/index.ts
export { FlywayConfiguration as Configuration } from './configuration.js';
// eslint-disable-next-line node/no-unpublished-import
export { Flyway } from './flyway.js';
// eslint-disable-next-line node/no-unpublished-import
export { Flyway, setFlywayLogger } from './flyway.js';
export { FlywayHistory } from './entity.js';