From a4464d48b556d989edadcd18cdb3acbf35fce1c9 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 27 九月 2023 11:22:26 +0800
Subject: [PATCH] 修改代理服务-1
---
src/main/java/com/moon/server/service/sys/ProxyService.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 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 4af51ee..7b96232 100644
--- a/src/main/java/com/moon/server/service/sys/ProxyService.java
+++ b/src/main/java/com/moon/server/service/sys/ProxyService.java
@@ -53,17 +53,15 @@
if (null == ue) {
return;
}
-
- // 9.鑾峰彇璧勬簮瀹炰綋
+ // 9.鑾峰彇璧勬簮瀹炰綋锛宻tatus锛�0-绂佺敤锛�1-鍚敤鍘熷鍦板潃锛�2-鍚敤浠ｇ悊鍦板潃
ResEntity entity = getResEntity(ue, resId);
if (null == entity || StaticData.I2 != 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, isRest);
+ String url = getUrl(req, entity, token, isRest);
res.setHeader("token", token);
forward(req, res, entity, url);
}
@@ -101,17 +99,14 @@
if (StringHelper.isEmpty(ip)) {
return WebHelper.writeStr2Page(res, AuthInterceptor.IP_NULL);
}
-
// 5.妫�鏌ラ粦鍚嶅崟
if (!checkBlackList(ip, req)) {
return WebHelper.writeStr2Page(res, AuthInterceptor.BLACK_LIST);
}
-
// 6.admin璺宠繃鏉冮檺妫�娴�
if (StaticData.ADMIN.equals(ue.getUid())) {
return true;
}
-
// 7.妫�鏌ョ櫧鍚嶅崟
if (!checkWhiteList(ip, req)) {
// 妫�鏌P涓�鑷存��
@@ -119,7 +114,6 @@
return WebHelper.writeStr2Page(res, AuthInterceptor.ILLEGAL_TOKEN);
}
}
-
// 8.妫�鏌ョ敤鎴稩D鏄惁绂佺敤
if (sysService.tokenService.isUidDisable(ue)) {
return WebHelper.writeStr2Page(res, AuthInterceptor.USER_LOCK);
@@ -136,11 +130,8 @@
if (blackList == null || blackList.isEmpty()) {
return true;
}
- if (blackList.contains(ip)) {
- return false;
- }
- return true;
+ return !blackList.contains(ip);
}
/**
@@ -233,24 +224,28 @@
}
/**
- * 鑾峰彇鍘熷Url
+ * 鑾峰彇Url
*/
- private String getSourceUrl(HttpServletRequest req, ResEntity entity, String token, boolean isRest) {
+ private String getUrl(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 + (url.contains("?") ? "&" : "?") + req.getQueryString();
}
- if (!StringHelper.isNull(entity.getArgs())) {
- url = url + (url.contains("?") ? "&" : "?") + entity.getArgs();
+ // category锛�0-鍏朵粬锛�1-GisServer锛�2-GeoServer锛�3-鏁扮畝
+ if (StaticData.I2 == entity.getCategory()) {
+ //
+ } else if (StaticData.I3 == entity.getCategory()) {
+ if (isRest) {
+ url = url.replace("/v6/wmts/", "/v6/rest/");
+ }
+ if (!StringHelper.isNull(entity.getArgs())) {
+ url = url + (url.contains("?") ? "&" : "?") + entity.getArgs();
+ }
}
- // System.out.println(url)
return url;
}
--
Gitblit v1.9.3