瀏覽代碼

refactor: api type

xingyu4j 2 年之前
父節點
當前提交
7b40e5a5e4
共有 24 個文件被更改,包括 49 次插入89 次删除
  1. 1 1
      yudao-ui-admin-vue3/src/api/infra/config/index.ts
  2. 1 1
      yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/index.ts
  3. 0 8
      yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/types.ts
  4. 24 1
      yudao-ui-admin-vue3/src/api/infra/fileConfig/index.ts
  5. 0 23
      yudao-ui-admin-vue3/src/api/infra/fileConfig/types.ts
  6. 1 1
      yudao-ui-admin-vue3/src/api/infra/fileList/index.ts
  7. 1 1
      yudao-ui-admin-vue3/src/api/infra/job/index.ts
  8. 0 11
      yudao-ui-admin-vue3/src/api/infra/job/types.ts
  9. 1 1
      yudao-ui-admin-vue3/src/api/infra/jobLog/index.ts
  10. 0 13
      yudao-ui-admin-vue3/src/api/infra/jobLog/types.ts
  11. 2 1
      yudao-ui-admin-vue3/src/api/system/dept/index.ts
  12. 0 15
      yudao-ui-admin-vue3/src/api/system/dept/types.ts
  13. 1 0
      yudao-ui-admin-vue3/src/api/system/errorCode/index.ts
  14. 1 0
      yudao-ui-admin-vue3/src/api/system/notice/index.ts
  15. 1 0
      yudao-ui-admin-vue3/src/api/system/oauth2/client.ts
  16. 1 0
      yudao-ui-admin-vue3/src/api/system/operatelog/index.ts
  17. 1 1
      yudao-ui-admin-vue3/src/api/system/role/index.ts
  18. 1 1
      yudao-ui-admin-vue3/src/api/system/sensitiveWord/index.ts
  19. 2 1
      yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts
  20. 2 1
      yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts
  21. 2 1
      yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts
  22. 2 1
      yudao-ui-admin-vue3/src/api/system/user/index.ts
  23. 3 4
      yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue
  24. 1 2
      yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue

+ 1 - 1
yudao-ui-admin-vue3/src/api/infra/config/index.ts

@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
 
 
-export type ConfigVO = {
+export interface ConfigVO {
   id: number
   id: number
   group: string
   group: string
   name: string
   name: string

+ 1 - 1
yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/index.ts

@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
 
 
-export type DataSourceConfigVO = {
+export interface DataSourceConfigVO {
   id: number
   id: number
   name: string
   name: string
   url: string
   url: string

+ 0 - 8
yudao-ui-admin-vue3/src/api/infra/dataSourceConfig/types.ts

@@ -1,8 +0,0 @@
-export type DataSourceConfigVO = {
-  id: number
-  name: string
-  url: string
-  username: string
-  password: string
-  createTime: string
-}

+ 24 - 1
yudao-ui-admin-vue3/src/api/infra/fileConfig/index.ts

@@ -1,5 +1,28 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
-import type { FileConfigVO } from './types'
+
+export interface ConfigType {
+  basePath: string
+  host: string
+  port: string
+  username: string
+  password: string
+  mode: string
+  endpoint: string
+  bucket: string
+  accessKey: string
+  accessSecret: string
+  domain: string
+}
+export interface FileConfigVO {
+  id: number
+  name: string
+  storage: string
+  master: boolean
+  visible: boolean
+  config: ConfigType
+  remark: string
+  createTime: string
+}
 
 
 // 查询文件配置列表
 // 查询文件配置列表
 export const getFileConfigPageApi = (params) => {
 export const getFileConfigPageApi = (params) => {

+ 0 - 23
yudao-ui-admin-vue3/src/api/infra/fileConfig/types.ts

@@ -1,23 +0,0 @@
-export type ConfigType = {
-  basePath: string
-  host: string
-  port: string
-  username: string
-  password: string
-  mode: string
-  endpoint: string
-  bucket: string
-  accessKey: string
-  accessSecret: string
-  domain: string
-}
-export type FileConfigVO = {
-  id: number
-  name: string
-  storage: string
-  master: boolean
-  visible: boolean
-  config: ConfigType
-  remark: string
-  createTime: string
-}

+ 1 - 1
yudao-ui-admin-vue3/src/api/infra/fileList/index.ts

@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
 
 
-export type FileVO = {
+export interface FileVO {
   id: number
   id: number
   path: string
   path: string
   url: string
   url: string

+ 1 - 1
yudao-ui-admin-vue3/src/api/infra/job/index.ts

@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
 
 
-export type JobVO = {
+export interface JobVO {
   id: number
   id: number
   name: string
   name: string
   status: number
   status: number

+ 0 - 11
yudao-ui-admin-vue3/src/api/infra/job/types.ts

@@ -1,11 +0,0 @@
-export type JobVO = {
-  id: number
-  name: string
-  status: number
-  handlerName: string
-  handlerParam: string
-  cronExpression: string
-  retryCount: number
-  retryInterval: number
-  monitorTimeout: number
-}

+ 1 - 1
yudao-ui-admin-vue3/src/api/infra/jobLog/index.ts

@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
 
 
-export type JobLogVO = {
+export interface JobLogVO {
   id: number
   id: number
   jobId: number
   jobId: number
   handlerName: string
   handlerName: string

+ 0 - 13
yudao-ui-admin-vue3/src/api/infra/jobLog/types.ts

@@ -1,13 +0,0 @@
-export type JobLogVO = {
-  id: number
-  jobId: number
-  handlerName: string
-  handlerParam: string
-  cronExpression: string
-  executeIndex: string
-  beginTime: Date
-  endTime: Date
-  duration: string
-  status: number
-  createTime: string
-}

+ 2 - 1
yudao-ui-admin-vue3/src/api/system/dept/index.ts

@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
-export type DeptVO = {
+
+export interface DeptVO {
   id?: number
   id?: number
   name: string
   name: string
   parentId: number
   parentId: number

+ 0 - 15
yudao-ui-admin-vue3/src/api/system/dept/types.ts

@@ -1,15 +0,0 @@
-export type DeptVO = {
-  id: number
-  name: string
-  parentId: number
-  status: number
-  sort: number
-  leaderUserId: number
-  phone: string
-  email: string
-}
-
-export type DeptListReqVO = {
-  name: string
-  status: number
-}

+ 1 - 0
yudao-ui-admin-vue3/src/api/system/errorCode/index.ts

@@ -1,4 +1,5 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
+
 export interface ErrorCodeVO {
 export interface ErrorCodeVO {
   id: number
   id: number
   type: number
   type: number

+ 1 - 0
yudao-ui-admin-vue3/src/api/system/notice/index.ts

@@ -1,4 +1,5 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
+
 export interface NoticeVO {
 export interface NoticeVO {
   id: number
   id: number
   title: string
   title: string

+ 1 - 0
yudao-ui-admin-vue3/src/api/system/oauth2/client.ts

@@ -1,4 +1,5 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
+
 export interface OAuth2ClientVO {
 export interface OAuth2ClientVO {
   id: number
   id: number
   clientId: string
   clientId: string

+ 1 - 0
yudao-ui-admin-vue3/src/api/system/operatelog/index.ts

@@ -22,6 +22,7 @@ export type OperateLogVO = {
   resultMsg: string
   resultMsg: string
   resultData: string
   resultData: string
 }
 }
+
 export interface OperateLogPageReqVO extends PageParam {
 export interface OperateLogPageReqVO extends PageParam {
   module?: string
   module?: string
   userNickname?: string
   userNickname?: string

+ 1 - 1
yudao-ui-admin-vue3/src/api/system/role/index.ts

@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
 
 
-export type RoleVO = {
+export interface RoleVO {
   id: number
   id: number
   name: string
   name: string
   code: string
   code: string

+ 1 - 1
yudao-ui-admin-vue3/src/api/system/sensitiveWord/index.ts

@@ -1,6 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
 
 
-export type SensitiveWordVO = {
+export interface SensitiveWordVO {
   id: number
   id: number
   name: string
   name: string
   status: number
   status: number

+ 2 - 1
yudao-ui-admin-vue3/src/api/system/sms/smsChannel/index.ts

@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
-export type SmsChannelVO = {
+
+export interface SmsChannelVO {
   id: number
   id: number
   status: number
   status: number
   signature: string
   signature: string

+ 2 - 1
yudao-ui-admin-vue3/src/api/system/sms/smsLog/index.ts

@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
-export type SmsLogVO = {
+
+export interface SmsLogVO {
   id: number
   id: number
   idchannelId: number
   idchannelId: number
   templateId: number
   templateId: number

+ 2 - 1
yudao-ui-admin-vue3/src/api/system/sms/smsTemplate/index.ts

@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
-export type SmsTemplateVO = {
+
+export interface SmsTemplateVO {
   id: number
   id: number
   type: number
   type: number
   status: number
   status: number

+ 2 - 1
yudao-ui-admin-vue3/src/api/system/user/index.ts

@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 import request from '@/config/axios'
-export type UserVO = {
+
+export interface UserVO {
   id: number
   id: number
   username: string
   username: string
   nickname: string
   nickname: string

+ 3 - 4
yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue

@@ -86,14 +86,13 @@ import { VxeGridInstance } from 'vxe-table'
 import { FormExpose } from '@/components/Form'
 import { FormExpose } from '@/components/Form'
 // 业务相关的 import
 // 业务相关的 import
 import * as FileConfigApi from '@/api/infra/fileConfig'
 import * as FileConfigApi from '@/api/infra/fileConfig'
-import type { FileConfigVO } from '@/api/infra/fileConfig/types'
 import { rules, allSchemas } from './fileConfig.data'
 import { rules, allSchemas } from './fileConfig.data'
 
 
 const { t } = useI18n() // 国际化
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const message = useMessage() // 消息弹窗
 // 列表相关的变量
 // 列表相关的变量
 const xGrid = ref<VxeGridInstance>() // 列表 Grid Ref
 const xGrid = ref<VxeGridInstance>() // 列表 Grid Ref
-const { gridOptions, getList, deleteData } = useVxeGrid<FileConfigVO>({
+const { gridOptions, getList, deleteData } = useVxeGrid<FileConfigApi.FileConfigVO>({
   allSchemas: allSchemas,
   allSchemas: allSchemas,
   getListApi: FileConfigApi.getFileConfigPageApi,
   getListApi: FileConfigApi.getFileConfigPageApi,
   deleteApi: FileConfigApi.deleteFileConfigApi
   deleteApi: FileConfigApi.deleteFileConfigApi
@@ -135,7 +134,7 @@ const handleDetail = async (rowId: number) => {
 }
 }
 
 
 // 主配置操作
 // 主配置操作
-const handleMaster = (row: FileConfigVO) => {
+const handleMaster = (row: FileConfigApi.FileConfigVO) => {
   message
   message
     .confirm('是否确认修改配置【 ' + row.name + ' 】为主配置?', t('common.reminder'))
     .confirm('是否确认修改配置【 ' + row.name + ' 】为主配置?', t('common.reminder'))
     .then(async () => {
     .then(async () => {
@@ -158,7 +157,7 @@ const submitForm = async () => {
       actionLoading.value = true
       actionLoading.value = true
       // 提交请求
       // 提交请求
       try {
       try {
-        const data = unref(formRef)?.formModel as FileConfigVO
+        const data = unref(formRef)?.formModel as FileConfigApi.FileConfigVO
         if (actionType.value === 'create') {
         if (actionType.value === 'create') {
           await FileConfigApi.createFileConfigApi(data)
           await FileConfigApi.createFileConfigApi(data)
           message.success(t('common.createSuccess'))
           message.success(t('common.createSuccess'))

+ 1 - 2
yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue

@@ -55,7 +55,6 @@ import { useI18n } from '@/hooks/web/useI18n'
 import { useVxeGrid } from '@/hooks/web/useVxeGrid'
 import { useVxeGrid } from '@/hooks/web/useVxeGrid'
 import { VxeGridInstance } from 'vxe-table'
 import { VxeGridInstance } from 'vxe-table'
 import * as JobLogApi from '@/api/infra/jobLog'
 import * as JobLogApi from '@/api/infra/jobLog'
-import { JobLogVO } from '@/api/infra/jobLog/types'
 import { allSchemas } from './jobLog.data'
 import { allSchemas } from './jobLog.data'
 
 
 const { t } = useI18n() // 国际化
 const { t } = useI18n() // 国际化
@@ -74,7 +73,7 @@ const dialogTitle = ref('') // 弹出层标题
 const detailRef = ref() // 详情 Ref
 const detailRef = ref() // 详情 Ref
 
 
 // 详情操作
 // 详情操作
-const handleDetail = async (row: JobLogVO) => {
+const handleDetail = async (row: JobLogApi.JobLogVO) => {
   // 设置数据
   // 设置数据
   const res = JobLogApi.getJobLogApi(row.id)
   const res = JobLogApi.getJobLogApi(row.id)
   detailRef.value = res
   detailRef.value = res