提交配置
This commit is contained in:
parent
212b6b1541
commit
9e733b32eb
|
@ -32,16 +32,6 @@ import net.mingsoft.basic.util.BasicUtil;
|
||||||
@Configuration
|
@Configuration
|
||||||
public class WebConfig implements WebMvcConfigurer {
|
public class WebConfig implements WebMvcConfigurer {
|
||||||
|
|
||||||
/**
|
|
||||||
* 上传路径
|
|
||||||
*/
|
|
||||||
@Value("${ms.upload.path}")
|
|
||||||
private String uploadFloderPath;
|
|
||||||
/**
|
|
||||||
* 上传路径映射
|
|
||||||
*/
|
|
||||||
@Value("${ms.upload.mapping}")
|
|
||||||
private String uploadMapping;
|
|
||||||
@Bean
|
@Bean
|
||||||
public ActionInterceptor actionInterceptor() {
|
public ActionInterceptor actionInterceptor() {
|
||||||
return new ActionInterceptor();
|
return new ActionInterceptor();
|
||||||
|
@ -65,25 +55,13 @@ public class WebConfig implements WebMvcConfigurer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addResourceHandlers(ResourceHandlerRegistry registry) {
|
public void addResourceHandlers(ResourceHandlerRegistry registry) {
|
||||||
//jar包方式映射处理
|
registry.addResourceHandler("/upload/**").addResourceLocations("/upload/","file:upload/");
|
||||||
String classPath = BasicUtil.getClassPath("");
|
registry.addResourceHandler("/templets/**").addResourceLocations("/templets/","file:templets/");
|
||||||
//jar包获取的路径带有file
|
registry.addResourceHandler("/html/**").addResourceLocations("/html/","file:html/");
|
||||||
if (classPath.startsWith("file")) {
|
//三种映射方式 webapp下、当前目录下、jar内
|
||||||
//判断是否设置的绝对路径
|
registry.addResourceHandler("/app/**").addResourceLocations("/app/","file:app/", "classpath:/app/");
|
||||||
registry.addResourceHandler("/html/**").addResourceLocations("file:" + BasicUtil.getRealPath("html") + File.separator);
|
registry.addResourceHandler("/static/**","/**").addResourceLocations("/static/","file:static/","classpath:/static/");
|
||||||
registry.addResourceHandler("/templets/**").addResourceLocations("file:" + BasicUtil.getRealPath("templets") + File.separator);
|
registry.addResourceHandler("/api/**").addResourceLocations("/api/","file:api/", "classpath:/api/");
|
||||||
registry.addResourceHandler("/app/**").addResourceLocations("classpath:/app/");
|
|
||||||
registry.addResourceHandler("/api/**").addResourceLocations("classpath:/api/");
|
|
||||||
}
|
|
||||||
//如果是绝对路径添加映射
|
|
||||||
if(uploadFloderPath.startsWith("file:")){
|
|
||||||
//如果指定了绝对路径,上传的文件都映射到uploadMapping下
|
|
||||||
registry.addResourceHandler(uploadMapping).addResourceLocations(uploadFloderPath+ File.separator
|
|
||||||
//映射其他路径文件
|
|
||||||
//,file:F://images
|
|
||||||
);
|
|
||||||
}
|
|
||||||
registry.addResourceHandler("/static/**").addResourceLocations("/static/","classpath:/static/");
|
|
||||||
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -157,7 +135,6 @@ public class WebConfig implements WebMvcConfigurer {
|
||||||
xssFilter.excludes.add(".*file/upload.do");
|
xssFilter.excludes.add(".*file/upload.do");
|
||||||
xssFilter.excludes.add(".*/jsp/editor.do");
|
xssFilter.excludes.add(".*/jsp/editor.do");
|
||||||
registration.addUrlPatterns("/*");
|
registration.addUrlPatterns("/*");
|
||||||
|
|
||||||
return registration;
|
return registration;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,7 @@ spring:
|
||||||
time_format: HH:mm:ss
|
time_format: HH:mm:ss
|
||||||
datetime_format: yyyy-MM-dd HH:mm:ss
|
datetime_format: yyyy-MM-dd HH:mm:ss
|
||||||
auto_import: /include/macro.ftl as ms
|
auto_import: /include/macro.ftl as ms
|
||||||
|
number_format: 0.##
|
||||||
|
|
||||||
mybatis:
|
mybatis:
|
||||||
mapper-locations: classpath*:**/dao/*.xml
|
mapper-locations: classpath*:**/dao/*.xml
|
||||||
|
|
Loading…
Reference in New Issue