From 2b6138a889468d9b39f07d27aeb46108e0392740 Mon Sep 17 00:00:00 2001 From: qaiu <736226400@qq.com> Date: Tue, 8 Oct 2024 03:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=89=93=E5=8C=85=E8=AF=B4?= =?UTF-8?q?=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++----- web-front/README.md | 10 ++++++++++ web-service/src/main/resources/http-tools/test.http | 2 +- web-service/src/main/resources/server-proxy.yml | 4 ++-- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e8aab5d..888cbc7 100644 --- a/README.md +++ b/README.md @@ -185,11 +185,8 @@ bash service-install.sh 如果不想使用服务运行可以直接运行run.bat > 注意: 如果jdk环境变量的java版本不是17请修改nfd-service-template.xml中的java命令的路径改为实际路径 -## 0.1.8 开发计划 -- Docker部署 -- 联想乐云解析 √ -- 直链缓存 √ -- 日志优化 √ +## 0.1.9 开发计划 +- todo **技术栈:** diff --git a/web-front/README.md b/web-front/README.md index e395d6e..d01c9b1 100644 --- a/web-front/README.md +++ b/web-front/README.md @@ -9,6 +9,16 @@ 2. 打包后请将当前目录下的nfd-front目录放置在项目下webroot目录, 然后使用maven打包java模块即可 3. 项目部署后演示页面的代理端口是6401默认使用http, 如需https可以加nginx代理, 也可以使用本项目自带的代理服务和配置证书路径 +## nginx配置 +```nginx + location / { + proxy_pass http://127.0.0.1:6401; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +``` + ## Project setup ``` npm install diff --git a/web-service/src/main/resources/http-tools/test.http b/web-service/src/main/resources/http-tools/test.http index e6f1273..c1bcad9 100644 --- a/web-service/src/main/resources/http-tools/test.http +++ b/web-service/src/main/resources/http-tools/test.http @@ -101,7 +101,7 @@ GET https://lz.qaiu.top/json/ye/iaKtVv-6OECd@DcGe ### 123 PASS # @no-redirect -GET http://127.0.0.1:6400/ye/iaKtVv-qOECd +GET http://127.0.0.1:6401/ye/iaKtVv-qOECd ### 123 # @no-redirect diff --git a/web-service/src/main/resources/server-proxy.yml b/web-service/src/main/resources/server-proxy.yml index 7a1f311..0fe8b9f 100644 --- a/web-service/src/main/resources/server-proxy.yml +++ b/web-service/src/main/resources/server-proxy.yml @@ -11,11 +11,11 @@ proxy: x-token: ABC root: webroot/nfd-front/ # index: index.html - # ~开通表示正则匹配否则为前缀匹配, 当origin带子路径时进行路由重写, + # ~开头(没有空格)表示正则匹配否则为前缀匹配, 当origin带子路径时进行路由重写, # 1.origin代理地址端口后有目录(包括 / ),转发后地址:代理地址+访问URL目录部分去除location匹配目录 # 2.origin代理地址端口后无任何,转发后地址:代理地址+访问URL目录部 location: - - path: ~^/(json/|v2/|parser).* + - path: ~^/(json/|v2/|parser|ye/|lz/|cow/|ec/|fj/|fc/|le/|qq/|ws/|iz/|ce/).* origin: 127.0.0.1:6400 # json/parser -> xxx/parser