chore: sync push

fix: remote-select默认pageSize设置为50，阿里云WAF不支持pageSize100
Merge branch 'v2' of https://github.com/certd/certd into v2
2026-07-12 08:17:32 +08:00 · 2026-03-20 13:53:12 +08:00 · 2026-03-20 13:44:49 +08:00 · 2026-03-20 12:09:01 +08:00 · 2026-03-20 12:08:55 +08:00 · 2026-03-19 01:12:34 +08:00
22 changed files with 105 additions and 19 deletions
@@ -17,6 +17,7 @@ jobs:
        with:
          fetch-depth: 0
          lfs: true
+          ref: v2-dev
      - name: Set git user                  # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
        run: |
          git config --global user.name "xiaojunnuo"
@@ -17,6 +17,7 @@ jobs:
        with:
          fetch-depth: 0
          lfs: true
+          ref: v2
      - name: Set git user                  # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
        run: |
          git config --global user.name "xiaojunnuo"
@@ -0,0 +1,35 @@
+name: sync-to-cnb-dev
+on:
+  push:
+    branches: ['v2-dev']
+#  schedule:
+#    - # 国际时间 19:17 执行，北京时间3:17  ↙↙↙ 改成你想要每天自动执行的时间
+#    - cron: '17 19 * * *'
+permissions:
+  contents: read
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout work repo            # 1. 检出当前仓库(certd-sync-work)
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          lfs: true
+          ref: v2-dev
+      - name: Set git user                  # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
+        run: |
+          git config --global user.name "xiaojunnuo"
+          git config --global user.email "xiaojunnuo@qq.com"
+
+      - name: Set git token                 # 3. 给git命令设置token，用于push到目标仓库
+        uses: de-vri-es/setup-git-credentials@v2
+        with:                              # token 格式为： username:password
+          credentials: https://cnb:${{secrets.TOKEN_CNB}}@cnb.cool
+
+      - name: push to cnb               # 4. 执行同步
+        run: |
+          git remote add upstream https://cnb.cool/certd/certd.git
+          git push --set-upstream upstream v2-dev
+
@@ -0,0 +1,34 @@
+name: sync-to-cnb
+on:
+  push:
+    branches: ['v2']
+#  schedule:
+#    - # 国际时间 19:17 执行，北京时间3:17  ↙↙↙ 改成你想要每天自动执行的时间
+#    - cron: '17 19 * * *'
+permissions:
+  contents: read
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout work repo            # 1. 检出当前仓库(certd-sync-work)
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          lfs: true
+      - name: Set git user                  # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
+        run: |
+          git config --global user.name "xiaojunnuo"
+          git config --global user.email "xiaojunnuo@qq.com"
+
+      - name: Set git token                 # 3. 给git命令设置token，用于push到目标仓库
+        uses: de-vri-es/setup-git-credentials@v2
+        with:                              # token 格式为： username:password
+          credentials: https://cnb:${{secrets.TOKEN_CNB}}@cnb.cool
+
+      - name: push to cnb               # 4. 执行同步
+        run: |
+          git remote add upstream https://cnb.cool/certd/certd.git
+          git push --set-upstream upstream v2
+
@@ -17,6 +17,7 @@ jobs:
        with:
          fetch-depth: 0
          lfs: true
+          ref: v2-dev
      - name: Set git user                  # 2. 给git命令设置用户名和邮箱,↙↙↙ 改成你的name和email
        run: |
          git config --global user.name "xiaojunnuo"
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

