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

# Conflicts:
#	packages/core/basic/src/utils/util.hash.ts

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

@@ -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';

packages/libs/lib-server/src/system/basic/service/ocr-service.ts

@@ -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;
+  }
+
+}

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

@@ -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()