Merge branch 'v2-dev' into v2-invite

2026-07-09 14:17:37 +08:00 · 2026-05-19 22:59:18 +08:00
parent f9a310b6c3 cb08e061d2
commit 85c633fddf
41 changed files with 194 additions and 71 deletions
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.40.1](https://github.com/certd/certd/compare/v1.40.0...v1.40.1) (2026-05-18)
+
+### Bug Fixes
+
+* 固化华为云sdk版本，避免华为云调用报错 ([59b9ffa](https://github.com/certd/certd/commit/59b9ffadd05faf3982151c48f8d83cbd97419865))
+* **email-service:** 优化商业版测试邮件内容中带的url链接 ([667e7b1](https://github.com/certd/certd/commit/667e7b185bf26558972be01720872f48352b5876))
+
+### Performance Improvements
+
+* 商业版支持限制泛域名数量 ([c63745d](https://github.com/certd/certd/commit/c63745d1ba30904428ba6b13ab0785298baa5cae))
+
 # [1.40.0](https://github.com/certd/certd/compare/v1.39.16...v1.40.0) (2026-05-14)

 ### Bug Fixes
@@ -0,0 +1 @@
+ALTER TABLE cd_cert_info ADD COLUMN wildcard_domain_count bigint NOT NULL DEFAULT 0;
@@ -0,0 +1 @@
+ALTER TABLE cd_cert_info ADD COLUMN wildcard_domain_count bigint NOT NULL DEFAULT 0;
@@ -1,6 +1,6 @@
 {
  "name": "@certd/ui-server",
-  "version": "1.40.0",
+  "version": "1.40.1",
  "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.40.0",
-    "@certd/basic": "^1.40.0",
-    "@certd/commercial-core": "^1.40.0",
+    "@certd/acme-client": "^1.40.1",
+    "@certd/basic": "^1.40.1",
+    "@certd/commercial-core": "^1.40.1",
    "@certd/cv4pve-api-javascript": "^8.4.2",
-    "@certd/jdcloud": "^1.40.0",
-    "@certd/lib-huawei": "^1.40.0",
-    "@certd/lib-k8s": "^1.40.0",
-    "@certd/lib-server": "^1.40.0",
-    "@certd/midway-flyway-js": "^1.40.0",
-    "@certd/pipeline": "^1.40.0",
-    "@certd/plugin-cert": "^1.40.0",
-    "@certd/plugin-lib": "^1.40.0",
-    "@certd/plugin-plus": "^1.40.0",
-    "@certd/plus-core": "^1.40.0",
+    "@certd/jdcloud": "^1.40.1",
+    "@certd/lib-huawei": "^1.40.1",
+    "@certd/lib-k8s": "^1.40.1",
+    "@certd/lib-server": "^1.40.1",
+    "@certd/midway-flyway-js": "^1.40.1",
+    "@certd/pipeline": "^1.40.1",
+    "@certd/plugin-cert": "^1.40.1",
+    "@certd/plugin-lib": "^1.40.1",
+    "@certd/plugin-plus": "^1.40.1",
+    "@certd/plus-core": "^1.40.1",
    "@google-cloud/dns": "^5.3.1",
    "@google-cloud/publicca": "^1.3.0",
    "@huaweicloud/huaweicloud-sdk-cdn": "3.1.185",
@@ -0,0 +1,17 @@
+/// <reference types="mocha" />
+/// <reference types="node" />
+
+import assert from "node:assert/strict";
+
+import { normalizeReleaseVersion } from "./app-controller.js";
+
+describe("AppController.normalizeReleaseVersion", () => {
+  it("normalizes AtomGit release tag names", () => {
+    assert.equal(normalizeReleaseVersion({ tag_name: "v1.40.0" }), "1.40.0");
+    assert.equal(normalizeReleaseVersion({ tag_name: "1.40.0" }), "1.40.0");
+  });
+
+  it("falls back to release name when tag_name is empty", () => {
+    assert.equal(normalizeReleaseVersion({ name: "v1.40.0" }), "1.40.0");
+  });
+});
@@ -3,6 +3,11 @@ import { BaseController, Constants, FileService, SysSettingsService, SysSiteInfo
 import { http, logger } from '@certd/basic';
 import { isComm } from '@certd/plus-core';

+export function normalizeReleaseVersion(release: { tag_name?: string; name?: string }) {
+  const version = release?.tag_name || release?.name || '';
+  return version.replace(/^v/i, '');
+}
+
 /**
 */
@Provide()
@@ -17,12 +22,12 @@ export class AppController extends BaseController {
  async latest(): Promise<any> {
    try {
      const res = await http.request({
-        url: 'https://registry.npmmirror.com/@certd/pipeline',
+        url: 'https://api.atomgit.com/api/v5/repos/certd/certd/releases/latest',
        method: 'get',
        logRes: false,
        timeout: 5000,
      });
-      const latest = res['dist-tags'].latest;
+      const latest = normalizeReleaseVersion(res);
      return this.ok(latest);
    } catch (e: any) {
      logger.error(e);
@@ -1,5 +1,5 @@
 import {Inject, Provide, Scope, ScopeEnum} from "@midwayjs/core";
-import {BaseService, Constants, NeedSuiteException, NeedVIPException, SysSettingsService} from "@certd/lib-server";
+import {BaseService, Constants, isEnterprise, NeedSuiteException, NeedVIPException, SysSettingsService} from "@certd/lib-server";
 import {InjectEntityModel} from "@midwayjs/typeorm";
 import {In, Repository} from "typeorm";
 import {SiteInfoEntity} from "../entity/site-info.js";
@@ -59,25 +59,35 @@ export class SiteInfoService extends BaseService<SiteInfoEntity> {
    return this.repository;
  }

-  async add(data: SiteInfoEntity) {
-    if (data.userId == null) {
-      throw new Error("userId is required");
+  async checkMonitorLimit(userId: number) {
+    if (isEnterprise()) {
+      //企业模式不限制
+      return;
    }

    if (isComm()) {
      const suiteSetting = await this.userSuiteService.getSuiteSetting();
      if (suiteSetting.enabled) {
-        const userSuite = await this.userSuiteService.getMySuiteDetail(data.userId);
+        const userSuite = await this.userSuiteService.getMySuiteDetail(userId);
        if (userSuite.monitorCount.max != -1 && userSuite.monitorCount.max <= userSuite.monitorCount.used) {
          throw new NeedSuiteException("站点监控数量已达上限，请购买或升级套餐");
        }
      }
    } else if (!isPlus()) {
-      const count = await this.getUserMonitorCount(data.userId);
+      const count = await this.getUserMonitorCount(userId);
      if (count >= 1) {
        throw new NeedVIPException("站点监控数量已达上限，请升级专业版");
      }
    }
+  }
+
+  async add(data: SiteInfoEntity) {
+    if (data.userId == null) {
+      throw new Error("userId is required");
+    }
+
+    await this.checkMonitorLimit(data.userId);
+   
    data.disabled = false;

    const found = await this.repository.findOne({
				`@@ -0,0 +1 @@`
				`ALTER TABLE cd_cert_info ADD COLUMN wildcard_domain_count bigint NOT NULL DEFAULT 0;`