From 4b96a9b2e71b7a67effdd55b26ca532ff849d0ef Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sat, 23 Oct 2021 08:09:05 +0300
Subject: ImagesService -> StorageService

img_path -> storage_path property
---
 src/main/java/com/juick/config/WebConfig.java | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src/main/java/com/juick/config/WebConfig.java')

diff --git a/src/main/java/com/juick/config/WebConfig.java b/src/main/java/com/juick/config/WebConfig.java
index fcc61b72..94f30bd5 100644
--- a/src/main/java/com/juick/config/WebConfig.java
+++ b/src/main/java/com/juick/config/WebConfig.java
@@ -20,6 +20,8 @@ package com.juick.config;
 import com.juick.*;
 import com.juick.model.User;
 import com.juick.service.HelpService;
+import com.juick.service.StorageService;
+import com.juick.service.FileSystemStorageService;
 import com.juick.service.UserService;
 import com.mitchellbosecke.pebble.PebbleEngine;
 import com.mitchellbosecke.pebble.extension.FormatterExtension;
@@ -64,8 +66,14 @@ import javax.inject.Inject;
 @EnableAsync(proxyTargetClass = true)
 @EnableScheduling
 public class WebConfig implements WebMvcConfigurer {
-    @Value("${img_path:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
-    private String imgDir;
+    @Value("${upload_tmp_dir:#{systemProperties['java.io.tmpdir']}}")
+    private String tmpDir;
+    @Value("${storage_path:#{systemProperties['java.io.tmpdir']}}")
+    private String baseDir;
+    @Bean
+    public StorageService storageService() {
+        return new FileSystemStorageService(baseDir, tmpDir);
+    }
     @Bean
     public CaffeineCacheManager cacheManager() {
         return new CaffeineCacheManager("help");
@@ -172,7 +180,7 @@ public class WebConfig implements WebMvcConfigurer {
         try {
             registry
                     .addResourceHandler("/**", "/i/a/**")
-                    .addResourceLocations("classpath:/static/", Paths.get(imgDir, "/a/").toUri().toURL().toString())
+                    .addResourceLocations("classpath:/static/", Paths.get(baseDir, "/i/a/").toUri().toURL().toString())
                     .setCacheControl(CacheControl.maxAge(365, TimeUnit.DAYS))
                     .resourceChain(false)
                     .addResolver(new VersionResourceResolver().addContentVersionStrategy("/**", "/i/a/**"));
-- 
cgit v1.2.3