From 5322edbcc5529864aaea26d78289df7a8a36fb77 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 20 七月 2023 11:25:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java b/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java
index 64012d1..aa0c995 100644
--- a/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java
+++ b/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java
@@ -1,21 +1,15 @@
package com.yuanchu.limslaboratory.config;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import java.io.File;
-import java.util.List;
-
@Configuration
public class WebMvcConfig extends WebMvcConfigurationSupport {
+
+ @Value("${file.path}")
+ private String filePath;
@Override
protected void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -25,6 +19,7 @@
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
//璁剧疆鏂囦欢铏氭嫙璺緞鏄犲皠
- registry.addResourceHandler("/img/**").addResourceLocations("file:E:\\webapp\\images\\");
+ registry.addResourceHandler("/img/**").addResourceLocations("file:"+filePath+"/")
+ .addResourceLocations("file:"+filePath+"/");
}
}
--
Gitblit v1.9.3