mirrors/certd
1
0
Fork 0
mirror of https://github.com/certd/certd.git synced 2025-11-25 09:10:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2-dev' into v2-dev-buy

Browse Source 
# Conflicts:
#	packages/core/basic/src/utils/util.hash.ts
This commit is contained in:
xiaojunnuo
2025-09-24 01:58:11 +08:00
parent 81e588a896 2ae193092d
commit c4ebbaba74
56 changed files with 869 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/libs/lib-huawei/CHANGELOG.md
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.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
**Note:** Version bump only for package @certd/lib-huawei
## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)
**Note:** Version bump only for package @certd/lib-huawei

4
packages/libs/lib-huawei/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-huawei",
"private": false,
"version": "1.36.21",
"version": "1.36.22",
"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": "3cedef4974708d828fb972acc54af0515e3ec3a0"
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
}

4
packages/libs/lib-iframe/CHANGELOG.md
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.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
**Note:** Version bump only for package @certd/lib-iframe
## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)
**Note:** Version bump only for package @certd/lib-iframe

4
packages/libs/lib-iframe/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-iframe",
"private": false,
"version": "1.36.21",
"version": "1.36.22",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -31,5 +31,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
}

4
packages/libs/lib-jdcloud/CHANGELOG.md
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.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
**Note:** Version bump only for package @certd/jdcloud
## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)
**Note:** Version bump only for package @certd/jdcloud

4
packages/libs/lib-jdcloud/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@certd/jdcloud",
"version": "1.36.21",
"version": "1.36.22",
"description": "jdcloud openApi sdk",
"main": "./dist/bundle.js",
"module": "./dist/bundle.js",
@@ -61,5 +61,5 @@
"fetch"
]
},
"gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
}

4
packages/libs/lib-k8s/CHANGELOG.md
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.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
**Note:** Version bump only for package @certd/lib-k8s
## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)
**Note:** Version bump only for package @certd/lib-k8s

6
packages/libs/lib-k8s/package.json
View File

@@ -1,7 +1,7 @@
{
"name": "@certd/lib-k8s",
"private": false,
"version": "1.36.21",
"version": "1.36.22",
"type": "module",
"main": "./dist/index.js",
"module": "./dist/index.js",
@@ -17,7 +17,7 @@
"pub": "npm publish"
},
"dependencies": {
"@certd/basic": "^1.36.21",
"@certd/basic": "^1.36.22",
"@kubernetes/client-node": "0.21.0"
},
"devDependencies": {
@@ -32,5 +32,5 @@
"tslib": "^2.8.1",
"typescript": "^5.4.2"
},
"gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
}

4
packages/libs/lib-server/CHANGELOG.md
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.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
**Note:** Version bump only for package @certd/lib-server
## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)
**Note:** Version bump only for package @certd/lib-server

13
packages/libs/lib-server/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@certd/lib-server",
"version": "1.36.21",
"version": "1.36.22",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -27,10 +27,11 @@
],
"license": "AGPL",
"dependencies": {
"@certd/acme-client": "^1.36.21",
"@certd/basic": "^1.36.21",
"@certd/pipeline": "^1.36.21",
"@certd/plus-core": "^1.36.21",
"@certd/acme-client": "^1.36.22",
"@certd/basic": "^1.36.22",
"@certd/pipeline": "^1.36.22",
"@certd/plugin-lib": "^1.36.22",
"@certd/plus-core": "^1.36.22",
"@midwayjs/cache": "~3.14.0",
"@midwayjs/core": "~3.20.3",
"@midwayjs/i18n": "~3.20.3",
@@ -61,5 +62,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
}

1
packages/libs/lib-server/src/system/basic/index.ts
View File

@@ -1,3 +1,4 @@
export * from './service/plus-service.js';
export * from './service/file-service.js';
export * from './service/encryptor.js';
export * from './service/ocr-service.js';

24
packages/libs/lib-server/src/system/basic/service/ocr-service.ts Normal file
View File

@@ -0,0 +1,24 @@
import { Inject, Provide, Scope, ScopeEnum } from "@midwayjs/core";
import { PlusService } from "./plus-service.js";
import { IOcrService } from "@certd/plugin-lib";
/**
*/
@Provide("ocrService")
@Scope(ScopeEnum.Request, { allowDowngrade: true })
export class OcrService implements IOcrService {
@Inject()
plusService: PlusService;
async doOcrFromImage(opts: { image: string }): Promise<{ texts: string[] }> {
const res = await this.plusService.requestWithToken({
url: "/activation/certd/ocr",
method: "post",
data: {
image: opts.image
}
});
return res;
}
}

2
packages/libs/lib-server/src/system/basic/service/plus-service.ts
View File

@@ -4,7 +4,7 @@ import { cache, http, HttpRequestConfig, logger } from '@certd/basic';
import { SysInstallInfo, SysLicenseInfo, SysSettingsService } from '../../settings/index.js';
import { merge } from 'lodash-es';
@Provide()
@Provide("plusService")
@Scope(ScopeEnum.Request, { allowDowngrade: true })
export class PlusService {
@Inject()

4
packages/libs/midway-flyway-js/CHANGELOG.md
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.36.22](https://github.com/certd/certd/compare/v1.36.21...v1.36.22) (2025-09-23)
**Note:** Version bump only for package @certd/midway-flyway-js
## [1.36.21](https://github.com/certd/certd/compare/v1.36.20...v1.36.21) (2025-09-15)
**Note:** Version bump only for package @certd/midway-flyway-js

4
packages/libs/midway-flyway-js/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@certd/midway-flyway-js",
"version": "1.36.21",
"version": "1.36.22",
"description": "midway with flyway, sql upgrade way ",
"private": false,
"type": "module",
@@ -46,5 +46,5 @@
"typeorm": "^0.3.11",
"typescript": "^5.4.2"
},
"gitHead": "3cedef4974708d828fb972acc54af0515e3ec3a0"
"gitHead": "c98f43b98459d107910c95d23fda785b0edc4702"
}