Merge branch 'v2-dev' into v2_admin_mode

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,
     });