From ed6edcaec6e56ee8bccf1df7fc61c10b990a67e3 Mon Sep 17 00:00:00 2001
From: lzq <liuzhiqiang@yuhsoft.cn>
Date: Mon, 11 Aug 2025 09:53:13 +0800
Subject: [PATCH] 1

---
 .env                |  4 ++--
 package-lock.json   |  4 ++--
 package.json        |  2 +-
 src/common/index.ts |  2 +-
 vite.config.ts      | 10 +++++-----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.env b/.env
index 0a20353..9a9d752 100644
--- a/.env
+++ b/.env
@@ -4,9 +4,9 @@ VITE_APP_NAME=垃圾回收监管平台
 # 服务器基础地址
 VITE_HTTP_SERVER_BASE_URL=/api
 VITE_WS_SERVER_BASE_URL=/ws
-VITE_OSS_UPLOAD_BASE_URL=/api/oss
-VITE_OSS_DOWNLOAD_BASE_URL=/api/oss/download
 VITE_OSS_BUCKET_NAME=zsy
+VITE_OSS_UPLOAD_BASE_URL=/api/oss/upload
+VITE_OSS_DOWNLOAD_BASE_URL=/api/oss/download
 
 # 接口超时时间
 VITE_HTTP_SERVER_TIMEOUT=10000
diff --git a/package-lock.json b/package-lock.json
index dadb9c9..fd6545a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "ling-ui",
+  "name": "zsy-recycling-supervision-admin",
   "version": "0.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "ling-ui",
+      "name": "zsy-recycling-supervision-admin",
       "version": "0.0.1",
       "dependencies": {
         "@element-plus/icons-vue": "^2.3.1",
diff --git a/package.json b/package.json
index 8001e49..d45c830 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "ling-ui",
+  "name": "zsy-recycling-supervision-admin",
   "private": true,
   "version": "0.0.1",
   "type": "module",
diff --git a/src/common/index.ts b/src/common/index.ts
index b9c8e4c..74f1b0c 100644
--- a/src/common/index.ts
+++ b/src/common/index.ts
@@ -14,7 +14,7 @@ export const appName = import.meta.env.VITE_APP_NAME
 export const serverBaseUrl = import.meta.env.VITE_HTTP_SERVER_BASE_URL ?? '/'
 export const downloadBaseUrl = import.meta.env.VITE_OSS_DOWNLOAD_BASE_URL ?? '/'
 export const bucketName = import.meta.env.VITE_OSS_BUCKET_NAME ?? 'zsy'
-export const uploadBaseUrl = import.meta.env.VITE_OSS_UPLOAD_BASE_URL ?? '/' + bucketName
+export const uploadBaseUrl = (import.meta.env.VITE_OSS_UPLOAD_BASE_URL ?? '') + '/' + bucketName
 
 /**
  * Axios 超时时间
diff --git a/vite.config.ts b/vite.config.ts
index 3a05e71..3196ff4 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -86,16 +86,16 @@ let viteConfig: UserConfigFnObject = configEnv => {
       host: '0.0.0.0',
       port: 80,
       proxy: {
-        [env.VITE_HTTP_SERVER_BASE_URL]: {
-          proxyTimeout: 10000,
-          target: env.VITE_HTTP_PROXY_TARGET,
-          rewrite: path => env.VITE_HTTP_SERVER_BASE_URL == null || env.VITE_HTTP_SERVER_BASE_URL == '/' ? path : path.replace(new RegExp(env.VITE_HTTP_SERVER_BASE_URL), ''),
-        } as ProxyOptions,
         [env.VITE_OSS_UPLOAD_BASE_URL]: {
           proxyTimeout: 10000,
           target: 'http://localhost:9000',
           rewrite: path => env.VITE_OSS_UPLOAD_BASE_URL == null || env.VITE_OSS_UPLOAD_BASE_URL == '/' ? path : path.replace(new RegExp(env.VITE_OSS_UPLOAD_BASE_URL), ''),
         } as ProxyOptions,
+        [env.VITE_HTTP_SERVER_BASE_URL]: {
+          proxyTimeout: 10000,
+          target: env.VITE_HTTP_PROXY_TARGET,
+          rewrite: path => env.VITE_HTTP_SERVER_BASE_URL == null || env.VITE_HTTP_SERVER_BASE_URL == '/' ? path : path.replace(new RegExp(env.VITE_HTTP_SERVER_BASE_URL), ''),
+        } as ProxyOptions,
         [env.VITE_WS_SERVER_BASE_URL]: {
           ws: true,
           target: env.VITE_WS_PROXY_TARGET,