From 09e61f7ef342db5c0a85c977338ab711524bc673 Mon Sep 17 00:00:00 2001 From: xingyu Date: Tue, 15 Nov 2022 20:43:02 +0800 Subject: [PATCH] refactor: sms --- .../src/api/system/sms/smsChannel/index.ts | 19 ++- .../src/api/system/sms/smsChannel/types.ts | 10 -- .../src/api/system/sms/smsLog/index.ts | 31 +++- .../src/api/system/sms/smsLog/types.ts | 9 -- .../src/api/system/sms/smsTemplate/index.ts | 20 ++- .../src/api/system/sms/smsTemplate/types.ts | 19 --- .../src/views/system/sms/smsChannel/index.vue | 129 +++++++-------- .../system/sms/smsChannel/sms.channel.data.ts | 113 +++++-------- .../src/views/system/sms/smsLog/index.vue | 74 ++++----- .../views/system/sms/smsLog/sms.log.data.ts | 153 +++++++----------- .../views/system/sms/smsTemplate/index.vue | 140 ++++++++-------- .../sms/smsTemplate/sms.template.data.ts | 131 ++++++--------- 12 files changed, 361 insertions(+), 487 deletions(-) delete mode 100644 yudao-ui-admin-vue3/src/api/system/sms/smsChannel/types.ts delete mode 100644 yudao-ui-admin-vue3/src/api/system/sms/smsLog/types.ts delete mode 100644 yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/types.ts diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts index 213cd2296..48aaf4c93 100644 --- a/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts @@ -1,8 +1,23 @@ import request from '@/config/axios' -import type { SmsChannelVO } from './types' +export type SmsChannelVO = { + id: number + status: number + signature: string + remark: string + apiKey: string + apiSecret: string + callbackUrl: string + createTime: string +} + +export interface SmsChannelPageReqVO extends PageParam { + signature?: string + code?: string + status?: number +} // 查询短信渠道列表 -export const getSmsChannelPageApi = (params) => { +export const getSmsChannelPageApi = (params: SmsChannelPageReqVO) => { return request.get({ url: '/system/sms-channel/page', params }) } diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/types.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/types.ts deleted file mode 100644 index c4e9da24a..000000000 --- a/yudao-ui-admin-vue3/src/api/system/sms/smsChannel/types.ts +++ /dev/null @@ -1,10 +0,0 @@ -export type SmsChannelVO = { - id: number - status: number - signature: string - remark: string - apiKey: string - apiSecret: string - callbackUrl: string - createTime: string -} diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts index b7c518720..501736de4 100644 --- a/yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts @@ -1,11 +1,38 @@ import request from '@/config/axios' +export type SmsLogVO = { + id: number + idchannelId: number + templateId: number + mobile: string + userId: number + userType: number + sendStatus: number + receiveStatus: number + templateType: number + templateContent: string + templateParams: Map + apiTemplateId: string + sendTime: string + createTime: string +} + +export interface SmsLogPageReqVO extends PageParam { + signature?: string + code?: string + status?: number +} +export interface SmsLogExportReqVO { + code?: string + name?: string + status?: number +} // 查询短信日志列表 -export const getSmsLogPageApi = (params) => { +export const getSmsLogPageApi = (params: SmsLogPageReqVO) => { return request.get({ url: '/system/sms-log/page', params }) } // 导出短信日志 -export const exportSmsLogApi = (params) => { +export const exportSmsLogApi = (params: SmsLogExportReqVO) => { return request.download({ url: '/system/sms-log/export', params }) } diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsLog/types.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsLog/types.ts deleted file mode 100644 index 2a1781f5b..000000000 --- a/yudao-ui-admin-vue3/src/api/system/sms/smsLog/types.ts +++ /dev/null @@ -1,9 +0,0 @@ -export type SmsLogVO = { - id: number - idchannelId: number - templateId: number - mobile: string - sendStatus: number - receiveStatus: number - createTime: string -} diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts index b096f00a7..1497d18d0 100644 --- a/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts @@ -1,5 +1,23 @@ import request from '@/config/axios' -import type { SmsTemplateVO } from './types' +export type SmsTemplateVO = { + id: number + type: number + status: number + code: string + name: string + content: string + remark: string + apiTemplateId: string + channelId: number + channelCode: string + createTime: string +} + +export type SmsSendVO = { + mobile: string + templateCode: string + templateParams: string +} // 查询短信模板列表 export const getSmsTemplatePageApi = (params) => { diff --git a/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/types.ts b/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/types.ts deleted file mode 100644 index 70c8421b5..000000000 --- a/yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/types.ts +++ /dev/null @@ -1,19 +0,0 @@ -export type SmsTemplateVO = { - id: number - type: number - status: number - code: string - name: string - content: string - remark: string - apiTemplateId: string - channelId: number - channelCode: string - createTime: string -} - -export type SmsSendVO = { - mobile: string - templateCode: string - templateParams: string -} diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue index 1b3d9c0dd..01e25384f 100644 --- a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue @@ -1,42 +1,18 @@