From e40345095f31e2fb8e2333a6647466659133fa0c Mon Sep 17 00:00:00 2001
From: xiaojunnuo <xiaojunnuo@qq.com>
Date: Fri, 18 Jul 2025 18:18:01 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E8=B4=A6=E5=8F=B7=E5=8D=B3=E5=B0=86?=
 =?UTF-8?q?=E8=BF=87=E6=9C=9F=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/sys/authority/user/crud.tsx     |  7 +-
 .../src/modules/auto/auto-c-register-cron.ts  | 70 +++++++++++++++++--
 2 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx b/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx
index f26b1376..c82985cc 100644
--- a/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx
+++ b/packages/ui/certd-client/src/views/sys/authority/user/crud.tsx
@@ -1,10 +1,11 @@
 import * as api from "./api";
-import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { useUserStore } from "/@/store/user";
 import { Modal, notification } from "ant-design-vue";
 import dayjs from "dayjs";
 import { useSettingStore } from "/@/store/settings";
 import { useI18n } from "/src/locales";
+import { computed } from "vue";
 
 export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
@@ -26,7 +27,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
   const userStore = useUserStore();
 
   const settingStore = useSettingStore();
-  const userValidTimeEnabled = compute(() => {
+  const userValidTimeEnabled = computed(() => {
     return settingStore.sysPublic.userValidTimeEnabled === true;
   });
   return {
@@ -226,7 +227,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
           column: {
             align: "center",
             sorter: true,
-            width: 100,
+            width: 160,
             show: userValidTimeEnabled,
             cellRender({ value }) {
               if (value == null || value === 0) {
diff --git a/packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts b/packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts
index d97adc1c..1a8b5431 100644
--- a/packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts
+++ b/packages/ui/certd-server/src/modules/auto/auto-c-register-cron.ts
@@ -1,15 +1,16 @@
-import { Autoload, Config, Init, Inject, Scope, ScopeEnum } from '@midwayjs/core';
-import { PipelineService } from '../pipeline/service/pipeline-service.js';
-import { logger } from '@certd/basic';
+import {Autoload, Config, Init, Inject, Scope, ScopeEnum} from '@midwayjs/core';
+import {PipelineService} from '../pipeline/service/pipeline-service.js';
+import {logger} from '@certd/basic';
 import {SysSettingsService, SysSiteInfo} from '@certd/lib-server';
-import { SiteInfoService } from '../monitor/index.js';
-import { Cron } from '../cron/cron.js';
+import {SiteInfoService} from '../monitor/index.js';
+import {Cron} from '../cron/cron.js';
 import {UserSettingsService} from "../mine/service/user-settings-service.js";
 import {UserSiteMonitorSetting} from "../mine/service/models.js";
 import {getPlusInfo} from "@certd/plus-core";
 import dayjs from "dayjs";
 import {NotificationService} from "../pipeline/service/notification-service.js";
 import {UserService} from "../sys/authority/service/user-service.js";
+import {Between} from "typeorm";
 
 @Autoload()
 @Scope(ScopeEnum.Request, { allowDowngrade: true })
@@ -58,6 +59,8 @@ export class AutoCRegisterCron {
 
 
     await this.registerPlusExpireCheckCron();
+
+    await this.registerUserExpireCheckCron()
   }
 
   async registerSiteMonitorCron() {
@@ -137,4 +140,61 @@ export class AutoCRegisterCron {
       }
     })
   }
+
+
+  registerUserExpireCheckCron() {
+    // 添加plus即将到期检查任务
+    this.cron.register({
+      name: 'user-expire-check',
+      cron: `0 20 9 * * *`, // 一天只能检查一次，否则会重复发送通知
+      job: async () => {
+
+        const getExpiresDaysUsers = async (days: number) => {
+          const targetDate = dayjs().add(days, 'day')
+          const startTime = targetDate.startOf('day').valueOf()
+          const endTime = targetDate.endOf('day').valueOf()
+          return await this.userService.find({
+            where: {
+              validTime: Between(startTime, endTime),
+              status: 1
+            }
+          })
+        }
+
+        const notifyExpiresDaysUsers = async (days: number) => {
+          const list = await getExpiresDaysUsers(days)
+          if (list.length === 0) {
+            return
+          }
+          let title = `账号即将到期`
+          let content = `您的账号剩余${days}天到期，请及时续期，以免影响业务`
+          if (days <= 0) {
+            title = `账号已过期`
+            content = `您的账号已过期${Math.abs(days)}天，请尽快续期，以免影响业务`
+          }
+          const url = await this.notificationService.getBindUrl("");
+          for (const user of list) {
+            logger.info(`发送到期通知给用户：${user.username}`)
+            await this.notificationService.send({
+              useDefault: true,
+              logger: logger,
+              body: {
+                title,
+                content,
+                errorMessage: title,
+                url
+              }
+            }, user.id)
+          }
+        }
+
+        await notifyExpiresDaysUsers(7)
+        await notifyExpiresDaysUsers(3)
+        await notifyExpiresDaysUsers(1)
+        await notifyExpiresDaysUsers(0)
+        await notifyExpiresDaysUsers(-1)
+        await notifyExpiresDaysUsers(-3)
+      }
+    })
+  }
 }