Merge branch 'gitee-master' into feature-project

# Conflicts:
#	.env.local
#	src/components/UploadFile/src/useUpload.ts
#	src/router/modules/remaining.ts
#	src/utils/dict.ts
This commit is contained in:
2024-10-08 14:23:33 +08:00
388 changed files with 23821 additions and 10188 deletions

View File

@@ -5,13 +5,9 @@ VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://localhost:48080'
#VITE_BASE_URL='https://1107bc6b.r21.vip.cpolar.cn'
# 文件上传类型server - 后端上传, client - 前端直连上传,仅支持 S3 服务
VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# VITE_UPLOAD_URL='http://16ba17bc.r2.cpolar.cn/admin-api/infra/file/upload'
# 接口地址
VITE_API_URL=/admin-api