mirror of
				https://gitee.com/hhyykk/ipms-sjy-ui.git
				synced 2025-11-04 12:18:43 +08:00 
			
		
		
		
	【代码优化】全局:移除 VITE_UPLOAD_URL 环境变量,使用 getUploadUrl 方法替代
This commit is contained in:
		
							
								
								
									
										2
									
								
								.env.dev
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								.env.dev
									
									
									
									
									
								
							@@ -8,8 +8,6 @@ VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
 | 
			
		||||
 | 
			
		||||
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
 | 
			
		||||
VITE_UPLOAD_TYPE=server
 | 
			
		||||
# 上传路径
 | 
			
		||||
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
 | 
			
		||||
 | 
			
		||||
# 接口地址
 | 
			
		||||
VITE_API_URL=/admin-api
 | 
			
		||||
 
 | 
			
		||||
@@ -8,8 +8,6 @@ VITE_BASE_URL='http://localhost:48080'
 | 
			
		||||
 | 
			
		||||
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务
 | 
			
		||||
VITE_UPLOAD_TYPE=server
 | 
			
		||||
# 上传路径
 | 
			
		||||
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 | 
			
		||||
 | 
			
		||||
# 接口地址
 | 
			
		||||
VITE_API_URL=/admin-api
 | 
			
		||||
 
 | 
			
		||||
@@ -8,8 +8,6 @@ VITE_BASE_URL='http://localhost:48080'
 | 
			
		||||
 | 
			
		||||
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
 | 
			
		||||
VITE_UPLOAD_TYPE=server
 | 
			
		||||
# 上传路径
 | 
			
		||||
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 | 
			
		||||
 | 
			
		||||
# 接口地址
 | 
			
		||||
VITE_API_URL=/admin-api
 | 
			
		||||
 
 | 
			
		||||
@@ -8,8 +8,6 @@ VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
 | 
			
		||||
 | 
			
		||||
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
 | 
			
		||||
VITE_UPLOAD_TYPE=server
 | 
			
		||||
# 上传路径
 | 
			
		||||
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
 | 
			
		||||
 | 
			
		||||
# 接口地址
 | 
			
		||||
VITE_API_URL=/admin-api
 | 
			
		||||
 
 | 
			
		||||
@@ -8,8 +8,6 @@ VITE_BASE_URL='http://localhost:48080'
 | 
			
		||||
 | 
			
		||||
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
 | 
			
		||||
VITE_UPLOAD_TYPE=server
 | 
			
		||||
# 上传路径
 | 
			
		||||
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 | 
			
		||||
 | 
			
		||||
# 接口地址
 | 
			
		||||
VITE_API_URL=/admin-api
 | 
			
		||||
 
 | 
			
		||||
@@ -7,6 +7,7 @@ import { isNumber } from '@/utils/is'
 | 
			
		||||
import { ElMessage } from 'element-plus'
 | 
			
		||||
import { useLocaleStore } from '@/store/modules/locale'
 | 
			
		||||
import { getAccessToken, getTenantId } from '@/utils/auth'
 | 
			
		||||
import { getUploadUrl } from '@/components/UploadFile/src/useUpload'
 | 
			
		||||
 | 
			
		||||
defineOptions({ name: 'Editor' })
 | 
			
		||||
 | 
			
		||||
@@ -88,7 +89,7 @@ const editorConfig = computed((): IEditorConfig => {
 | 
			
		||||
      scroll: true,
 | 
			
		||||
      MENU_CONF: {
 | 
			
		||||
        ['uploadImage']: {
 | 
			
		||||
          server: import.meta.env.VITE_UPLOAD_URL,
 | 
			
		||||
          server: getUploadUrl(),
 | 
			
		||||
          // 单个文件的最大体积限制,默认为 2M
 | 
			
		||||
          maxFileSize: 5 * 1024 * 1024,
 | 
			
		||||
          // 最多可上传几个文件,默认为 100
 | 
			
		||||
@@ -136,7 +137,7 @@ const editorConfig = computed((): IEditorConfig => {
 | 
			
		||||
          }
 | 
			
		||||
        },
 | 
			
		||||
        ['uploadVideo']: {
 | 
			
		||||
          server: import.meta.env.VITE_UPLOAD_URL,
 | 
			
		||||
          server: getUploadUrl(),
 | 
			
		||||
          // 单个文件的最大体积限制,默认为 10M
 | 
			
		||||
          maxFileSize: 10 * 1024 * 1024,
 | 
			
		||||
          // 最多可上传几个文件,默认为 100
 | 
			
		||||
 
 | 
			
		||||
@@ -3,9 +3,16 @@ import CryptoJS from 'crypto-js'
 | 
			
		||||
import { UploadRawFile, UploadRequestOptions } from 'element-plus/es/components/upload/src/upload'
 | 
			
		||||
import axios from 'axios'
 | 
			
		||||
 | 
			
		||||
/**
 | 
			
		||||
 * 获得上传 URL
 | 
			
		||||
 */
 | 
			
		||||
export const getUploadUrl = (): string => {
 | 
			
		||||
  return import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/infra/file/upload'
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
export const useUpload = () => {
 | 
			
		||||
  // 后端上传地址
 | 
			
		||||
  const uploadUrl = import.meta.env.VITE_UPLOAD_URL
 | 
			
		||||
  const uploadUrl = getUploadUrl()
 | 
			
		||||
  // 是否使用前端直连上传
 | 
			
		||||
  const isClientUpload = UPLOAD_TYPE.CLIENT === import.meta.env.VITE_UPLOAD_TYPE
 | 
			
		||||
  // 重写ElUpload上传方法
 | 
			
		||||
@@ -17,11 +24,13 @@ export const useUpload = () => {
 | 
			
		||||
      // 1.2 获取文件预签名地址
 | 
			
		||||
      const presignedInfo = await FileApi.getFilePresignedUrl(fileName)
 | 
			
		||||
      // 1.3 上传文件(不能使用 ElUpload 的 ajaxUpload 方法的原因:其使用的是 FormData 上传,Minio 不支持)
 | 
			
		||||
      return axios.put(presignedInfo.uploadUrl, options.file, {
 | 
			
		||||
      return axios
 | 
			
		||||
        .put(presignedInfo.uploadUrl, options.file, {
 | 
			
		||||
          headers: {
 | 
			
		||||
          'Content-Type': options.file.type,
 | 
			
		||||
            'Content-Type': options.file.type
 | 
			
		||||
          }
 | 
			
		||||
      }).then(() => {
 | 
			
		||||
        })
 | 
			
		||||
        .then(() => {
 | 
			
		||||
          // 1.4. 记录文件信息到后端(异步)
 | 
			
		||||
          createFile(presignedInfo, fileName, options.file)
 | 
			
		||||
          // 通知成功,数据格式保持与后端上传的返回结果一致
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								types/env.d.ts
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								types/env.d.ts
									
									
									
									
										vendored
									
									
								
							@@ -19,7 +19,6 @@ interface ImportMetaEnv {
 | 
			
		||||
  readonly VITE_APP_DEFAULT_LOGIN_PASSWORD: string
 | 
			
		||||
  readonly VITE_APP_DOCALERT_ENABLE: string
 | 
			
		||||
  readonly VITE_BASE_URL: string
 | 
			
		||||
  readonly VITE_UPLOAD_URL: string
 | 
			
		||||
  readonly VITE_API_URL: string
 | 
			
		||||
  readonly VITE_BASE_PATH: string
 | 
			
		||||
  readonly VITE_DROP_DEBUGGER: string
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user