Merge branch 'master' of github.com:esensar/steleks_web_app

master
esensar 2017-04-16 17:30:22 +02:00
commit 0f23e80aaf
7 changed files with 93 additions and 0 deletions

View File

@ -12,6 +12,7 @@ import java.net.MalformedURLException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.nio.file.attribute.FileOwnerAttributeView;
import java.util.stream.Stream; import java.util.stream.Stream;
@Service @Service
@ -30,6 +31,13 @@ public class FileSystemStorageService implements StorageService {
if (file.isEmpty()) { if (file.isEmpty()) {
throw new StorageException("Failed to store empty file " + file.getOriginalFilename()); throw new StorageException("Failed to store empty file " + file.getOriginalFilename());
} }
String tempDest="";
String[] locations=this.rootLocation.resolve(dest).toString().split("/");
for(int i=0; i<locations.length-1;i++)
tempDest=tempDest+"/"+locations[i];
Files.createDirectory(Paths.get(tempDest));
Files.copy(file.getInputStream(), Files.copy(file.getInputStream(),
this.rootLocation.resolve(dest)); this.rootLocation.resolve(dest));
} catch (IOException e) { } catch (IOException e) {

View File

@ -1,10 +1,13 @@
package ba.steleks; package ba.steleks;
import ba.steleks.service.ServiceConstants; import ba.steleks.service.ServiceConstants;
import ba.steleks.storage.StorageProperties;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cloud.client.ServiceInstance; import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient; import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
@ -18,6 +21,7 @@ import java.util.List;
@EnableDiscoveryClient @EnableDiscoveryClient
@SpringBootApplication @SpringBootApplication
@EnableConfigurationProperties(StorageProperties.class)
public class EventsApplication { public class EventsApplication {
public static void main(String[] args) { public static void main(String[] args) {

View File

@ -0,0 +1,81 @@
package ba.steleks.controller;
import ba.steleks.error.exception.ExternalServiceException;
import ba.steleks.model.Media;
import ba.steleks.repository.EventsJpaRepository;
import ba.steleks.repository.MediaJpaRepository;
import ba.steleks.storage.StorageFileNotFoundException;
import ba.steleks.storage.StorageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.core.io.Resource;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import java.util.Date;
import java.util.List;
/**
* Created by admin on 16/04/2017.
*/
@RestController
public class EventGalleryController {
private final StorageService storageService;
private final MediaJpaRepository repository;
private final DiscoveryClient discoveryClient;
@Autowired
public EventGalleryController(StorageService storageService, MediaJpaRepository repository, DiscoveryClient discoveryClient) {
this.storageService = storageService;
this.repository = repository;
this.discoveryClient=discoveryClient;
}
@GetMapping("/eventPictures/{filename:.+}")
@ResponseBody
public ResponseEntity<Resource> serveFile(@PathVariable String filename) {
Resource file = storageService.loadAsResource("mediaEvent/"+filename);
return ResponseEntity
.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\""+file.getFilename()+"\"")
.body(file);
}
@PostMapping("/media/{mediaId}/picture")
public String handleFileUpload(@PathVariable Long mediaId, @RequestParam("file") MultipartFile file,
RedirectAttributes redirectAttributes) throws ExternalServiceException {
List<ServiceInstance> usersInstances = discoveryClient.getInstances("events");
if(usersInstances == null || usersInstances.size() == 0) {
System.err.print("Users service not found!");
throw new ExternalServiceException();
}
ServiceInstance usersService = usersInstances.get(0);
String mediaServiceBase = usersService.getUri().toString();
String[] names = file.getOriginalFilename().split("\\.");
String dest = String.valueOf("mediaEvent/" + mediaId + "_" + new Date().getTime()) + "." + names[names.length - 1];
storageService.store(file, dest);
redirectAttributes.addFlashAttribute("message",
"You successfully uploaded " + file.getOriginalFilename() + "!");
Media media = repository.findOne(mediaId);
media.setContentUrl(mediaServiceBase+"/profilePictures/" + dest);
repository.save(media);
return "redirect:/";
}
@ExceptionHandler(StorageFileNotFoundException.class)
public ResponseEntity handleStorageFileNotFound(StorageFileNotFoundException exc) {
return ResponseEntity.notFound().build();
}
}