+## [1.39.5](https://github.com/certd/certd/compare/v1.39.4...v1.39.5) (2026-03-18)
+
+### Bug Fixes
+
+* 修复修改分组报错的bug ([224db7d](https://github.com/certd/certd/commit/224db7da57dbdddf25bcac7faa0a29eb228c5a33))
+
+### Performance Improvements
+
+* 移除passkey的counter递增校验 ([68b669d](https://github.com/certd/certd/commit/68b669d3ff3e13b931939093320ce7237bb02b1b))
+* passkey 支持Bitwarden ([29f44c6](https://github.com/certd/certd/commit/29f44c67c808bed9ff1c9d4884d39a1a62d043a7))
+* passkey登录放到下方其他登录位置 ([1413e1a](https://github.com/certd/certd/commit/1413e1aff4aabcfd471716338c210fbcfd76c8f9))
+
 ## [1.39.4](https://github.com/certd/certd/compare/v1.39.3...v1.39.4) (2026-03-17)

 ### Bug Fixes
@@ -70,5 +70,5 @@
    "bugs": {
        "url": "https://github.com/publishlab/node-acme-client/issues"
    },
-    "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+    "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -1 +1 @@
-00:48
+01:09
@@ -47,5 +47,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -45,5 +45,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -24,5 +24,5 @@
    "prettier": "^2.8.8",
    "tslib": "^2.8.1"
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -31,5 +31,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -56,5 +56,5 @@
      "fetch"
    ]
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -32,5 +32,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -64,5 +64,5 @@
    "typeorm": "^0.3.11",
    "typescript": "^5.4.2"
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -46,5 +46,5 @@
    "typeorm": "^0.3.11",
    "typescript": "^5.4.2"
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -38,5 +38,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -57,5 +57,5 @@
    "tslib": "^2.8.1",
    "typescript": "^5.4.2"
  },
-  "gitHead": "aacee4a94c2e2481be8a307fb5a6a5d04a09dda7"
+  "gitHead": "5f9341ad8edd08bb553c2d04e71f0838032e727f"
 }
@@ -104,7 +104,7 @@ const loading = ref(false);
 const pagerRef: Ref = ref({
  pageNo: 1,
  total: 0,
-  pageSize: props.pageSize || 100,
+  pageSize: props.pageSize || 50,
 });
 const getOptions = async () => {
  if (loading.value) {
@@ -182,7 +182,7 @@ const getOptions = async () => {
        pagerRef.value.pageNo = res.pageNo ?? 1;
      }
      if (res.pageSize != null) {
-        pagerRef.value.pageSize = res.pageSize ?? 100;
+        pagerRef.value.pageSize = res.pageSize ?? pageSize;
      }
      if (res.total != null) {
        pagerRef.value.total = res.total ?? list.length;
@@ -1074,6 +1074,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
    if (!isPlus()) {
      throw new NeedVIPException("此功能需要升级专业版");
    }
+    //允许管理员修改，userId=null
    const query: any = {}
    if (userId && userId > 0) {
      query.userId = userId;
@@ -1126,6 +1127,7 @@ export class PipelineService extends BaseService<PipelineEntity> {
    if (!isPlus()) {
      throw new NeedVIPException("此功能需要升级专业版");
    }
+    //允许管理员修改，userId=null
    const query: any = {}
    if (userId && userId > 0) {
      query.userId = userId;
@@ -1164,9 +1166,9 @@ export class PipelineService extends BaseService<PipelineEntity> {
    if (!isPlus()) {
      throw new NeedVIPException("此功能需要升级专业版");
    }
-
-    if (userId == null || ids.length === 0) {
-      return;
+    //允许userId为空，为空则为管理员触发
+    if (ids.length === 0) {
+      throw new Error("参数错误 ids 不能为空");
    }
    const where: any = {
      id: In(ids),
@@ -1 +1 @@
-01:13
+00:52
@@ -1 +1 @@
-01:30
+01:11
Author	SHA1	Message	Date
xiaojunnuo	440d55ccb8	chore: sync push	2026-03-20 13:53:12 +08:00
xiaojunnuo	285532d431	fix: remote-select默认pageSize设置为50，阿里云WAF不支持pageSize100	2026-03-20 13:44:49 +08:00
xiaojunnuo	f2c47459f8	Merge branch 'v2' of https://github.com/certd/certd into v2	2026-03-20 12:09:01 +08:00
xiaojunnuo	49703f08e5	fix: 修复批量执行按钮无效的bug	2026-03-20 12:08:55 +08:00
xiaojunnuo	1d0aa9573b	Merge branch 'v2' of https://github.com/certd/certd into v2	2026-03-19 01:12:34 +08:00
xiaojunnuo	b2014cf88b	build: release	2026-03-19 01:11:46 +08:00
xiaojunnuo	a0e0078bad	build: prepare to build	2026-03-19 01:09:00 +08:00
xiaojunnuo	5ebca21c32	build: publish	2026-03-19 00:52:27 +08:00
xiaojunnuo	970aea90c9	build: trigger build image	2026-03-19 00:52:15 +08:00
xiaojunnuo	3332d2288f	chore: 支持推送到cnb	2026-03-18 16:16:22 +08:00
@@ -1 +1 @@
 :48
 :09
@@ -1 +1 @@
 :13
 :52
@@ -1 +1 @@
 :30
 :11