From a5f7c438d5b0bd74ebc774dda30e147b4428d1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B9=94=E6=88=88=E9=87=8C?= <chiaokoli@gmail.com>
Date: Tue, 19 Jul 2022 10:36:05 +0800
Subject: [PATCH] perf: access to admin page changed to template rendering
 (#2259)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--  Thanks for sending a pull request!  Here are some tips for you:
1. 如果这是你的第一次，请阅读我们的贡献指南：<https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md>。
1. If this is your first time, please read our contributor guidelines: <https://github.com/halo-dev/halo/blob/master/CONTRIBUTING.md>.
2. 请根据你解决问题的类型为 Pull Request 添加合适的标签。
2. Please label this pull request according to what type of issue you are addressing, especially if this is a release targeted pull request.
3. 请确保你已经添加并运行了适当的测试。
3. Ensure you have added or ran the appropriate tests for your PR.
-->

#### What type of PR is this?

/kind improvement

<!--
添加其中一个类别：
Add one of the following kinds:

/kind bug
/kind cleanup
/kind documentation
/kind feature
/kind improvement

适当添加其中一个或多个类别（可选）：
Optionally add one or more of the following kinds if applicable:

/kind api-change
/kind deprecation
/kind failing-test
/kind flake
/kind regression
-->

#### What this PR does / why we need it:

访问后台管理时使用重定向，在有反向代理且配置不完善的情况下，会导致重定向的域名发生错误。

https://spring.io/guides/gs/serving-web-content/
#### Which issue(s) this PR fixes:

<!--
PR 合并时自动关闭 issue。
Automatically closes linked issue when PR is merged.

用法：`Fixes #<issue 号>`，或者 `Fixes (粘贴 issue 完整链接)`
Usage: `Fixes #<issue number>`, or `Fixes (paste link of issue)`.
-->
Fixes #2254

#### Special notes for your reviewer:
/cc @halo-dev/sig-halo

#### Does this PR introduce a user-facing change?



<!--
如果当前 Pull Request 的修改不会造成用户侧的任何变更，在 `release-note` 代码块儿中填写 `NONE`。
否则请填写用户侧能够理解的 Release Note。如果当前 Pull Request 包含破坏性更新（Break Change），
Release Note 需要以 `action required` 开头。
If no, just write "NONE" in the release-note block below.
If yes, a release note is required:
Enter your extended release note in the block below. If the PR requires additional action from users switching to the new release, include the string "action required".
-->

```release-note
修改后台管理页面为直接渲染而不是重定向，以更好的兼容反向代理
```
---
 .../app/controller/content/MainController.java | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/run/halo/app/controller/content/MainController.java b/src/main/java/run/halo/app/controller/content/MainController.java
index d2f6f58a4..9c31ef556 100644
--- a/src/main/java/run/halo/app/controller/content/MainController.java
+++ b/src/main/java/run/halo/app/controller/content/MainController.java
@@ -50,11 +50,9 @@ public class MainController {
     }
 
     @GetMapping("${halo.admin-path:admin}")
-    public void admin(HttpServletResponse response) throws IOException {
-        String adminIndexRedirectUri =
-            HaloUtils.ensureBoth(haloProperties.getAdminPath(), HaloUtils.URL_SEPARATOR)
-                + INDEX_REDIRECT_URI;
-        response.sendRedirect(adminIndexRedirectUri);
+    public String admin() throws IOException {
+        return HaloUtils.ensureBoth(haloProperties.getAdminPath(), HaloUtils.URL_SEPARATOR)
+            + INDEX_REDIRECT_URI;
     }
 
     @GetMapping("version")
@@ -64,14 +62,12 @@ public class MainController {
     }
 
     @GetMapping("install")
-    public void installation(HttpServletResponse response) throws IOException {
+    public String installation() throws IOException {
         boolean isInstalled = optionService
             .getByPropertyOrDefault(PrimaryProperties.IS_INSTALLED, Boolean.class, false);
         if (!isInstalled) {
-            String installRedirectUri =
-                StringUtils.appendIfMissing(this.haloProperties.getAdminPath(), "/")
-                    + INSTALL_REDIRECT_URI;
-            response.sendRedirect(installRedirectUri);
+            return StringUtils.appendIfMissing(this.haloProperties.getAdminPath(), "/")
+                + INSTALL_REDIRECT_URI;
         } else {
             throw new NotFoundException("404");
         }
@@ -103,4 +99,4 @@ public class MainController {
             response.sendRedirect(HaloUtils.normalizeUrl(favicon));
         }
     }
-}
+}
\ No newline at end of file