Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

# Conflicts:
#	.env.base
#	vite.config.js

.env.base

@@ -1,10 +1,11 @@
 # 本地开发环境
-VITE_NODE_ENV=development
+NODE_ENV=development
 
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+#VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
+VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'

vite.config.js

@@ -33,20 +33,13 @@ export default ({ command, mode }) => {
       open: env.VITE_OPEN === 'true',
       // 本地跨域代理. 目前注释的原因：暂时没有用途，server 端已经支持跨域
       proxy: {
-        ['/call-api']: {
-          // target: env.VITE_BASE_URL,
-          target: 'http://119.3.87.30:443',
-          ws: false,
-          changeOrigin: true,
-          rewrite: (path) => path.replace(new RegExp(`^/call-api`), '')
-        },
-        ['/dev-api']: {
+        ['/admin-api']: {
           target: env.VITE_BASE_URL,
           ws: false,
           changeOrigin: true,
-          rewrite: (path) => path.replace(new RegExp(`^/dev-api`), '')
-        }
-      }
+          rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''),
+        },
+      },
     },
     // 项目使用的vite插件。 单独提取到build/vite/plugin中管理
     plugins: createVitePlugins(),