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

Fixed migrate from v0.4.4 api.

pull/235/head
ruibaby 2019-06-28 00:34:26 +08:00
parent ab069efefd
commit ecdc38a19f
52 changed files with 215 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/run/halo/app/controller/content/ContentCategoryController.java
View File

@ -85,7 +85,7 @@ public class ContentCategoryController {
@PathVariable("page") Integer page,
@SortDefault(sort = "createTime", direction = DESC) Sort sort) {
// Get category by slug name
final Category category = categoryService.getBySlugName(slugName);
final Category category = categoryService.getBySlugNameOfNonNull(slugName);
final Pageable pageable = PageRequest.of(page - 1, optionService.getPostPageSize(), sort);
Page<Post> postPage = postCategoryService.pagePostBy(category.getId(), pageable);

2
src/main/java/run/halo/app/controller/content/api/CategoryController.java
View File

@ -58,7 +58,7 @@ public class CategoryController {
public Page<BasePostSimpleDTO> listPostsBy(@PathVariable("slugName") String slugName,
@PageableDefault(sort = "updateTime", direction = DESC) Pageable pageable) {
// Get category by slug name
Category category = categoryService.getBySlugName(slugName);
Category category = categoryService.getBySlugNameOfNonNull(slugName);
Page<Post> postPage = postCategoryService.pagePostBy(category.getId(), pageable);
return postService.convertToSimple(postPage);

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

@ -7,11 +7,11 @@ import run.halo.app.model.params.LoginParam;
import run.halo.app.security.token.AuthToken;
/**
* Admin service.
* Admin service interface.
*
* @author johnniang
* @author ryanwang
* @date 19-4-29
* @date 2019-04-29
*/
public interface AdminService {

1
src/main/java/run/halo/app/service/AttachmentService.java
View File

@ -17,6 +17,7 @@ import java.util.List;
* Attachment service.
*
* @author johnniang
* @date : 2019-03-14
*/
public interface AttachmentService extends CrudService<Attachment, Integer> {

2
src/main/java/run/halo/app/service/BackupService.java
View File

@ -9,7 +9,7 @@ import java.io.IOException;
* Backup service interface.
*
* @author johnniang
* @date 19-4-26
* @date 2019-04-26
*/
public interface BackupService {

11
src/main/java/run/halo/app/service/CategoryService.java
View File

@ -15,6 +15,8 @@ import java.util.List;
* Category service.
*
* @author johnniang
* @author ryanwang
* @date : 2019-03-14
*/
public interface CategoryService extends CrudService<Category, Integer> {
@ -36,6 +38,15 @@ public interface CategoryService extends CrudService<Category, Integer> {
@NonNull
Category getBySlugName(@NonNull String slugName);
/**
* Get category by slug name
*
* @param slugName slug name
* @return Category
*/
@NonNull
Category getBySlugNameOfNonNull(String slugName);
/**
* Get Category by name.
*

2
src/main/java/run/halo/app/service/JournalCommentService.java
View File

@ -13,7 +13,7 @@ import java.util.List;
* Journal comment service interface.
*
* @author johnniang
* @date 19-4-25
* @date 2019-04-25
*/
public interface JournalCommentService extends BaseCommentService<JournalComment> {

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

@ -18,7 +18,7 @@ import java.util.List;
*
* @author johnniang
* @author ryanwang
* @date 19-4-24
* @date 2019-04-24
*/
public interface JournalService extends CrudService<Journal, Integer> {

3
src/main/java/run/halo/app/service/LinkService.java
View File

@ -11,9 +11,10 @@ import run.halo.app.service.base.CrudService;
import java.util.List;
/**
* Link service.
* Link service interface.
*
* @author johnniang
* @date 2019-03-14
*/
public interface LinkService extends CrudService<Link, Integer> {

3
src/main/java/run/halo/app/service/LogService.java
View File

@ -6,9 +6,10 @@ import run.halo.app.model.entity.Log;
import run.halo.app.service.base.CrudService;
/**
* Log service.
* Log service interface.
*
* @author johnniang
* @date 2019-03-14
*/
public interface LogService extends CrudService<Log, Long> {

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

@ -3,10 +3,10 @@ package run.halo.app.service;
import java.util.Map;
/**
* Mail server
* Mail service interface.
*
* @author ryanwang
* @date : 2019-03-17
* @date 2019-03-17
*/
public interface MailService {

3
src/main/java/run/halo/app/service/MenuService.java
View File

@ -11,10 +11,11 @@ import run.halo.app.service.base.CrudService;
import java.util.List;
/**
* Menu service.
* Menu service interface.
*
* @author johnniang
* @author ryanwang
* @date 2019-03-14
*/
public interface MenuService extends CrudService<Menu, Integer> {

3
src/main/java/run/halo/app/service/OptionService.java
View File

@ -18,9 +18,10 @@ import java.util.Map;
import java.util.Optional;
/**
* Option service.
* Option service interface.
*
* @author johnniang
* @date 2019-03-14
*/
public interface OptionService extends CrudService<Option, Integer> {

3
src/main/java/run/halo/app/service/PhotoService.java
View File

@ -14,9 +14,10 @@ import run.halo.app.service.base.CrudService;
import java.util.List;
/**
* Photo service.
* Photo service interface.
*
* @author johnniang
* @date 2019-03-14
*/
public interface PhotoService extends CrudService<Photo, Integer> {

2
src/main/java/run/halo/app/service/PostCategoryService.java
View File

@ -21,7 +21,7 @@ import java.util.Set;
* Post category service interface.
*
* @author johnniang
* @date 3/19/19
* @date 2019-03-19
*/
public interface PostCategoryService extends CrudService<PostCategory, Integer> {

3
src/main/java/run/halo/app/service/PostCommentService.java
View File

@ -12,9 +12,10 @@ import run.halo.app.service.base.BaseCommentService;
import java.util.List;
/**
* PostComment service.
* Post comment service interface.
*
* @author johnniang
* @date 2019-03-14
*/
public interface PostCommentService extends BaseCommentService<PostComment> {

3
src/main/java/run/halo/app/service/PostService.java
View File

@ -17,10 +17,11 @@ import java.util.List;
import java.util.Set;
/**
* Post service.
* Post service interface.
*
* @author johnniang
* @author ryanwang
* @date 2019-03-14
*/
public interface PostService extends BasePostService<Post> {

2
src/main/java/run/halo/app/service/PostTagService.java
View File

@ -21,7 +21,7 @@ import java.util.Set;
* Post tag service interface.
*
* @author johnniang
* @date 3/19/19
* @date 2019-03-19
*/
public interface PostTagService extends CrudService<PostTag, Integer> {

2
src/main/java/run/halo/app/service/RecoveryService.java
View File

@ -7,7 +7,7 @@ import org.springframework.web.multipart.MultipartFile;
* Recovery service interface.
*
* @author johnniang
* @date 19-4-26
* @date 2019-04-26
*/
public interface RecoveryService {

2
src/main/java/run/halo/app/service/SheetCommentService.java
View File

@ -13,7 +13,7 @@ import java.util.List;
* Sheet comment service interface.
*
* @author johnniang
* @date 19-4-24
* @date 2019-04-24
*/
public interface SheetCommentService extends BaseCommentService<SheetComment> {

2
src/main/java/run/halo/app/service/SheetService.java
View File

@ -15,7 +15,7 @@ import java.util.List;
*
* @author johnniang
* @author ryanwang
* @date 19-4-24
* @date 2019-04-24
*/
public interface SheetService extends BasePostService<Sheet> {

14
src/main/java/run/halo/app/service/TagService.java
View File

@ -8,11 +8,12 @@ import run.halo.app.service.base.CrudService;
import java.util.List;
/**
* Tag service.
* Tag service interface.
*
* @author johnniang
* @author ryanwang
* @date 2019-03-14
*/
public interface TagService extends CrudService<Tag, Integer> {
@ -25,6 +26,15 @@ public interface TagService extends CrudService<Tag, Integer> {
@NonNull
Tag getBySlugNameOfNonNull(@NonNull String slugName);
/**
* Get tag by slug name
*
* @param slugName slug name
* @return tag
*/
@NonNull
Tag getBySlugName(@NonNull String slugName);
/**
* Get tag by tag name.
*

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

@ -14,8 +14,10 @@ import java.util.Optional;
import java.util.Set;
/**
* Theme service interface.
*
* @author ryanwang
* @date : 2019/3/26
* @date 2019-03-26
*/
public interface ThemeService {

2
src/main/java/run/halo/app/service/ThemeSettingService.java
View File

@ -12,7 +12,7 @@ import java.util.Map;
* Theme setting service interface.
*
* @author johnniang
* @date 4/8/19
* @date 2019-04-08
*/
public interface ThemeSettingService {

2
src/main/java/run/halo/app/service/TraceService.java
View File

@ -9,7 +9,7 @@ import java.util.List;
* Trace service interface.
*
* @author johnniang
* @date 19-6-18
* @date 2019-06-18
*/
public interface TraceService {

3
src/main/java/run/halo/app/service/UserService.java
View File

@ -11,9 +11,10 @@ import run.halo.app.service.base.CrudService;
import java.util.Optional;
/**
* User service.
* User service interface.
*
* @author johnniang
* @date 2019-03-14
*/
public interface UserService extends CrudService<User, Integer> {

2
src/main/java/run/halo/app/service/impl/AdminServiceImpl.java
View File

@ -51,7 +51,7 @@ import static run.halo.app.model.support.HaloConst.*;
*
* @author johnniang
* @author ryanwang
* @date 19-4-29
* @date 2019-04-29
*/
@Slf4j
@Service

1
src/main/java/run/halo/app/service/impl/AttachmentServiceImpl.java
View File

@ -32,6 +32,7 @@ import java.util.Objects;
* AttachmentService implementation
*
* @author ryanwang
* @author johnniang
* @date : 2019-03-14
*/
@Slf4j

2
src/main/java/run/halo/app/service/impl/BackupServiceImpl.java
View File

@ -14,7 +14,7 @@ import java.nio.charset.StandardCharsets;
* Backup service implementation.
*
* @author johnniang
* @date 19-4-26
* @date 2019-04-26
*/
@Service
public class BackupServiceImpl implements BackupService {

2
src/main/java/run/halo/app/service/impl/BaseCommentServiceImpl.java
View File

@ -51,7 +51,7 @@ import java.util.stream.Collectors;
* Base comment service implementation.
*
* @author johnniang
* @date 19-4-24
* @date 2019-04-24
*/
@Slf4j
public abstract class BaseCommentServiceImpl<COMMENT extends BaseComment> extends AbstractCrudService<COMMENT, Long> implements BaseCommentService<COMMENT> {

2
src/main/java/run/halo/app/service/impl/BasePostServiceImpl.java
View File

@ -40,7 +40,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
* Base post service implementation.
*
* @author johnniang
* @date 19-4-24
* @date 2019-04-24
*/
@Slf4j
public abstract class BasePostServiceImpl<POST extends BasePost> extends AbstractCrudService<POST, Integer> implements BasePostService<POST> {

10
src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java
View File

@ -24,9 +24,10 @@ import java.util.List;
import java.util.stream.Collectors;
/**
* CategoryService implementation class
* CategoryService implementation class.
*
* @author ryanwang
* @author johnniang
* @date : 2019-03-14
*/
@Slf4j
@ -146,7 +147,12 @@ public class CategoryServiceImpl extends AbstractCrudService<Category, Integer>
@Override
public Category getBySlugName(String slugName) {
return categoryRepository.getBySlugName(slugName).orElseThrow(() -> new NotFoundException("该分类已存在").setErrorData(slugName));
return categoryRepository.getBySlugName(slugName).orElse(null);
}
@Override
public Category getBySlugNameOfNonNull(String slugName) {
return categoryRepository.getBySlugName(slugName).orElseThrow(() -> new NotFoundException("该分类不存在").setErrorData(slugName));
}
@Override

2
src/main/java/run/halo/app/service/impl/JournalCommentServiceImpl.java
View File

@ -28,7 +28,7 @@ import java.util.stream.Collectors;
* Journal comment service implementation.
*
* @author johnniang
* @date 19-4-25
* @date 2019-04-25
*/
@Service
public class JournalCommentServiceImpl extends BaseCommentServiceImpl<JournalComment> implements JournalCommentService {

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

@ -29,7 +29,7 @@ import java.util.stream.Collectors;
*
* @author johnniang
* @author ryanwang
* @date 19-4-24
* @date 2019-04-24
*/
@Service
public class JournalServiceImpl extends AbstractCrudService<Journal, Integer> implements JournalService {

2
src/main/java/run/halo/app/service/impl/LinkServiceImpl.java
View File

@ -24,7 +24,7 @@ import java.util.stream.Collectors;
* LinkService implementation class
*
* @author ryanwang
* @date : 2019-03-14
* @date 2019-03-14
*/
@Service
public class LinkServiceImpl extends AbstractCrudService<Link, Integer> implements LinkService {

2
src/main/java/run/halo/app/service/impl/LogServiceImpl.java
View File

@ -15,7 +15,7 @@ import run.halo.app.service.base.AbstractCrudService;
* LogService implementation class
*
* @author ryanwang
* @date : 2019-03-14
* @date 2019-03-14
*/
@Service
public class LogServiceImpl extends AbstractCrudService<Log, Long> implements LogService {

2
src/main/java/run/halo/app/service/impl/MailServiceImpl.java
View File

@ -20,7 +20,7 @@ import java.util.Properties;
* Mail service implementation.
*
* @author ryanwang
* @date : 2019-03-17
* @date 2019-03-17
*/
@Slf4j
@Service

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

@ -21,10 +21,10 @@ import java.util.List;
import java.util.stream.Collectors;
/**
* MenuService implementation class
* MenuService implementation class.
*
* @author ryanwang
* @date : 2019-03-14
* @date 2019-03-14
*/
@Service
public class MenuServiceImpl extends AbstractCrudService<Menu, Integer> implements MenuService {

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

@ -30,7 +30,7 @@ import java.util.*;
* OptionService implementation class
*
* @author ryanwang
* @date : 2019-03-14
* @date 2019-03-14
*/
@Slf4j
@Service

2
src/main/java/run/halo/app/service/impl/PhotoServiceImpl.java
View File

@ -29,7 +29,7 @@ import java.util.stream.Collectors;
* PhotoService implementation class
*
* @author ryanwang
* @date : 2019-03-14
* @date 2019-03-14
*/
@Service
public class PhotoServiceImpl extends AbstractCrudService<Photo, Integer> implements PhotoService {

2
src/main/java/run/halo/app/service/impl/PostCategoryServiceImpl.java
View File

@ -25,7 +25,7 @@ import java.util.stream.Collectors;
* Post category service implementation.
*
* @author johnniang
* @date 3/19/19
* @date 2019-03-19
*/
@Service
public class PostCategoryServiceImpl extends AbstractCrudService<PostCategory, Integer> implements PostCategoryService {

3
src/main/java/run/halo/app/service/impl/PostCommentServiceImpl.java
View File

@ -32,7 +32,8 @@ import java.util.stream.Collectors;
* PostCommentService implementation class
*
* @author ryanwang
* @date : 2019-03-14
* @author johnniang
* @date 2019-03-14
*/
@Slf4j
@Service

1
src/main/java/run/halo/app/service/impl/PostServiceImpl.java
View File

@ -45,6 +45,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
*
* @author johnniang
* @author ryanwang
* @date 2019-03-14
*/
@Slf4j
@Service

2
src/main/java/run/halo/app/service/impl/PostTagServiceImpl.java
View File

@ -25,7 +25,7 @@ import java.util.stream.Collectors;
* Post tag service implementation.
*
* @author johnniang
* @date 3/19/19
* @date 2019-03-19
*/
@Service
public class PostTagServiceImpl extends AbstractCrudService<PostTag, Integer> implements PostTagService {

115
src/main/java/run/halo/app/service/impl/RecoveryServiceImpl.java
View File

@ -33,7 +33,8 @@ import java.util.stream.Collectors;
* Recovery service implementation.
*
* @author johnniang
* @date 19-4-26
* @author ryanwang
* @date 2019-04-26
*/
@Slf4j
@Service
@ -64,6 +65,10 @@ public class RecoveryServiceImpl implements RecoveryService {
private final PhotoService photoService;
private final PostCategoryService postCategoryService;
private final PostTagService postTagService;
public RecoveryServiceImpl(AttachmentService attachmentService,
PostService postService,
LinkService linkService,
@ -75,7 +80,9 @@ public class RecoveryServiceImpl implements RecoveryService {
SheetCommentService sheetCommentService,
SheetCommentRepository sheetCommentRepository,
SheetService sheetService,
PhotoService photoService) {
PhotoService photoService,
PostCategoryService postCategoryService,
PostTagService postTagService) {
this.attachmentService = attachmentService;
this.postService = postService;
this.linkService = linkService;
@ -88,6 +95,8 @@ public class RecoveryServiceImpl implements RecoveryService {
this.sheetCommentRepository = sheetCommentRepository;
this.sheetService = sheetService;
this.photoService = photoService;
this.postCategoryService = postCategoryService;
this.postTagService = postTagService;
}
@Override
@ -215,12 +224,20 @@ public class RecoveryServiceImpl implements RecoveryService {
Post createdPost = postService.createOrUpdateBy(post);
Object commentsObject = postMap.get("comments");
Object categoriesObject = postMap.get("categories");
Object tagsObject = postMap.get("tags");
// Handle comments
List<BaseComment> baseComments = handleComment(commentsObject, createdPost.getId());
// TODO Handle categories
// Handle categories
List<Category> categories = handleCategories(categoriesObject, createdPost.getId());
// TODO Handle tags
log.debug("Migrated categories of post [{}]: [{}]", categories, createdPost.getId());
// Handle tags
List<Tag> tags = handleTags(tagsObject, createdPost.getId());
log.debug("Migrated tags of post [{}]: [{}]", tags, createdPost.getId());
List<PostComment> postComments = baseComments.stream()
.map(baseComment -> BeanUtils.transformFrom(baseComment, PostComment.class))
@ -376,6 +393,96 @@ public class RecoveryServiceImpl implements RecoveryService {
return result;
}
@NonNull
private List<Category> handleCategories(@Nullable Object categoriesObject, @NonNull Integer postId) {
Assert.notNull(postId, "Post id must not be null");
if (!(categoriesObject instanceof List)) {
return Collections.emptyList();
}
List<Object> categoryObjectList = (List<Object>) categoriesObject;
List<Category> result = new LinkedList<>();
categoryObjectList.forEach(categoryObject -> {
if (!(categoryObject instanceof Map)) {
return;
}
Map<String, Object> categoryMap = (Map<String, Object>) categoryObject;
String slugName = categoryMap.getOrDefault("cateUrl", "").toString();
Category category = categoryService.getBySlugName(slugName);
if (null == category) {
category = new Category();
category.setName(categoryMap.getOrDefault("cateName", "").toString());
category.setSlugName(slugName);
category.setDescription(categoryMap.getOrDefault("cateDesc", "").toString());
category = categoryService.create(category);
}
PostCategory postCategory = new PostCategory();
postCategory.setCategoryId(category.getId());
postCategory.setPostId(postId);
postCategoryService.create(postCategory);
try {
result.add(category);
} catch (Exception e) {
log.warn("Failed to migrate a category", e);
}
});
return result;
}
@NonNull
private List<Tag> handleTags(@Nullable Object tagsObject, @NonNull Integer postId) {
Assert.notNull(postId, "Post id must not be null");
if (!(tagsObject instanceof List)) {
return Collections.emptyList();
}
List<Object> tagObjectList = (List<Object>) tagsObject;
List<Tag> result = new LinkedList<>();
tagObjectList.forEach(tagObject -> {
if (!(tagObject instanceof Map)) {
return;
}
Map<String, Object> tagMap = (Map<String, Object>) tagObject;
String slugName = tagMap.getOrDefault("tagUrl", "").toString();
Tag tag = tagService.getBySlugName(slugName);
if (null == tag) {
tag = new Tag();
tag.setName(tagMap.getOrDefault("tagName", "").toString());
tag.setSlugName(slugName);
tag = tagService.create(tag);
}
PostTag postTag = new PostTag();
postTag.setTagId(tag.getId());
postTag.setPostId(postId);
postTagService.create(postTag);
try {
result.add(tag);
} catch (Exception e) {
log.warn("Failed to migrate a tag", e);
}
});
return result;
}
@NonNull
private List<Menu> handleMenus(@Nullable Object menusObject) {

2
src/main/java/run/halo/app/service/impl/SheetCommentServiceImpl.java
View File

@ -29,7 +29,7 @@ import java.util.stream.Collectors;
* Sheet comment service implementation.
*
* @author johnniang
* @date 19-4-24
* @date 2019-04-24
*/
@Service
public class SheetCommentServiceImpl extends BaseCommentServiceImpl<SheetComment> implements SheetCommentService {

2
src/main/java/run/halo/app/service/impl/SheetServiceImpl.java
View File

@ -31,7 +31,7 @@ import java.util.Set;
*
* @author johnniang
* @author ryanwang
* @date 19-4-24
* @date 2019-04-24
*/
@Service
public class SheetServiceImpl extends BasePostServiceImpl<Sheet> implements SheetService {

11
src/main/java/run/halo/app/service/impl/TagServiceImpl.java
View File

@ -17,10 +17,11 @@ import java.util.List;
import java.util.stream.Collectors;
/**
* TagService implementation class
* TagService implementation class.
*
* @author johnniang
* @author ryanwang
* @date : 2019-03-14
* @date 2019-03-14
*/
@Slf4j
@Service
@ -51,9 +52,13 @@ public class TagServiceImpl extends AbstractCrudService<Tag, Integer> implements
@Override
public Tag getBySlugNameOfNonNull(String slugName) {
return tagRepository.getBySlugName(slugName).orElseThrow(() -> new NotFoundException("该标签已存在").setErrorData(slugName));
return tagRepository.getBySlugName(slugName).orElseThrow(() -> new NotFoundException("该标签不存在").setErrorData(slugName));
}
@Override
public Tag getBySlugName(String slugName) {
return tagRepository.getBySlugName(slugName).orElse(null);
}
@Override
public Tag getByName(String name) {

2
src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java
View File

@ -53,7 +53,7 @@ import static run.halo.app.model.support.HaloConst.DEFAULT_THEME_ID;
* Theme service implementation.
*
* @author ryanwang
* @date : 2019/3/26
* @date 2019-03-26
*/
@Slf4j
@Service

2
src/main/java/run/halo/app/service/impl/ThemeSettingServiceImpl.java
View File

@ -24,7 +24,7 @@ import java.util.*;
* Theme setting service implementation.
*
* @author johnniang
* @date 4/8/19
* @date 2019-04-08
*/
@Slf4j
@Service

8
src/main/java/run/halo/app/service/impl/TraceServiceImpl.java
View File

@ -2,18 +2,16 @@ package run.halo.app.service.impl;
import org.springframework.boot.actuate.trace.http.HttpTrace;
import org.springframework.boot.actuate.trace.http.HttpTraceRepository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import run.halo.app.service.TraceService;
import java.util.List;
/**
* TraceService implementation class.
*
* @author johnniang
* @date 19-6-18
* @date 2019-06-18
*/
@Service
public class TraceServiceImpl implements TraceService {

5
src/main/java/run/halo/app/service/impl/UserServiceImpl.java
View File

@ -31,10 +31,11 @@ import java.util.Optional;
import java.util.concurrent.TimeUnit;
/**
* UserService implementation class
* UserService implementation class.
*
* @author ryanwang
* @date : 2019-03-14
* @author johnniang
* @date 2019-03-14
*/
@Service
public class UserServiceImpl extends AbstractCrudService<User, Integer> implements UserService {