9
0

2 Commity 0b01b50578 ... bda51f33e0

Autor SHA1 Správa Dátum
  1811872455@163.com bda51f33e0 Merge remote-tracking branch 'origin/master' 3 týždňov pred
  1811872455@163.com 05f0ce243e 邮件功能调整 3 týždňov pred

+ 1 - 1
java/storlead-api/src/main/java/com/storlead/system/controller/FileResourceController.java

@@ -7,7 +7,7 @@ import com.storlead.framework.common.util.FileUtil;
 import com.storlead.framework.common.util.OssBootUtil;
 import com.storlead.framework.common.util.generate.CodeGenerate;
 import com.storlead.system.pojo.entity.FileResourceEntity;
-import com.storlead.system.properties.FileProperties;
+import com.storlead.framework.web.properties.FileProperties;
 import com.storlead.system.service.FileResourceService;
 import com.storlead.system.service.IOSSFileService;
 import io.swagger.annotations.Api;

+ 1 - 1
java/storlead-system/storlead-system-biz/src/main/java/com/storlead/system/properties/FileProperties.java → java/storlead-framework/storlead-web/src/main/java/com/storlead/framework/web/properties/FileProperties.java

@@ -1,4 +1,4 @@
-package com.storlead.system.properties;
+package com.storlead.framework.web.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 2
java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/FileResourceController.java

@@ -7,7 +7,7 @@ import com.storlead.framework.common.util.OssBootUtil;
 import com.storlead.framework.common.util.generate.CodeGenerate;
 import com.storlead.framework.common.result.Result;
 import com.storlead.system.pojo.entity.FileResourceEntity;
-import com.storlead.system.properties.FileProperties;
+import com.storlead.framework.web.properties.FileProperties;
 import com.storlead.system.service.FileResourceService;
 import com.storlead.system.service.IOSSFileService;
 import io.swagger.annotations.Api;
@@ -19,7 +19,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;

+ 1 - 1
java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/ThumbnailPreviewController.java

@@ -1,6 +1,6 @@
 package com.storlead.system.controller;
 
-import com.storlead.system.properties.FileProperties;
+import com.storlead.framework.web.properties.FileProperties;
 import io.swagger.annotations.Api;
 import lombok.extern.log4j.Log4j2;
 import javax.annotation.Resource;