diff --git a/yanzhu-server/pom.xml b/yanzhu-server/pom.xml index 2371533..d9c9986 100644 --- a/yanzhu-server/pom.xml +++ b/yanzhu-server/pom.xml @@ -53,18 +53,18 @@ - + - + @@ -110,11 +110,11 @@ - + @@ -143,10 +143,25 @@ - repackage + repackage + + + true + + + + org.testcontainers + * + + + org.junit + * + + + diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.dev b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.dev index 3d7f01b..a6fdda0 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.dev +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.dev @@ -22,7 +22,7 @@ VITE_DROP_CONSOLE=false VITE_SOURCEMAP=true # 打包路径 -VITE_BASE_PATH=/sass +VITE_BASE_PATH=/saas # 输出路径 VITE_OUT_DIR=dist diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.prod b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.prod index 4b37336..69aa40a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.prod +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.prod @@ -22,7 +22,7 @@ VITE_DROP_CONSOLE=true VITE_SOURCEMAP=false # 打包路径 -VITE_BASE_PATH=/sass +VITE_BASE_PATH=/saas # 输出路径 VITE_OUT_DIR=dist-prod diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.stage b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.stage index b02860f..2cba083 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.stage +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.stage @@ -22,7 +22,7 @@ VITE_DROP_CONSOLE=true VITE_SOURCEMAP=false # 打包路径 -VITE_BASE_PATH=/sass +VITE_BASE_PATH=/saas # 输出路径 VITE_OUT_DIR=dist-stage diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.test b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.test index 265443e..10eb2f5 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/.env.test +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/.env.test @@ -22,7 +22,7 @@ VITE_DROP_CONSOLE=true VITE_SOURCEMAP=false # 打包路径 -VITE_BASE_PATH=/sass +VITE_BASE_PATH=/saas # 输出路径 VITE_OUT_DIR=dist-test diff --git a/yanzhu-ui/yanzhu-ui-admin-vue3/vite.config.ts b/yanzhu-ui/yanzhu-ui-admin-vue3/vite.config.ts index 87d121d..68c110a 100644 --- a/yanzhu-ui/yanzhu-ui-admin-vue3/vite.config.ts +++ b/yanzhu-ui/yanzhu-ui-admin-vue3/vite.config.ts @@ -30,7 +30,8 @@ export default ({command, mode}: ConfigEnv): UserConfig => { open: env.VITE_OPEN === 'true', proxy: { '/admin-api': { - target: 'http://localhost:48080/',//'http://62.234.3.186/', + //target: 'http://localhost:48080/',//'http://62.234.3.186/', + target: 'http://62.234.3.186/', ws: false, changeOrigin: true, },