From 9e733b32ebe074bf0d14875ee6b7cc1e4085d72c Mon Sep 17 00:00:00 2001
From: sgjj <995959152@qq.com>
Date: Fri, 6 Sep 2019 09:25:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/net/mingsoft/config/WebConfig.java   | 37 ++++---------------
 src/main/resources/application.yml            |  1 +
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/main/java/net/mingsoft/config/WebConfig.java b/src/main/java/net/mingsoft/config/WebConfig.java
index 07cee990..d806353b 100644
--- a/src/main/java/net/mingsoft/config/WebConfig.java
+++ b/src/main/java/net/mingsoft/config/WebConfig.java
@@ -32,16 +32,6 @@ import net.mingsoft.basic.util.BasicUtil;
 @Configuration
 public class WebConfig implements WebMvcConfigurer {
 
-	/**
-	 * 上传路径
-	 */
-	@Value("${ms.upload.path}")
-	private String uploadFloderPath;
-	/**
-	 * 上传路径映射
-	 */
-	@Value("${ms.upload.mapping}")
-	private String uploadMapping;
 	@Bean
 	public ActionInterceptor actionInterceptor() {
 		return new ActionInterceptor();
@@ -65,25 +55,13 @@ public class WebConfig implements WebMvcConfigurer {
 
 	@Override
 	public void addResourceHandlers(ResourceHandlerRegistry registry) {
-		//jar包方式映射处理
-		String classPath = BasicUtil.getClassPath("");
-		//jar包获取的路径带有file
-		if (classPath.startsWith("file")) {
-			//判断是否设置的绝对路径
-			registry.addResourceHandler("/html/**").addResourceLocations("file:" + BasicUtil.getRealPath("html") + File.separator);
-			registry.addResourceHandler("/templets/**").addResourceLocations("file:" + BasicUtil.getRealPath("templets") + File.separator);
-			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/");
+		registry.addResourceHandler("/upload/**").addResourceLocations("/upload/","file:upload/");
+		registry.addResourceHandler("/templets/**").addResourceLocations("/templets/","file:templets/");
+		registry.addResourceHandler("/html/**").addResourceLocations("/html/","file:html/");
+		//三种映射方式 webapp下、当前目录下、jar内
+		registry.addResourceHandler("/app/**").addResourceLocations("/app/","file:app/", "classpath:/app/");
+		registry.addResourceHandler("/static/**","/**").addResourceLocations("/static/","file:static/","classpath:/static/");
+		registry.addResourceHandler("/api/**").addResourceLocations("/api/","file:api/", "classpath:/api/");
 
 	}
 	/**
@@ -157,7 +135,6 @@ public class WebConfig implements WebMvcConfigurer {
         xssFilter.excludes.add(".*file/upload.do");
         xssFilter.excludes.add(".*/jsp/editor.do");
         registration.addUrlPatterns("/*");
-
         return registration;
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 1907a3ac..dc01e260 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -54,6 +54,7 @@ spring:
       time_format: HH:mm:ss
       datetime_format: yyyy-MM-dd HH:mm:ss
       auto_import: /include/macro.ftl as ms
+      number_format: 0.##
       
 mybatis:
   mapper-locations: classpath*:**/dao/*.xml