github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix the problem of resolving logo starting with slash (#5256) 

#### What type of PR is this?

/kind bug
/area core
/milestone 2.12.x

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

This PR treats logo as a path when building logo HTTP URL instead of a path segment. The concrete rules of logo is described [here](https://github.com/halo-dev/halo/issues/5253#issuecomment-1911729063).

See https://github.com/halo-dev/halo/issues/5253 for more.

#### Which issue(s) this PR fixes:

Fixes https://github.com/halo-dev/halo/issues/5253

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

```release-note
None
```
pull/5258/head v2.12.0-beta.1
John Niang 2024-01-26 19:24:11 +08:00 committed by GitHub
parent 8288e4edf8
commit 1be470a4f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/java/run/halo/app/core/extension/reconciler/PluginReconciler.java
View File

@ -240,7 +240,7 @@ public class PluginReconciler implements Reconciler<Request> {
log.info("Resolving logo resource for plugin {}", pluginName);
// the logo might be:
// 1. URL
// 2. file name
// 2. relative path to "resources" folder
// 3. base64 format data image
var logo = specLogo;
if (!specLogo.startsWith("data:image")) {
@ -249,7 +249,8 @@ public class PluginReconciler implements Reconciler<Request> {
} catch (MalformedURLException ignored) {
// indicate the logo is a path
logo = UriComponentsBuilder.newInstance()
.pathSegment("plugins", pluginName, "assets", specLogo)
.pathSegment("plugins", pluginName, "assets")
.path(specLogo)
.queryParam("version", pluginVersion)
.build(true)
.toString();