From 198cd6912c4065ae7ee20bb1b09597c8af54b9db Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 12:52:30 +0800
Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E6=9C=AC=E5=9C=B0=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E9=BB=98=E8=AE=A4=20website?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/.env.development                |  2 ++
 apps/web-antd/src/api/core/auth.ts            | 28 ++++++++++------
 .../src/views/_core/authentication/login.vue  | 32 +++++++++++++------
 packages/effects/hooks/src/use-app-config.ts  |  9 ++++--
 packages/types/global.d.ts                    |  2 ++
 5 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/apps/web-antd/.env.development b/apps/web-antd/.env.development
index 5d29cd97b..cbe12db2a 100644
--- a/apps/web-antd/.env.development
+++ b/apps/web-antd/.env.development
@@ -7,6 +7,8 @@ VITE_BASE=/
 VITE_GLOB_API_URL=/admin-api
 # 是否打开 devtools，true 为打开，false 为关闭
 VITE_DEVTOOLS=false
+# 本地开发默认 website
+VITE_APP_WEBSITE=www.iocoder.cn
 
 # 是否注入全局loading
 VITE_INJECT_APP_LOADING=true
diff --git a/apps/web-antd/src/api/core/auth.ts b/apps/web-antd/src/api/core/auth.ts
index 4071577dd..e5cffc513 100644
--- a/apps/web-antd/src/api/core/auth.ts
+++ b/apps/web-antd/src/api/core/auth.ts
@@ -1,6 +1,7 @@
-import { baseRequestClient, requestClient } from '#/api/request';
 import type { AuthPermissionInfo } from '@vben/types';
 
+import { baseRequestClient, requestClient } from '#/api/request';
+
 export namespace AuthApi {
   /** 登录接口参数 */
   export interface LoginParams {
@@ -34,7 +35,6 @@ export namespace AuthApi {
     mobile: string;
     code: string;
   }
-
 }
 
 /** 登录 */
@@ -44,16 +44,22 @@ export async function loginApi(data: AuthApi.LoginParams) {
 
 /** 刷新 accessToken */
 export async function refreshTokenApi(refreshToken: string) {
-  return baseRequestClient.post(`/system/auth/refresh-token?refreshToken=${refreshToken}`);
+  return baseRequestClient.post(
+    `/system/auth/refresh-token?refreshToken=${refreshToken}`,
+  );
 }
 
 /** 退出登录 */
 export async function logoutApi(accessToken: string) {
-  return baseRequestClient.post('/system/auth/logout', {}, {
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-    }
-  });
+  return baseRequestClient.post(
+    '/system/auth/logout',
+    {},
+    {
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+      },
+    },
+  );
 }
 
 /** 获取权限信息 */
