From 159dc09d556ee54b4ff0bb5c8e44af4ef9507cf8 Mon Sep 17 00:00:00 2001
From: datagear <datagear@163.com>
Date: Wed, 4 Nov 2020 20:26:07 +0800
Subject: [PATCH] =?UTF-8?q?springboot=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 datagear-analysis/pom.xml                     |  2 +-
 datagear-management/pom.xml                   |  4 +--
 datagear-web/pom.xml                          |  2 +-
 .../web/controller/AbstractController.java    | 10 ++++----
 .../AbstractDataAnalysisController.java       | 25 -------------------
 pom.xml                                       | 15 +++--------
 6 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/datagear-analysis/pom.xml b/datagear-analysis/pom.xml
index eeeea128..b15a0303 100644
--- a/datagear-analysis/pom.xml
+++ b/datagear-analysis/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
-			<version>5.0.1</version>
+			<version>${httpclient.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.jayway.jsonpath</groupId>
diff --git a/datagear-management/pom.xml b/datagear-management/pom.xml
index 70d77efb..ba09e8db 100644
--- a/datagear-management/pom.xml
+++ b/datagear-management/pom.xml
@@ -31,12 +31,12 @@
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis</artifactId>
-			<version>3.3.1</version>
+			<version>${mybatis.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mybatis</groupId>
 			<artifactId>mybatis-spring</artifactId>
-			<version>1.3.1</version>
+			<version>${mybatis-spring.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
diff --git a/datagear-web/pom.xml b/datagear-web/pom.xml
index 326555cb..1a53e4ac 100644
--- a/datagear-web/pom.xml
+++ b/datagear-web/pom.xml
@@ -93,7 +93,7 @@
 		<dependency>
 			<groupId>commons-fileupload</groupId>
 			<artifactId>commons-fileupload</artifactId>
-			<version>1.3.3</version>
+			<version>${commons-fileupload.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
diff --git a/datagear-web/src/main/java/org/datagear/web/controller/AbstractController.java b/datagear-web/src/main/java/org/datagear/web/controller/AbstractController.java
index 0cf498c4..94493c34 100644
--- a/datagear-web/src/main/java/org/datagear/web/controller/AbstractController.java
+++ b/datagear-web/src/main/java/org/datagear/web/controller/AbstractController.java
@@ -751,20 +751,20 @@ public abstract class AbstractController
 	 */
 	protected String resolvePathAfter(HttpServletRequest request, String pathPrefix)
 	{
-		String pathInfo = request.getPathInfo();
+		String uri = request.getRequestURI();
 
 		if (StringUtil.isEmpty(pathPrefix))
-			return pathInfo;
+			return uri;
 
-		if (pathInfo.endsWith(pathPrefix))
+		if (uri.endsWith(pathPrefix))
 			return "";
 
-		int index = pathInfo.indexOf(pathPrefix);
+		int index = uri.indexOf(pathPrefix);
 
 		if (index < 0)
 			return null;
 
-		return pathInfo.substring(index + pathPrefix.length());
+		return uri.substring(index + pathPrefix.length());
 	}
 
 	/**
diff --git a/datagear-web/src/main/java/org/datagear/web/controller/AbstractDataAnalysisController.java b/datagear-web/src/main/java/org/datagear/web/controller/AbstractDataAnalysisController.java
index ce2f1e10..72545b42 100644
--- a/datagear-web/src/main/java/org/datagear/web/controller/AbstractDataAnalysisController.java
+++ b/datagear-web/src/main/java/org/datagear/web/controller/AbstractDataAnalysisController.java
@@ -152,31 +152,6 @@ public abstract class AbstractDataAnalysisController extends AbstractController
 		return dashboardTheme;
 	}
 
-	/**
-	 * 解析展示看板请求路径的看板资源名。
-	 * <p>
-	 * 返回空字符串表情请求展示首页。
-	 * </p>
-	 * 
-	 * @param request
-	 * @param response
-	 * @param id
-	 * @return
-	 */
-	protected String resolveDashboardResName(HttpServletRequest request, HttpServletResponse response, String id)
-	{
-		String pathInfo = request.getPathInfo();
-
-		String idPath = id + "/";
-
-		if (pathInfo.endsWith(id) || pathInfo.endsWith(idPath))
-			return "";
-
-		String resPath = pathInfo.substring(pathInfo.indexOf(idPath) + idPath.length());
-
-		return resPath;
-	}
-
 	/**
 	 * 获取看板数据。
 	 * 
diff --git a/pom.xml b/pom.xml
index 06a0906c..a4be5c20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,24 +13,17 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
-		<junit.version>4.13.1</junit.version>
-		<hamcrest.version>2.2</hamcrest.version>
 		<springboot.version>2.3.5.RELEASE</springboot.version>
-		<spring.version>4.3.26.RELEASE</spring.version>
-		<spring.security.version>3.2.10.RELEASE</spring.security.version>
-		<DBCP.version>2.7.0</DBCP.version>
-		<slf4j.version>1.7.9</slf4j.version>
-		<slf4j-log4j12.version>1.7.9</slf4j-log4j12.version>
-		<log4j.version>1.2.17</log4j.version>
 		<javax.json.version>1.0.4</javax.json.version>
 		<guava.version>28.2-jre</guava.version>
-		<jackson.version>2.9.10.4</jackson.version>
-		<freemarker.version>2.3.30</freemarker.version>
 		<commons-csv.version>1.4</commons-csv.version>
 		<poi.version>3.17</poi.version>
 		<poi-ooxml.version>3.17</poi-ooxml.version>
-		<quartz.version>2.3.2</quartz.version>
 		<cometd.version>4.0.9</cometd.version>
+		<httpclient.version>5.0.1</httpclient.version>
+		<mybatis.version>3.3.1</mybatis.version>
+		<mybatis-spring.version>1.3.1</mybatis-spring.version>
+		<commons-fileupload.version>1.3.3</commons-fileupload.version>
 		<maven-antrun-plugin.version>1.4</maven-antrun-plugin.version>
 	</properties>