diff --git a/src/api/platform/core/entity/upload.ts b/src/api/platform/core/entity/upload.ts
index 07a02df..cc2f046 100644
--- a/src/api/platform/core/entity/upload.ts
+++ b/src/api/platform/core/entity/upload.ts
@@ -6,7 +6,7 @@
* @create: 2022/4/8
*/
-import type { File as OssFile } from '/@/api/platform/system/entity/file';
+import type { OssFile } from '/@/api/platform/system/entity/ossFile';
/** oss上传返回结果对象 */
export type UploadResult = OssFile
diff --git a/src/api/platform/system/controller/file.ts b/src/api/platform/system/controller/ossFile.ts
similarity index 98%
rename from src/api/platform/system/controller/file.ts
rename to src/api/platform/system/controller/ossFile.ts
index 0a8bd21..6f45b95 100644
--- a/src/api/platform/system/controller/file.ts
+++ b/src/api/platform/system/controller/ossFile.ts
@@ -3,7 +3,7 @@
* Copyright © 2023-2023 海豚生态开源社区 All rights reserved.
* author wangxiang4
*/
-import type { FileParams, FileResult } from '/@/api/platform/system/entity/file';
+import type { FileParams, FileResult } from '/@/api/platform/system/entity/ossFile';
import { defHttp } from '/@/utils/http/axios';
import { downloadByUrl } from '/@/utils/file/download';
import { useGlobSetting } from '/@/hooks/setting';
diff --git a/src/api/platform/system/entity/file.ts b/src/api/platform/system/entity/ossFile.ts
similarity index 80%
rename from src/api/platform/system/entity/file.ts
rename to src/api/platform/system/entity/ossFile.ts
index 5cc21b2..c6196a4 100644
--- a/src/api/platform/system/entity/file.ts
+++ b/src/api/platform/system/entity/ossFile.ts
@@ -9,10 +9,10 @@ import type { R } from '/#/axios';
import type { CommonEntity, Page } from '/@/api/common/data/entity';
/** 文件查询参数 */
-export type FileParams = Page & File;
+export type FileParams = Page & OssFile;
/** 文件对象 */
-export interface File extends CommonEntity {
+export interface OssFile extends CommonEntity {
id: string;
fileName: string;
bucketName: string;
@@ -26,4 +26,4 @@ export interface File extends CommonEntity {
}
/** 文件响应对象 */
-export type FileResult = R;
+export type FileResult = R;
diff --git a/src/views/system/file/index.vue b/src/views/system/ossFile/index.vue
similarity index 98%
rename from src/views/system/file/index.vue
rename to src/views/system/ossFile/index.vue
index ce87dfc..a54accc 100644
--- a/src/views/system/file/index.vue
+++ b/src/views/system/ossFile/index.vue
@@ -57,8 +57,8 @@
*/
import { reactive, toRaw } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
- import { listFile, delFile, getFile } from '/@/api/platform/system/controller/file';
- import { columns, searchFormSchema } from './file.data';
+ import { listFile, delFile, getFile } from '/@/api/platform/system/controller/ossFile';
+ import { columns, searchFormSchema } from './ossFile.data';
import { useMessage } from '/@/hooks/web/useMessage';
import { commonUpload } from '/@/api/platform/core/controller/upload';
import { BasicUpload } from '/@/components/Upload';
diff --git a/src/views/system/file/file.data.ts b/src/views/system/ossFile/ossFile.data.ts
similarity index 91%
rename from src/views/system/file/file.data.ts
rename to src/views/system/ossFile/ossFile.data.ts
index 12fa4ba..82732ad 100644
--- a/src/views/system/file/file.data.ts
+++ b/src/views/system/ossFile/ossFile.data.ts
@@ -12,7 +12,7 @@ import { h } from 'vue';
import { useGlobSetting } from '/@/hooks/setting';
import { Button } from 'ant-design-vue';
const { filePreviewUrl = '' } = useGlobSetting();
-import { Api } from '/@/api/platform/system/controller/file';
+import { Api } from '/@/api/platform/system/controller/ossFile';
import { encodeURL } from 'js-base64';
import { getCloudProxyUrl } from '/@/utils';
@@ -33,7 +33,6 @@ export const columns: BasicColumn[] = [
ellipsis: true,
width: 380,
customRender: ({ record }) => {
- console.log(`${getCloudProxyUrl()}${Api.get}/${record.bucketName}/${record.fileName}`)
const url = encodeURL(`${getCloudProxyUrl()}${Api.get}/${record.bucketName}/${record.fileName}`);
return h(Button, {
type: 'link',