From 2148f513155ca2516dc30af751f967be904d4efe Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 14 Jan 2022 17:23:10 +0800
Subject: [PATCH] update

---
 screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java |    6 +++++-
 screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java    |   15 +++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java b/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
index 4afcad5..f1cde10 100644
--- a/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
+++ b/screen-api/src/main/java/com/moral/api/config/Interceptor/WebAppConfiguration.java
@@ -1,6 +1,7 @@
 package com.moral.api.config.Interceptor;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.system.ApplicationHome;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
@@ -38,7 +39,10 @@
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
         try {
-            registry.addResourceHandler("/static/**").addResourceLocations("classpath:/static/");
+            ApplicationHome h = new ApplicationHome(getClass());
+            //���jar������������������������������upload������������������������������������
+            String path = h.getSource().getParentFile().toString() + "/static/";
+            registry.addResourceHandler("/static/**").addResourceLocations("file:" + path);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
index 8237bfa..97036b6 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
@@ -12,12 +12,11 @@
 import com.moral.util.FileUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.system.ApplicationHome;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -43,14 +42,10 @@
 
     @Override
     public Map<String, Object> add(MultipartFile[] files, Supervision supervision) {
-
-        String path = null;
-        try {
-            path = ResourceUtils.getURL("classpath:").getPath() + "static/img/";
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        }
-
+        //������jar���������������
+        ApplicationHome h = new ApplicationHome(getClass());
+        //���jar������������������������������upload������������������������������������
+        String path = h.getSource().getParentFile().toString() + "/static/img/";
 
         Map<String, Object> result = new HashMap<>();
 

--
Gitblit v1.8.0