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

fix: newly added setting item are not taking effect (#4486) 

#### What type of PR is this?
/kind improvement
/area core
/milestone 2.9.x

#### What this PR does / why we need it:
修复新增加的配置项默认值没有填充的问题

how to test it?
测试插件和主题新增加的配置项（带默认值）在升级后是否具有默认值

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

#### Does this PR introduce a user-facing change?
```release-note
修复新增加的配置项默认值没有填充的问题
```
pull/4482/head^2
guqing 2023-08-25 23:36:14 +08:00 committed by GitHub
parent 03bf2aea7c
commit 401c3c79ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,13 +184,6 @@ public class PluginReconciler implements Reconciler<Request> {
Assert.notNull(name, "Plugin name must not be null");
Assert.notNull(settingName, "Setting name must not be null");
PluginWrapper pluginWrapper = getPluginWrapper(name);
// If it already exists, do not look for setting
if (RuntimeMode.DEPLOYMENT.equals(pluginWrapper.getRuntimeMode())) {
Optional<Setting> existing = client.fetch(Setting.class, settingName);
if (existing.isPresent()) {
return existing;
}
}
var resourceLoader =
new DefaultResourceLoader(pluginWrapper.getPluginClassLoader());

19
application/src/main/java/run/halo/app/core/extension/theme/ThemeServiceImpl.java
View File

@ -166,14 +166,25 @@ public class ThemeServiceImpl implements ThemeService {
})
.doOnNext(unstructured ->
populateThemeNameLabel(unstructured, theme.getMetadata().getName()))
.flatMap(unstructured -> client.create(unstructured)
.retryWhen(Retry.backoff(5, Duration.ofMillis(100))
.filter(OptimisticLockingFailureException.class::isInstance))
)
.flatMap(this::createOrUpdate)
.then(Mono.just(theme));
});
}
Mono<Unstructured> createOrUpdate(Unstructured unstructured) {
return Mono.defer(() -> client.fetch(unstructured.groupVersionKind(),
unstructured.getMetadata().getName())
.flatMap(existUnstructured -> {
existUnstructured.getMetadata()
.setVersion(unstructured.getMetadata().getVersion());
return client.update(existUnstructured);
})
.switchIfEmpty(Mono.defer(() -> client.create(unstructured)))
)
.retryWhen(Retry.backoff(5, Duration.ofMillis(100))
.filter(OptimisticLockingFailureException.class::isInstance));
}
@Override
public Mono<Theme> reloadTheme(String name) {
return client.fetch(Theme.class, name)