diff --git a/src/main/java/run/halo/app/controller/core/CommonController.java b/src/main/java/run/halo/app/controller/core/CommonController.java index bae5ee298..c56710cbd 100644 --- a/src/main/java/run/halo/app/controller/core/CommonController.java +++ b/src/main/java/run/halo/app/controller/core/CommonController.java @@ -57,11 +57,7 @@ public class CommonController implements ErrorController { } } - if (statusCode == 500) { - return "redirect:/500"; - } else { - return "redirect:/404"; - } + return statusCode == 500 ? "redirect:/500" : "redirect:/404"; } /** diff --git a/src/main/java/run/halo/app/handler/file/AliYunFileHandler.java b/src/main/java/run/halo/app/handler/file/AliYunFileHandler.java index c2de320aa..4649b0ac6 100644 --- a/src/main/java/run/halo/app/handler/file/AliYunFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/AliYunFileHandler.java @@ -62,7 +62,7 @@ public class AliYunFileHandler implements FileHandler { // Upload PutObjectResult putObjectResult = ossClient.putObject(ossBucketName, upFilePath, file.getInputStream()); if (putObjectResult == null) { - throw new FileOperationException("Failed to upload file " + file.getOriginalFilename() + " to AliYun " + upFilePath); + throw new FileOperationException("上传附件 " + file.getOriginalFilename() + " 到阿里云失败 "); } // Response result diff --git a/src/main/java/run/halo/app/handler/file/LocalFileHandler.java b/src/main/java/run/halo/app/handler/file/LocalFileHandler.java index 14cf56bb1..d81454e0a 100644 --- a/src/main/java/run/halo/app/handler/file/LocalFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/LocalFileHandler.java @@ -162,7 +162,7 @@ public class LocalFileHandler implements FileHandler { return uploadResult; } catch (IOException e) { log.error("Failed to upload file to local: " + uploadPath, e); - throw new ServiceException("Failed to upload file to local").setErrorData(uploadPath); + throw new ServiceException("上传附件失败").setErrorData(uploadPath); } } diff --git a/src/main/java/run/halo/app/handler/file/QnYunFileHandler.java b/src/main/java/run/halo/app/handler/file/QnYunFileHandler.java index 8747cf9d6..0d0d406fa 100644 --- a/src/main/java/run/halo/app/handler/file/QnYunFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/QnYunFileHandler.java @@ -121,7 +121,7 @@ public class QnYunFileHandler implements FileHandler { log.error("QnYun error response: [{}]", ((QiniuException) e).response); } - throw new FileOperationException("Failed to upload file " + file.getOriginalFilename() + " to QnYun", e); + throw new FileOperationException("上传附件 " + file.getOriginalFilename() + " 到七牛云失败", e); } } diff --git a/src/main/java/run/halo/app/handler/file/SmmsFileHandler.java b/src/main/java/run/halo/app/handler/file/SmmsFileHandler.java index ec0fd7ab8..526abcb09 100644 --- a/src/main/java/run/halo/app/handler/file/SmmsFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/SmmsFileHandler.java @@ -65,7 +65,7 @@ public class SmmsFileHandler implements FileHandler { body.add("smfile", new HttpClientUtils.MultipartFileResource(file.getBytes(), file.getOriginalFilename())); } catch (IOException e) { log.error("Failed to get file input stream", e); - throw new FileOperationException("Failed to upload " + file.getOriginalFilename() + " file", e); + throw new FileOperationException("上传附件 " + file.getOriginalFilename() + " 到 SM.MS 失败", e); } body.add("ssl", false); diff --git a/src/main/java/run/halo/app/handler/file/UpYunFileHandler.java b/src/main/java/run/halo/app/handler/file/UpYunFileHandler.java index 2ff2b06d3..097f706e2 100644 --- a/src/main/java/run/halo/app/handler/file/UpYunFileHandler.java +++ b/src/main/java/run/halo/app/handler/file/UpYunFileHandler.java @@ -91,7 +91,7 @@ public class UpYunFileHandler implements FileHandler { return uploadResult; } catch (Exception e) { - throw new FileOperationException("Failed to upload file " + file.getOriginalFilename() + " to UpYun", e); + throw new FileOperationException("上传附件 " + file.getOriginalFilename() + " 到又拍云失败", e); } } diff --git a/src/main/java/run/halo/app/service/impl/BasePostServiceImpl.java b/src/main/java/run/halo/app/service/impl/BasePostServiceImpl.java index bb28f1cf0..163586804 100644 --- a/src/main/java/run/halo/app/service/impl/BasePostServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/BasePostServiceImpl.java @@ -342,7 +342,7 @@ public abstract class BasePostServiceImpl extends Abstrac } if (exist) { - throw new AlreadyExistsException("The post url " + post.getUrl() + " has been exist"); + throw new AlreadyExistsException("文章路径 " + post.getUrl() + " 已存在"); } } diff --git a/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java b/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java index fff4aa1cc..2b78e82a6 100644 --- a/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/CategoryServiceImpl.java @@ -53,7 +53,7 @@ public class CategoryServiceImpl extends AbstractCrudService if (count > 0) { log.error("Category has exist already: [{}]", category); - throw new AlreadyExistsException("The category has exist already"); + throw new AlreadyExistsException("该分类已存在"); } // Check parent id diff --git a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java index 318fb087b..b91b8b750 100644 --- a/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/MenuServiceImpl.java @@ -171,7 +171,7 @@ public class MenuServiceImpl extends AbstractCrudService implemen } if (exist) { - throw new AlreadyExistsException("The menu name " + menu.getName() + " already exists"); + throw new AlreadyExistsException("菜单 " + menu.getName() + " 已存在"); } } } diff --git a/src/main/java/run/halo/app/service/impl/TagServiceImpl.java b/src/main/java/run/halo/app/service/impl/TagServiceImpl.java index 9b3310830..e2c49b6ad 100644 --- a/src/main/java/run/halo/app/service/impl/TagServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/TagServiceImpl.java @@ -42,7 +42,7 @@ public class TagServiceImpl extends AbstractCrudService implements if (count > 0) { // If the tag has exist already - throw new AlreadyExistsException("The tag has already exist").setErrorData(tag); + throw new AlreadyExistsException("该标签已存在").setErrorData(tag); } // Get tag name diff --git a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java index d9f161ab0..7fb995568 100644 --- a/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java +++ b/src/main/java/run/halo/app/service/impl/ThemeServiceImpl.java @@ -3,12 +3,10 @@ package run.halo.app.service.impl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.MergeCommand; import org.eclipse.jgit.api.PullResult; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.Ref; -import org.eclipse.jgit.merge.MergeStrategy; import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.URIish; import org.springframework.context.ApplicationEventPublisher; @@ -371,7 +369,7 @@ public class ThemeServiceImpl implements ThemeService { Assert.notNull(file, "Multipart file must not be null"); if (!StringUtils.endsWithIgnoreCase(file.getOriginalFilename(), ".zip")) { - throw new UnsupportedMediaTypeException("Unsupported theme media type: " + file.getContentType()).setErrorData(file.getOriginalFilename()); + throw new UnsupportedMediaTypeException("不支持的文件类型: " + file.getContentType()).setErrorData(file.getOriginalFilename()); } ZipInputStream zis = null; @@ -395,7 +393,7 @@ public class ThemeServiceImpl implements ThemeService { // Go to the base folder and add the theme into system return add(FileUtils.skipZipParentFolder(themeTempPath)); } catch (IOException e) { - throw new ServiceException("Failed to upload theme file: " + file.getOriginalFilename(), e); + throw new ServiceException("上传主题失败: " + file.getOriginalFilename(), e); } finally { // Close zip input stream FileUtils.closeQuietly(zis);