From 15e31c6e6550f9e8bf6fb1df5ca5ad4cc726b64f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 26 八月 2023 13:30:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 560b57f..241a68a 100644
--- a/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java
+++ b/framework/src/main/java/com/yuanchu/limslaboratory/config/WebMvcConfig.java
@@ -1,26 +1,24 @@
package com.yuanchu.limslaboratory.config;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import java.io.File;
-
@Configuration
public class WebMvcConfig extends WebMvcConfigurationSupport {
+ @Value("${file.path}")
+ private String filePath;
+
@Override
protected void addResourceHandlers(ResourceHandlerRegistry registry) {
- // swagger鍙鍖栭厤缃�
- registry.addResourceHandler("/systemPictures/**")
- .addResourceLocations("file:" + System.getProperty("user.dir")+ File.separator+"uploadFile"+File.separator+"systemPictures"+File.separator);
- registry.addResourceHandler("/uploadFile/pluginFiles/logo/**")
- .addResourceLocations("file:" + System.getProperty("user.dir")+ File.separator+"uploadFile"+File.separator+"pluginFiles"+File.separator+"logo"+File.separator);
-
+ //閰嶇疆鎷︽埅鍣ㄨ闂潤鎬佽祫婧�
registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
+ registry.addResourceHandler("/favicon.ico").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
//璁剧疆鏂囦欢铏氭嫙璺緞鏄犲皠
- registry.addResourceHandler("/img/**").addResourceLocations("file:E:\\webapp\\images\\");
+ registry.addResourceHandler("/img/**").addResourceLocations("file:"+filePath+"/");
}
}
--
Gitblit v1.9.3