fix: attachment upload to sm.ms failed. (halo-dev#609)

* fix: attachment upload to sm.ms failed. * fix: attachment upload to sm.ms failed. * refactor: SmmsFileHandler. * refactor: SmmsFileHandler.
acdodo · Mar 2, 2020 · b708069 · b708069
1 parent b23755a
commit b708069
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/main/java/run/halo/app/handler/file/SmmsFileHandler.java b/src/main/java/run/halo/app/handler/file/SmmsFileHandler.java
@@ -17,6 +17,7 @@
 import run.halo.app.exception.ServiceException;
 import run.halo.app.model.enums.AttachmentType;
 import run.halo.app.model.properties.SmmsProperties;
+import run.halo.app.model.support.HaloConst;
 import run.halo.app.model.support.UploadResult;
 import run.halo.app.service.OptionService;
 import run.halo.app.utils.FilenameUtils;
@@ -53,6 +54,8 @@ public class SmmsFileHandler implements FileHandler {
 
     private final OptionService optionService;
 
+    private HttpHeaders headers = new HttpHeaders();
+
     public SmmsFileHandler(RestTemplate httpsRestTemplate,
                            OptionService optionService) {
         this.httpsRestTemplate = httpsRestTemplate;
@@ -78,10 +81,9 @@ public UploadResult upload(MultipartFile file) {
             throw new FileOperationException("不支持的文件类型，仅支持 \"jpeg, jpg, png, gif, bmp\" 格式的图片");
         }
 
-        HttpHeaders headers = new HttpHeaders();
+        setHeaders();
         // Set content type
         headers.setContentType(MediaType.MULTIPART_FORM_DATA);
-        headers.set(HttpHeaders.AUTHORIZATION, apiSecretToken);
 
         LinkedMultiValueMap<String, Object> body = new LinkedMultiValueMap<>();
 
@@ -114,7 +116,7 @@ public UploadResult upload(MultipartFile file) {
             throw new FileOperationException(smmsResponse == null ? "SM.MS 服务返回内容为空" : smmsResponse.getMessage()).setErrorData(smmsResponse);
         }
 
-        if (smmsResponse.getSuccess()) {
+        if (!smmsResponse.getSuccess()) {
             throw new FileOperationException("上传请求失败：" + smmsResponse.getMessage()).setErrorData(smmsResponse);
         }
 
@@ -146,8 +148,7 @@ public void delete(String key) {
         // Build delete url
         String url = String.format(DELETE_API_V2, key);
 
-        // Set user agent manually
-        HttpHeaders headers = new HttpHeaders();
+        setHeaders();
 
         // Delete the file
         ResponseEntity<String> responseEntity = httpsRestTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null, headers), String.class);
@@ -178,6 +179,14 @@ private boolean isResponseSuccessfully(@Nullable SmmsResponse smmsResponse) {
         return smmsResponse != null && smmsResponse.getCode().equals(SUCCESS_CODE);
     }
 
+    /**
+     * Set headers.
+     */
+    private void setHeaders() {
+        headers.set(HttpHeaders.USER_AGENT, "Halo/" + HaloConst.HALO_VERSION);
+        headers.set(HttpHeaders.AUTHORIZATION, optionService.getByPropertyOfNonNull(SmmsProperties.SMMS_API_SECRET_TOKEN).toString());
+    }
+
     @Data
     @NoArgsConstructor
     private static class SmmsResponse {