From 89f9b7d46346da4f9263d27f6ce20032b9458bd5 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 25 八月 2023 11:10:56 +0800
Subject: [PATCH] 元数据管理添加空间过滤条件
---
src/main/java/com/moon/server/service/sys/ProxyService.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/moon/server/service/sys/ProxyService.java b/src/main/java/com/moon/server/service/sys/ProxyService.java
index 1b03132..454dcbe 100644
--- a/src/main/java/com/moon/server/service/sys/ProxyService.java
+++ b/src/main/java/com/moon/server/service/sys/ProxyService.java
@@ -47,7 +47,7 @@
/**
* URL浠ｇ悊
*/
- public void proxyUrl(String token, int resId, HttpServletRequest req, HttpServletResponse res) throws Exception {
+ public void proxyUrl(String token, int resId, boolean isRest, HttpServletRequest req, HttpServletResponse res) throws Exception {
// 3.鑾峰彇鐢ㄦ埛
UserEntity ue = getUser(req, res, token);
if (null == ue) {
@@ -56,14 +56,14 @@
// 9.鑾峰彇璧勬簮瀹炰綋
ResEntity entity = getResEntity(ue, resId);
- if (null == entity || entity.getType() != StaticData.THREE || StringHelper.isNull(entity.getProxy()) || StringHelper.isNull(entity.getUrl())) {
+ if (null == entity || StaticData.TWO != entity.getStatus() || StringHelper.isNull(entity.getProxy()) || StringHelper.isNull(entity.getUrl())) {
WebHelper.writeStr2Page(res, ILLEGAL_RESOURCE);
return;
}
insertLog(req, ue, resId);
- String url = getSourceUrl(req, entity, token);
+ String url = getSourceUrl(req, entity, token, isRest);
res.setHeader("token", token);
forward(req, res, entity, url);
}
@@ -236,15 +236,22 @@
/**
* 鑾峰彇鍘熷Url
*/
- private String getSourceUrl(HttpServletRequest req, ResEntity entity, String token) {
+ private String getSourceUrl(HttpServletRequest req, ResEntity entity, String token, boolean isRest) {
String proxyUrl = entity.getProxy().replace("{token}", token);
int end = req.getRequestURL().indexOf(proxyUrl) + proxyUrl.length();
String url = entity.getUrl() + req.getRequestURL().substring(end);
+ if (isRest) {
+ url = url.replace("/v6/wmts/", "/v6/rest/");
+ }
if (null != req.getQueryString()) {
- url = url + (entity.getUrl().contains("?") ? "&" : "?") + req.getQueryString();
+ url = url + (url.contains("?") ? "&" : "?") + req.getQueryString();
+ }
+ if (!StringHelper.isNull(entity.getArgs())) {
+ url = url + (url.contains("?") ? "&" : "?") + entity.getArgs();
}
+ // System.out.println(url)
return url;
}
--
Gitblit v1.9.3