From 4212d47bc243e1609b27a6772f7eb11263dec9c9 Mon Sep 17 00:00:00 2001
From: Looly <loolly@aliyun.com>
Date: Fri, 30 Sep 2022 18:59:50 +0800
Subject: [PATCH] fix bugs

---
 CHANGELOG.md                                  |  4 +++-
 .../main/java/cn/hutool/http/HttpRequest.java | 15 ++++++++++++++-
 .../java/cn/hutool/http/IssueI5TPSYTest.java  | 19 +++++++++++++++++++
 .../poi/excel/reader/MapSheetReader.java      |  5 +++--
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100755 hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f852135f1..62971eb0d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,12 @@
 
 -------------------------------------------------------------------------------------------------------------
 
-# 5.8.9.M1 (2022-09-26)
+# 5.8.9.M1 (2022-09-30)
 
 ### 🐣新特性
 ### 🐞Bug修复
+* 【poi    】     修复ExcelReader读取只有标题行报错问题（issue#I5U1JA@Gitee）
+* 【http   】     修复Http重定向时相对路径导致的问题（issue#I5TPSY@Gitee）
 
 -------------------------------------------------------------------------------------------------------------
 
diff --git a/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java b/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
index 97aad52f1..496e9bdc5 100755
--- a/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
+++ b/hutool-http/src/main/java/cn/hutool/http/HttpRequest.java
@@ -1236,7 +1236,20 @@ public class HttpRequest extends HttpBase<HttpRequest> {
 
 			if (responseCode != HttpURLConnection.HTTP_OK) {
 				if (HttpStatus.isRedirected(responseCode)) {
-					setUrl(UrlBuilder.ofHttpWithoutEncode(httpConnection.header(Header.LOCATION)));
+					final UrlBuilder redirectUrl;
+					String location = httpConnection.header(Header.LOCATION);
+					if(false == HttpUtil.isHttp(location) && false == HttpUtil.isHttps(location)){
+						// issue#I5TPSY
+						// location可能为相对路径
+						if(false == location.startsWith("/")){
+							location = StrUtil.addSuffixIfNot(this.url.getPathStr(), "/") + location;
+						}
+						redirectUrl = UrlBuilder.of(this.url.getScheme(), this.url.getHost(), this.url.getPort()
+								, location, null, null, this.charset);
+					} else{
+						redirectUrl = UrlBuilder.ofHttpWithoutEncode(location);
+					}
+					setUrl(redirectUrl);
 					if (redirectCount < config.maxRedirectCount) {
 						redirectCount++;
 						// 重定向不再走过滤器
diff --git a/hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java b/hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java
new file mode 100755
index 000000000..a297634fd
--- /dev/null
+++ b/hutool-http/src/test/java/cn/hutool/http/IssueI5TPSYTest.java
@@ -0,0 +1,19 @@
+package cn.hutool.http;
+
+import cn.hutool.core.lang.Console;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.net.HttpCookie;
+
+public class IssueI5TPSYTest {
+	@Test
+	@Ignore
+	public void redirectTest() {
+		final String url = "https://bsxt.gdzwfw.gov.cn/UnifiedReporting/auth/newIndex";
+		final HttpResponse res = HttpUtil.createGet(url).setFollowRedirects(true)
+				.cookie(new HttpCookie("iPlanetDirectoryPro", "123"))
+				.execute();
+		Console.log(res.body());
+	}
+}
diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java
index 11aebaea0..c62b6242f 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/reader/MapSheetReader.java
@@ -46,13 +46,14 @@ public class MapSheetReader extends AbstractSheetReader<List<Map<String, Object>
 		} else if (headerRowIndex > lastRowNum) {
 			throw new IndexOutOfBoundsException(StrUtil.format("Header row index {} is greater than last row index {}.", headerRowIndex, lastRowNum));
 		} else if (startRowIndex > lastRowNum) {
-			throw new IndexOutOfBoundsException(StrUtil.format("startRowIndex row index {} is greater than last row index {}.", startRowIndex, lastRowNum));
+			// issue#I5U1JA 只有标题行的Excel，起始行是1，标题行（最后的行号是0）
+			return ListUtil.empty();
 		}
 		final int startRowIndex = Math.max(this.startRowIndex, firstRowNum);// 读取起始行（包含）
 		final int endRowIndex = Math.min(this.endRowIndex, lastRowNum);// 读取结束行（包含）
 
 		// 读取header
-		List<String> headerList = aliasHeader(readRow(sheet, headerRowIndex));
+		final List<String> headerList = aliasHeader(readRow(sheet, headerRowIndex));
 
 		final List<Map<String, Object>> result = new ArrayList<>(endRowIndex - startRowIndex + 1);
 		List<Object> rowList;