@@ -72,7 +78,9 @@ export async function getTenantSimpleList() {
 
 /** 使用租户域名，获得租户信息 */
 export async function getTenantByWebsite(website: string) {
-  return requestClient.get<AuthApi.TenantResult>(`/system/tenant/get-by-website?website=${website}`);
+  return requestClient.get<AuthApi.TenantResult>(
+    `/system/tenant/get-by-website?website=${website}`,
+  );
 }
 
 /** 获取验证码 */
@@ -83,4 +91,4 @@ export async function getCaptcha(data: any) {
 /** 校验验证码 */
 export async function checkCaptcha(data: any) {
   return baseRequestClient.post('/system/captcha/check', data);
-}
\ No newline at end of file
+}
diff --git a/apps/web-antd/src/views/_core/authentication/login.vue b/apps/web-antd/src/views/_core/authentication/login.vue
index b0f15b6a0..b67d2bdde 100644
--- a/apps/web-antd/src/views/_core/authentication/login.vue
+++ b/apps/web-antd/src/views/_core/authentication/login.vue
@@ -1,21 +1,31 @@
 <script lang="ts" setup>
 import type { VbenFormSchema } from '@vben/common-ui';
-import {type AuthApi, checkCaptcha, getCaptcha } from '#/api/core/auth';
 
-import { computed, markRaw, onMounted, ref } from 'vue';
+import type { AuthApi } from '#/api/core/auth';
+
+import { computed, onMounted, ref } from 'vue';
 
 import { AuthenticationLogin, Verification, z } from '@vben/common-ui';
-import { $t } from '@vben/locales';
 import { useAppConfig } from '@vben/hooks';
-
-import { useAuthStore } from '#/store';
+import { $t } from '@vben/locales';
 import { useAccessStore } from '@vben/stores';
 
-import { getTenantSimpleList, getTenantByWebsite } from '#/api/core/auth';
-const { tenantEnable, captchaEnable } = useAppConfig(import.meta.env, import.meta.env.PROD);
+import {
+  checkCaptcha,
+  getCaptcha,
+  getTenantByWebsite,
+  getTenantSimpleList,
+} from '#/api/core/auth';
+import { useAuthStore } from '#/store';
 
 defineOptions({ name: 'Login' });
 
+const isProduction = import.meta.env.PROD;
+const { tenantEnable, captchaEnable, website } = useAppConfig(
+  import.meta.env,
+  isProduction,
+);
+
 const authStore = useAuthStore();
 const accessStore = useAccessStore();
 
@@ -32,11 +42,13 @@ const fetchTenantList = async () => {
   }
   try {
     // 获取租户列表、域名对应租户
-    const websiteTenantPromise = getTenantByWebsite(window.location.hostname);
+    const websiteTenantPromise = getTenantByWebsite(
+      isProduction ? window.location.hostname : website, // 生成环境使用真实域名开发环境固定
+    );
     tenantList.value = await getTenantSimpleList();
 
     // 选中租户：域名 > store 中的租户 > 首个租户
-    let tenantId: number | null = null;
+    let tenantId: null | number = null;
     const websiteTenant = await websiteTenantPromise;
     if (websiteTenant?.id) {
       tenantId = websiteTenant.id;
@@ -68,7 +80,7 @@ const handleLogin = async (values: any) => {
 
   // 无验证码，直接登录
   await authStore.authLogin(values);
-}
+};
 
 /** 验证码通过，执行登录 */
 const handleVerifySuccess = async ({ captchaVerification }: any) => {
diff --git a/packages/effects/hooks/src/use-app-config.ts b/packages/effects/hooks/src/use-app-config.ts
index 0072bb93d..2b3299b32 100644
--- a/packages/effects/hooks/src/use-app-config.ts
+++ b/packages/effects/hooks/src/use-app-config.ts
@@ -15,13 +15,18 @@ export function useAppConfig(
     ? window._VBEN_ADMIN_PRO_APP_CONF_
     : (env as VbenAdminProAppConfigRaw);
 
-  const { VITE_APP_CAPTCHA_ENABLE, VITE_APP_TENANT_ENABLE, VITE_GLOB_API_URL } =
-    config;
+  const {
+    VITE_APP_CAPTCHA_ENABLE,
+    VITE_APP_TENANT_ENABLE,
+    VITE_GLOB_API_URL,
+    VITE_APP_WEBSITE,
+  } = config;
 
   // TODO @芋艿：貌似 VITE_APP_CAPTCHA_ENABLE 读取的是字符串，所以这里暂时这么转换
   return {
     apiURL: VITE_GLOB_API_URL,
     captchaEnable: VITE_APP_CAPTCHA_ENABLE === 'true',
     tenantEnable: VITE_APP_TENANT_ENABLE === 'true',
+    website: VITE_APP_WEBSITE,
   };
 }
diff --git a/packages/types/global.d.ts b/packages/types/global.d.ts
index 8280443b3..e09cb0ca1 100644
--- a/packages/types/global.d.ts
+++ b/packages/types/global.d.ts
@@ -11,12 +11,14 @@ export interface VbenAdminProAppConfigRaw {
   VITE_GLOB_API_URL: string;
   VITE_APP_TENANT_ENABLE: boolean;
   VITE_APP_CAPTCHA_ENABLE: boolean;
+  VITE_APP_WEBSITE: string;
 }
 
 export interface ApplicationConfig {
   apiURL: string;
   captchaEnable: boolean;
   tenantEnable: boolean;
+  website: string;
 }
 
 declare global {

From 8f385f1da358b1e608d825543171c833e48efbab Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 15:11:01 +0800
Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=E7=9F=AD=E4=BF=A1=E6=B8=A0?=
 =?UTF-8?q?=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/sms/smsChannel/index.ts    |  60 ++++++
 apps/web-antd/src/api/system/user/index.ts    |   3 +-
 .../src/views/system/sms/channel/data.ts      | 184 ++++++++++++++++++
 .../src/views/system/sms/channel/index.vue    | 133 +++++++++++++
 .../views/system/sms/channel/modules/form.vue |  84 ++++++++
 5 files changed, 463 insertions(+), 1 deletion(-)
 create mode 100644 apps/web-antd/src/api/system/sms/smsChannel/index.ts
 create mode 100644 apps/web-antd/src/views/system/sms/channel/data.ts
 create mode 100644 apps/web-antd/src/views/system/sms/channel/index.vue
 create mode 100644 apps/web-antd/src/views/system/sms/channel/modules/form.vue

diff --git a/apps/web-antd/src/api/system/sms/smsChannel/index.ts b/apps/web-antd/src/api/system/sms/smsChannel/index.ts
new file mode 100644
index 000000000..fb9e8d53f
--- /dev/null
+++ b/apps/web-antd/src/api/system/sms/smsChannel/index.ts
@@ -0,0 +1,60 @@
+import type { PageParam } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace SystemSmsChannelApi {
+  /** 短信渠道信息 */
+  export interface SmsChannelVO {
+    id?: number;
+    code: string;
+    status: number;
+    signature: string;
+    remark: string;
+    apiKey: string;
+    apiSecret: string;
+    callbackUrl: string;
+    createTime?: Date;
+  }
+}
+
+/** 查询短信渠道列表 */
+export function getSmsChannelPage(params: PageParam) {
+  return requestClient.get<{
+    list: SystemSmsChannelApi.SmsChannelVO[];
+    total: number;
+  }>('/system/sms-channel/page', { params });
+}
+
+/** 获得短信渠道精简列表 */
+export function getSimpleSmsChannelList() {
+  return requestClient.get<SystemSmsChannelApi.SmsChannelVO[]>(
+    '/system/sms-channel/simple-list',
+  );
+}
+
+/** 查询短信渠道详情 */
+export function getSmsChannel(id: number) {
+  return requestClient.get<SystemSmsChannelApi.SmsChannelVO>(
+    `/system/sms-channel/get?id=${id}`,
+  );
+}
+
+/** 新增短信渠道 */
+export function createSmsChannel(data: SystemSmsChannelApi.SmsChannelVO) {
+  return requestClient.post({ url: '/system/sms-channel/create', data });
+}
+
+/** 修改短信渠道 */
+export function updateSmsChannel(data: SystemSmsChannelApi.SmsChannelVO) {
+  return requestClient.put({ url: '/system/sms-channel/update', data });
+}
+
+/** 删除短信渠道 */
+export function deleteSmsChannel(id: number) {
+  return requestClient.delete({ url: `/system/sms-channel/delete?id=${id}` });
+}
+
+/** 导出短信渠道 */
+export function exportSmsChannel(params: SystemSmsChannelApi.SmsChannelVO) {
+  return requestClient.download('/system/sms-channel/export', { params });
+}
diff --git a/apps/web-antd/src/api/system/user/index.ts b/apps/web-antd/src/api/system/user/index.ts
index e69610626..2ef22f292 100644
--- a/apps/web-antd/src/api/system/user/index.ts
+++ b/apps/web-antd/src/api/system/user/index.ts
@@ -1,6 +1,7 @@
-import { requestClient } from '#/api/request';
 import type { PageParam } from '@vben/request';
 
+import { requestClient } from '#/api/request';
+
 export namespace SystemUserApi {
   /** 用户信息 */
   export interface SystemUser {
diff --git a/apps/web-antd/src/views/system/sms/channel/data.ts b/apps/web-antd/src/views/system/sms/channel/data.ts
new file mode 100644
index 000000000..7c021e3fd
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/channel/data.ts
@@ -0,0 +1,184 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemSmsChannelApi } from '#/api/system/sms/smsChannel';
+
+import { z } from '#/adapter/form';
+import { CommonStatusEnum } from '#/utils/constants';
+import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+
+/** 新增/修改的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      component: 'Input',
+      fieldName: 'id',
+      label: 'id',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      component: 'Input',
+      fieldName: 'signature',
+      label: '短信签名',
+      rules: 'required',
+    },
+    {
+      fieldName: 'code',
+      label: '渠道编码',
+      component: 'Select',
+      componentProps: {
+        class: 'w-full',
+        options: getDictOptions(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, 'string'),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'status',
+      label: '启用状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+    },
+    {
+      fieldName: 'apiKey',
+      label: '短信 API 的账号',
+      component: 'Input',
+      rules: 'required',
+    },
+    {
+      fieldName: 'apiSecret',
+      label: '短信 API 的密钥',
+      component: 'Input',
+    },
+    {
+      fieldName: 'callbackUrl',
+      label: '短信发送回调 URL',
+      component: 'Input',
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'signature',
+      label: '短信签名',
+      component: 'Input',
+    },
+    {
+      fieldName: 'code',
+      label: '渠道编码',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE, 'string'),
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns<T = SystemSmsChannelApi.SmsChannelVO>(
+  onActionClick: OnActionClickFn<T>,
+): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+      minWidth: 100,
+    },
+    {
+      field: 'signature',
+      title: '短信签名',
+      minWidth: 120,
+    },
+    {
+      field: 'code',
+      title: '渠道编码',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE },
+      },
+    },
+    {
+      field: 'status',
+      title: '启用状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+    {
+      field: 'apiKey',
+      title: '短信 API 的账号',
+      minWidth: 180,
+    },
+    {
+      field: 'apiSecret',
+      title: '短信 API 的密钥',
+      minWidth: 180,
+    },
+    {
+      field: 'callbackUrl',
+      title: '短信发送回调 URL',
+      minWidth: 180,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'operation',
+      title: '操作',
+      minWidth: 180,
+      align: 'center',
+      fixed: 'right',
+      cellRender: {
+        attrs: {
+          nameField: 'signature',
+          nameTitle: '短信渠道',
+          onClick: onActionClick,
+        },
+        name: 'CellOperation',
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/system/sms/channel/index.vue b/apps/web-antd/src/views/system/sms/channel/index.vue
new file mode 100644
index 000000000..e7c9e6517
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/channel/index.vue
@@ -0,0 +1,133 @@
+<script lang="ts" setup>
+import type {
+  OnActionClickParams,
+  VxeTableGridOptions,
+} from '#/adapter/vxe-table';
+import type { SystemSmsChannelApi } from '#/api/system/sms/smsChannel';
+
+import { Page, useVbenModal } from '@vben/common-ui';
+import { Download, Plus } from '@vben/icons';
+
+import { Button, message } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteSmsChannel,
+  exportSmsChannel,
+  getSmsChannelPage,
+} from '#/api/system/sms/smsChannel';
+import { $t } from '#/locales';
+import { downloadByData } from '#/utils/download';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function onRefresh() {
+  gridApi.query();
+}
+
+/** 导出表格 */
+async function onExport() {
+  const data = await exportSmsChannel(await gridApi.formApi.getValues());
+  downloadByData(data, '短信渠道.xls');
+}
+
+/** 创建短信渠道 */
+function onCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑短信渠道 */
+function onEdit(row: SystemSmsChannelApi.SmsChannelVO) {
+  formModalApi.setData(row).open();
+}
+
+/** 删除短信渠道 */
+async function onDelete(row: SystemSmsChannelApi.SmsChannelVO) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.signature]),
+    duration: 0,
+    key: 'action_process_msg',
+  });
+  try {
+    await deleteSmsChannel(row.id as number);
+    message.success({
+      content: $t('ui.actionMessage.deleteSuccess', [row.signature]),
+      key: 'action_process_msg',
+    });
+    onRefresh();
+  } catch {
+    hideLoading();
+  }
+}
+
+/** 表格操作按钮的回调函数 */
+function onActionClick({
+  code,
+  row,
+}: OnActionClickParams<SystemSmsChannelApi.SmsChannelVO>) {
+  switch (code) {
+    case 'delete': {
+      onDelete(row);
+      break;
+    }
+    case 'edit': {
+      onEdit(row);
+      break;
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(onActionClick),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSmsChannelPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: { code: 'query' },
+      search: true,
+    },
+  } as VxeTableGridOptions<SystemSmsChannelApi.SmsChannelVO>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <FormModal @success="onRefresh" />
+    <Grid table-title="短信渠道列表">
+      <template #toolbar-tools>
+        <Button type="primary" @click="onCreate">
+          <Plus class="size-5" />
+          {{ $t('ui.actionTitle.create', ['短信渠道']) }}
+        </Button>
+        <Button type="primary" class="ml-2" @click="onExport">
+          <Download class="size-5" />
+          {{ $t('ui.actionTitle.export') }}
+        </Button>
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/system/sms/channel/modules/form.vue b/apps/web-antd/src/views/system/sms/channel/modules/form.vue
new file mode 100644
index 000000000..095c5fd31
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/channel/modules/form.vue
@@ -0,0 +1,84 @@
+<script lang="ts" setup>
+import type { SystemSmsChannelApi } from '#/api/system/sms/smsChannel';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createSmsChannel,
+  getSmsChannel,
+  updateSmsChannel,
+} from '#/api/system/sms/smsChannel';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<SystemSmsChannelApi.SmsChannelVO>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['短信渠道'])
+    : $t('ui.actionTitle.create', ['短信渠道']);
+});
+
+const [Form, formApi] = useVbenForm({
+  layout: 'horizontal',
+  schema: useFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as SystemSmsChannelApi.SmsChannelVO;
+    try {
+      await (formData.value?.id
+        ? updateSmsChannel(data)
+        : createSmsChannel(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success({
+        content: $t('ui.actionMessage.operationSuccess'),
+        key: 'action_process_msg',
+      });
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<SystemSmsChannelApi.SmsChannelVO>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getSmsChannel(data.id as number);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle">
+    <Form class="mx-4" />
+  </Modal>
+</template>

From b852f238676a18ece2b0f62a46887bdae6a8ce6a Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 16:57:33 +0800
Subject: [PATCH 03/11] =?UTF-8?q?feat:=20=E7=9F=AD=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/sms/smsTemplate/index.ts   |  70 +++++
 .../src/views/system/sms/template/data.ts     | 252 ++++++++++++++++++
 .../src/views/system/sms/template/index.vue   | 149 +++++++++++
 .../system/sms/template/modules/form.vue      |  84 ++++++
 .../system/sms/template/modules/send-form.vue | 109 ++++++++
 5 files changed, 664 insertions(+)
 create mode 100644 apps/web-antd/src/api/system/sms/smsTemplate/index.ts
 create mode 100644 apps/web-antd/src/views/system/sms/template/data.ts
 create mode 100644 apps/web-antd/src/views/system/sms/template/index.vue
 create mode 100644 apps/web-antd/src/views/system/sms/template/modules/form.vue
 create mode 100644 apps/web-antd/src/views/system/sms/template/modules/send-form.vue

diff --git a/apps/web-antd/src/api/system/sms/smsTemplate/index.ts b/apps/web-antd/src/api/system/sms/smsTemplate/index.ts
new file mode 100644
index 000000000..043a1a6d9
--- /dev/null
+++ b/apps/web-antd/src/api/system/sms/smsTemplate/index.ts
@@ -0,0 +1,70 @@
+import type { PageParam } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace SystemSmsTemplateApi {
+  /** 短信模板信息 */
+  export interface SmsTemplateVO {
+    id?: number;
+    type?: number;
+    status: number;
+    code: string;
+    name: string;
+    content: string;
+    remark: string;
+    apiTemplateId: string;
+    channelId?: number;
+    channelCode?: string;
+    params?: string[];
+    createTime?: Date;
+  }
+
+  /** 发送短信请求 */
+  export interface SendSmsReqVO {
+    mobile: string;
+    templateCode: string;
+    templateParams: Record<string, any>;
+  }
+}
+
+/** 查询短信模板列表 */
+export function getSmsTemplatePage(params: PageParam) {
+  return requestClient.get<{
+    list: SystemSmsTemplateApi.SmsTemplateVO[];
+    total: number;
+  }>('/system/sms-template/page', { params });
+}
+
+/** 查询短信模板详情 */
+export function getSmsTemplate(id: number) {
+  return requestClient.get<SystemSmsTemplateApi.SmsTemplateVO>(
+    `/system/sms-template/get?id=${id}`,
+  );
+}
+
+/** 新增短信模板 */
+export function createSmsTemplate(data: SystemSmsTemplateApi.SmsTemplateVO) {
+  return requestClient.post({ url: '/system/sms-template/create', data });
+}
+
+/** 修改短信模板 */
+export function updateSmsTemplate(data: SystemSmsTemplateApi.SmsTemplateVO) {
+  return requestClient.put({ url: '/system/sms-template/update', data });
+}
+
+/** 删除短信模板 */
+export function deleteSmsTemplate(id: number) {
+  return requestClient.delete({ url: `/system/sms-template/delete?id=${id}` });
+}
+
+/** 导出短信模板 */
+export function exportSmsTemplate(params: SystemSmsTemplateApi.SmsTemplateVO) {
+  return requestClient.download('/system/sms-template/export-excel', {
+    params,
+  });
+}
+
+/** 发送短信 */
+export function sendSms(data: SystemSmsTemplateApi.SendSmsReqVO) {
+  return requestClient.post({ url: '/system/sms-template/send-sms', data });
+}
diff --git a/apps/web-antd/src/views/system/sms/template/data.ts b/apps/web-antd/src/views/system/sms/template/data.ts
new file mode 100644
index 000000000..c6a6c22ae
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/template/data.ts
@@ -0,0 +1,252 @@
+import type { VbenFormSchema } from '#/adapter/form';
+import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemSmsTemplateApi } from '#/api/system/sms/smsTemplate';
+
+import { z } from '#/adapter/form';
+import { getSimpleSmsChannelList } from '#/api/system/sms/smsChannel';
+import { CommonStatusEnum } from '#/utils/constants';
+import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+
+/** 新增/修改的表单 */
+export function useFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      component: 'Input',
+      fieldName: 'id',
+      label: 'id',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'type',
+      label: '短信类型',
+      component: 'Select',
+      componentProps: {
+        class: 'w-full',
+        options: getDictOptions(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, 'number'),
+      },
+      rules: 'required',
+    },
+    {
+      component: 'Input',
+      fieldName: 'name',
+      label: '模板名称',
+      rules: 'required',
+    },
+    {
+      component: 'Input',
+      fieldName: 'code',
+      label: '模板编码',
+      rules: 'required',
+    },
+    {
+      fieldName: 'channelId',
+      label: '短信渠道',
+      component: 'ApiSelect',
+      componentProps: {
+        api: async () => await getSimpleSmsChannelList(),
+        class: 'w-full',
+        labelField: 'signature',
+        valueField: 'id',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'status',
+      label: '开启状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
+      },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
+    },
+    {
+      component: 'Textarea',
+      fieldName: 'content',
+      label: '模板内容',
+      rules: 'required',
+    },
+    {
+      component: 'Input',
+      fieldName: 'apiTemplateId',
+      label: '短信 API 的模板编号',
+    },
+    {
+      fieldName: 'remark',
+      label: '备注',
+      component: 'Textarea',
+    },
+  ];
+}
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'type',
+      label: '短信类型',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE, 'number'),
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '开启状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+      },
+    },
+    {
+      fieldName: 'code',
+      label: '模板编码',
+      component: 'Input',
+    },
+    {
+      fieldName: 'name',
+      label: '模板名称',
+      component: 'Input',
+    },
+    {
+      fieldName: 'channelId',
+      label: '短信渠道',
+      component: 'ApiSelect',
+      componentProps: {
+        api: async () => await getSimpleSmsChannelList(),
+        labelField: 'signature',
+        valueField: 'id',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 发送短信表单 */
+export function useSendSmsFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      component: 'Input',
+      fieldName: 'mobile',
+      label: '手机号码',
+      rules: 'required',
+    },
+    {
+      fieldName: 'templateParams',
+      label: '模板参数',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns<T = SystemSmsTemplateApi.SmsTemplateVO>(
+  onActionClick: OnActionClickFn<T>,
+): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+      minWidth: 100,
+    },
+    {
+      field: 'type',
+      title: '短信类型',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE },
+      },
+    },
+    {
+      field: 'name',
+      title: '模板名称',
+      minWidth: 120,
+    },
+    {
+      field: 'code',
+      title: '模板编码',
+      minWidth: 120,
+    },
+    {
+      field: 'content',
+      title: '模板内容',
+      minWidth: 200,
+    },
+    {
+      field: 'status',
+      title: '开启状态',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.COMMON_STATUS },
+      },
+    },
+    {
+      field: 'remark',
+      title: '备注',
+      minWidth: 120,
+    },
+    {
+      field: 'apiTemplateId',
+      title: '短信 API 的模板编号',
+      minWidth: 180,
+    },
+    {
+      field: 'channelCode',
+      title: '短信渠道',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'operation',
+      title: '操作',
+      minWidth: 300,
+      align: 'center',
+      fixed: 'right',
+      cellRender: {
+        attrs: {
+          nameField: 'name',
+          nameTitle: '短信模板',
+          onClick: onActionClick,
+        },
+        name: 'CellOperation',
+        options: [
+          'edit', // 默认的编辑按钮
+          'delete', // 默认的删除按钮
+          {
+            code: 'sms-send',
+            text: '发送短信',
+          },
+        ],
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/system/sms/template/index.vue b/apps/web-antd/src/views/system/sms/template/index.vue
new file mode 100644
index 000000000..2d1a2b022
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/template/index.vue
@@ -0,0 +1,149 @@
+<script lang="ts" setup>
+import type {
+  OnActionClickParams,
+  VxeTableGridOptions,
+} from '#/adapter/vxe-table';
+import type { SystemSmsTemplateApi } from '#/api/system/sms/smsTemplate';
+
+import { Page, useVbenModal } from '@vben/common-ui';
+import { Download, Plus } from '@vben/icons';
+
+import { Button, message } from 'ant-design-vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteSmsTemplate,
+  exportSmsTemplate,
+  getSmsTemplatePage,
+} from '#/api/system/sms/smsTemplate';
+import { $t } from '#/locales';
+import { downloadByData } from '#/utils/download';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+import SendForm from './modules/send-form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+const [SendModal, sendModalApi] = useVbenModal({
+  connectedComponent: SendForm,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function onRefresh() {
+  gridApi.query();
+}
+
+/** 导出表格 */
+async function onExport() {
+  const data = await exportSmsTemplate(await gridApi.formApi.getValues());
+  downloadByData(data, '短信模板.xls');
+}
+
+/** 创建短信模板 */
+function onCreate() {
+  formModalApi.setData(null).open();
+}
+
+/** 编辑短信模板 */
+function onEdit(row: SystemSmsTemplateApi.SmsTemplateVO) {
+  formModalApi.setData(row).open();
+}
+
+/** 发送测试短信 */
+function onSend(row: SystemSmsTemplateApi.SmsTemplateVO) {
+  sendModalApi.setData(row).open();
+}
+
+/** 删除短信模板 */
+async function onDelete(row: SystemSmsTemplateApi.SmsTemplateVO) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+    key: 'action_process_msg',
+  });
+  try {
+    await deleteSmsTemplate(row.id as number);
+    message.success({
+      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
+      key: 'action_process_msg',
+    });
+    onRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
+/** 表格操作按钮的回调函数 */
+function onActionClick({
+  code,
+  row,
+}: OnActionClickParams<SystemSmsTemplateApi.SmsTemplateVO>) {
+  switch (code) {
+    case 'delete': {
+      onDelete(row);
+      break;
+    }
+    case 'edit': {
+      onEdit(row);
+      break;
+    }
+    case 'sms-send': {
+      onSend(row);
+      break;
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(onActionClick),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSmsTemplatePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: { code: 'query' },
+      search: true,
+    },
+  } as VxeTableGridOptions<SystemSmsTemplateApi.SmsTemplateVO>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <FormModal @success="onRefresh" />
+    <SendModal />
+    <Grid table-title="短信模板列表">
+      <template #toolbar-tools>
+        <Button type="primary" @click="onCreate">
+          <Plus class="size-5" />
+          {{ $t('ui.actionTitle.create', ['短信模板']) }}
+        </Button>
+        <Button type="primary" class="ml-2" @click="onExport">
+          <Download class="size-5" />
+          {{ $t('ui.actionTitle.export') }}
+        </Button>
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/system/sms/template/modules/form.vue b/apps/web-antd/src/views/system/sms/template/modules/form.vue
new file mode 100644
index 000000000..f0fe37ee5
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/template/modules/form.vue
@@ -0,0 +1,84 @@
+<script lang="ts" setup>
+import type { SystemSmsTemplateApi } from '#/api/system/sms/smsTemplate';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createSmsTemplate,
+  getSmsTemplate,
+  updateSmsTemplate,
+} from '#/api/system/sms/smsTemplate';
+import { $t } from '#/locales';
+
+import { useFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<SystemSmsTemplateApi.SmsTemplateVO>();
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['短信模板'])
+    : $t('ui.actionTitle.create', ['短信模板']);
+});
+
+const [Form, formApi] = useVbenForm({
+  layout: 'horizontal',
+  schema: useFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 提交表单
+    const data =
+      (await formApi.getValues()) as SystemSmsTemplateApi.SmsTemplateVO;
+    try {
+      await (formData.value?.id
+        ? updateSmsTemplate(data)
+        : createSmsTemplate(data));
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success({
+        content: $t('ui.actionMessage.operationSuccess'),
+        key: 'action_process_msg',
+      });
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<SystemSmsTemplateApi.SmsTemplateVO>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getSmsTemplate(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle">
+    <Form class="mx-4" />
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/system/sms/template/modules/send-form.vue b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue
new file mode 100644
index 000000000..8b5e24e5d
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue
@@ -0,0 +1,109 @@
+<script lang="ts" setup>
+import type { SystemSmsTemplateApi } from '#/api/system/sms/smsTemplate';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import { sendSms } from '#/api/system/sms/smsTemplate';
+import { $t } from '#/locales';
+
+import { useSendSmsFormSchema } from '../data';
+
+const emit = defineEmits(['success']);
+const templateData = ref<SystemSmsTemplateApi.SmsTemplateVO>();
+const getTitle = computed(() => {
+  return $t('ui.actionTitle.send', ['短信']);
+});
+
+// 动态构建表单
+const buildSchema = () => {
+  const schema = useSendSmsFormSchema();
+
+  // 添加参数字段
+  if (templateData.value?.params && templateData.value.params.length > 0) {
+    templateData.value.params.forEach((param) => {
+      schema.push({
+        component: 'Input',
+        fieldName: `param_${param}`,
+        label: `参数 ${param}`,
+        rules: 'required',
+      });
+    });
+  }
+
+  return schema;
+};
+
+const [Form, formApi] = useVbenForm({
+  layout: 'horizontal',
+  schema: buildSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 获取表单数据
+    const values = await formApi.getValues();
+
+    // 提取参数
+    const paramsObj: Record<string, string> = {};
+    if (templateData.value?.params) {
+      templateData.value.params.forEach((param) => {
+        paramsObj[param] = values[`param_${param}`];
+      });
+    }
+
+    // 构建发送短信请求
+    const data: SystemSmsTemplateApi.SendSmsReqVO = {
+      mobile: values.mobile,
+      templateCode: templateData.value?.code || '',
+      templateParams: paramsObj,
+    };
+
+    try {
+      await sendSms(data);
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success({
+        content: '短信发送成功',
+        key: 'action_process_msg',
+      });
+    } catch (error) {
+      console.error('发送短信失败', error);
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      return;
+    }
+    // 获取数据
+    const data = modalApi.getData<SystemSmsTemplateApi.SmsTemplateVO>();
+    if (!data) {
+      return;
+    }
+
+    templateData.value = data;
+    // 更新表单结构
+    const schema = buildSchema();
+    await formApi.updateSchema(schema);
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle">
+    <Form class="mx-4" />
+  </Modal>
+</template>

From 7f37ca4a6be510c21a8b1f45e3b6df03a6a8b2ae Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 17:15:07 +0800
Subject: [PATCH 04/11] =?UTF-8?q?fix:=20=E7=9F=AD=E4=BF=A1=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E3=80=81=E6=B8=A0=E9=81=93=20api=20=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/system/sms/smsChannel/index.ts      | 6 +++---
 apps/web-antd/src/api/system/sms/smsTemplate/index.ts     | 8 ++++----
 .../request/src/request-client/preset-interceptors.ts     | 5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/web-antd/src/api/system/sms/smsChannel/index.ts b/apps/web-antd/src/api/system/sms/smsChannel/index.ts
index fb9e8d53f..2adbf30fd 100644
--- a/apps/web-antd/src/api/system/sms/smsChannel/index.ts
+++ b/apps/web-antd/src/api/system/sms/smsChannel/index.ts
@@ -41,17 +41,17 @@ export function getSmsChannel(id: number) {
 
 /** 新增短信渠道 */
 export function createSmsChannel(data: SystemSmsChannelApi.SmsChannelVO) {
-  return requestClient.post({ url: '/system/sms-channel/create', data });
+  return requestClient.post('/system/sms-channel/create', data);
 }
 
 /** 修改短信渠道 */
 export function updateSmsChannel(data: SystemSmsChannelApi.SmsChannelVO) {
-  return requestClient.put({ url: '/system/sms-channel/update', data });
+  return requestClient.put('/system/sms-channel/update', data);
 }
 
 /** 删除短信渠道 */
 export function deleteSmsChannel(id: number) {
-  return requestClient.delete({ url: `/system/sms-channel/delete?id=${id}` });
+  return requestClient.delete(`/system/sms-channel/delete?id=${id}`);
 }
 
 /** 导出短信渠道 */
diff --git a/apps/web-antd/src/api/system/sms/smsTemplate/index.ts b/apps/web-antd/src/api/system/sms/smsTemplate/index.ts
index 043a1a6d9..322a0002e 100644
--- a/apps/web-antd/src/api/system/sms/smsTemplate/index.ts
+++ b/apps/web-antd/src/api/system/sms/smsTemplate/index.ts
@@ -44,17 +44,17 @@ export function getSmsTemplate(id: number) {
 
 /** 新增短信模板 */
 export function createSmsTemplate(data: SystemSmsTemplateApi.SmsTemplateVO) {
-  return requestClient.post({ url: '/system/sms-template/create', data });
+  return requestClient.post('/system/sms-template/create', data);
 }
 
 /** 修改短信模板 */
 export function updateSmsTemplate(data: SystemSmsTemplateApi.SmsTemplateVO) {
-  return requestClient.put({ url: '/system/sms-template/update', data });
+  return requestClient.put('/system/sms-template/update', data);
 }
 
 /** 删除短信模板 */
 export function deleteSmsTemplate(id: number) {
-  return requestClient.delete({ url: `/system/sms-template/delete?id=${id}` });
+  return requestClient.delete(`/system/sms-template/delete?id=${id}`);
 }
 
 /** 导出短信模板 */
@@ -66,5 +66,5 @@ export function exportSmsTemplate(params: SystemSmsTemplateApi.SmsTemplateVO) {
 
 /** 发送短信 */
 export function sendSms(data: SystemSmsTemplateApi.SendSmsReqVO) {
-  return requestClient.post({ url: '/system/sms-template/send-sms', data });
+  return requestClient.post('/system/sms-template/send-sms', data);
 }
diff --git a/packages/effects/request/src/request-client/preset-interceptors.ts b/packages/effects/request/src/request-client/preset-interceptors.ts
index e5c677abf..de0f5bdcc 100644
--- a/packages/effects/request/src/request-client/preset-interceptors.ts
+++ b/packages/effects/request/src/request-client/preset-interceptors.ts
@@ -61,7 +61,7 @@ export const authenticateResponseInterceptor = ({
     rejected: async (error) => {
       const { config, response, data: responseData } = error;
       // 如果不是 401 错误，直接抛出异常
-      if (response?.status !== 401 && responseData.code !== 401) {
+      if (response?.status !== 401 && responseData?.code !== 401) {
         throw error;
       }
       // 判断是否启用了 refreshToken 功能
@@ -131,7 +131,8 @@ export const errorMessageResponseInterceptor = (
       }
 
       let errorMessage = '';
-      const status = error?.code || error?.response?.data?.code || error?.response?.status;
+      const status =
+        error?.code || error?.response?.data?.code || error?.response?.status;
 
       switch (status) {
         case 400: {

From d288cd6be2e20f9d72e14d18c64a325c927e09b2 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 17:43:52 +0800
Subject: [PATCH 05/11] =?UTF-8?q?feat:=20=E7=9F=AD=E4=BF=A1=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/system/sms/log/index.ts |  45 +++++
 .../web-antd/src/views/system/sms/log/data.ts | 172 ++++++++++++++++++
 .../src/views/system/sms/log/index.vue        |  98 ++++++++++
 .../src/views/system/sms/log/modules/form.vue | 122 +++++++++++++
 4 files changed, 437 insertions(+)
 create mode 100644 apps/web-antd/src/api/system/sms/log/index.ts
 create mode 100644 apps/web-antd/src/views/system/sms/log/data.ts
 create mode 100644 apps/web-antd/src/views/system/sms/log/index.vue
 create mode 100644 apps/web-antd/src/views/system/sms/log/modules/form.vue

diff --git a/apps/web-antd/src/api/system/sms/log/index.ts b/apps/web-antd/src/api/system/sms/log/index.ts
new file mode 100644
index 000000000..4a2aac414
--- /dev/null
+++ b/apps/web-antd/src/api/system/sms/log/index.ts
@@ -0,0 +1,45 @@
+import type { PageParam } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace SystemSmsLogApi {
+  /** 短信日志信息 */
+  export interface SmsLogVO {
+    id: null | number;
+    channelId: null | number;
+    channelCode: string;
+    templateId: null | number;
+    templateCode: string;
+    templateType: null | number;
+    templateContent: string;
+    templateParams: null | Record<string, any>;
+    apiTemplateId: string;
+    mobile: string;
+    userId: null | number;
+    userType: null | number;
+    sendStatus: null | number;
+    sendTime: Date | null;
+    apiSendCode: string;
+    apiSendMsg: string;
+    apiRequestId: string;
+    apiSerialNo: string;
+    receiveStatus: null | number;
+    receiveTime: Date | null;
+    apiReceiveCode: string;
+    apiReceiveMsg: string;
+    createTime: Date | null;
+  }
+}
+
+/** 查询短信日志列表 */
+export function getSmsLogPage(params: PageParam) {
+  return requestClient.get<{
+    list: SystemSmsLogApi.SmsLogVO[];
+    total: number;
+  }>('/system/sms-log/page', { params });
+}
+
+/** 导出短信日志 */
+export function exportSmsLog(params: SystemSmsLogApi.SmsLogVO) {
+  return requestClient.download('/system/sms-log/export-excel', { params });
+}
diff --git a/apps/web-antd/src/views/system/sms/log/data.ts b/apps/web-antd/src/views/system/sms/log/data.ts
new file mode 100644
index 000000000..893bcdf43
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/log/data.ts
@@ -0,0 +1,172 @@
+import type { SystemSmsLogApi } from 'src/api/system/sms/log';
+
+import type { VbenFormSchema } from '#/adapter/form';
+import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+
+import { getSimpleSmsChannelList } from 'src/api/system/sms/channel';
+
+import { DICT_TYPE, getDictOptions } from '#/utils/dict';
+
+/** 列表的搜索表单 */
+export function useGridFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'mobile',
+      label: '手机号',
+      component: 'Input',
+    },
+    {
+      fieldName: 'channelId',
+      label: '短信渠道',
+      component: 'ApiSelect',
+      componentProps: {
+        api: async () => await getSimpleSmsChannelList(),
+        labelField: 'signature',
+        valueField: 'id',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'templateId',
+      label: '模板编号',
+      component: 'Input',
+    },
+    {
+      fieldName: 'sendStatus',
+      label: '发送状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.SYSTEM_SMS_SEND_STATUS, 'number'),
+      },
+    },
+    {
+      fieldName: 'sendTime',
+      label: '发送时间',
+      component: 'RangePicker',
+      componentProps: {
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'receiveStatus',
+      label: '接收状态',
+      component: 'Select',
+      componentProps: {
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS, 'number'),
+      },
+    },
+    {
+      fieldName: 'receiveTime',
+      label: '接收时间',
+      component: 'RangePicker',
+      componentProps: {
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 列表的字段 */
+export function useGridColumns<T = SystemSmsLogApi.SmsLogVO>(
+  onActionClick: OnActionClickFn<T>,
+): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '编号',
+      minWidth: 100,
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'mobile',
+      title: '手机号',
+      minWidth: 120,
+    },
+    {
+      field: 'templateContent',
+      title: '短信内容',
+      minWidth: 300,
+    },
+    {
+      field: 'sendStatus',
+      title: '发送状态',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.SYSTEM_SMS_SEND_STATUS },
+      },
+    },
+    {
+      field: 'sendTime',
+      title: '发送时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'receiveStatus',
+      title: '接收状态',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.SYSTEM_SMS_RECEIVE_STATUS },
+      },
+    },
+    {
+      field: 'receiveTime',
+      title: '接收时间',
+      minWidth: 180,
+      formatter: 'formatDateTime',
+    },
+    {
+      field: 'channelCode',
+      title: '短信渠道',
+      minWidth: 120,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.SYSTEM_SMS_CHANNEL_CODE },
+      },
+    },
+    {
+      field: 'templateId',
+      title: '模板编号',
+      minWidth: 100,
+    },
+    {
+      field: 'templateType',
+      title: '短信类型',
+      minWidth: 100,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.SYSTEM_SMS_TEMPLATE_TYPE },
+      },
+    },
+    {
+      field: 'operation',
+      title: '操作',
+      minWidth: 120,
+      align: 'center',
+      fixed: 'right',
+      cellRender: {
+        attrs: {
+          nameField: 'mobile',
+          nameTitle: '短信日志',
+          onClick: onActionClick,
+        },
+        name: 'CellOperation',
+        options: [
+          {
+            code: 'view',
+            text: '查看',
+          },
+        ],
+      },
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/system/sms/log/index.vue b/apps/web-antd/src/views/system/sms/log/index.vue
new file mode 100644
index 000000000..7ba9b7b3b
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/log/index.vue
@@ -0,0 +1,98 @@
+<script lang="ts" setup>
+import type { SystemSmsLogApi } from 'src/api/system/sms/log';
+
+import type {
+  OnActionClickParams,
+  VxeTableGridOptions,
+} from '#/adapter/vxe-table';
+
+import { Page, useVbenModal } from '@vben/common-ui';
+import { Download } from '@vben/icons';
+
+import { Button } from 'ant-design-vue';
+import { exportSmsLog, getSmsLogPage } from 'src/api/system/sms/log';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { $t } from '#/locales';
+import { downloadByData } from '#/utils/download';
+
+import { useGridColumns, useGridFormSchema } from './data';
+import Form from './modules/form.vue';
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
+
+/** 刷新表格 */
+function onRefresh() {
+  gridApi.query();
+}
+
+/** 导出表格 */
+async function onExport() {
+  const data = await exportSmsLog(await gridApi.formApi.getValues());
+  downloadByData(data, '短信日志.xls');
+}
+
+/** 查看短信日志详情 */
+function onView(row: SystemSmsLogApi.SmsLogVO) {
+  formModalApi.setData(row).open();
+}
+
+/** 表格操作按钮的回调函数 */
+function onActionClick({
+  code,
+  row,
+}: OnActionClickParams<SystemSmsLogApi.SmsLogVO>) {
+  switch (code) {
+    case 'view': {
+      onView(row);
+      break;
+    }
+  }
+}
+
+const [Grid, gridApi] = useVbenVxeGrid({
+  formOptions: {
+    schema: useGridFormSchema(),
+  },
+  gridOptions: {
+    columns: useGridColumns(onActionClick),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getSmsLogPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+    },
+    toolbarConfig: {
+      refresh: { code: 'query' },
+      search: true,
+    },
+  } as VxeTableGridOptions<SystemSmsLogApi.SmsLogVO>,
+});
+</script>
+
+<template>
+  <Page auto-content-height>
+    <FormModal @success="onRefresh" />
+    <Grid table-title="短信日志列表">
+      <template #toolbar-tools>
+        <Button type="primary" class="ml-2" @click="onExport">
+          <Download class="size-5" />
+          {{ $t('ui.actionTitle.export') }}
+        </Button>
+      </template>
+    </Grid>
+  </Page>
+</template>
diff --git a/apps/web-antd/src/views/system/sms/log/modules/form.vue b/apps/web-antd/src/views/system/sms/log/modules/form.vue
new file mode 100644
index 000000000..731d900ca
--- /dev/null
+++ b/apps/web-antd/src/views/system/sms/log/modules/form.vue
@@ -0,0 +1,122 @@
+<script lang="ts" setup>
+import type { SystemSmsLogApi } from 'src/api/system/sms/log';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+const formData = ref<SystemSmsLogApi.SmsLogVO>();
+const getTitle = computed(() => {
+  return '短信日志详情';
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<SystemSmsLogApi.SmsLogVO>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = data;
+    } finally {
+      modalApi.lock(false);
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle">
+    <div class="p-4">
+      <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+        <div class="form-item">
+          <div class="form-label">编号：</div>
+          <div>{{ formData?.id }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">创建时间：</div>
+          <div>{{ formData?.createTime }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">手机号：</div>
+          <div>{{ formData?.mobile }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">短信渠道：</div>
+          <div>{{ formData?.channelCode }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">模板编号：</div>
+          <div>{{ formData?.templateId }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">模板类型：</div>
+          <div>{{ formData?.templateType }}</div>
+        </div>
+      </div>
+
+      <div class="mt-4">
+        <div class="form-label">短信内容：</div>
+        <div>{{ formData?.templateContent }}</div>
+      </div>
+
+      <div class="mt-4 grid grid-cols-1 gap-4 md:grid-cols-2">
+        <div class="form-item">
+          <div class="form-label">发送状态：</div>
+          <div>{{ formData?.sendStatus }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">发送时间：</div>
+          <div>{{ formData?.sendTime }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">API发送编码：</div>
+          <div>{{ formData?.apiSendCode }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">API发送消息：</div>
+          <div>{{ formData?.apiSendMsg }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">接收状态：</div>
+          <div>{{ formData?.receiveStatus }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">接收时间：</div>
+          <div>{{ formData?.receiveTime }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">API接收编码：</div>
+          <div>{{ formData?.apiReceiveCode }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">API接收消息：</div>
+          <div>{{ formData?.apiReceiveMsg }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">API请求ID：</div>
+          <div>{{ formData?.apiRequestId }}</div>
+        </div>
+        <div class="form-item">
+          <div class="form-label">API序列号：</div>
+          <div>{{ formData?.apiSerialNo }}</div>
+        </div>
+      </div>
+    </div>
+  </Modal>
+</template>
+
+<style scoped>
+.form-item {
+  @apply mb-2;
+}
+
+.form-label {
+  @apply font-medium;
+}
+</style>

From bca7938c6f12ab806d76d54507a71de84c003509 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 17:49:38 +0800
Subject: [PATCH 06/11] =?UTF-8?q?fix:=20=E7=9F=AD=E4=BF=A1=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=96=87=E4=BB=B6=E5=A4=B9=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=91=BD=E5=90=8D=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/sms/{smsChannel => channel}/index.ts     | 0
 .../src/api/system/sms/{smsTemplate => template}/index.ts   | 0
 apps/web-antd/src/views/system/sms/channel/data.ts          | 2 +-
 apps/web-antd/src/views/system/sms/channel/index.vue        | 4 ++--
 apps/web-antd/src/views/system/sms/channel/modules/form.vue | 4 ++--
 apps/web-antd/src/views/system/sms/log/data.ts              | 6 ++----
 apps/web-antd/src/views/system/sms/log/index.vue            | 5 ++---
 apps/web-antd/src/views/system/sms/log/modules/form.vue     | 2 +-
 apps/web-antd/src/views/system/sms/template/data.ts         | 4 ++--
 apps/web-antd/src/views/system/sms/template/index.vue       | 4 ++--
 .../web-antd/src/views/system/sms/template/modules/form.vue | 4 ++--
 .../src/views/system/sms/template/modules/send-form.vue     | 4 ++--
 12 files changed, 18 insertions(+), 21 deletions(-)
 rename apps/web-antd/src/api/system/sms/{smsChannel => channel}/index.ts (100%)
 rename apps/web-antd/src/api/system/sms/{smsTemplate => template}/index.ts (100%)

diff --git a/apps/web-antd/src/api/system/sms/smsChannel/index.ts b/apps/web-antd/src/api/system/sms/channel/index.ts
similarity index 100%
rename from apps/web-antd/src/api/system/sms/smsChannel/index.ts
rename to apps/web-antd/src/api/system/sms/channel/index.ts
diff --git a/apps/web-antd/src/api/system/sms/smsTemplate/index.ts b/apps/web-antd/src/api/system/sms/template/index.ts
similarity index 100%
rename from apps/web-antd/src/api/system/sms/smsTemplate/index.ts
rename to apps/web-antd/src/api/system/sms/template/index.ts
diff --git a/apps/web-antd/src/views/system/sms/channel/data.ts b/apps/web-antd/src/views/system/sms/channel/data.ts
index 7c021e3fd..231831109 100644
--- a/apps/web-antd/src/views/system/sms/channel/data.ts
+++ b/apps/web-antd/src/views/system/sms/channel/data.ts
@@ -1,6 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { SystemSmsChannelApi } from '#/api/system/sms/smsChannel';
+import type { SystemSmsChannelApi } from '#/api/system/sms/channel';
 
 import { z } from '#/adapter/form';
 import { CommonStatusEnum } from '#/utils/constants';
diff --git a/apps/web-antd/src/views/system/sms/channel/index.vue b/apps/web-antd/src/views/system/sms/channel/index.vue
index e7c9e6517..866ee605c 100644
--- a/apps/web-antd/src/views/system/sms/channel/index.vue
+++ b/apps/web-antd/src/views/system/sms/channel/index.vue
@@ -3,7 +3,7 @@ import type {
   OnActionClickParams,
   VxeTableGridOptions,
 } from '#/adapter/vxe-table';
-import type { SystemSmsChannelApi } from '#/api/system/sms/smsChannel';
+import type { SystemSmsChannelApi } from '#/api/system/sms/channel';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { Download, Plus } from '@vben/icons';
@@ -15,7 +15,7 @@ import {
   deleteSmsChannel,
   exportSmsChannel,
   getSmsChannelPage,
-} from '#/api/system/sms/smsChannel';
+} from '#/api/system/sms/channel';
 import { $t } from '#/locales';
 import { downloadByData } from '#/utils/download';
 
diff --git a/apps/web-antd/src/views/system/sms/channel/modules/form.vue b/apps/web-antd/src/views/system/sms/channel/modules/form.vue
index 095c5fd31..3cacd6732 100644
--- a/apps/web-antd/src/views/system/sms/channel/modules/form.vue
+++ b/apps/web-antd/src/views/system/sms/channel/modules/form.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { SystemSmsChannelApi } from '#/api/system/sms/smsChannel';
+import type { SystemSmsChannelApi } from '#/api/system/sms/channel';
 
 import { computed, ref } from 'vue';
 
@@ -12,7 +12,7 @@ import {
   createSmsChannel,
   getSmsChannel,
   updateSmsChannel,
-} from '#/api/system/sms/smsChannel';
+} from '#/api/system/sms/channel';
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/system/sms/log/data.ts b/apps/web-antd/src/views/system/sms/log/data.ts
index 893bcdf43..5a8e3b69e 100644
--- a/apps/web-antd/src/views/system/sms/log/data.ts
+++ b/apps/web-antd/src/views/system/sms/log/data.ts
@@ -1,10 +1,8 @@
-import type { SystemSmsLogApi } from 'src/api/system/sms/log';
-
 import type { VbenFormSchema } from '#/adapter/form';
 import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemSmsLogApi } from '#/api/system/sms/log';
 
-import { getSimpleSmsChannelList } from 'src/api/system/sms/channel';
-
+import { getSimpleSmsChannelList } from '#/api/system/sms/channel';
 import { DICT_TYPE, getDictOptions } from '#/utils/dict';
 
 /** 列表的搜索表单 */
diff --git a/apps/web-antd/src/views/system/sms/log/index.vue b/apps/web-antd/src/views/system/sms/log/index.vue
index 7ba9b7b3b..fc55da7be 100644
--- a/apps/web-antd/src/views/system/sms/log/index.vue
+++ b/apps/web-antd/src/views/system/sms/log/index.vue
@@ -1,18 +1,17 @@
 <script lang="ts" setup>
-import type { SystemSmsLogApi } from 'src/api/system/sms/log';
-
 import type {
   OnActionClickParams,
   VxeTableGridOptions,
 } from '#/adapter/vxe-table';
+import type { SystemSmsLogApi } from '#/api/system/sms/log';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { Download } from '@vben/icons';
 
 import { Button } from 'ant-design-vue';
-import { exportSmsLog, getSmsLogPage } from 'src/api/system/sms/log';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { exportSmsLog, getSmsLogPage } from '#/api/system/sms/log';
 import { $t } from '#/locales';
 import { downloadByData } from '#/utils/download';
 
diff --git a/apps/web-antd/src/views/system/sms/log/modules/form.vue b/apps/web-antd/src/views/system/sms/log/modules/form.vue
index 731d900ca..a3de58d45 100644
--- a/apps/web-antd/src/views/system/sms/log/modules/form.vue
+++ b/apps/web-antd/src/views/system/sms/log/modules/form.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { SystemSmsLogApi } from 'src/api/system/sms/log';
+import type { SystemSmsLogApi } from '#/api/system/sms/log';
 
 import { computed, ref } from 'vue';
 
diff --git a/apps/web-antd/src/views/system/sms/template/data.ts b/apps/web-antd/src/views/system/sms/template/data.ts
index c6a6c22ae..226d75a59 100644
--- a/apps/web-antd/src/views/system/sms/template/data.ts
+++ b/apps/web-antd/src/views/system/sms/template/data.ts
@@ -1,9 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { SystemSmsTemplateApi } from '#/api/system/sms/smsTemplate';
+import type { SystemSmsTemplateApi } from '#/api/system/sms/template';
 
 import { z } from '#/adapter/form';
-import { getSimpleSmsChannelList } from '#/api/system/sms/smsChannel';
+import { getSimpleSmsChannelList } from '#/api/system/sms/channel';
 import { CommonStatusEnum } from '#/utils/constants';
 import { DICT_TYPE, getDictOptions } from '#/utils/dict';
 
diff --git a/apps/web-antd/src/views/system/sms/template/index.vue b/apps/web-antd/src/views/system/sms/template/index.vue
index 2d1a2b022..ccc5d8ae2 100644
--- a/apps/web-antd/src/views/system/sms/template/index.vue
+++ b/apps/web-antd/src/views/system/sms/template/index.vue
@@ -3,7 +3,7 @@ import type {
   OnActionClickParams,
   VxeTableGridOptions,
 } from '#/adapter/vxe-table';
-import type { SystemSmsTemplateApi } from '#/api/system/sms/smsTemplate';
+import type { SystemSmsTemplateApi } from '#/api/system/sms/template';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { Download, Plus } from '@vben/icons';
@@ -15,7 +15,7 @@ import {
   deleteSmsTemplate,
   exportSmsTemplate,
   getSmsTemplatePage,
-} from '#/api/system/sms/smsTemplate';
+} from '#/api/system/sms/template';
 import { $t } from '#/locales';
 import { downloadByData } from '#/utils/download';
 
diff --git a/apps/web-antd/src/views/system/sms/template/modules/form.vue b/apps/web-antd/src/views/system/sms/template/modules/form.vue
index f0fe37ee5..3960a4970 100644
--- a/apps/web-antd/src/views/system/sms/template/modules/form.vue
+++ b/apps/web-antd/src/views/system/sms/template/modules/form.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { SystemSmsTemplateApi } from '#/api/system/sms/smsTemplate';
+import type { SystemSmsTemplateApi } from '#/api/system/sms/template';
 
 import { computed, ref } from 'vue';
 
@@ -12,7 +12,7 @@ import {
   createSmsTemplate,
   getSmsTemplate,
   updateSmsTemplate,
-} from '#/api/system/sms/smsTemplate';
+} from '#/api/system/sms/template';
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/system/sms/template/modules/send-form.vue b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue
index 8b5e24e5d..8042bad2a 100644
--- a/apps/web-antd/src/views/system/sms/template/modules/send-form.vue
+++ b/apps/web-antd/src/views/system/sms/template/modules/send-form.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import type { SystemSmsTemplateApi } from '#/api/system/sms/smsTemplate';
+import type { SystemSmsTemplateApi } from '#/api/system/sms/template';
 
 import { computed, ref } from 'vue';
 
@@ -8,7 +8,7 @@ import { useVbenModal } from '@vben/common-ui';
 import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
-import { sendSms } from '#/api/system/sms/smsTemplate';
+import { sendSms } from '#/api/system/sms/template';
 import { $t } from '#/locales';
 
 import { useSendSmsFormSchema } from '../data';

From ba82401cd4646c77383ebd015eb79f9cb642d823 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 18:12:51 +0800
Subject: [PATCH 07/11] =?UTF-8?q?feat:=20=E9=82=AE=E7=AE=B1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9B=B8=E5=85=B3=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/mail/account/index.ts      | 78 +++++++++++++++++++
 .../web-antd/src/api/system/mail/log/index.ts | 57 ++++++++++++++
 .../src/api/system/mail/template/index.ts     | 78 +++++++++++++++++++
 3 files changed, 213 insertions(+)
 create mode 100644 apps/web-antd/src/api/system/mail/account/index.ts
 create mode 100644 apps/web-antd/src/api/system/mail/log/index.ts
 create mode 100644 apps/web-antd/src/api/system/mail/template/index.ts

diff --git a/apps/web-antd/src/api/system/mail/account/index.ts b/apps/web-antd/src/api/system/mail/account/index.ts
new file mode 100644
index 000000000..9ec32721d
--- /dev/null
+++ b/apps/web-antd/src/api/system/mail/account/index.ts
@@ -0,0 +1,78 @@
+import type { PageParam } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace SystemMailAccountApi {
+  export interface MailAccountVO {
+    id: number;
+    mail: string;
+    username: string;
+    password: string;
+    host: string;
+    port: number;
+    sslEnable: boolean;
+    starttlsEnable: boolean;
+    status: number;
+    createTime: Date;
+    remark: string;
+  }
+}
+
+// 查询邮箱账号列表
+export const getMailAccountPage = async (params: PageParam) => {
+  return await requestClient.get<{
+    list: SystemMailAccountApi.MailAccountVO[];
+    total: number;
+  }>('/system/mail-account/page', { params });
+};
+
+// 查询邮箱账号详情
+export const getMailAccount = async (id: number) => {
+  return await requestClient.get<SystemMailAccountApi.MailAccountVO>(
+    '/system/mail-account/get',
+    {
+      params: { id },
+    },
+  );
+};
+
+// 新增邮箱账号
+export const createMailAccount = async (
+  data: SystemMailAccountApi.MailAccountVO,
+) => {
+  return await requestClient.post<SystemMailAccountApi.MailAccountVO>(
+    '/system/mail-account/create',
+    data,
+  );
+};
+
+// 修改邮箱账号
+export const updateMailAccount = async (
+  data: SystemMailAccountApi.MailAccountVO,
+) => {
+  return await requestClient.put<SystemMailAccountApi.MailAccountVO>(
+    '/system/mail-account/update',
+    data,
+  );
+};
+
+// 删除邮箱账号
+export const deleteMailAccount = async (id: number) => {
+  return await requestClient.delete<boolean>('/system/mail-account/delete', {
+    params: { id },
+  });
+};
+
+// 获得邮箱账号精简列表
+export const getSimpleMailAccountList = async () => {
+  return await requestClient.get<SystemMailAccountApi.MailAccountVO[]>(
+    '/system/mail-account/simple-list',
+  );
+};
+
+// 测试邮箱连接
+export const testMailAccount = async (id: number) => {
+  return await requestClient.post<boolean>('/system/mail-account/test', null, {
+    params: { id },
+  });
+};
diff --git a/apps/web-antd/src/api/system/mail/log/index.ts b/apps/web-antd/src/api/system/mail/log/index.ts
new file mode 100644
index 000000000..651c90124
--- /dev/null
+++ b/apps/web-antd/src/api/system/mail/log/index.ts
@@ -0,0 +1,57 @@
+import type { PageParam } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace SystemMailLogApi {
+  export interface MailLogVO {
+    id: number;
+    userId: number;
+    userType: number;
+    toMail: string;
+    accountId: number;
+    fromMail: string;
+    templateId: number;
+    templateCode: string;
+    templateNickname: string;
+    templateTitle: string;
+    templateContent: string;
+    templateParams: string;
+    sendStatus: number;
+    sendTime: Date;
+    sendMessageId: string;
+    sendException: string;
+    createTime: Date;
+  }
+}
+
+// 查询邮件日志列表
+export const getMailLogPage = async (params: PageParam) => {
+  return await requestClient.get<{
+    list: SystemMailLogApi.MailLogVO[];
+    total: number;
+  }>('/system/mail-log/page', { params });
+};
+
+// 查询邮件日志详情
+export const getMailLog = async (id: number) => {
+  return await requestClient.get<SystemMailLogApi.MailLogVO>(
+    '/system/mail-log/get',
+    {
+      params: { id },
+    },
+  );
+};
+
+// 重新发送邮件
+export const resendMail = async (id: number) => {
+  return await requestClient.put<boolean>('/system/mail-log/resend', null, {
+    params: { id },
+  });
+};
+
+// 批量删除邮件日志
+export const deleteMailLogs = async (ids: number[]) => {
+  return await requestClient.delete<boolean>('/system/mail-log/delete', {
+    data: { ids },
+  });
+};
diff --git a/apps/web-antd/src/api/system/mail/template/index.ts b/apps/web-antd/src/api/system/mail/template/index.ts
new file mode 100644
index 000000000..70415679f
--- /dev/null
+++ b/apps/web-antd/src/api/system/mail/template/index.ts
@@ -0,0 +1,78 @@
+import type { PageParam } from '@vben/request';
+
+import { requestClient } from '#/api/request';
+
+export namespace SystemMailTemplateApi {
+  export interface MailTemplateVO {
+    id: number;
+    name: string;
+    code: string;
+    accountId: number;
+    nickname: string;
+    title: string;
+    content: string;
+    params: string;
+    status: number;
+    remark: string;
+    createTime: Date;
+  }
+
+  export interface MailSendReqVO {
+    mail: string;
+    templateCode: string;
+    templateParams: Record<string, any>;
+  }
+}
+
+// 查询邮件模版列表
+export const getMailTemplatePage = async (params: PageParam) => {
+  return await requestClient.get<{
+    list: SystemMailTemplateApi.MailTemplateVO[];
+    total: number;
+  }>('/system/mail-template/page', { params });
+};
+
+// 查询邮件模版详情
+export const getMailTemplate = async (id: number) => {
+  return await requestClient.get<SystemMailTemplateApi.MailTemplateVO>(
+    '/system/mail-template/get',
+    {
+      params: { id },
+    },
+  );
+};
+
+// 新增邮件模版
+export const createMailTemplate = async (
+  data: SystemMailTemplateApi.MailTemplateVO,
+) => {
+  return await requestClient.post<SystemMailTemplateApi.MailTemplateVO>(
+    '/system/mail-template/create',
+    data,
+  );
+};
+
+// 修改邮件模版
+export const updateMailTemplate = async (
+  data: SystemMailTemplateApi.MailTemplateVO,
+) => {
+  return await requestClient.put<SystemMailTemplateApi.MailTemplateVO>(
+    '/system/mail-template/update',
+    data,
+  );
+};
+
+// 删除邮件模版
+export const deleteMailTemplate = async (id: number) => {
+  return await requestClient.delete<boolean>('/system/mail-template/delete', {
+    params: { id },
+  });
+};
+
+// 发送邮件
+export const sendMail = async (data: SystemMailTemplateApi.MailSendReqVO) => {
+  return await requestClient.post<boolean>(
+    '/system/mail-template/send-mail',
+    data,
+  );
+};

From 6ecfcb07bd3cda090bc5135f00dff1fe37ef216a Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 21:03:54 +0800
Subject: [PATCH 08/11] =?UTF-8?q?Revert=20"feat:=20=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E9=BB=98=E8=AE=A4=20website"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 198cd6912c4065ae7ee20bb1b09597c8af54b9db.
---
 apps/web-antd/.env.development                |  2 --
 apps/web-antd/src/api/core/auth.ts            | 28 ++++++----------
 .../src/views/_core/authentication/login.vue  | 32 ++++++-------------
 packages/effects/hooks/src/use-app-config.ts  |  9 ++----
 packages/types/global.d.ts                    |  2 --
 5 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/apps/web-antd/.env.development b/apps/web-antd/.env.development
index cbe12db2a..5d29cd97b 100644
--- a/apps/web-antd/.env.development
+++ b/apps/web-antd/.env.development
@@ -7,8 +7,6 @@ VITE_BASE=/
 VITE_GLOB_API_URL=/admin-api
 # 是否打开 devtools，true 为打开，false 为关闭
 VITE_DEVTOOLS=false
-# 本地开发默认 website
-VITE_APP_WEBSITE=www.iocoder.cn
 
 # 是否注入全局loading
 VITE_INJECT_APP_LOADING=true
diff --git a/apps/web-antd/src/api/core/auth.ts b/apps/web-antd/src/api/core/auth.ts
index e5cffc513..4071577dd 100644
--- a/apps/web-antd/src/api/core/auth.ts
+++ b/apps/web-antd/src/api/core/auth.ts
@@ -1,6 +1,5 @@
-import type { AuthPermissionInfo } from '@vben/types';
-
 import { baseRequestClient, requestClient } from '#/api/request';
+import type { AuthPermissionInfo } from '@vben/types';
 
 export namespace AuthApi {
   /** 登录接口参数 */
@@ -35,6 +34,7 @@ export namespace AuthApi {
     mobile: string;
     code: string;
   }
+
 }
 
 /** 登录 */
@@ -44,22 +44,16 @@ export async function loginApi(data: AuthApi.LoginParams) {
 
 /** 刷新 accessToken */
 export async function refreshTokenApi(refreshToken: string) {
-  return baseRequestClient.post(
-    `/system/auth/refresh-token?refreshToken=${refreshToken}`,
-  );
+  return baseRequestClient.post(`/system/auth/refresh-token?refreshToken=${refreshToken}`);
 }
 
 /** 退出登录 */
 export async function logoutApi(accessToken: string) {
-  return baseRequestClient.post(
-    '/system/auth/logout',
-    {},
-    {
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-      },
-    },
-  );
+  return baseRequestClient.post('/system/auth/logout', {}, {
+    headers: {
+      Authorization: `Bearer ${accessToken}`,
+    }
+  });
 }
 
 /** 获取权限信息 */
@@ -78,9 +72,7 @@ export async function getTenantSimpleList() {
 
 /** 使用租户域名，获得租户信息 */
 export async function getTenantByWebsite(website: string) {
-  return requestClient.get<AuthApi.TenantResult>(
-    `/system/tenant/get-by-website?website=${website}`,
-  );
+  return requestClient.get<AuthApi.TenantResult>(`/system/tenant/get-by-website?website=${website}`);
 }
 
 /** 获取验证码 */
@@ -91,4 +83,4 @@ export async function getCaptcha(data: any) {
 /** 校验验证码 */
 export async function checkCaptcha(data: any) {
   return baseRequestClient.post('/system/captcha/check', data);
-}
+}
\ No newline at end of file
diff --git a/apps/web-antd/src/views/_core/authentication/login.vue b/apps/web-antd/src/views/_core/authentication/login.vue
index b67d2bdde..b0f15b6a0 100644
--- a/apps/web-antd/src/views/_core/authentication/login.vue
+++ b/apps/web-antd/src/views/_core/authentication/login.vue
@@ -1,31 +1,21 @@
 <script lang="ts" setup>
 import type { VbenFormSchema } from '@vben/common-ui';
+import {type AuthApi, checkCaptcha, getCaptcha } from '#/api/core/auth';
 
-import type { AuthApi } from '#/api/core/auth';
-
-import { computed, onMounted, ref } from 'vue';
+import { computed, markRaw, onMounted, ref } from 'vue';
 
 import { AuthenticationLogin, Verification, z } from '@vben/common-ui';
-import { useAppConfig } from '@vben/hooks';
 import { $t } from '@vben/locales';
+import { useAppConfig } from '@vben/hooks';
+
+import { useAuthStore } from '#/store';
 import { useAccessStore } from '@vben/stores';
 
-import {
-  checkCaptcha,
-  getCaptcha,
-  getTenantByWebsite,
-  getTenantSimpleList,
-} from '#/api/core/auth';
-import { useAuthStore } from '#/store';
+import { getTenantSimpleList, getTenantByWebsite } from '#/api/core/auth';
+const { tenantEnable, captchaEnable } = useAppConfig(import.meta.env, import.meta.env.PROD);
 
 defineOptions({ name: 'Login' });
 
-const isProduction = import.meta.env.PROD;
-const { tenantEnable, captchaEnable, website } = useAppConfig(
-  import.meta.env,
-  isProduction,
-);
-
 const authStore = useAuthStore();
 const accessStore = useAccessStore();
 
@@ -42,13 +32,11 @@ const fetchTenantList = async () => {
   }
   try {
     // 获取租户列表、域名对应租户
-    const websiteTenantPromise = getTenantByWebsite(
-      isProduction ? window.location.hostname : website, // 生成环境使用真实域名开发环境固定
-    );
+    const websiteTenantPromise = getTenantByWebsite(window.location.hostname);
     tenantList.value = await getTenantSimpleList();
 
     // 选中租户：域名 > store 中的租户 > 首个租户
-    let tenantId: null | number = null;
+    let tenantId: number | null = null;
     const websiteTenant = await websiteTenantPromise;
     if (websiteTenant?.id) {
       tenantId = websiteTenant.id;
@@ -80,7 +68,7 @@ const handleLogin = async (values: any) => {
 
   // 无验证码，直接登录
   await authStore.authLogin(values);
-};
+}
 
 /** 验证码通过，执行登录 */
 const handleVerifySuccess = async ({ captchaVerification }: any) => {
diff --git a/packages/effects/hooks/src/use-app-config.ts b/packages/effects/hooks/src/use-app-config.ts
index 2b3299b32..0072bb93d 100644
--- a/packages/effects/hooks/src/use-app-config.ts
+++ b/packages/effects/hooks/src/use-app-config.ts
@@ -15,18 +15,13 @@ export function useAppConfig(
     ? window._VBEN_ADMIN_PRO_APP_CONF_
     : (env as VbenAdminProAppConfigRaw);
 
-  const {
-    VITE_APP_CAPTCHA_ENABLE,
-    VITE_APP_TENANT_ENABLE,
-    VITE_GLOB_API_URL,
-    VITE_APP_WEBSITE,
-  } = config;
+  const { VITE_APP_CAPTCHA_ENABLE, VITE_APP_TENANT_ENABLE, VITE_GLOB_API_URL } =
+    config;
 
   // TODO @芋艿：貌似 VITE_APP_CAPTCHA_ENABLE 读取的是字符串，所以这里暂时这么转换
   return {
     apiURL: VITE_GLOB_API_URL,
     captchaEnable: VITE_APP_CAPTCHA_ENABLE === 'true',
     tenantEnable: VITE_APP_TENANT_ENABLE === 'true',
-    website: VITE_APP_WEBSITE,
   };
 }
diff --git a/packages/types/global.d.ts b/packages/types/global.d.ts
index e09cb0ca1..8280443b3 100644
--- a/packages/types/global.d.ts
+++ b/packages/types/global.d.ts
@@ -11,14 +11,12 @@ export interface VbenAdminProAppConfigRaw {
   VITE_GLOB_API_URL: string;
   VITE_APP_TENANT_ENABLE: boolean;
   VITE_APP_CAPTCHA_ENABLE: boolean;
-  VITE_APP_WEBSITE: string;
 }
 
 export interface ApplicationConfig {
   apiURL: string;
   captchaEnable: boolean;
   tenantEnable: boolean;
-  website: string;
 }
 
 declare global {

From 09a22a3113a05de7f6f367b715b4ad2496e67d96 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 21:18:43 +0800
Subject: [PATCH 09/11] =?UTF-8?q?fix:=20data.ts=20=E6=8C=89=E7=85=A7=20fie?=
 =?UTF-8?q?ldName=E3=80=81label=E3=80=81component=E3=80=81rules=E3=80=81de?=
 =?UTF-8?q?pendencies=20=E8=BF=99=E6=A0=B7=E7=9A=84=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/system/sms/channel/data.ts  |  4 ++--
 apps/web-antd/src/views/system/sms/template/data.ts | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/web-antd/src/views/system/sms/channel/data.ts b/apps/web-antd/src/views/system/sms/channel/data.ts
index 231831109..d7cda29f7 100644
--- a/apps/web-antd/src/views/system/sms/channel/data.ts
+++ b/apps/web-antd/src/views/system/sms/channel/data.ts
@@ -10,18 +10,18 @@ import { DICT_TYPE, getDictOptions } from '#/utils/dict';
 export function useFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'id',
       label: 'id',
+      component: 'Input',
       dependencies: {
         triggerFields: [''],
         show: () => false,
       },
     },
     {
-      component: 'Input',
       fieldName: 'signature',
       label: '短信签名',
+      component: 'Input',
       rules: 'required',
     },
     {
diff --git a/apps/web-antd/src/views/system/sms/template/data.ts b/apps/web-antd/src/views/system/sms/template/data.ts
index 226d75a59..1d197ec84 100644
--- a/apps/web-antd/src/views/system/sms/template/data.ts
+++ b/apps/web-antd/src/views/system/sms/template/data.ts
@@ -11,9 +11,9 @@ import { DICT_TYPE, getDictOptions } from '#/utils/dict';
 export function useFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'id',
       label: 'id',
+      component: 'Input',
       dependencies: {
         triggerFields: [''],
         show: () => false,
@@ -30,15 +30,15 @@ export function useFormSchema(): VbenFormSchema[] {
       rules: 'required',
     },
     {
-      component: 'Input',
       fieldName: 'name',
       label: '模板名称',
+      component: 'Input',
       rules: 'required',
     },
     {
-      component: 'Input',
       fieldName: 'code',
       label: '模板编码',
+      component: 'Input',
       rules: 'required',
     },
     {
@@ -65,15 +65,15 @@ export function useFormSchema(): VbenFormSchema[] {
       rules: z.number().default(CommonStatusEnum.ENABLE),
     },
     {
-      component: 'Textarea',
       fieldName: 'content',
       label: '模板内容',
+      component: 'Textarea',
       rules: 'required',
     },
     {
-      component: 'Input',
       fieldName: 'apiTemplateId',
       label: '短信 API 的模板编号',
+      component: 'Input',
     },
     {
       fieldName: 'remark',
@@ -140,9 +140,9 @@ export function useGridFormSchema(): VbenFormSchema[] {
 export function useSendSmsFormSchema(): VbenFormSchema[] {
   return [
     {
-      component: 'Input',
       fieldName: 'mobile',
       label: '手机号码',
+      component: 'Input',
       rules: 'required',
     },
     {

From 113813ec94e624181a8be27050b282747d0ad8a3 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 21:31:03 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=20page=20=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=BD=BF=E7=94=A8=20PageResult?=
 =?UTF-8?q?=EF=BC=8Cnull=20=E7=B1=BB=E5=9E=8B=E5=B1=9E=E6=80=A7=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/mail/account/index.ts      |  9 +++--
 .../web-antd/src/api/system/mail/log/index.ts | 10 +++---
 .../src/api/system/mail/template/index.ts     |  9 +++--
 .../src/api/system/sms/channel/index.ts       | 10 +++---
 apps/web-antd/src/api/system/sms/log/index.ts | 34 +++++++++----------
 .../src/api/system/sms/template/index.ts      | 10 +++---
 6 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/apps/web-antd/src/api/system/mail/account/index.ts b/apps/web-antd/src/api/system/mail/account/index.ts
index 9ec32721d..aca87d9e8 100644
--- a/apps/web-antd/src/api/system/mail/account/index.ts
+++ b/apps/web-antd/src/api/system/mail/account/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -20,10 +20,9 @@ export namespace SystemMailAccountApi {
 
 // 查询邮箱账号列表
 export const getMailAccountPage = async (params: PageParam) => {
-  return await requestClient.get<{
-    list: SystemMailAccountApi.MailAccountVO[];
-    total: number;
-  }>('/system/mail-account/page', { params });
+  return await requestClient.get<
+    PageResult<SystemMailAccountApi.MailAccountVO>
+  >('/system/mail-account/page', { params });
 };
 
 // 查询邮箱账号详情
diff --git a/apps/web-antd/src/api/system/mail/log/index.ts b/apps/web-antd/src/api/system/mail/log/index.ts
index 651c90124..ed1285420 100644
--- a/apps/web-antd/src/api/system/mail/log/index.ts
+++ b/apps/web-antd/src/api/system/mail/log/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -26,10 +26,10 @@ export namespace SystemMailLogApi {
 
 // 查询邮件日志列表
 export const getMailLogPage = async (params: PageParam) => {
-  return await requestClient.get<{
-    list: SystemMailLogApi.MailLogVO[];
-    total: number;
-  }>('/system/mail-log/page', { params });
+  return await requestClient.get<PageResult<SystemMailLogApi.MailLogVO>>(
+    '/system/mail-log/page',
+    { params },
+  );
 };
 
 // 查询邮件日志详情
diff --git a/apps/web-antd/src/api/system/mail/template/index.ts b/apps/web-antd/src/api/system/mail/template/index.ts
index 70415679f..bf83cc3c5 100644
--- a/apps/web-antd/src/api/system/mail/template/index.ts
+++ b/apps/web-antd/src/api/system/mail/template/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -26,10 +26,9 @@ export namespace SystemMailTemplateApi {
 
 // 查询邮件模版列表
 export const getMailTemplatePage = async (params: PageParam) => {
-  return await requestClient.get<{
-    list: SystemMailTemplateApi.MailTemplateVO[];
-    total: number;
-  }>('/system/mail-template/page', { params });
+  return await requestClient.get<
+    PageResult<SystemMailTemplateApi.MailTemplateVO>
+  >('/system/mail-template/page', { params });
 };
 
 // 查询邮件模版详情
diff --git a/apps/web-antd/src/api/system/sms/channel/index.ts b/apps/web-antd/src/api/system/sms/channel/index.ts
index 2adbf30fd..9108eeffd 100644
--- a/apps/web-antd/src/api/system/sms/channel/index.ts
+++ b/apps/web-antd/src/api/system/sms/channel/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -19,10 +19,10 @@ export namespace SystemSmsChannelApi {
 
 /** 查询短信渠道列表 */
 export function getSmsChannelPage(params: PageParam) {
-  return requestClient.get<{
-    list: SystemSmsChannelApi.SmsChannelVO[];
-    total: number;
-  }>('/system/sms-channel/page', { params });
+  return requestClient.get<PageResult<SystemSmsChannelApi.SmsChannelVO>>(
+    '/system/sms-channel/page',
+    { params },
+  );
 }
 
 /** 获得短信渠道精简列表 */
diff --git a/apps/web-antd/src/api/system/sms/log/index.ts b/apps/web-antd/src/api/system/sms/log/index.ts
index 4a2aac414..c7448ef82 100644
--- a/apps/web-antd/src/api/system/sms/log/index.ts
+++ b/apps/web-antd/src/api/system/sms/log/index.ts
@@ -1,42 +1,42 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
 export namespace SystemSmsLogApi {
   /** 短信日志信息 */
   export interface SmsLogVO {
-    id: null | number;
-    channelId: null | number;
+    id?: number;
+    channelId?: number;
     channelCode: string;
-    templateId: null | number;
+    templateId?: number;
     templateCode: string;
-    templateType: null | number;
+    templateType?: number;
     templateContent: string;
-    templateParams: null | Record<string, any>;
+    templateParams?: Record<string, any>;
     apiTemplateId: string;
     mobile: string;
-    userId: null | number;
-    userType: null | number;
-    sendStatus: null | number;
-    sendTime: Date | null;
+    userId?: number;
+    userType?: number;
+    sendStatus?: number;
+    sendTime?: Date;
     apiSendCode: string;
     apiSendMsg: string;
     apiRequestId: string;
     apiSerialNo: string;
-    receiveStatus: null | number;
-    receiveTime: Date | null;
+    receiveStatus?: number;
+    receiveTime?: Date;
     apiReceiveCode: string;
     apiReceiveMsg: string;
-    createTime: Date | null;
+    createTime?: Date;
   }
 }
 
 /** 查询短信日志列表 */
 export function getSmsLogPage(params: PageParam) {
-  return requestClient.get<{
-    list: SystemSmsLogApi.SmsLogVO[];
-    total: number;
-  }>('/system/sms-log/page', { params });
+  return requestClient.get<PageResult<SystemSmsLogApi.SmsLogVO>>(
+    '/system/sms-log/page',
+    { params },
+  );
 }
 
 /** 导出短信日志 */
diff --git a/apps/web-antd/src/api/system/sms/template/index.ts b/apps/web-antd/src/api/system/sms/template/index.ts
index 322a0002e..643197818 100644
--- a/apps/web-antd/src/api/system/sms/template/index.ts
+++ b/apps/web-antd/src/api/system/sms/template/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -29,10 +29,10 @@ export namespace SystemSmsTemplateApi {
 
 /** 查询短信模板列表 */
 export function getSmsTemplatePage(params: PageParam) {
-  return requestClient.get<{
-    list: SystemSmsTemplateApi.SmsTemplateVO[];
-    total: number;
-  }>('/system/sms-template/page', { params });
+  return requestClient.get<PageResult<SystemSmsTemplateApi.SmsTemplateVO>>(
+    '/system/sms-template/page',
+    { params },
+  );
 }
 
 /** 查询短信模板详情 */

From 83ae8ce3fa04734658af66fc82833d696b3b9aa9 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 3 Apr 2025 21:36:44 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BA=20any?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/api/system/mail/account/index.ts  | 4 ++--
 apps/web-antd/src/api/system/mail/log/index.ts      | 4 ++--
 apps/web-antd/src/api/system/mail/template/index.ts | 4 ++--
 apps/web-antd/src/api/system/sms/channel/index.ts   | 6 +++---
 apps/web-antd/src/api/system/sms/log/index.ts       | 6 +++---
 apps/web-antd/src/api/system/sms/template/index.ts  | 6 +++---
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/web-antd/src/api/system/mail/account/index.ts b/apps/web-antd/src/api/system/mail/account/index.ts
index aca87d9e8..5c03f4f9b 100644
--- a/apps/web-antd/src/api/system/mail/account/index.ts
+++ b/apps/web-antd/src/api/system/mail/account/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '@vben/request';
+import type { PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -19,7 +19,7 @@ export namespace SystemMailAccountApi {
 }
 
 // 查询邮箱账号列表
-export const getMailAccountPage = async (params: PageParam) => {
+export const getMailAccountPage = async (params: any) => {
   return await requestClient.get<
     PageResult<SystemMailAccountApi.MailAccountVO>
   >('/system/mail-account/page', { params });
diff --git a/apps/web-antd/src/api/system/mail/log/index.ts b/apps/web-antd/src/api/system/mail/log/index.ts
index ed1285420..505ba471e 100644
--- a/apps/web-antd/src/api/system/mail/log/index.ts
+++ b/apps/web-antd/src/api/system/mail/log/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '@vben/request';
+import type { PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -25,7 +25,7 @@ export namespace SystemMailLogApi {
 }
 
 // 查询邮件日志列表
-export const getMailLogPage = async (params: PageParam) => {
+export const getMailLogPage = async (params: any) => {
   return await requestClient.get<PageResult<SystemMailLogApi.MailLogVO>>(
     '/system/mail-log/page',
     { params },
diff --git a/apps/web-antd/src/api/system/mail/template/index.ts b/apps/web-antd/src/api/system/mail/template/index.ts
index bf83cc3c5..bf85bab97 100644
--- a/apps/web-antd/src/api/system/mail/template/index.ts
+++ b/apps/web-antd/src/api/system/mail/template/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '@vben/request';
+import type { PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -25,7 +25,7 @@ export namespace SystemMailTemplateApi {
 }
 
 // 查询邮件模版列表
-export const getMailTemplatePage = async (params: PageParam) => {
+export const getMailTemplatePage = async (params: any) => {
   return await requestClient.get<
     PageResult<SystemMailTemplateApi.MailTemplateVO>
   >('/system/mail-template/page', { params });
diff --git a/apps/web-antd/src/api/system/sms/channel/index.ts b/apps/web-antd/src/api/system/sms/channel/index.ts
index 9108eeffd..93be7aca7 100644
--- a/apps/web-antd/src/api/system/sms/channel/index.ts
+++ b/apps/web-antd/src/api/system/sms/channel/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '@vben/request';
+import type { PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -18,7 +18,7 @@ export namespace SystemSmsChannelApi {
 }
 
 /** 查询短信渠道列表 */
-export function getSmsChannelPage(params: PageParam) {
+export function getSmsChannelPage(params: any) {
   return requestClient.get<PageResult<SystemSmsChannelApi.SmsChannelVO>>(
     '/system/sms-channel/page',
     { params },
@@ -55,6 +55,6 @@ export function deleteSmsChannel(id: number) {
 }
 
 /** 导出短信渠道 */
-export function exportSmsChannel(params: SystemSmsChannelApi.SmsChannelVO) {
+export function exportSmsChannel(params: any) {
   return requestClient.download('/system/sms-channel/export', { params });
 }
diff --git a/apps/web-antd/src/api/system/sms/log/index.ts b/apps/web-antd/src/api/system/sms/log/index.ts
index c7448ef82..e4aa01796 100644
--- a/apps/web-antd/src/api/system/sms/log/index.ts
+++ b/apps/web-antd/src/api/system/sms/log/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '@vben/request';
+import type { PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -32,7 +32,7 @@ export namespace SystemSmsLogApi {
 }
 
 /** 查询短信日志列表 */
-export function getSmsLogPage(params: PageParam) {
+export function getSmsLogPage(params: any) {
   return requestClient.get<PageResult<SystemSmsLogApi.SmsLogVO>>(
     '/system/sms-log/page',
     { params },
@@ -40,6 +40,6 @@ export function getSmsLogPage(params: PageParam) {
 }
 
 /** 导出短信日志 */
-export function exportSmsLog(params: SystemSmsLogApi.SmsLogVO) {
+export function exportSmsLog(params: any) {
   return requestClient.download('/system/sms-log/export-excel', { params });
 }
diff --git a/apps/web-antd/src/api/system/sms/template/index.ts b/apps/web-antd/src/api/system/sms/template/index.ts
index 643197818..336398474 100644
--- a/apps/web-antd/src/api/system/sms/template/index.ts
+++ b/apps/web-antd/src/api/system/sms/template/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '@vben/request';
+import type { PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -28,7 +28,7 @@ export namespace SystemSmsTemplateApi {
 }
 
 /** 查询短信模板列表 */
-export function getSmsTemplatePage(params: PageParam) {
+export function getSmsTemplatePage(params: any) {
   return requestClient.get<PageResult<SystemSmsTemplateApi.SmsTemplateVO>>(
     '/system/sms-template/page',
     { params },
@@ -58,7 +58,7 @@ export function deleteSmsTemplate(id: number) {
 }
 
 /** 导出短信模板 */
-export function exportSmsTemplate(params: SystemSmsTemplateApi.SmsTemplateVO) {
+export function exportSmsTemplate(params: any) {
   return requestClient.download('/system/sms-template/export-excel', {
     params,
   });