From 2ab1de34b119570c99946ab3e480e9d31745518a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 20 Jan 2022 17:28:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
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 aed072d..78ef537 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
@@ -11,6 +11,7 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.FileUtils;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
import org.springframework.stereotype.Service;
@@ -36,6 +37,7 @@
* @since 2022-01-12
*/
@Service
+@Slf4j
public class SupervisionServiceImpl extends ServiceImpl<SupervisionMapper, Supervision> implements SupervisionService {
@Autowired
@@ -44,9 +46,9 @@
@Override
public Map<String, Object> add(MultipartFile[] files, Supervision supervision) {
//������jar���������������
- ApplicationHome h = new ApplicationHome(getClass());
+ ApplicationHome applicationHome = new ApplicationHome(getClass());
//���jar������������������������������upload������������������������������������
- String path = h.getSource().getParentFile().toString() + "/static/img";
+ String path = applicationHome.getSource().getParentFile().toString() + "/static/img";
Map<String, Object> result = new HashMap<>();
@@ -124,8 +126,10 @@
@Override
public Map<String, Object> updateSupervision(MultipartFile[] files, Supervision supervision) {
- String path = this.getClass().getClassLoader()
- .getResource("").getFile() + "static/img";
+ //������jar���������������
+ ApplicationHome applicationHome = new ApplicationHome(getClass());
+ //���jar������������������������������upload������������������������������������
+ String path = applicationHome.getSource().getParentFile().toString() + "/static/img";
Map<String, Object> result = new HashMap<>();
@@ -176,8 +180,8 @@
//���������������������������������������
- String path = this.getClass().getClassLoader()
- .getResource("").getFile() + "static/img";
+ ApplicationHome applicationHome = new ApplicationHome(getClass());
+ String path = applicationHome.getSource().getParentFile().toString() + "/static/img";
for (String image : images) {
String realPath = path + File.separator + image;
File file = new File(realPath);
--
Gitblit v1.8.0