Merge branch 'v2-dev' into v2_admin_mode

packages/ui/certd-server/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.38.11](https://github.com/certd/certd/compare/v1.38.10...v1.38.11) (2026-02-16)
+
+### Bug Fixes
+
+* 修复1panel2.1.0新版本测试失败的问题 ([8ef1f2e](https://github.com/certd/certd/commit/8ef1f2e395ea5969a95f55535e6c16a65e2b463b))
+
+### Performance Improvements
+
+* 支持自定义发件人名称，格式：名称<邮箱> ([bab9adc](https://github.com/certd/certd/commit/bab9adce240108d4291eedc67e04abc4a01019e0))
+
 ## [1.38.10](https://github.com/certd/certd/compare/v1.38.9...v1.38.10) (2026-02-15)
 
 ### Bug Fixes

packages/ui/certd-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certd/ui-server",
-  "version": "1.38.10",
+  "version": "1.38.11",
   "description": "fast-server base midway",
   "private": true,
   "type": "module",
@@ -50,20 +50,20 @@
     "@aws-sdk/client-route-53": "^3.964.0",
     "@aws-sdk/client-s3": "^3.964.0",
     "@aws-sdk/client-sts": "^3.990.0",
-    "@certd/acme-client": "^1.38.10",
-    "@certd/basic": "^1.38.10",
-    "@certd/commercial-core": "^1.38.10",
+    "@certd/acme-client": "^1.38.11",
+    "@certd/basic": "^1.38.11",
+    "@certd/commercial-core": "^1.38.11",
     "@certd/cv4pve-api-javascript": "^8.4.2",
-    "@certd/jdcloud": "^1.38.10",
-    "@certd/lib-huawei": "^1.38.10",
-    "@certd/lib-k8s": "^1.38.10",
-    "@certd/lib-server": "^1.38.10",
-    "@certd/midway-flyway-js": "^1.38.10",
-    "@certd/pipeline": "^1.38.10",
-    "@certd/plugin-cert": "^1.38.10",
-    "@certd/plugin-lib": "^1.38.10",
-    "@certd/plugin-plus": "^1.38.10",
-    "@certd/plus-core": "^1.38.10",
+    "@certd/jdcloud": "^1.38.11",
+    "@certd/lib-huawei": "^1.38.11",
+    "@certd/lib-k8s": "^1.38.11",
+    "@certd/lib-server": "^1.38.11",
+    "@certd/midway-flyway-js": "^1.38.11",
+    "@certd/pipeline": "^1.38.11",
+    "@certd/plugin-cert": "^1.38.11",
+    "@certd/plugin-lib": "^1.38.11",
+    "@certd/plugin-plus": "^1.38.11",
+    "@certd/plus-core": "^1.38.11",
     "@google-cloud/publicca": "^1.3.0",
     "@huaweicloud/huaweicloud-sdk-cdn": "^3.1.185",
     "@huaweicloud/huaweicloud-sdk-core": "^3.1.185",

packages/ui/certd-server/src/modules/basic/service/email-service.ts

@@ -110,9 +110,12 @@ export class EmailService implements IEmailService {
 
   private async sendByCustom(emailConfig: EmailConfig, email: EmailSend, sysTitle: string) {
     const transporter = nodemailer.createTransport(emailConfig);
-
+    let from = `${sysTitle} <${emailConfig.sender}>`;
+    if (emailConfig.sender.includes('<')) {
+      from = emailConfig.sender;
+    }
     const mailOptions = {
-      from: `${sysTitle} <${emailConfig.sender}>`,
+      from: from,
       to: email.receivers.join(', '), // list of receivers
       subject: email.subject,
       text: email.content,

packages/ui/certd-server/src/plugins/plugin-plus/1panel/access.ts

@@ -151,6 +151,8 @@ export class OnePanelAccess extends BaseAccess {
       data: {
         page: 1,
         pageSize: 1,
+        order: "ascending",
+        orderBy: "expire_date"
       },
     });
     return "ok";

packages/ui/certd-server/src/plugins/plugin-plus/1panel/plugins/deploy-to-website.ts

@@ -191,6 +191,8 @@ export class OnePanelDeployToWebsitePlugin extends AbstractTaskPlugin {
       data: {
         page: 1,
         pageSize: 99999,
+        order: "ascending",
+        orderBy: "expire_date"
       },
       currentNode: this.currentNode,
     });