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

Fix option list bug

pull/146/head
johnniang 2019-04-25 10:16:35 +08:00
parent 4819a9824f
commit e854626366
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/run/halo/app/model/properties/PropertyEnum.java
View File

@ -1,6 +1,5 @@
package run.halo.app.model.properties; package run.halo.app.model.properties;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;

4
src/main/java/run/halo/app/service/JournalService.java
View File

@ -1,7 +1,7 @@
package run.halo.app.service; package run.halo.app.service;
import run.halo.app.model.entity.Journal; import run.halo.app.model.entity.Journal;
import run.halo.app.service.base.CrudService; import run.halo.app.service.base.BaseCommentService;
/** /**
* Journal service interface. * Journal service interface.
@ -9,6 +9,6 @@ import run.halo.app.service.base.CrudService;
* @author johnniang * @author johnniang
* @date 19-4-24 * @date 19-4-24
*/ */
public interface JournalService extends CrudService<Journal, Long> { public interface JournalService extends BaseCommentService<Journal> {
} }

15
src/main/java/run/halo/app/service/impl/JournalServiceImpl.java
View File

@ -1,9 +1,12 @@
package run.halo.app.service.impl; package run.halo.app.service.impl;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import run.halo.app.model.entity.Journal; import run.halo.app.model.entity.Journal;
import run.halo.app.repository.JournalRepository; import run.halo.app.repository.JournalRepository;
import run.halo.app.repository.PostRepository;
import run.halo.app.service.JournalService; import run.halo.app.service.JournalService;
import run.halo.app.service.base.AbstractCrudService; import run.halo.app.service.OptionService;
/** /**
* Journal service implementation. * Journal service implementation.
@ -11,12 +14,16 @@ import run.halo.app.service.base.AbstractCrudService;
* @author johnniang * @author johnniang
* @date 19-4-24 * @date 19-4-24
*/ */
public class JournalServiceImpl extends AbstractCrudService<Journal, Long> implements JournalService { @Service
public class JournalServiceImpl extends BaseCommentServiceImpl<Journal> implements JournalService {
private final JournalRepository journalRepository; private final JournalRepository journalRepository;
public JournalServiceImpl(JournalRepository journalRepository) { public JournalServiceImpl(JournalRepository journalRepository,
super(journalRepository); PostRepository postRepository,
OptionService optionService,
ApplicationEventPublisher eventPublisher) {
super(journalRepository, postRepository, optionService, eventPublisher);
this.journalRepository = journalRepository; this.journalRepository = journalRepository;
} }
} }

4
src/main/java/run/halo/app/service/impl/OptionServiceImpl.java
View File

@ -130,7 +130,7 @@ public class OptionServiceImpl extends AbstractCrudService<Option, Integer> impl
Set<String> keys = ServiceUtils.fetchProperty(options, Option::getKey); Set<String> keys = ServiceUtils.fetchProperty(options, Option::getKey);
Map<String, Object> result = ServiceUtils.convertToMap(options, Option::getKey, option -> { Map<String, Object> userDefinedOptionMap = ServiceUtils.convertToMap(options, Option::getKey, option -> {
String key = option.getKey(); String key = option.getKey();
PropertyEnum propertyEnum = propertyEnumMap.get(key); PropertyEnum propertyEnum = propertyEnumMap.get(key);
@ -142,6 +142,8 @@ public class OptionServiceImpl extends AbstractCrudService<Option, Integer> impl
return PropertyEnum.convertTo(option.getValue(), propertyEnum); return PropertyEnum.convertTo(option.getValue(), propertyEnum);
}); });
Map<String, Object> result = new HashMap<>(userDefinedOptionMap);
// Add default property // Add default property
propertyEnumMap.keySet() propertyEnumMap.keySet()
.stream() .stream()