Skip to content

B
beyond-clouds
Commit e076bf6e by 段启岩
Options

规范命名：bean统一改为DTO

parent ac050adc
Showing with 109 additions and 114 deletions
src/main/java/cn/meteor/beyondclouds/common/bean/QQAuthResult.java → src/main/java/cn/meteor/beyondclouds/common/dto/QQAuthResultDTO.java
package cn.meteor.beyondclouds.common.bean; package cn.meteor.beyondclouds.common.dto;
import lombok.Data; import lombok.Data;
...@@ -7,7 +7,7 @@ import lombok.Data; ...@@ -7,7 +7,7 @@ import lombok.Data;
* @author meteor * @author meteor
*/ */
@Data @Data
public class QQAuthResult { public class QQAuthResultDTO {
/** /**
* token * token
......
src/main/java/cn/meteor/beyondclouds/common/helper/IQQAuthenticationHelper.java
package cn.meteor.beyondclouds.common.helper; package cn.meteor.beyondclouds.common.helper;
import cn.meteor.beyondclouds.common.bean.QQAuthResult; import cn.meteor.beyondclouds.common.dto.QQAuthResultDTO;
import cn.meteor.beyondclouds.common.exception.QQAuthenticationException; import cn.meteor.beyondclouds.common.exception.QQAuthenticationException;
/** /**
...@@ -14,5 +14,5 @@ public interface IQQAuthenticationHelper { ...@@ -14,5 +14,5 @@ public interface IQQAuthenticationHelper {
* @param code * @param code
* @return * @return
*/ */
QQAuthResult authentication(String code) throws QQAuthenticationException; QQAuthResultDTO authentication(String code) throws QQAuthenticationException;
} }
src/main/java/cn/meteor/beyondclouds/common/helper/impl/QQAuthenticationHelperImpl.java
package cn.meteor.beyondclouds.common.helper.impl; package cn.meteor.beyondclouds.common.helper.impl;
import cn.meteor.beyondclouds.common.bean.QQAuthResult; import cn.meteor.beyondclouds.common.dto.QQAuthResultDTO;
import cn.meteor.beyondclouds.common.exception.QQAuthenticationException; import cn.meteor.beyondclouds.common.exception.QQAuthenticationException;
import cn.meteor.beyondclouds.common.helper.IQQAuthenticationHelper; import cn.meteor.beyondclouds.common.helper.IQQAuthenticationHelper;
import cn.meteor.beyondclouds.config.properties.BeyondCloudsProperties; import cn.meteor.beyondclouds.config.properties.BeyondCloudsProperties;
...@@ -25,7 +25,7 @@ public class QQAuthenticationHelperImpl implements IQQAuthenticationHelper { ...@@ -25,7 +25,7 @@ public class QQAuthenticationHelperImpl implements IQQAuthenticationHelper {
} }
@Override @Override
public QQAuthResult authentication(String code) throws QQAuthenticationException { public QQAuthResultDTO authentication(String code) throws QQAuthenticationException {
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
BeyondCloudsProperties.QQAuthProperties qqAuthProperties = beyondCloudsProperties.getAuth().getQq(); BeyondCloudsProperties.QQAuthProperties qqAuthProperties = beyondCloudsProperties.getAuth().getQq();
// 1.向QQ的认证服务器发送请求，换取accessToken // 1.向QQ的认证服务器发送请求，换取accessToken
...@@ -66,7 +66,7 @@ public class QQAuthenticationHelperImpl implements IQQAuthenticationHelper { ...@@ -66,7 +66,7 @@ public class QQAuthenticationHelperImpl implements IQQAuthenticationHelper {
throw new QQAuthenticationException("QQ认证-user_info获取失败"); throw new QQAuthenticationException("QQ认证-user_info获取失败");
} }
QQAuthResult qqAuthResult = new QQAuthResult(); QQAuthResultDTO qqAuthResult = new QQAuthResultDTO();
qqAuthResult.setAccessToken(accessToken); qqAuthResult.setAccessToken(accessToken);
qqAuthResult.setOpenId(openId); qqAuthResult.setOpenId(openId);
......
src/main/java/cn/meteor/beyondclouds/common/bean/FieldError.java → src/main/java/cn/meteor/beyondclouds/common/vo/FieldError.java
package cn.meteor.beyondclouds.common.bean; package cn.meteor.beyondclouds.common.vo;
import lombok.Data; import lombok.Data;
......
src/main/java/cn/meteor/beyondclouds/core/api/Response.java
package cn.meteor.beyondclouds.core.api; package cn.meteor.beyondclouds.core.api;
import cn.meteor.beyondclouds.common.bean.FieldError; import cn.meteor.beyondclouds.common.vo.FieldError;
import cn.meteor.beyondclouds.common.enums.ErrorCode; import cn.meteor.beyondclouds.common.enums.ErrorCode;
import cn.meteor.beyondclouds.core.IErrorCode; import cn.meteor.beyondclouds.core.IErrorCode;
import cn.meteor.beyondclouds.core.exception.ServiceException; import cn.meteor.beyondclouds.core.exception.ServiceException;
......
src/main/java/cn/meteor/beyondclouds/core/bean/Subject.java → src/main/java/cn/meteor/beyondclouds/core/authentication/Subject.java
package cn.meteor.beyondclouds.core.bean; package cn.meteor.beyondclouds.core.authentication;
import cn.meteor.beyondclouds.core.emuns.SubjectType; import cn.meteor.beyondclouds.core.emuns.SubjectType;
......
src/main/java/cn/meteor/beyondclouds/core/interceptor/AccessInterceptor.java
package cn.meteor.beyondclouds.core.interceptor; package cn.meteor.beyondclouds.core.interceptor;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.core.constant.SysConstants; import cn.meteor.beyondclouds.core.constant.SysConstants;
import cn.meteor.beyondclouds.core.emuns.AuthorizationErrorCode; import cn.meteor.beyondclouds.core.emuns.AuthorizationErrorCode;
import cn.meteor.beyondclouds.modules.user.exception.AuthenticationServiceException; import cn.meteor.beyondclouds.modules.user.exception.AuthenticationServiceException;
......
src/main/java/cn/meteor/beyondclouds/core/interceptor/TokenInterceptor.java
package cn.meteor.beyondclouds.core.interceptor; package cn.meteor.beyondclouds.core.interceptor;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.core.constant.HttpRequestHeaderNames; import cn.meteor.beyondclouds.core.constant.HttpRequestHeaderNames;
import cn.meteor.beyondclouds.core.constant.SysConstants; import cn.meteor.beyondclouds.core.constant.SysConstants;
import cn.meteor.beyondclouds.core.emuns.AuthorizationErrorCode; import cn.meteor.beyondclouds.core.emuns.AuthorizationErrorCode;
......
src/main/java/cn/meteor/beyondclouds/modules/blog/api/BlogApi.java
...@@ -5,10 +5,10 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,10 +5,10 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.core.validation.groups.InsertGroup; import cn.meteor.beyondclouds.core.validation.groups.InsertGroup;
import cn.meteor.beyondclouds.core.validation.groups.UpdateGroup; import cn.meteor.beyondclouds.core.validation.groups.UpdateGroup;
import cn.meteor.beyondclouds.modules.blog.bean.BlogDetail; import cn.meteor.beyondclouds.modules.blog.dto.BlogDetailDTO;
import cn.meteor.beyondclouds.modules.blog.entity.Blog; import cn.meteor.beyondclouds.modules.blog.entity.Blog;
import cn.meteor.beyondclouds.modules.blog.exception.BlogCategoryServiceException; import cn.meteor.beyondclouds.modules.blog.exception.BlogCategoryServiceException;
import cn.meteor.beyondclouds.modules.blog.exception.BlogServiceException; import cn.meteor.beyondclouds.modules.blog.exception.BlogServiceException;
...@@ -81,9 +81,9 @@ public class BlogApi { ...@@ -81,9 +81,9 @@ public class BlogApi {
@Anonymous @Anonymous
@ApiOperation("博客详情") @ApiOperation("博客详情")
@GetMapping("/blog/{blogId}") @GetMapping("/blog/{blogId}")
public Response<BlogDetail> getBlog(@PathVariable("blogId") String blogId, @CurrentSubject Subject subject) { public Response<BlogDetailDTO> getBlog(@PathVariable("blogId") String blogId, @CurrentSubject Subject subject) {
try { try {
BlogDetail blogDetail = blogService.getBlog(blogId, subject); BlogDetailDTO blogDetail = blogService.getBlog(blogId, subject);
return Response.success(blogDetail); return Response.success(blogDetail);
} catch (BlogServiceException e) { } catch (BlogServiceException e) {
e.printStackTrace(); e.printStackTrace();
......
src/main/java/cn/meteor/beyondclouds/modules/blog/api/BlogCommentApi.java
...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.blog.entity.BlogComment; import cn.meteor.beyondclouds.modules.blog.entity.BlogComment;
import cn.meteor.beyondclouds.modules.blog.exception.BlogCommentServiceException; import cn.meteor.beyondclouds.modules.blog.exception.BlogCommentServiceException;
import cn.meteor.beyondclouds.modules.blog.exception.BlogServiceException; import cn.meteor.beyondclouds.modules.blog.exception.BlogServiceException;
......
src/main/java/cn/meteor/beyondclouds/modules/blog/bean/BlogDetail.java → src/main/java/cn/meteor/beyondclouds/modules/blog/dto/BlogDetailDTO.java
package cn.meteor.beyondclouds.modules.blog.bean; package cn.meteor.beyondclouds.modules.blog.dto;
import cn.meteor.beyondclouds.modules.blog.entity.Blog; import cn.meteor.beyondclouds.modules.blog.entity.Blog;
import lombok.Data; import lombok.Data;
import java.util.List;
/** /**
* @author gaoTong * @author gaoTong
* @date 2020/2/1 9:26 * @date 2020/2/1 9:26
*/ */
@Data @Data
public class BlogDetail extends Blog { public class BlogDetailDTO extends Blog {
private String content; private String content;
} }
src/main/java/cn/meteor/beyondclouds/modules/blog/service/IBlogService.java
package cn.meteor.beyondclouds.modules.blog.service; package cn.meteor.beyondclouds.modules.blog.service;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.blog.bean.BlogDetail; import cn.meteor.beyondclouds.modules.blog.dto.BlogDetailDTO;
import cn.meteor.beyondclouds.modules.blog.entity.Blog; import cn.meteor.beyondclouds.modules.blog.entity.Blog;
import cn.meteor.beyondclouds.modules.blog.exception.BlogCategoryServiceException; import cn.meteor.beyondclouds.modules.blog.exception.BlogCategoryServiceException;
import cn.meteor.beyondclouds.modules.blog.exception.BlogServiceException; import cn.meteor.beyondclouds.modules.blog.exception.BlogServiceException;
...@@ -43,7 +43,7 @@ public interface IBlogService extends IService<Blog> { ...@@ -43,7 +43,7 @@ public interface IBlogService extends IService<Blog> {
* @return * @return
* @throws BlogServiceException * @throws BlogServiceException
*/ */
BlogDetail getBlog(String blogId, Subject subject) throws BlogServiceException; BlogDetailDTO getBlog(String blogId, Subject subject) throws BlogServiceException;
/** /**
* 博客列表 * 博客列表
......
src/main/java/cn/meteor/beyondclouds/modules/blog/service/impl/BlogServiceImpl.java
package cn.meteor.beyondclouds.modules.blog.service.impl; package cn.meteor.beyondclouds.modules.blog.service.impl;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.core.validation.groups.UpdateGroup; import cn.meteor.beyondclouds.modules.blog.dto.BlogDetailDTO;
import cn.meteor.beyondclouds.modules.blog.bean.BlogDetail;
import cn.meteor.beyondclouds.modules.blog.entity.*; import cn.meteor.beyondclouds.modules.blog.entity.*;
import cn.meteor.beyondclouds.modules.blog.enums.BlogCategoryErrorCode; import cn.meteor.beyondclouds.modules.blog.enums.BlogCategoryErrorCode;
import cn.meteor.beyondclouds.modules.blog.enums.BlogErrorCode; import cn.meteor.beyondclouds.modules.blog.enums.BlogErrorCode;
...@@ -214,7 +213,7 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB ...@@ -214,7 +213,7 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
* @throws BlogServiceException * @throws BlogServiceException
*/ */
@Override @Override
public BlogDetail getBlog(String blogId, Subject subject) throws BlogServiceException { public BlogDetailDTO getBlog(String blogId, Subject subject) throws BlogServiceException {
Assert.notNull(subject, "subject must not be null"); Assert.notNull(subject, "subject must not be null");
// 1.获取博客 // 1.获取博客
...@@ -266,7 +265,7 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB ...@@ -266,7 +265,7 @@ public class BlogServiceImpl extends ServiceImpl<BlogMapper, Blog> implements IB
} }
//装配并返回查询到的数据 //装配并返回查询到的数据
BlogDetail blogDetail = new BlogDetail(); BlogDetailDTO blogDetail = new BlogDetailDTO();
BeanUtils.copyProperties(blog, blogDetail); BeanUtils.copyProperties(blog, blogDetail);
blogDetail.setContent(blogExt.getContent()); blogDetail.setContent(blogExt.getContent());
return blogDetail; return blogDetail;
......
src/main/java/cn/meteor/beyondclouds/modules/content/api/ContentApi.java
...@@ -4,7 +4,7 @@ import cn.meteor.beyondclouds.common.form.PageForm; ...@@ -4,7 +4,7 @@ import cn.meteor.beyondclouds.common.form.PageForm;
import cn.meteor.beyondclouds.common.vo.PageVO; import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.modules.content.bean.ContentDetail; import cn.meteor.beyondclouds.modules.content.dto.ContentDetailDTO;
import cn.meteor.beyondclouds.modules.content.entity.Content; import cn.meteor.beyondclouds.modules.content.entity.Content;
import cn.meteor.beyondclouds.modules.content.exception.ContentServiceException; import cn.meteor.beyondclouds.modules.content.exception.ContentServiceException;
import cn.meteor.beyondclouds.modules.content.service.IContentService; import cn.meteor.beyondclouds.modules.content.service.IContentService;
...@@ -63,10 +63,10 @@ public class ContentApi { ...@@ -63,10 +63,10 @@ public class ContentApi {
@Anonymous @Anonymous
@ApiOperation("内容详情") @ApiOperation("内容详情")
@GetMapping("/content/{contentId}") @GetMapping("/content/{contentId}")
public Response<ContentDetail> getContentDetail(@PathVariable("contentId") Integer contentId) { public Response<ContentDetailDTO> getContentDetail(@PathVariable("contentId") Integer contentId) {
try { try {
ContentDetail contentDetail = contentService.getContentDetail(contentId); ContentDetailDTO contentDetail = contentService.getContentDetail(contentId);
return Response.success(contentDetail); return Response.success(contentDetail);
} catch (ContentServiceException e) { } catch (ContentServiceException e) {
e.printStackTrace(); e.printStackTrace();
......
src/main/java/cn/meteor/beyondclouds/modules/content/bean/ContentDetail.java → src/main/java/cn/meteor/beyondclouds/modules/content/dto/ContentDetailDTO.java
package cn.meteor.beyondclouds.modules.content.bean; package cn.meteor.beyondclouds.modules.content.dto;
import cn.meteor.beyondclouds.modules.content.entity.Content; import cn.meteor.beyondclouds.modules.content.entity.Content;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
...@@ -10,7 +10,7 @@ import lombok.Data; ...@@ -10,7 +10,7 @@ import lombok.Data;
* 内容详情 * 内容详情
*/ */
@Data @Data
public class ContentDetail extends Content { public class ContentDetailDTO extends Content {
@ApiModelProperty(value = "内容") @ApiModelProperty(value = "内容")
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
......
src/main/java/cn/meteor/beyondclouds/modules/content/service/IContentService.java
package cn.meteor.beyondclouds.modules.content.service; package cn.meteor.beyondclouds.modules.content.service;
import cn.meteor.beyondclouds.modules.content.bean.ContentDetail; import cn.meteor.beyondclouds.modules.content.dto.ContentDetailDTO;
import cn.meteor.beyondclouds.modules.content.entity.Content; import cn.meteor.beyondclouds.modules.content.entity.Content;
import cn.meteor.beyondclouds.modules.content.exception.ContentServiceException; import cn.meteor.beyondclouds.modules.content.exception.ContentServiceException;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -31,5 +31,5 @@ public interface IContentService extends IService<Content> { ...@@ -31,5 +31,5 @@ public interface IContentService extends IService<Content> {
* @param contentId * @param contentId
* @return * @return
*/ */
ContentDetail getContentDetail(Integer contentId) throws ContentServiceException; ContentDetailDTO getContentDetail(Integer contentId) throws ContentServiceException;
} }
src/main/java/cn/meteor/beyondclouds/modules/content/service/impl/ContentServiceImpl.java
package cn.meteor.beyondclouds.modules.content.service.impl; package cn.meteor.beyondclouds.modules.content.service.impl;
import cn.meteor.beyondclouds.modules.content.bean.ContentDetail; import cn.meteor.beyondclouds.modules.content.dto.ContentDetailDTO;
import cn.meteor.beyondclouds.modules.content.entity.Content; import cn.meteor.beyondclouds.modules.content.entity.Content;
import cn.meteor.beyondclouds.modules.content.entity.ContentExt; import cn.meteor.beyondclouds.modules.content.entity.ContentExt;
import cn.meteor.beyondclouds.modules.content.enums.CmsContentType; import cn.meteor.beyondclouds.modules.content.enums.CmsContentType;
...@@ -52,7 +52,7 @@ public class ContentServiceImpl extends ServiceImpl<ContentMapper, Content> impl ...@@ -52,7 +52,7 @@ public class ContentServiceImpl extends ServiceImpl<ContentMapper, Content> impl
} }
@Override @Override
public ContentDetail getContentDetail(Integer contentId) throws ContentServiceException { public ContentDetailDTO getContentDetail(Integer contentId) throws ContentServiceException {
Assert.notNull(contentId, "contentId must not be null"); Assert.notNull(contentId, "contentId must not be null");
// 1. 获取content // 1. 获取content
...@@ -65,7 +65,7 @@ public class ContentServiceImpl extends ServiceImpl<ContentMapper, Content> impl ...@@ -65,7 +65,7 @@ public class ContentServiceImpl extends ServiceImpl<ContentMapper, Content> impl
ContentExt contentExt = contentExtService.getById(contentId); ContentExt contentExt = contentExtService.getById(contentId);
// 3. 组合数据 // 3. 组合数据
ContentDetail contentDetail = new ContentDetail(); ContentDetailDTO contentDetail = new ContentDetailDTO();
BeanUtils.copyProperties(content, contentDetail); BeanUtils.copyProperties(content, contentDetail);
if (null != contentExt) { if (null != contentExt) {
contentDetail.setContent(contentExt.getContent()); contentDetail.setContent(contentExt.getContent());
......
src/main/java/cn/meteor/beyondclouds/modules/post/api/PostApi.java
...@@ -5,8 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,8 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.core.validation.groups.InsertGroup;
import cn.meteor.beyondclouds.modules.post.entity.Post; import cn.meteor.beyondclouds.modules.post.entity.Post;
import cn.meteor.beyondclouds.modules.post.exception.PostServiceException; import cn.meteor.beyondclouds.modules.post.exception.PostServiceException;
import cn.meteor.beyondclouds.modules.post.form.PostForm; import cn.meteor.beyondclouds.modules.post.form.PostForm;
...@@ -20,7 +19,6 @@ import org.springframework.beans.BeanUtils; ...@@ -20,7 +19,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.validation.Valid; import javax.validation.Valid;
......
src/main/java/cn/meteor/beyondclouds/modules/post/api/PostCommentApi.java
...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.core.exception.ServiceException; import cn.meteor.beyondclouds.core.exception.ServiceException;
import cn.meteor.beyondclouds.modules.post.entity.PostComment; import cn.meteor.beyondclouds.modules.post.entity.PostComment;
import cn.meteor.beyondclouds.modules.post.exception.PostCommentServiceException; import cn.meteor.beyondclouds.modules.post.exception.PostCommentServiceException;
......
src/main/java/cn/meteor/beyondclouds/modules/project/api/ProjectApi.java
...@@ -5,8 +5,8 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,8 +5,8 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.project.bean.ProjectDetail; import cn.meteor.beyondclouds.modules.project.dto.ProjectDetailDTO;
import cn.meteor.beyondclouds.modules.project.entity.Project; import cn.meteor.beyondclouds.modules.project.entity.Project;
import cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException; import cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException;
import cn.meteor.beyondclouds.modules.project.form.ProjectForm; import cn.meteor.beyondclouds.modules.project.form.ProjectForm;
...@@ -129,11 +129,11 @@ public class ProjectApi { ...@@ -129,11 +129,11 @@ public class ProjectApi {
@Anonymous @Anonymous
@ApiOperation("项目详情") @ApiOperation("项目详情")
@GetMapping("/project/{projectId}") @GetMapping("/project/{projectId}")
public Response<ProjectDetail> getProject(@PathVariable("projectId") String projectId) { public Response<ProjectDetailDTO> getProject(@PathVariable("projectId") String projectId) {
try { try {
// 获取项目详情并返回 // 获取项目详情并返回
ProjectDetail projectDetail = projectService.getProject(projectId); ProjectDetailDTO projectDetail = projectService.getProject(projectId);
return Response.success(projectDetail); return Response.success(projectDetail);
} catch (ProjectServiceException e) { } catch (ProjectServiceException e) {
e.printStackTrace(); e.printStackTrace();
......
src/main/java/cn/meteor/beyondclouds/modules/project/api/ProjectCommentApi.java
...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.project.entity.ProjectComment; import cn.meteor.beyondclouds.modules.project.entity.ProjectComment;
import cn.meteor.beyondclouds.modules.project.exception.ProjectCommentServiceException; import cn.meteor.beyondclouds.modules.project.exception.ProjectCommentServiceException;
import cn.meteor.beyondclouds.modules.project.form.ProjectCommentForm; import cn.meteor.beyondclouds.modules.project.form.ProjectCommentForm;
......
src/main/java/cn/meteor/beyondclouds/modules/project/bean/ProjectDetail.java → src/main/java/cn/meteor/beyondclouds/modules/project/dto/ProjectDetailDTO.java
package cn.meteor.beyondclouds.modules.project.bean; package cn.meteor.beyondclouds.modules.project.dto;
import cn.meteor.beyondclouds.modules.project.entity.Project; import cn.meteor.beyondclouds.modules.project.entity.Project;
import lombok.Data; import lombok.Data;
...@@ -8,7 +8,7 @@ import lombok.Data; ...@@ -8,7 +8,7 @@ import lombok.Data;
* @author meteor * @author meteor
*/ */
@Data @Data
public class ProjectDetail extends Project { public class ProjectDetailDTO extends Project {
/** /**
* 项目详情 * 项目详情
......
src/main/java/cn/meteor/beyondclouds/modules/project/service/IProjectService.java
package cn.meteor.beyondclouds.modules.project.service; package cn.meteor.beyondclouds.modules.project.service;
import cn.meteor.beyondclouds.modules.project.bean.ProjectDetail; import cn.meteor.beyondclouds.modules.project.dto.ProjectDetailDTO;
import cn.meteor.beyondclouds.modules.project.entity.Project; import cn.meteor.beyondclouds.modules.project.entity.Project;
import cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException; import cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -35,7 +35,7 @@ public interface IProjectService extends IService<Project> { ...@@ -35,7 +35,7 @@ public interface IProjectService extends IService<Project> {
* @param projectId * @param projectId
* @return * @return
*/ */
ProjectDetail getProject(String projectId) throws ProjectServiceException; ProjectDetailDTO getProject(String projectId) throws ProjectServiceException;
/** /**
* 获取项目列表 * 获取项目列表
......
src/main/java/cn/meteor/beyondclouds/modules/project/service/impl/ProjectServiceImpl.java
package cn.meteor.beyondclouds.modules.project.service.impl; package cn.meteor.beyondclouds.modules.project.service.impl;
import cn.meteor.beyondclouds.modules.project.bean.ProjectDetail; import cn.meteor.beyondclouds.modules.project.dto.ProjectDetailDTO;
import cn.meteor.beyondclouds.modules.project.entity.Project; import cn.meteor.beyondclouds.modules.project.entity.Project;
import cn.meteor.beyondclouds.modules.project.entity.ProjectCategory; import cn.meteor.beyondclouds.modules.project.entity.ProjectCategory;
import cn.meteor.beyondclouds.modules.project.entity.ProjectComment; import cn.meteor.beyondclouds.modules.project.entity.ProjectComment;
...@@ -145,7 +145,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl ...@@ -145,7 +145,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
} }
@Override @Override
public ProjectDetail getProject(String projectId) throws ProjectServiceException { public ProjectDetailDTO getProject(String projectId) throws ProjectServiceException {
Assert.notNull(projectId, "projectId must not be null"); Assert.notNull(projectId, "projectId must not be null");
// 1.获取项目 // 1.获取项目
...@@ -164,7 +164,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl ...@@ -164,7 +164,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
ProjectExt projectExt = projectExtService.getById(projectId); ProjectExt projectExt = projectExtService.getById(projectId);
// 3.装配并返回查询到的信息 // 3.装配并返回查询到的信息
ProjectDetail projectDetail = new ProjectDetail(); ProjectDetailDTO projectDetail = new ProjectDetailDTO();
BeanUtils.copyProperties(project, projectDetail); BeanUtils.copyProperties(project, projectDetail);
projectDetail.setProjectDetail(projectExt.getProjectDetail()); projectDetail.setProjectDetail(projectExt.getProjectDetail());
return projectDetail; return projectDetail;
......
src/main/java/cn/meteor/beyondclouds/modules/question/api/QuestionApi.java
...@@ -5,10 +5,10 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,10 +5,10 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.core.validation.groups.InsertGroup; import cn.meteor.beyondclouds.core.validation.groups.InsertGroup;
import cn.meteor.beyondclouds.core.validation.groups.UpdateGroup; import cn.meteor.beyondclouds.core.validation.groups.UpdateGroup;
import cn.meteor.beyondclouds.modules.question.bean.QuestionDetail; import cn.meteor.beyondclouds.modules.question.dto.QuestionDetailDTO;
import cn.meteor.beyondclouds.modules.question.entity.Question; import cn.meteor.beyondclouds.modules.question.entity.Question;
import cn.meteor.beyondclouds.modules.question.exception.QuestionServiceException; import cn.meteor.beyondclouds.modules.question.exception.QuestionServiceException;
import cn.meteor.beyondclouds.modules.question.exception.QuestionTagServiceException; import cn.meteor.beyondclouds.modules.question.exception.QuestionTagServiceException;
...@@ -140,8 +140,8 @@ public class QuestionApi { ...@@ -140,8 +140,8 @@ public class QuestionApi {
@Anonymous @Anonymous
@ApiOperation("问题详情") @ApiOperation("问题详情")
@GetMapping("/question/{questionId}") @GetMapping("/question/{questionId}")
public Response<QuestionDetail> questionDetails(@PathVariable("questionId") String questionId) { public Response<QuestionDetailDTO> questionDetails(@PathVariable("questionId") String questionId) {
QuestionDetail questionDetail = null; QuestionDetailDTO questionDetail = null;
try { try {
questionDetail = questionService.questionDetails(questionId); questionDetail = questionService.questionDetails(questionId);
return Response.success(questionDetail); return Response.success(questionDetail);
......
src/main/java/cn/meteor/beyondclouds/modules/question/api/QuestionReplyApi.java
...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.question.entity.QuestionReply; import cn.meteor.beyondclouds.modules.question.entity.QuestionReply;
import cn.meteor.beyondclouds.modules.question.exception.QuestionReplyServiceException; import cn.meteor.beyondclouds.modules.question.exception.QuestionReplyServiceException;
import cn.meteor.beyondclouds.modules.question.service.IQuestionReplyService; import cn.meteor.beyondclouds.modules.question.service.IQuestionReplyService;
......
src/main/java/cn/meteor/beyondclouds/modules/question/api/QuestionReplyCommentApi.java
...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.question.entity.QuestionReplyComment; import cn.meteor.beyondclouds.modules.question.entity.QuestionReplyComment;
import cn.meteor.beyondclouds.modules.question.exception.QuestionReplyCommentServiceException; import cn.meteor.beyondclouds.modules.question.exception.QuestionReplyCommentServiceException;
import cn.meteor.beyondclouds.modules.question.form.QuestionReplyCommentForm; import cn.meteor.beyondclouds.modules.question.form.QuestionReplyCommentForm;
......
src/main/java/cn/meteor/beyondclouds/modules/question/bean/QuestionDetail.java → src/main/java/cn/meteor/beyondclouds/modules/question/dto/QuestionDetailDTO.java
package cn.meteor.beyondclouds.modules.question.bean; package cn.meteor.beyondclouds.modules.question.dto;
import cn.meteor.beyondclouds.modules.question.entity.Question; import cn.meteor.beyondclouds.modules.question.entity.Question;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
...@@ -11,7 +11,7 @@ import lombok.Data; ...@@ -11,7 +11,7 @@ import lombok.Data;
*/ */
@ApiModel("问题详情") @ApiModel("问题详情")
@Data @Data
public class QuestionDetail extends Question { public class QuestionDetailDTO extends Question {
@ApiModelProperty("详情") @ApiModelProperty("详情")
private String questionDetail; private String questionDetail;
......
src/main/java/cn/meteor/beyondclouds/modules/question/service/IQuestionService.java
package cn.meteor.beyondclouds.modules.question.service; package cn.meteor.beyondclouds.modules.question.service;
import cn.meteor.beyondclouds.modules.question.bean.QuestionDetail; import cn.meteor.beyondclouds.modules.question.dto.QuestionDetailDTO;
import cn.meteor.beyondclouds.modules.question.entity.Question; import cn.meteor.beyondclouds.modules.question.entity.Question;
import cn.meteor.beyondclouds.modules.question.exception.QuestionServiceException; import cn.meteor.beyondclouds.modules.question.exception.QuestionServiceException;
import cn.meteor.beyondclouds.modules.question.exception.QuestionTagServiceException; import cn.meteor.beyondclouds.modules.question.exception.QuestionTagServiceException;
...@@ -56,7 +56,7 @@ public interface IQuestionService extends IService<Question> { ...@@ -56,7 +56,7 @@ public interface IQuestionService extends IService<Question> {
* @throws QuestionServiceException 问题业务异常 * @throws QuestionServiceException 问题业务异常
* @throws QuestionTagServiceException 问题标签业务异常 * @throws QuestionTagServiceException 问题标签业务异常
*/ */
QuestionDetail questionDetails(String questionId) throws QuestionServiceException, QuestionTagServiceException; QuestionDetailDTO questionDetails(String questionId) throws QuestionServiceException, QuestionTagServiceException;
/** /**
* 获取问答列表 * 获取问答列表
......
src/main/java/cn/meteor/beyondclouds/modules/question/service/impl/QuestionServiceImpl.java
package cn.meteor.beyondclouds.modules.question.service.impl; package cn.meteor.beyondclouds.modules.question.service.impl;
import cn.meteor.beyondclouds.modules.question.bean.QuestionDetail; import cn.meteor.beyondclouds.modules.question.dto.QuestionDetailDTO;
import cn.meteor.beyondclouds.modules.question.entity.*; import cn.meteor.beyondclouds.modules.question.entity.*;
import cn.meteor.beyondclouds.modules.question.enums.QuestionErrorCode; import cn.meteor.beyondclouds.modules.question.enums.QuestionErrorCode;
import cn.meteor.beyondclouds.modules.question.enums.QuestionTagErrorCode; import cn.meteor.beyondclouds.modules.question.enums.QuestionTagErrorCode;
...@@ -252,7 +252,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i ...@@ -252,7 +252,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
} }
@Override @Override
public QuestionDetail questionDetails(String questionId) throws QuestionServiceException, QuestionTagServiceException { public QuestionDetailDTO questionDetails(String questionId) throws QuestionServiceException, QuestionTagServiceException {
//1.获取问题基本信息 //1.获取问题基本信息
Question question = getById(questionId); Question question = getById(questionId);
...@@ -296,7 +296,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i ...@@ -296,7 +296,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
} }
//7.生成问题详情对象 //7.生成问题详情对象
QuestionDetail questionDetail = new QuestionDetail(); QuestionDetailDTO questionDetail = new QuestionDetailDTO();
BeanUtils.copyProperties(question, questionDetail); BeanUtils.copyProperties(question, questionDetail);
questionDetail.setQuestionDetail(questionExt.getQuestionDetail()); questionDetail.setQuestionDetail(questionExt.getQuestionDetail());
return questionDetail; return questionDetail;
......
src/main/java/cn/meteor/beyondclouds/modules/resource/api/FileUploadApi.java
...@@ -2,7 +2,7 @@ package cn.meteor.beyondclouds.modules.resource.api; ...@@ -2,7 +2,7 @@ package cn.meteor.beyondclouds.modules.resource.api;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.resource.enums.FileUploadErrorCode; import cn.meteor.beyondclouds.modules.resource.enums.FileUploadErrorCode;
import cn.meteor.beyondclouds.modules.resource.enums.UploadType; import cn.meteor.beyondclouds.modules.resource.enums.UploadType;
import cn.meteor.beyondclouds.modules.resource.exception.FileUploadServiceException; import cn.meteor.beyondclouds.modules.resource.exception.FileUploadServiceException;
......
src/main/java/cn/meteor/beyondclouds/modules/search/entity/SearchItem.java
package cn.meteor.beyondclouds.modules.search.entity; package cn.meteor.beyondclouds.modules.search.entity;
import cn.meteor.beyondclouds.modules.blog.bean.BlogDetail; import cn.meteor.beyondclouds.modules.blog.dto.BlogDetailDTO;
import cn.meteor.beyondclouds.modules.search.enums.DataItemType; import cn.meteor.beyondclouds.modules.search.enums.DataItemType;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -84,7 +84,7 @@ public class SearchItem { ...@@ -84,7 +84,7 @@ public class SearchItem {
@Field(index = false, type = FieldType.Date) @Field(index = false, type = FieldType.Date)
private Date updateTime; private Date updateTime;
public static SearchItem of(BlogDetail blogDetail) { public static SearchItem of(BlogDetailDTO blogDetail) {
return null; return null;
} }
} }
src/main/java/cn/meteor/beyondclouds/modules/search/service/impl/SearchServiceImpl.java
package cn.meteor.beyondclouds.modules.search.service.impl; package cn.meteor.beyondclouds.modules.search.service.impl;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.blog.bean.BlogDetail; import cn.meteor.beyondclouds.modules.blog.dto.BlogDetailDTO;
import cn.meteor.beyondclouds.modules.blog.entity.Blog; import cn.meteor.beyondclouds.modules.blog.entity.Blog;
import cn.meteor.beyondclouds.modules.blog.exception.BlogServiceException; import cn.meteor.beyondclouds.modules.blog.exception.BlogServiceException;
import cn.meteor.beyondclouds.modules.blog.service.IBlogService; import cn.meteor.beyondclouds.modules.blog.service.IBlogService;
import cn.meteor.beyondclouds.modules.project.bean.ProjectDetail; import cn.meteor.beyondclouds.modules.project.dto.ProjectDetailDTO;
import cn.meteor.beyondclouds.modules.project.entity.Project; import cn.meteor.beyondclouds.modules.project.entity.Project;
import cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException; import cn.meteor.beyondclouds.modules.project.exception.ProjectServiceException;
import cn.meteor.beyondclouds.modules.project.service.IProjectService; import cn.meteor.beyondclouds.modules.project.service.IProjectService;
import cn.meteor.beyondclouds.modules.question.bean.QuestionDetail; import cn.meteor.beyondclouds.modules.question.dto.QuestionDetailDTO;
import cn.meteor.beyondclouds.modules.question.entity.Question; import cn.meteor.beyondclouds.modules.question.entity.Question;
import cn.meteor.beyondclouds.modules.question.exception.QuestionServiceException; import cn.meteor.beyondclouds.modules.question.exception.QuestionServiceException;
import cn.meteor.beyondclouds.modules.question.exception.QuestionTagServiceException; import cn.meteor.beyondclouds.modules.question.exception.QuestionTagServiceException;
...@@ -194,7 +194,7 @@ public class SearchServiceImpl implements ISearchService { ...@@ -194,7 +194,7 @@ public class SearchServiceImpl implements ISearchService {
} }
private SearchItem buildSearchItemFromProject(String projectId) throws ProjectServiceException { private SearchItem buildSearchItemFromProject(String projectId) throws ProjectServiceException {
ProjectDetail projectDetail = projectService.getProject(projectId); ProjectDetailDTO projectDetail = projectService.getProject(projectId);
if (null != projectDetail) { if (null != projectDetail) {
SearchItem searchItem = new SearchItem(DataItemType.PROJECT, projectId); SearchItem searchItem = new SearchItem(DataItemType.PROJECT, projectId);
searchItem.setTitle(projectDetail.getProjectName()); searchItem.setTitle(projectDetail.getProjectName());
...@@ -223,7 +223,7 @@ public class SearchServiceImpl implements ISearchService { ...@@ -223,7 +223,7 @@ public class SearchServiceImpl implements ISearchService {
} }
private SearchItem buildSearchItemFromQuestion(String questionId) throws QuestionServiceException, QuestionTagServiceException { private SearchItem buildSearchItemFromQuestion(String questionId) throws QuestionServiceException, QuestionTagServiceException {
QuestionDetail questionDetail = questionService.questionDetails(questionId); QuestionDetailDTO questionDetail = questionService.questionDetails(questionId);
if (null != questionDetail) { if (null != questionDetail) {
SearchItem searchItem = new SearchItem(DataItemType.QUESTION, questionId); SearchItem searchItem = new SearchItem(DataItemType.QUESTION, questionId);
searchItem.setTitle(questionDetail.getQuestionTitle()); searchItem.setTitle(questionDetail.getQuestionTitle());
...@@ -237,7 +237,7 @@ public class SearchServiceImpl implements ISearchService { ...@@ -237,7 +237,7 @@ public class SearchServiceImpl implements ISearchService {
} }
private SearchItem buildSearchItemFromBlog(String blogId) throws BlogServiceException { private SearchItem buildSearchItemFromBlog(String blogId) throws BlogServiceException {
BlogDetail blogDetail = blogService.getBlog(blogId, Subject.anonymous(this.getClass().getName())); BlogDetailDTO blogDetail = blogService.getBlog(blogId, Subject.anonymous(this.getClass().getName()));
if (null != blogDetail) { if (null != blogDetail) {
SearchItem searchItem = new SearchItem(DataItemType.BLOG, blogId); SearchItem searchItem = new SearchItem(DataItemType.BLOG, blogId);
searchItem.setTitle(blogDetail.getBlogTitle()); searchItem.setTitle(blogDetail.getBlogTitle());
......
src/main/java/cn/meteor/beyondclouds/modules/tag/api/TagApi.java
...@@ -5,8 +5,8 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,8 +5,8 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.tag.bean.TagDetail; import cn.meteor.beyondclouds.modules.tag.dto.TagDetailDTO;
import cn.meteor.beyondclouds.modules.tag.entity.Tag; import cn.meteor.beyondclouds.modules.tag.entity.Tag;
import cn.meteor.beyondclouds.modules.tag.exception.TagServiceException; import cn.meteor.beyondclouds.modules.tag.exception.TagServiceException;
import cn.meteor.beyondclouds.modules.tag.form.CreateTagForm; import cn.meteor.beyondclouds.modules.tag.form.CreateTagForm;
...@@ -45,7 +45,7 @@ public class TagApi { ...@@ -45,7 +45,7 @@ public class TagApi {
} }
try { try {
TagDetail tag = tagService.createTag(createTagForm.getTagName(), createTagForm.getTagType(), String.valueOf(subject.getId())); TagDetailDTO tag = tagService.createTag(createTagForm.getTagName(), createTagForm.getTagType(), String.valueOf(subject.getId()));
return Response.success(tag); return Response.success(tag);
} catch (TagServiceException e) { } catch (TagServiceException e) {
e.printStackTrace(); e.printStackTrace();
......
src/main/java/cn/meteor/beyondclouds/modules/tag/bean/TagDetail.java → src/main/java/cn/meteor/beyondclouds/modules/tag/dto/TagDetailDTO.java
package cn.meteor.beyondclouds.modules.tag.bean; package cn.meteor.beyondclouds.modules.tag.dto;
import lombok.Data; import lombok.Data;
...@@ -7,7 +7,7 @@ import lombok.Data; ...@@ -7,7 +7,7 @@ import lombok.Data;
* @since 2020/2/8 * @since 2020/2/8
*/ */
@Data @Data
public class TagDetail { public class TagDetailDTO {
private String tagId; private String tagId;
......
src/main/java/cn/meteor/beyondclouds/modules/tag/service/ITagService.java
package cn.meteor.beyondclouds.modules.tag.service; package cn.meteor.beyondclouds.modules.tag.service;
import cn.meteor.beyondclouds.modules.tag.bean.TagDetail; import cn.meteor.beyondclouds.modules.tag.dto.TagDetailDTO;
import cn.meteor.beyondclouds.modules.tag.entity.Tag; import cn.meteor.beyondclouds.modules.tag.entity.Tag;
import cn.meteor.beyondclouds.modules.tag.exception.TagServiceException; import cn.meteor.beyondclouds.modules.tag.exception.TagServiceException;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
...@@ -26,7 +26,7 @@ public interface ITagService extends IService<Tag> { ...@@ -26,7 +26,7 @@ public interface ITagService extends IService<Tag> {
* @return TagDetail * @return TagDetail
* @throws TagServiceException * @throws TagServiceException
*/ */
TagDetail createTag(String tagName, Integer tagType, String userId) throws TagServiceException; TagDetailDTO createTag(String tagName, Integer tagType, String userId) throws TagServiceException;
/** /**
* 检索标签 * 检索标签
......
src/main/java/cn/meteor/beyondclouds/modules/tag/service/impl/TagServiceImpl.java
package cn.meteor.beyondclouds.modules.tag.service.impl; package cn.meteor.beyondclouds.modules.tag.service.impl;
import cn.meteor.beyondclouds.modules.tag.bean.TagDetail; import cn.meteor.beyondclouds.modules.tag.dto.TagDetailDTO;
import cn.meteor.beyondclouds.modules.tag.entity.Tag; import cn.meteor.beyondclouds.modules.tag.entity.Tag;
import cn.meteor.beyondclouds.modules.tag.enums.TagErrorCode; import cn.meteor.beyondclouds.modules.tag.enums.TagErrorCode;
import cn.meteor.beyondclouds.modules.tag.exception.TagServiceException; import cn.meteor.beyondclouds.modules.tag.exception.TagServiceException;
...@@ -43,7 +43,7 @@ public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements ITagS ...@@ -43,7 +43,7 @@ public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements ITagS
} }
@Override @Override
public TagDetail createTag(String tagName, Integer tagType,String userId) throws TagServiceException { public TagDetailDTO createTag(String tagName, Integer tagType, String userId) throws TagServiceException {
//1. 判断标签类型是否正确 //1. 判断标签类型是否正确
if(tagType!=TAGTYPE_0 && tagType!=TAGTYPE_2) { if(tagType!=TAGTYPE_0 && tagType!=TAGTYPE_2) {
...@@ -64,7 +64,7 @@ public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements ITagS ...@@ -64,7 +64,7 @@ public class TagServiceImpl extends ServiceImpl<TagMapper, Tag> implements ITagS
save(tag); save(tag);
//4.返回标签id与标签名称 //4.返回标签id与标签名称
TagDetail tagDetail=new TagDetail(); TagDetailDTO tagDetail=new TagDetailDTO();
BeanUtils.copyProperties(tag, tagDetail); BeanUtils.copyProperties(tag, tagDetail);
return tagDetail; return tagDetail;
......
src/main/java/cn/meteor/beyondclouds/modules/topic/api/TopicApi.java
...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.topic.bean.TopicDetail; import cn.meteor.beyondclouds.modules.topic.bean.TopicDetail;
import cn.meteor.beyondclouds.modules.topic.entity.Topic; import cn.meteor.beyondclouds.modules.topic.entity.Topic;
import cn.meteor.beyondclouds.modules.topic.exception.TopicServiceException; import cn.meteor.beyondclouds.modules.topic.exception.TopicServiceException;
......
src/main/java/cn/meteor/beyondclouds/modules/user/api/AuthenticationApi.java
...@@ -2,7 +2,7 @@ package cn.meteor.beyondclouds.modules.user.api; ...@@ -2,7 +2,7 @@ package cn.meteor.beyondclouds.modules.user.api;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.modules.user.bean.AuthenticationResult; import cn.meteor.beyondclouds.modules.user.dto.AuthenticationResultDTO;
import cn.meteor.beyondclouds.modules.user.exception.AuthenticationServiceException; import cn.meteor.beyondclouds.modules.user.exception.AuthenticationServiceException;
import cn.meteor.beyondclouds.modules.user.exception.UserServiceException; import cn.meteor.beyondclouds.modules.user.exception.UserServiceException;
import cn.meteor.beyondclouds.modules.user.form.LocalAuthFrom; import cn.meteor.beyondclouds.modules.user.form.LocalAuthFrom;
...@@ -35,8 +35,8 @@ public class AuthenticationApi { ...@@ -35,8 +35,8 @@ public class AuthenticationApi {
@Anonymous @Anonymous
@ApiOperation(value = "账号密码认证") @ApiOperation(value = "账号密码认证")
@PostMapping("/password") @PostMapping("/password")
public Response<AuthenticationResult> localAuth(@RequestBody @Valid LocalAuthFrom localAuthFrom) { public Response<AuthenticationResultDTO> localAuth(@RequestBody @Valid LocalAuthFrom localAuthFrom) {
AuthenticationResult authenticationResult = null; AuthenticationResultDTO authenticationResult = null;
try { try {
authenticationResult = authenticationService.localAuthentication(localAuthFrom.getAccount(), localAuthFrom.getPassword()); authenticationResult = authenticationService.localAuthentication(localAuthFrom.getAccount(), localAuthFrom.getPassword());
return Response.success(authenticationResult); return Response.success(authenticationResult);
...@@ -54,7 +54,7 @@ public class AuthenticationApi { ...@@ -54,7 +54,7 @@ public class AuthenticationApi {
return Response.fieldError(bindingResult.getFieldError()); return Response.fieldError(bindingResult.getFieldError());
} }
AuthenticationResult authenticationResult = null; AuthenticationResultDTO authenticationResult = null;
try { try {
authenticationResult = authenticationService.smsAuthentication(smsAuthFrom.getMobile(), smsAuthFrom.getVerifyCode()); authenticationResult = authenticationService.smsAuthentication(smsAuthFrom.getMobile(), smsAuthFrom.getVerifyCode());
return Response.success(authenticationResult); return Response.success(authenticationResult);
...@@ -67,8 +67,8 @@ public class AuthenticationApi { ...@@ -67,8 +67,8 @@ public class AuthenticationApi {
@Anonymous @Anonymous
@ApiOperation(value = "QQ认证") @ApiOperation(value = "QQ认证")
@GetMapping("/qq") @GetMapping("/qq")
public Response<AuthenticationResult> qqAuth(@RequestParam("code") String code) { public Response<AuthenticationResultDTO> qqAuth(@RequestParam("code") String code) {
AuthenticationResult authenticationResult = null; AuthenticationResultDTO authenticationResult = null;
try { try {
authenticationResult = authenticationService.qqAuthentication(code); authenticationResult = authenticationService.qqAuthentication(code);
return Response.success(authenticationResult); return Response.success(authenticationResult);
......
src/main/java/cn/meteor/beyondclouds/modules/user/api/UserApi.java
...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO; ...@@ -5,7 +5,7 @@ import cn.meteor.beyondclouds.common.vo.PageVO;
import cn.meteor.beyondclouds.core.annotation.Anonymous; import cn.meteor.beyondclouds.core.annotation.Anonymous;
import cn.meteor.beyondclouds.core.annotation.CurrentSubject; import cn.meteor.beyondclouds.core.annotation.CurrentSubject;
import cn.meteor.beyondclouds.core.api.Response; import cn.meteor.beyondclouds.core.api.Response;
import cn.meteor.beyondclouds.core.bean.Subject; import cn.meteor.beyondclouds.core.authentication.Subject;
import cn.meteor.beyondclouds.modules.user.entity.User; import cn.meteor.beyondclouds.modules.user.entity.User;
import cn.meteor.beyondclouds.modules.user.entity.UserBlacklist; import cn.meteor.beyondclouds.modules.user.entity.UserBlacklist;
import cn.meteor.beyondclouds.modules.user.entity.UserFollow; import cn.meteor.beyondclouds.modules.user.entity.UserFollow;
......
src/main/java/cn/meteor/beyondclouds/modules/user/bean/AuthenticationResult.java → src/main/java/cn/meteor/beyondclouds/modules/user/dto/AuthenticationResultDTO.java
package cn.meteor.beyondclouds.modules.user.bean; package cn.meteor.beyondclouds.modules.user.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -10,7 +10,7 @@ import lombok.Data; ...@@ -10,7 +10,7 @@ import lombok.Data;
*/ */
@Data @Data
@ApiModel("认证结果") @ApiModel("认证结果")
public class AuthenticationResult { public class AuthenticationResultDTO {
@ApiModelProperty("用户ID") @ApiModelProperty("用户ID")
private String userId; private String userId;
......
src/main/java/cn/meteor/beyondclouds/modules/user/service/IAuthenticationService.java
package cn.meteor.beyondclouds.modules.user.service; package cn.meteor.beyondclouds.modules.user.service;
import cn.meteor.beyondclouds.modules.user.bean.AuthenticationResult; import cn.meteor.beyondclouds.modules.user.dto.AuthenticationResultDTO;
import cn.meteor.beyondclouds.modules.user.exception.AuthenticationServiceException; import cn.meteor.beyondclouds.modules.user.exception.AuthenticationServiceException;
import cn.meteor.beyondclouds.modules.user.exception.UserServiceException; import cn.meteor.beyondclouds.modules.user.exception.UserServiceException;
...@@ -16,14 +16,14 @@ public interface IAuthenticationService { ...@@ -16,14 +16,14 @@ public interface IAuthenticationService {
* @param password * @param password
* @return * @return
*/ */
AuthenticationResult localAuthentication(String account, String password) throws AuthenticationServiceException; AuthenticationResultDTO localAuthentication(String account, String password) throws AuthenticationServiceException;
/** /**
* QQ认证 * QQ认证
* @param code * @param code
* @return * @return
*/ */
AuthenticationResult qqAuthentication(String code) throws AuthenticationServiceException; AuthenticationResultDTO qqAuthentication(String code) throws AuthenticationServiceException;
/** /**
* 短信验证登陆 * 短信验证登陆
...@@ -31,5 +31,5 @@ public interface IAuthenticationService { ...@@ -31,5 +31,5 @@ public interface IAuthenticationService {
* @param verifyCode * @param verifyCode
* @return * @return
*/ */
AuthenticationResult smsAuthentication(String mobile, String verifyCode) throws UserServiceException, AuthenticationServiceException; AuthenticationResultDTO smsAuthentication(String mobile, String verifyCode) throws UserServiceException, AuthenticationServiceException;
} }
src/main/java/cn/meteor/beyondclouds/modules/user/service/IUserService.java
package cn.meteor.beyondclouds.modules.user.service; package cn.meteor.beyondclouds.modules.user.service;
import cn.meteor.beyondclouds.common.bean.QQAuthResult; import cn.meteor.beyondclouds.common.dto.QQAuthResultDTO;
import cn.meteor.beyondclouds.modules.user.entity.User; import cn.meteor.beyondclouds.modules.user.entity.User;
import cn.meteor.beyondclouds.modules.user.exception.UserServiceException; import cn.meteor.beyondclouds.modules.user.exception.UserServiceException;
import cn.meteor.beyondclouds.modules.user.vo.UserStatisticsVO; import cn.meteor.beyondclouds.modules.user.vo.UserStatisticsVO;
...@@ -40,7 +40,7 @@ public interface IUserService extends IService<User> { ...@@ -40,7 +40,7 @@ public interface IUserService extends IService<User> {
* @param qqAuthResult * @param qqAuthResult
* @return * @return
*/ */
User qqRegister(QQAuthResult qqAuthResult); User qqRegister(QQAuthResultDTO qqAuthResult);
/** /**
* 修改用户基本信息 * 修改用户基本信息
......
src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/AuthenticationServiceImpl.java
package cn.meteor.beyondclouds.modules.user.service.impl; package cn.meteor.beyondclouds.modules.user.service.impl;
import cn.meteor.beyondclouds.common.bean.QQAuthResult; import cn.meteor.beyondclouds.common.dto.QQAuthResultDTO;
import cn.meteor.beyondclouds.common.exception.QQAuthenticationException; import cn.meteor.beyondclouds.common.exception.QQAuthenticationException;
import cn.meteor.beyondclouds.common.helper.IQQAuthenticationHelper; import cn.meteor.beyondclouds.common.helper.IQQAuthenticationHelper;
import cn.meteor.beyondclouds.common.helper.IRedisHelper; import cn.meteor.beyondclouds.common.helper.IRedisHelper;
import cn.meteor.beyondclouds.core.redis.RedisKey; import cn.meteor.beyondclouds.core.redis.RedisKey;
import cn.meteor.beyondclouds.modules.user.bean.AuthenticationResult; import cn.meteor.beyondclouds.modules.user.dto.AuthenticationResultDTO;
import cn.meteor.beyondclouds.modules.user.entity.UserAuthApp; import cn.meteor.beyondclouds.modules.user.entity.UserAuthApp;
import cn.meteor.beyondclouds.modules.user.entity.UserAuthLocal; import cn.meteor.beyondclouds.modules.user.entity.UserAuthLocal;
import cn.meteor.beyondclouds.modules.user.enums.AuthStatus; import cn.meteor.beyondclouds.modules.user.enums.AuthStatus;
...@@ -57,7 +57,7 @@ public class AuthenticationServiceImpl implements IAuthenticationService { ...@@ -57,7 +57,7 @@ public class AuthenticationServiceImpl implements IAuthenticationService {
} }
@Override @Override
public AuthenticationResult localAuthentication(String account, String password) throws AuthenticationServiceException { public AuthenticationResultDTO localAuthentication(String account, String password) throws AuthenticationServiceException {
//1. 查找用户是否存在 //1. 查找用户是否存在
UserAuthLocal userAuthLocal = userAuthLocalService.getByAccount(account); UserAuthLocal userAuthLocal = userAuthLocalService.getByAccount(account);
if (null == userAuthLocal) { if (null == userAuthLocal) {
...@@ -88,8 +88,8 @@ public class AuthenticationServiceImpl implements IAuthenticationService { ...@@ -88,8 +88,8 @@ public class AuthenticationServiceImpl implements IAuthenticationService {
} }
@Override @Override
public AuthenticationResult qqAuthentication(String code) throws AuthenticationServiceException { public AuthenticationResultDTO qqAuthentication(String code) throws AuthenticationServiceException {
QQAuthResult qqAuthResult; QQAuthResultDTO qqAuthResult;
try { try {
// 1.进行QQ认证，获取认证结果 // 1.进行QQ认证，获取认证结果
qqAuthResult = iqqAuthenticationHelper.authentication(code); qqAuthResult = iqqAuthenticationHelper.authentication(code);
...@@ -117,7 +117,7 @@ public class AuthenticationServiceImpl implements IAuthenticationService { ...@@ -117,7 +117,7 @@ public class AuthenticationServiceImpl implements IAuthenticationService {
} }
@Override @Override
public AuthenticationResult smsAuthentication(String mobile, String verifyCode) throws UserServiceException, AuthenticationServiceException { public AuthenticationResultDTO smsAuthentication(String mobile, String verifyCode) throws UserServiceException, AuthenticationServiceException {
//1.检查验证码是否正确 //1.检查验证码是否正确
String realVerifyCode = redisHelper.get(RedisKey.MOBILE_VERIFY_CODE(mobile)); String realVerifyCode = redisHelper.get(RedisKey.MOBILE_VERIFY_CODE(mobile));
...@@ -145,8 +145,8 @@ public class AuthenticationServiceImpl implements IAuthenticationService { ...@@ -145,8 +145,8 @@ public class AuthenticationServiceImpl implements IAuthenticationService {
* @param userId * @param userId
* @return * @return
*/ */
private AuthenticationResult makeAuthenticationResult(String userId) { private AuthenticationResultDTO makeAuthenticationResult(String userId) {
AuthenticationResult result = new AuthenticationResult(); AuthenticationResultDTO result = new AuthenticationResultDTO();
result.setUserId(userId); result.setUserId(userId);
Map<String, String> claimMap = new HashMap<>(); Map<String, String> claimMap = new HashMap<>();
......
src/main/java/cn/meteor/beyondclouds/modules/user/service/impl/UserServiceImpl.java
package cn.meteor.beyondclouds.modules.user.service.impl; package cn.meteor.beyondclouds.modules.user.service.impl;
import cn.meteor.beyondclouds.common.bean.QQAuthResult; import cn.meteor.beyondclouds.common.dto.QQAuthResultDTO;
import cn.meteor.beyondclouds.common.helper.IRedisHelper; import cn.meteor.beyondclouds.common.helper.IRedisHelper;
import cn.meteor.beyondclouds.core.redis.RedisKey; import cn.meteor.beyondclouds.core.redis.RedisKey;
import cn.meteor.beyondclouds.modules.blog.entity.Blog; import cn.meteor.beyondclouds.modules.blog.entity.Blog;
...@@ -214,7 +214,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I ...@@ -214,7 +214,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public User qqRegister(QQAuthResult qqAuthResult) { public User qqRegister(QQAuthResultDTO qqAuthResult) {
// 1.创建用户 // 1.创建用户
User user = new User(); User user = new User();
user.setNickName(qqAuthResult.getNickName()); user.setNickName(qqAuthResult.getNickName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment