diff --git a/blog-api/src/main/java/com/shimh/config/WebMvcConfig.java b/blog-api/src/main/java/com/shimh/config/WebMvcConfig.java index a619e328..a8702e13 100644 --- a/blog-api/src/main/java/com/shimh/config/WebMvcConfig.java +++ b/blog-api/src/main/java/com/shimh/config/WebMvcConfig.java @@ -46,7 +46,7 @@ public void configureMessageConverters(List> converters) ); - List fastMediaTypes = new ArrayList<>(); + List fastMediaTypes = new ArrayList(); fastMediaTypes.add(MediaType.APPLICATION_JSON_UTF8); fastConverter.setFastJsonConfig(fastJsonConfig); diff --git a/blog-api/src/main/java/com/shimh/controller/ArticleController.java b/blog-api/src/main/java/com/shimh/controller/ArticleController.java index b74235d9..94316505 100644 --- a/blog-api/src/main/java/com/shimh/controller/ArticleController.java +++ b/blog-api/src/main/java/com/shimh/controller/ArticleController.java @@ -173,7 +173,7 @@ public Result updateArticle(@RequestBody Article article) { Result r = new Result(); if (null == article.getId()) { - r.setResultCode(ResultCode.USER_NOT_EXIST); + r.setResultCode(ResultCode.PARAM_IS_BLANK); return r; } diff --git a/blog-api/src/main/java/com/shimh/controller/CategoryController.java b/blog-api/src/main/java/com/shimh/controller/CategoryController.java index c1296341..145c8add 100644 --- a/blog-api/src/main/java/com/shimh/controller/CategoryController.java +++ b/blog-api/src/main/java/com/shimh/controller/CategoryController.java @@ -107,7 +107,7 @@ public Result updateCategory(@RequestBody Category category) { Result r = new Result(); if (null == category.getId()) { - r.setResultCode(ResultCode.USER_NOT_EXIST); + r.setResultCode(ResultCode.PARAM_IS_BLANK); return r; } diff --git a/blog-api/src/main/java/com/shimh/controller/TagController.java b/blog-api/src/main/java/com/shimh/controller/TagController.java index 6195cb5b..c80ce4e0 100644 --- a/blog-api/src/main/java/com/shimh/controller/TagController.java +++ b/blog-api/src/main/java/com/shimh/controller/TagController.java @@ -46,10 +46,10 @@ public Result listTags() { @GetMapping("detail") @LogAnnotation(module = "标签", operation = "获取所有标签，详细") - public Result listCategorysDetail() { - List categorys = tagService.findAllDetail(); + public Result listTagsDetail() { + List tags = tagService.findAllDetail(); - return Result.success(categorys); + return Result.success(tags); } @GetMapping("/hot") @@ -116,7 +116,7 @@ public Result updateTag(@RequestBody Tag tag) { Result r = new Result(); if (null == tag.getId()) { - r.setResultCode(ResultCode.USER_NOT_EXIST); + r.setResultCode(ResultCode.PARAM_IS_BLANK); return r; } diff --git a/blog-api/src/main/java/com/shimh/controller/UploadController.java b/blog-api/src/main/java/com/shimh/controller/UploadController.java index 3256e7fd..14540045 100644 --- a/blog-api/src/main/java/com/shimh/controller/UploadController.java +++ b/blog-api/src/main/java/com/shimh/controller/UploadController.java @@ -14,6 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -32,7 +33,7 @@ public class UploadController { @PostMapping("/upload") @RequiresAuthentication @LogAnnotation(module = "文件上传", operation = "文件上传") - public Result upload(HttpServletRequest request, MultipartFile image) { + public Result upload(HttpServletRequest request, @RequestParam("image") MultipartFile image) { Result r = new Result(); diff --git a/blog-api/src/main/java/com/shimh/oauth/OAuthSessionManager.java b/blog-api/src/main/java/com/shimh/oauth/OAuthSessionManager.java index e5bf19e1..fb13543f 100644 --- a/blog-api/src/main/java/com/shimh/oauth/OAuthSessionManager.java +++ b/blog-api/src/main/java/com/shimh/oauth/OAuthSessionManager.java @@ -34,10 +34,13 @@ protected Serializable getSessionId(ServletRequest request, ServletResponse resp HttpServletRequest httpRequest = (HttpServletRequest) request; String id = httpRequest.getHeader(OAUTH_TOKEN); - request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_SOURCE, REFERENCED_SESSION_ID_SOURCE); - request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID, id); - request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, Boolean.TRUE); - return id; + if (!StringUtils.isEmpty(id)) { + request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_SOURCE, REFERENCED_SESSION_ID_SOURCE); + request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID, id); + request.setAttribute(ShiroHttpServletRequest.REFERENCED_SESSION_ID_IS_VALID, Boolean.TRUE); + return id; + } + return super.getSessionId(request, response); } } diff --git a/blog-api/src/main/java/com/shimh/service/impl/ArticleServiceImpl.java b/blog-api/src/main/java/com/shimh/service/impl/ArticleServiceImpl.java index 2b77357b..3dd503f0 100644 --- a/blog-api/src/main/java/com/shimh/service/impl/ArticleServiceImpl.java +++ b/blog-api/src/main/java/com/shimh/service/impl/ArticleServiceImpl.java @@ -52,7 +52,7 @@ public List
findAll() { @Override public Article getArticleById(Integer id) { - return articleRepository.getOne(id); + return articleRepository.findOne(id); } @Override @@ -86,7 +86,7 @@ public Integer saveArticle(Article article) { @Override @Transactional public Integer updateArticle(Article article) { - Article oldArticle = articleRepository.getOne(article.getId()); + Article oldArticle = articleRepository.findOne(article.getId()); oldArticle.setTitle(article.getTitle()); oldArticle.setSummary(article.getSummary()); @@ -122,7 +122,7 @@ public List
listArticlesByCategory(Integer id) { @Transactional public Article getArticleAndAddViews(Integer id) { int count = 1; - Article article = articleRepository.getOne(id); + Article article = articleRepository.findOne(id); article.setViewCounts(article.getViewCounts() + count); return article; } diff --git a/blog-api/src/main/java/com/shimh/service/impl/CategoryServiceImpl.java b/blog-api/src/main/java/com/shimh/service/impl/CategoryServiceImpl.java index a3cc6689..25fad50f 100644 --- a/blog-api/src/main/java/com/shimh/service/impl/CategoryServiceImpl.java +++ b/blog-api/src/main/java/com/shimh/service/impl/CategoryServiceImpl.java @@ -30,7 +30,7 @@ public List findAll() { @Override public Category getCategoryById(Integer id) { - return categoryRepository.getOne(id); + return categoryRepository.findOne(id); } @Override @@ -43,7 +43,7 @@ public Integer saveCategory(Category category) { @Override @Transactional public Integer updateCategory(Category category) { - Category oldCategory = categoryRepository.getOne(category.getId()); + Category oldCategory = categoryRepository.findOne(category.getId()); oldCategory.setCategoryname(category.getCategoryname()); oldCategory.setAvatar(category.getAvatar()); diff --git a/blog-api/src/main/java/com/shimh/service/impl/CommentServiceImpl.java b/blog-api/src/main/java/com/shimh/service/impl/CommentServiceImpl.java index e89f9a0d..7b9b5503 100644 --- a/blog-api/src/main/java/com/shimh/service/impl/CommentServiceImpl.java +++ b/blog-api/src/main/java/com/shimh/service/impl/CommentServiceImpl.java @@ -42,7 +42,7 @@ public List findAll() { @Override public Comment getCommentById(Integer id) { - return commentRepository.getOne(id); + return commentRepository.findOne(id); } @Override diff --git a/blog-api/src/main/java/com/shimh/service/impl/TagServiceImpl.java b/blog-api/src/main/java/com/shimh/service/impl/TagServiceImpl.java index 972da864..00274bcc 100644 --- a/blog-api/src/main/java/com/shimh/service/impl/TagServiceImpl.java +++ b/blog-api/src/main/java/com/shimh/service/impl/TagServiceImpl.java @@ -30,7 +30,7 @@ public List findAll() { @Override public Tag getTagById(Integer id) { - return tagRepository.getOne(id); + return tagRepository.findOne(id); } @Override @@ -43,7 +43,7 @@ public Integer saveTag(Tag tag) { @Override @Transactional public Integer updateTag(Tag tag) { - Tag oldTag = tagRepository.getOne(tag.getId()); + Tag oldTag = tagRepository.findOne(tag.getId()); oldTag.setTagname(tag.getTagname()); oldTag.setAvatar(tag.getAvatar()); diff --git a/blog-api/src/main/resources/application.properties b/blog-api/src/main/resources/application.properties index 0d444011..3e7d2315 100644 --- a/blog-api/src/main/resources/application.properties +++ b/blog-api/src/main/resources/application.properties @@ -16,9 +16,9 @@ spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/reso # datasource spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.url=jdbc:mysql://localhost:3306/blog?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 +spring.datasource.url=jdbc:mysql://gz-cdb-rh50u3k3.sql.tencentcdb.com:26324/blog?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8 spring.datasource.username=root -spring.datasource.password=123456 +spring.datasource.password=1qaz@WSX3edc@123 spring.datasource.driver-class-name=com.mysql.jdbc.Driver #spring.datasource.initialize=true