Merge remote-tracking branch 'yudao/master'

# Conflicts:
#	src/api/infra/demo/demo03/erp/index.ts
#	src/api/infra/demo/demo03/inner/index.ts
#	src/api/infra/demo/demo03/normal/index.ts
#	src/views/infra/demo/demo03/erp/components/Demo03CourseList.vue
#	src/views/infra/demo/demo03/erp/components/Demo03GradeList.vue
#	src/views/infra/demo/demo03/erp/index.vue

src/api/infra/apiAccessLog/index.ts

@@ -8,11 +8,15 @@ export interface ApiAccessLogVO {
   applicationName: string
   requestMethod: string
   requestParams: string
+  responseBody: string
   requestUrl: string
   userIp: string
   userAgent: string
+  operateModule: string
+  operateName: string
+  operateType: number
   beginTime: Date
-  endTIme: Date
+  endTime: Date
   duration: number
   resultCode: number
   resultMsg: string

src/api/infra/codegen/index.ts

@@ -28,7 +28,6 @@ export type CodegenColumnVO = {
   columnComment: string
   nullable: number
   primaryKey: number
-  autoIncrement: string
   ordinalPosition: number
   javaType: string
   javaField: string
@@ -47,11 +46,6 @@ export type DatabaseTableVO = {
   comment: string
 }
 
-export type CodegenDetailVO = {
-  table: CodegenTableVO
-  columns: CodegenColumnVO[]
-}
-
 export type CodegenPreviewVO = {
   filePath: string
   code: string
@@ -62,11 +56,6 @@ export type CodegenUpdateReqVO = {
   columns: CodegenColumnVO[]
 }
 
-export type CodegenCreateListReqVO = {
-  dataSourceConfigId: number
-  tableNames: string[]
-}
-
 // 查询列表代码生成表定义
 export const getCodegenTableList = (dataSourceConfigId: number) => {
   return request.get({ url: '/infra/codegen/table/list?dataSourceConfigId=' + dataSourceConfigId })
@@ -82,11 +71,6 @@ export const getCodegenTable = (id: number) => {
   return request.get({ url: '/infra/codegen/detail?tableId=' + id })
 }
 
-// 新增代码生成表定义
-export const createCodegenTable = (data: CodegenCreateListReqVO) => {
-  return request.post({ url: '/infra/codegen/create', data })
-}
-
 // 修改代码生成表定义
 export const updateCodegenTable = (data: CodegenUpdateReqVO) => {
   return request.put({ url: '/infra/codegen/update', data })

src/api/infra/dbDoc/index.ts

@@ -1,16 +0,0 @@
-import request from '@/config/axios'
-
-// 导出Html
-export const exportHtml = () => {
-  return request.download({ url: '/infra/db-doc/export-html' })
-}
-
-// 导出Word
-export const exportWord = () => {
-  return request.download({ url: '/infra/db-doc/export-word' })
-}
-
-// 导出Markdown
-export const exportMarkdown = () => {
-  return request.download({ url: '/infra/db-doc/export-markdown' })
-}

src/api/infra/demo/demo01/index.ts

@@ -37,4 +37,4 @@ export const deleteDemo01Contact = async (id: number) => {
 // 导出示例联系人 Excel
 export const exportDemo01Contact = async (params) => {
   return await request.download({ url: `/infra/demo01-contact/export-excel`, params })
-}
+}

src/api/infra/demo/demo02/index.ts

@@ -7,8 +7,8 @@ export interface Demo02CategoryVO {
 }
 
 // 查询示例分类列表
-export const getDemo02CategoryList = async (params) => {
-  return await request.get({ url: `/infra/demo02-category/list`, params })
+export const getDemo02CategoryList = async () => {
+  return await request.get({ url: `/infra/demo02-category/list` })
 }
 
 // 查询示例分类详情
@@ -34,4 +34,4 @@ export const deleteDemo02Category = async (id: number) => {
 // 导出示例分类 Excel
 export const exportDemo02Category = async (params) => {
   return await request.download({ url: `/infra/demo02-category/export-excel`, params })
-}
+}

src/api/infra/file/index.ts

@@ -1,13 +1,19 @@
 import request from '@/config/axios'
 
-export interface FilePageReqVO extends PageParam {
-  path?: string
-  type?: string
-  createTime?: Date[]
+// 文件预签名地址 Response VO
+export interface FilePresignedUrlRespVO {
+  // 文件配置编号
+  configId: number
+  // 文件上传 URL
+  uploadUrl: string
+  // 文件 URL
+  url: string
+  // 文件路径
+  path: string
 }
 
 // 查询文件列表
-export const getFilePage = (params: FilePageReqVO) => {
+export const getFilePage = (params: PageParam) => {
   return request.get({ url: '/infra/file/page', params })
 }
 
@@ -15,3 +21,21 @@ export const getFilePage = (params: FilePageReqVO) => {
 export const deleteFile = (id: number) => {
   return request.delete({ url: '/infra/file/delete?id=' + id })
 }
+
+// 获取文件预签名地址
+export const getFilePresignedUrl = (name: string, directory?: string) => {
+  return request.get<FilePresignedUrlRespVO>({
+    url: '/infra/file/presigned-url',
+    params: { name, directory }
+  })
+}
+
+// 创建文件
+export const createFile = (data: any) => {
+  return request.post({ url: '/infra/file/create', data })
+}
+
+// 上传文件
+export const updateFile = (data: any) => {
+  return request.upload({ url: '/infra/file/upload', data })
+}

src/api/infra/fileConfig/index.ts

@@ -11,13 +11,14 @@ export interface FileClientConfig {
   bucket?: string
   accessKey?: string
   accessSecret?: string
+  enablePathStyleAccess?: boolean
   domain: string
 }
 
 export interface FileConfigVO {
   id: number
   name: string
-  storage: any
+  storage?: number
   master: boolean
   visible: boolean
   config: FileClientConfig

src/api/infra/jobLog/index.ts

@@ -7,11 +7,12 @@ export interface JobLogVO {
   handlerParam: string
   cronExpression: string
   executeIndex: string
-  beginTime: string
-  endTime: string
+  beginTime: Date
+  endTime: Date
   duration: string
   status: number
   createTime: string
+  result: string
 }
 
 // 任务日志列表