diff --git a/.env.development b/.env.development index 679e865..9feaca6 100644 --- a/.env.development +++ b/.env.development @@ -5,10 +5,7 @@ VITE_PUBLIC_PATH = '/' VITE_USE_MOCK = true # 是否启用MOCK -VITE_USE_PROXY = false - -# 代理类型(跟启动和构建环境无关) 'dev' | 'test' | 'prod' -VITE_PROXY_TYPE = 'dev' +VITE_USE_PROXY = true # base api -VITE_BASE_API = '/api' \ No newline at end of file +VITE_BASE_API = '/api' diff --git a/build/config/define.js b/build/config/define.js deleted file mode 100644 index 4b10543..0000000 --- a/build/config/define.js +++ /dev/null @@ -1,13 +0,0 @@ -import dayjs from 'dayjs' - -/** - * * 此处定义的是全局常量,启动或打包后将添加到window中 - * https://vitejs.cn/config/#define - */ - -// 项目构建时间 -const _BUILD_TIME_ = JSON.stringify(dayjs().format('YYYY-MM-DD HH:mm:ss')) - -export const viteDefine = { - _BUILD_TIME_, -} diff --git a/build/config/index.js b/build/config/index.js deleted file mode 100644 index 967ddda..0000000 --- a/build/config/index.js +++ /dev/null @@ -1,2 +0,0 @@ -export * from './define' -export * from './proxy' diff --git a/build/config/proxy.js b/build/config/proxy.js deleted file mode 100644 index f3d0c92..0000000 --- a/build/config/proxy.js +++ /dev/null @@ -1,15 +0,0 @@ -import { getProxyConfig } from '../../settings' - -export function createViteProxy(isUseProxy = true, proxyType) { - if (!isUseProxy) return undefined - - const proxyConfig = getProxyConfig(proxyType) - const proxy = { - [proxyConfig.prefix]: { - target: proxyConfig.target, - changeOrigin: true, - rewrite: (path) => path.replace(new RegExp(`^${proxyConfig.prefix}`), ''), - }, - } - return proxy -} diff --git a/build/constant.js b/build/constant.js index cdf559a..e63072c 100644 --- a/build/constant.js +++ b/build/constant.js @@ -1 +1,33 @@ export const OUTPUT_DIR = 'dist' + +export const PROXY_CONFIG = { + /** + * @desc 替换匹配值 + * @请求路径 http://localhost:3100/api/user + * @转发路径 http://localhost:8080/user + */ + '/api': { + target: 'http://localhost:8080', + changeOrigin: true, + rewrite: (path) => path.replace(new RegExp('^/api'), ''), + }, + /** + * @desc 不替换匹配值 + * @请求路径 http://localhost:3100/api/v2/user + * @转发路径 http://localhost:8080/api/v2/user + */ + '/api/v2': { + target: 'http://localhost:8080', + changeOrigin: true, + }, + /** + * @desc 替换部分匹配值 + * @请求路径 http://localhost:3100/api/v3/user + * @转发路径 http://localhost:8080/user + */ + '/api/v3': { + target: 'http://localhost:8080', + changeOrigin: true, + rewrite: (path) => path.replace(new RegExp('^/api'), ''), + }, +} diff --git a/settings/index.js b/settings/index.js index 1957e86..913a438 100644 --- a/settings/index.js +++ b/settings/index.js @@ -1,2 +1 @@ export * from './theme.json' -export * from './proxy-config' diff --git a/settings/proxy-config.js b/settings/proxy-config.js deleted file mode 100644 index f65738b..0000000 --- a/settings/proxy-config.js +++ /dev/null @@ -1,18 +0,0 @@ -const proxyConfigMappings = { - dev: { - prefix: '/api', - target: 'http://localhost:8080', - }, - test: { - prefix: '/api', - target: 'http://localhost:8080', - }, - prod: { - prefix: '/api', - target: 'http://localhost:8080', - }, -} - -export function getProxyConfig(envType = 'dev') { - return proxyConfigMappings[envType] -} diff --git a/src/components/common/AppFooter.vue b/src/components/common/AppFooter.vue index 9d80972..2a4f6a7 100644 --- a/src/components/common/AppFooter.vue +++ b/src/components/common/AppFooter.vue @@ -1,7 +1,7 @@