Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf: access to admin page changed to template rendering #2259

Merged
merged 1 commit into from
Jul 19, 2022
Merged

perf: access to admin page changed to template rendering #2259

merged 1 commit into from
Jul 19, 2022

Conversation

8Q757
Copy link

@8Q757 8Q757 commented Jul 17, 2022 •
edited by guqing
Loading

What type of PR is this?

/kind improvement

What this PR does / why we need it:

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

https://spring.io/guides/gs/serving-web-content/

Which issue(s) this PR fixes:

Fixes #2254

Special notes for your reviewer:

/cc @halo-dev/sig-halo

Does this PR introduce a user-facing change?

修改后台管理页面为直接渲染而不是重定向，以更好的兼容反向代理

@f2c-ci-robot f2c-ci-robot bot added kind/improvement Categorizes issue or PR as related to a improvement. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 17, 2022
@CLAassistant
Copy link

CLAassistant commented Jul 17, 2022 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@f2c-ci-robot f2c-ci-robot bot requested review from JohnNiang and ruibaby July 17, 2022 08:56
ruibaby
ruibaby reviewed Jul 18, 2022
View reviewed changes
Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

感谢你的贡献，这里有一些小建议。

我们将在稍后进行实际测试。

src/main/java/run/halo/app/controller/content/MainController.java Outdated Show resolved Hide resolved
src/main/java/run/halo/app/controller/content/MainController.java Outdated Show resolved Hide resolved
src/main/java/run/halo/app/controller/content/MainController.java Outdated Show resolved Hide resolved
src/main/java/run/halo/app/controller/content/MainController.java Outdated Show resolved Hide resolved
@f2c-ci-robot f2c-ci-robot bot added release-note-none Denotes a PR that doesn't merit a release note. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. labels Jul 18, 2022
@ruibaby
Copy link
Member

ruibaby commented Jul 18, 2022

/retitle perf: access to admin page changed to template rendering

@f2c-ci-robot f2c-ci-robot bot changed the title fix: 修改后台管理页面为直接渲染而不是重定向，以更好的兼容反向代理 perf: access to admin page changed to template rendering Jul 18, 2022
@8Q757
Copy link
Author

8Q757 commented Jul 18, 2022

了解，我稍后会在此PR上作修改。

@ruibaby
Copy link
Member

ruibaby commented Jul 18, 2022

@viticis 另外需要签署一下我们的 CLA，否则我们没有权限合并。

#2259 (comment)

@guqing
Copy link
Member

guqing commented Jul 18, 2022

关于此 PR 的写法如何工作可以参考以下链接

ContentNegotiatingViewResolver#resolveViewName() -> ContentNegotiatingViewResolver#getCandidateViews() -> InternalResourceViewResolver -> 调用父类 UrlBasedViewResolver#buildView方法将静态资源创建为InternalResourceView

@guqing
Copy link
Member

guqing commented Jul 18, 2022

/area core
/milestone 1.5.x

@f2c-ci-robot f2c-ci-robot bot added this to the 1.5.x milestone Jul 18, 2022
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Jul 18, 2022
@ruibaby
Copy link
Member

ruibaby commented Jul 18, 2022

/area core /milestone 1.5.x

这个改动放在 1.6.x 合适一点。

/milestone 1.6.x

@f2c-ci-robot f2c-ci-robot bot modified the milestones: 1.5.x, 1.6.x Jul 18, 2022
@8Q757 8Q757 force-pushed the master branch 2 times, most recently from 14d31d1 to d2480f3 Compare July 19, 2022 01:55
@8Q757
Copy link
Author

8Q757 commented Jul 19, 2022

已作修改，已签署CLA。
好标准的PR流程，受益匪浅。🙏

guqing
guqing reviewed Jul 19, 2022
View reviewed changes
Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Jul 19, 2022
ruibaby
ruibaby reviewed Jul 19, 2022
View reviewed changes
Copy link
Member

@ruibaby ruibaby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

已在实际情况下进行测试，符合预期。感谢 @viticis 的反馈和贡献。

JohnNiang
JohnNiang approved these changes Jul 19, 2022
View reviewed changes
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

@f2c-ci-robot
Copy link

