diff --git a/linusboot-vue3/.env.development b/linusboot-vue3/.env.development index 4d975e0..d7894be 100644 --- a/linusboot-vue3/.env.development +++ b/linusboot-vue3/.env.development @@ -5,7 +5,7 @@ VITE_USE_MOCK = true VITE_PUBLIC_PATH = / # 跨域代理，您可以配置多个 ,请注意，没有换行符 -VITE_PROXY = [["/jeecgboot","http://101.34.35.69:6060/jeecg-boot"],["/upload","http://101.34.35.69:3300/upload"]] +VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]] # 控制台不输出 VITE_DROP_CONSOLE = false @@ -14,10 +14,10 @@ VITE_DROP_CONSOLE = false VITE_GLOB_API_URL=/jeecgboot #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://101.34.35.69:6060/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot # 接口前缀 VITE_GLOB_API_URL_PREFIX= #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径 -VITE_APP_SUB_jeecg-app-1 = '//101.34.35.69:8092' +VITE_APP_SUB_jeecg-app-1 = '//localhost:8092' diff --git a/linusboot-vue3/.env.production b/linusboot-vue3/.env.production index a809371..9742096 100644 --- a/linusboot-vue3/.env.production +++ b/linusboot-vue3/.env.production @@ -19,8 +19,8 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false VITE_GLOB_API_URL=/jeecgboot #后台接口全路径地址(必填) -#VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:6060/jeecg-boot -VITE_GLOB_DOMAIN_URL=http://101.34.35.69:6060/jeecg-boot +#VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:8080/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/linusboot-vue3/.env.test b/linusboot-vue3/.env.test index 907b1ce..c0d9f8f 100644 --- a/linusboot-vue3/.env.test +++ b/linusboot-vue3/.env.test @@ -19,7 +19,7 @@ VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false VITE_GLOB_API_URL=/jeecgboot #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://101.34.35.69:6060/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/linusboot-vue3/Dockerfile b/linusboot-vue3/Dockerfile index cd7789c..bafce2b 100644 --- a/linusboot-vue3/Dockerfile +++ b/linusboot-vue3/Dockerfile @@ -5,7 +5,7 @@ ENV LANG en_US.UTF-8 RUN echo "server { \ listen 80; \ location /jeecgboot/ { \ - proxy_pass http://jeecg-boot-system:6060/jeecg-boot/; \ + proxy_pass http://jeecg-boot-system:8080/jeecg-boot/; \ proxy_redirect off; \ proxy_set_header Host jeecg-boot-system; \ proxy_set_header X-Real-IP \$remote_addr; \ diff --git a/linusboot-vue3/README.md b/linusboot-vue3/README.md index 1e749ed..0f2ac2f 100644 --- a/linusboot-vue3/README.md +++ b/linusboot-vue3/README.md @@ -69,11 +69,11 @@ pnpm install - 配置接口地址 `.env.development` ```bash -VITE_PROXY = [["/jeecgboot","http://101.34.35.69:6060/jeecg-boot"],["/upload","http://101.34.35.69:3300/upload"]] -VITE_GLOB_DOMAIN_URL=http://101.34.35.69:6060/jeecg-boot +VITE_PROXY = [["/jeecgboot","http://localhost:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]] +VITE_GLOB_DOMAIN_URL=http://localhost:8080/jeecg-boot ``` -> 说明：把`http://101.34.35.69:6060/jeecg-boot` 换成自己地址，其他不用改。 +> 说明：把`http://localhost:8080/jeecg-boot` 换成自己地址，其他不用改。 - run @@ -114,7 +114,7 @@ cd jeecgboot-vue3 ```bash VITE_GLOB_API_URL=/jeecgboot -VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:6060/jeecg-boot +VITE_GLOB_DOMAIN_URL=http://jeecg-boot-system:8080/jeecg-boot ``` 后台单体启动 [见此文档](https://help.jeecg.com/java/setup/docker/up.html) @@ -134,7 +134,7 @@ docker run --name jeecgboot-vue3-nginx -p 80:80 -d jeecgboot-vue3 - 访问前台 -http://101.34.35.69 +http://localhost ## Docker镜像启动前端(微服务模式) > 这里只写与单体的区别步骤 @@ -152,7 +152,7 @@ VITE_GLOB_DOMAIN_URL=http://jeecg-boot-gateway:9999 - 区别2. 修改Dockerfile文件 ```bash -- 把`http://jeecg-boot-system:6060/jeecg-boot`替换成 `http://jeecg-boot-gateway:9999` +- 把`http://jeecg-boot-system:8080/jeecg-boot`替换成 `http://jeecg-boot-gateway:9999` - 把`jeecg-boot-system`替换成 `jeecg-boot-gateway` ``` diff --git a/linusboot-vue3/src/components/jeecg/comment/useComment.ts b/linusboot-vue3/src/components/jeecg/comment/useComment.ts index 3dccb05..058f818 100644 --- a/linusboot-vue3/src/components/jeecg/comment/useComment.ts +++ b/linusboot-vue3/src/components/jeecg/comment/useComment.ts @@ -326,8 +326,8 @@ export function useFileList() { //数据库中地址 let url = getFileAccessHttpUrl(file.url); await initViewDomain(); - //本地测试需要将文件地址的101.34.35.69/127.0.0.1替换成IP, 或是直接修改全局domain - //url = url.replace('101.34.35.69', '192.168.1.100') + //本地测试需要将文件地址的localhost/127.0.0.1替换成IP, 或是直接修改全局domain + //url = url.replace('localhost', '192.168.1.100') //如果集成的KkFileview-v3.3.0+ 需要对url再做一层base64编码 encodeURIComponent(encryptByBase64(url)) window.open(onlinePreviewDomain+'?officePreviewType=pdf&url='+encodeURIComponent(url)); } diff --git a/linusboot-vue3/src/views/demo/feat/ws/index.vue b/linusboot-vue3/src/views/demo/feat/ws/index.vue index 9d77665..348fe33 100644 --- a/linusboot-vue3/src/views/demo/feat/ws/index.vue +++ b/linusboot-vue3/src/views/demo/feat/ws/index.vue @@ -61,7 +61,7 @@ }, setup() { const state = reactive({ - server: 'ws://101.34.35.69:3300/test', + server: 'ws://localhost:3300/test', sendValue: '', recordList: [] as { id: number; time: number; res: string }[], }); diff --git a/linusboot-vue3/tests/server/index.ts b/linusboot-vue3/tests/server/index.ts index 603c4dd..d0b0931 100644 --- a/linusboot-vue3/tests/server/index.ts +++ b/linusboot-vue3/tests/server/index.ts @@ -59,5 +59,5 @@ app.use(router.allowedMethods()); app.use(koaStatic(path.join(__dirname))); app.listen(PORT, () => { - console.log(`Application started successfully: http://101.34.35.69:${PORT}`); + console.log(`Application started successfully: http://localhost:${PORT}`); }); diff --git a/linusboot-vue3/tests/server/service/FileService.ts b/linusboot-vue3/tests/server/service/FileService.ts index 1703480..dfd378f 100644 --- a/linusboot-vue3/tests/server/service/FileService.ts +++ b/linusboot-vue3/tests/server/service/FileService.ts @@ -1,7 +1,7 @@ import path from 'path'; import fs from 'fs-extra'; -const uploadUrl = 'http://101.34.35.69:3300/static/upload'; +const uploadUrl = 'http://localhost:3300/static/upload'; const filePath = path.join(__dirname, '../static/upload/'); fs.ensureDir(filePath);