f2c-ci-robot bot commented Jul 19, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 19, 2022
@f2c-ci-robot f2c-ci-robot bot merged commit a5f7c43 into halo-dev:master Jul 19, 2022
@8Q757
Copy link
Author

8Q757 commented Jul 19, 2022

感谢 review and merge.

f2c-ci-robot bot pushed a commit that referenced this pull request Oct 12, 2022
@ruibaby
release: 1.6.0 (#2542)
de684ff 
#### What type of PR is this?


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

发布 1.6.0

#### Special notes for your reviewer:

/cc @halo-dev/sig-halo 

```markdown
## Features

- SMTP 添加 STARTTLS 的设置支持。 #1861 halo-dev/console#552 @ntdgy @wangxiaoerYah
- 为邮件通知模板添加更多的可用参数，`email`、`status`、`createTime`、`authorUrl`。 #2095 @Yhcrown @iRoZhi
- 后台附件设置中添加 `去除图片 EXIF 信息` 的选项。 #2168 halo-dev/console#554 @SladeGranger @eziosudo @52lemon6
- 后台文章标签管理支持清理未使用标签。 halo-dev/console#587 @ruibaby
- 重构后台的友情链接管理页面，现在支持拖动排序以及分组管理。 halo-dev/console#574 #2105 @Camsyn @daifiyum @gungnir479

## Improvements

- 优化文章编辑时间更新的逻辑，目前更改为仅在修改文章标题或者内容时才更新。 #2195 @wxyShine @ListenV
- 修改后台管理页面为直接渲染而不是重定向，以更好地兼容反向代理。 #2259 @viticis
- 后台在构建时提供 gzip 压缩的资源。 halo-dev/console#547 @2211898719
- 后台主题设置界面顶部提供了保存设置的按钮。 halo-dev/console#549 @Aanko
- 修改后台页面的 lang 属性，由 `zh-cmn-Hans` 改为 `cmn-Han`，`zh-cmn-Hans` 已废弃。 halo-dev/console#576 @wordlesswind
- 优化后台附件库列表以及选择附件弹框的布局。 halo-dev/console#580 @ruibaby
- 修改后台底部的 `Power by Halo` 为 `Powered by Halo`。 halo-dev/console#597 @liaocp666
- 优化后台日志管理设置公开/隐藏状态的方式。 halo-dev/console#610 @zjy4fun @manction
- 优化后台在个人资料中设置头像的逻辑，现在无需再提交个人资料表单。 halo-dev/console#619 @wxyShine
- 优化后台图库批量从附件添加时，按照选择顺序倒序排列，即最先选择的图片在最前面。 halo-dev/console#631 @zjy4fun @zyy247796143

## Bug Fixes

- 修复文章详情页 `meta_description` 为空的问题。 #2282 @guqing @ruibaby
- 修复批量删除外部云存储的时候，因为文件不存在导致的删除失败问题。 #2317 @JustinLiang522 @129duckflew
- 修复了七牛云存储附件无法上传非图片文件的问题。 #2331 @AirboZH @hexWars
- 修复未审核评论回复会发送邮件提醒的问题。 #2340 @AirboZH @cetr
- 修复在单个分类所属文章页面页面变量中无法获取子分类中文章的问题。 #2405 @JustinLiang522 @HugeLeaf
- 修复管理员资料表单中邮件地址的字符数限制。 halo-dev/console#571 @Yhcrown
- 修复了无法设置日志、相册、链接页标题和每页显示条数的问题。 halo-dev/console#601 @JustinLiang522 @manction

## Dependencies

- Docker 镜像的基础镜像使用 Eclipse Temurin 镜像替代 AdoptOpenJDK。 #2120 @wordlesswind
```

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

```release-note
None
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruibaby ruibaby ruibaby left review comments

@guqing guqing guqing left review comments

@JohnNiang JohnNiang JohnNiang approved these changes

Assignees

@ruibaby ruibaby

@guqing guqing

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core kind/improvement Categorizes issue or PR as related to a improvement. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Milestone
1.6.x
Development

Successfully merging this pull request may close these issues.

Nginx 请求头配置导致的 admin 页面重定向错误
5 participants
@8Q757 @CLAassistant @ruibaby @guqing @JohnNiang