From 641eb582091b1be100a2cbedc4f12c4cec80e7a1 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 20 May 2019 19:55:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E4=BC=98?= =?UTF-8?q?=E5=8C=96][=E4=BF=AE=E6=94=B9]:=E7=BB=9F=E4=B8=80=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/UserApplication.java | 8 ++++++++ .../iformall/controller/app/WxAppinfoController.java | 5 ++++- .../controller/mem/WxCUserBasicInfoController.java | 5 ++++- .../com/iformall/controller/msg/WxMsgController.java | 6 ++++-- .../controller/rent/WxBillDailyController.java | 6 +++++- .../com/iformall/controller/sys/UploadController.java | 7 +++++-- mallinkAdmin/src/main/resources/application-dev.yml | 1 + mallinkAdmin/src/main/resources/application-prod.yml | 1 + mallinkAdmin/src/main/resources/application-test.yml | 1 + .../com/iformall/controller/UploadController.java | 11 +++++------ mallinkBApi/src/main/resources/application-dev.yml | 1 + mallinkBApi/src/main/resources/application-prod.yml | 1 + mallinkBApi/src/main/resources/application-test.yml | 1 + .../src/main/java/com/iformall/CApplication.java | 8 ++++++++ mallinkCApi/src/main/resources/application-dev.yml | 3 ++- mallinkCApi/src/main/resources/application-prod.yml | 1 + mallinkCApi/src/main/resources/application-test.yml | 1 + .../main/java/com/iformall/CallbackApplication.java | 8 ++++++++ .../src/main/resources/application-dev.yml | 1 + .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../main/java/com/iformall/ConsumerApplication.java | 8 ++++++++ .../src/main/resources/application-dev.yml | 1 + .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../main/java/com/iformall/ScheduleApplication.java | 8 ++++++++ .../src/main/resources/application-dev.yml | 1 + .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../service/impl/WxPropertyContractServiceImpl.java | 5 ++++- .../service/impl/WxRentContractServiceImpl.java | 7 +++++-- .../src/main/java/com/iformall/utils/Constant.java | 3 +-- .../src/main/java/com/iformall/SysApplication.java | 8 ++++++++ .../iformall/controller/app/WxAppinfoController.java | 5 ++++- .../com/iformall/controller/msg/WxMsgController.java | 6 ++++-- .../com/iformall/controller/sys/UploadController.java | 7 +++++-- .../src/main/resources/application-dev.yml | 1 + .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../java/com/iformall/SocketServerApplication.java | 8 ++++++++ .../src/main/resources/application-dev.yml | 1 + .../src/main/resources/application-prod.yml | 1 + .../src/main/resources/application-test.yml | 1 + 43 files changed, 131 insertions(+), 24 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java index ed37b6797..09dac4c9e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/UserApplication.java +++ b/mallinkAdmin/src/main/java/com/iformall/UserApplication.java @@ -31,6 +31,9 @@ public class UserApplication { @Value("${fm.open}") private boolean fmOpen; + @Value("${fm.upload_dir}") + private String uploadDir; + @Bean public boolean isFmException() { return fmException; @@ -46,6 +49,11 @@ public class UserApplication { return fmOpen; } + @Bean + public String fmUploadDir() { + return uploadDir; + } + public static void main(String[] args) { SpringApplication.run(UserApplication.class, args); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 7e889939a..b2c67624d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -48,6 +48,9 @@ public class WxAppinfoController extends BaseController { @Autowired private boolean isFmOpen; + @Autowired + private String fmUploadDir; + @Autowired private WxAppinfoService wxAppinfoService; @@ -148,7 +151,7 @@ public class WxAppinfoController extends BaseController { } - String filepath = Constant.fileDirectory; + String filepath = fmUploadDir; String fileName = name + ".png"; String destPath1 = filepath + "1_" + fileName; String destPath = filepath + fileName; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 7d58ea470..ac5fc5d8e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -47,6 +47,9 @@ import static com.iformall.domain.po.WxCouponOrder.Field.CreateDate_DESC; public class WxCUserBasicInfoController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private String fmUploadDir; + @Autowired private WxCUserBasicInfoService wxCUserBasicInfoService; @@ -328,7 +331,7 @@ public class WxCUserBasicInfoController extends BaseController { stringRedisTemplate.opsForHash().putIfAbsent(importKey, "processCount", ""); stringRedisTemplate.opsForHash().putIfAbsent(importKey, "failCount", ""); - String fpath = Constant.fileDirectory; + String fpath = fmUploadDir; File targetFile = new File(fpath); if (!targetFile.exists()) { targetFile.mkdirs(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 9074089da..e6268efe5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -30,6 +30,8 @@ import java.util.*; public class WxMsgController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private String fmUploadDir; @Autowired private WxMsgService wxMsgService; @@ -89,11 +91,11 @@ public class WxMsgController extends BaseController { } String filename = UUID.randomUUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - File path = new File(Constant.fileDirectory); + File path = new File(fmUploadDir); if (!path.exists()) { path.mkdirs(); } - String filepath = Constant.fileDirectory + File.separator + filename; + String filepath = fmUploadDir + filename; try { FileOutputStream out = new FileOutputStream(new File(filepath)); IOUtils.write(file.getBytes(), out); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 935edc9b1..5efbffd38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -38,6 +38,10 @@ import java.util.concurrent.TimeUnit; @RestController @RequestMapping("wxBillDaily") public class WxBillDailyController extends BaseController { + + @Autowired + private String fmUploadDir; + @Autowired private WxBillDailyService wxBillDailyService; @@ -141,7 +145,7 @@ public class WxBillDailyController extends BaseController { stringRedisTemplate.opsForHash().putIfAbsent(importKey, "processCount", ""); stringRedisTemplate.opsForHash().putIfAbsent(importKey, "failCount", ""); - String fpath = Constant.fileDirectory; + String fpath = fmUploadDir; File targetFile = new File(fpath); if (!targetFile.exists()) { targetFile.mkdirs(); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index c17dd45f8..6244707e4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -46,6 +46,9 @@ public class UploadController extends BaseController { @Autowired private MallResourceService mallResourceService; + @Autowired + private String fmUploadDir; + private AmazonS3 s3 = null; public ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, String tenantId) { @@ -176,8 +179,8 @@ public class UploadController extends BaseController { FileOutputStream fos = null; String imgFormat = ImgUtil.getImgFormat(fileFormat); if(StringUtils.isNotBlank(imgFormat)) { - String localImgFileName = Constant.fileDirectory + File.separator + tempFileName + "-1" + fileFormat; - String localNewImgFileName = Constant.fileDirectory + File.separator + tempFileName + fileFormat; + String localImgFileName = fmUploadDir + tempFileName + "-1" + fileFormat; + String localNewImgFileName = fmUploadDir + tempFileName + fileFormat; BufferedInputStream fs = null; File localFile = new File(localImgFileName); fos = new FileOutputStream(localFile); diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 6d7d267f6..8324da103 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -114,6 +114,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 open: false + upload_dir: /home/test/server/uploads/ ueditor: config: config.json diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 4daed2fce..6191f87b1 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -98,6 +98,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 3 open: true + upload_dir: /home/ec2-user/server/uploads/ ueditor: config: config.json diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml index 14866dd7b..5c5226404 100644 --- a/mallinkAdmin/src/main/resources/application-test.yml +++ b/mallinkAdmin/src/main/resources/application-test.yml @@ -98,6 +98,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 2 open: true + upload_dir: /home/ec2-user/server/uploads/ ueditor: config: config.json diff --git a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java index b55c5fd41..21da254e0 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java @@ -15,7 +15,6 @@ import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; import com.iformall.domain.po.MallResource; import com.iformall.service.MallResourceService; -import com.iformall.utils.Constant; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,9 +28,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import javax.imageio.ImageIO; -import java.awt.*; -import java.awt.image.BufferedImage; import java.io.*; import java.net.URL; import java.util.*; @@ -50,6 +46,9 @@ public class UploadController extends BaseController { @Autowired private MallResourceService mallResourceService; + @Autowired + private String fmUploadDir; + private AmazonS3 s3 = null; private ResultData awsUpload(InputStream inputStream, ObjectMetadata metadata, String fileName, String tenantId) { @@ -180,8 +179,8 @@ public class UploadController extends BaseController { String imgFormat = ImgUtil.getImgFormat(fileFormat); if(StringUtils.isNotBlank(imgFormat)) { - String localImgFileName = Constant.fileDirectory + File.separator + tempFileName + "-1" + fileFormat; - String localNewImgFileName = Constant.fileDirectory + File.separator + tempFileName + fileFormat; + String localImgFileName = fmUploadDir + tempFileName + "-1" + fileFormat; + String localNewImgFileName = fmUploadDir + tempFileName + fileFormat; BufferedInputStream fs = null; File localFile = new File(localImgFileName); fos = new FileOutputStream(localFile); diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 480f09d57..6b7d302e5 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -107,6 +107,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 open: true + upload_dir: /home/test/server/uploads logging: level: diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 6f3ec6854..23b4ab7f2 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -91,6 +91,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 3 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml index d43639686..e0f7072ba 100644 --- a/mallinkBApi/src/main/resources/application-test.yml +++ b/mallinkBApi/src/main/resources/application-test.yml @@ -91,6 +91,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 2 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkCApi/src/main/java/com/iformall/CApplication.java b/mallinkCApi/src/main/java/com/iformall/CApplication.java index a3f904892..ecbda2fa3 100644 --- a/mallinkCApi/src/main/java/com/iformall/CApplication.java +++ b/mallinkCApi/src/main/java/com/iformall/CApplication.java @@ -27,6 +27,9 @@ public class CApplication { @Value("${fm.open}") private boolean fmOpen; + @Value("${fm.upload_dir}") + private String uploadDir; + @Bean public boolean isFmException() { return fmException; @@ -42,6 +45,11 @@ public class CApplication { return fmOpen; } + @Bean + public String fmUploadDir() { + return uploadDir; + } + public static void main(String[] args) { SpringApplication.run(CApplication.class, args); diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 44c4811df..48d3fa5ba 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -106,7 +106,8 @@ fm: exception: false exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 - open: false + open: true + upload_dir: /home/test/server/uploads/ logging: level: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 9c608b7ed..470c51ae1 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -91,6 +91,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 3 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml index a27ed39ec..530be4bf3 100644 --- a/mallinkCApi/src/main/resources/application-test.yml +++ b/mallinkCApi/src/main/resources/application-test.yml @@ -91,6 +91,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 2 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkCallback/src/main/java/com/iformall/CallbackApplication.java b/mallinkCallback/src/main/java/com/iformall/CallbackApplication.java index 069f232b5..83b4f6b96 100644 --- a/mallinkCallback/src/main/java/com/iformall/CallbackApplication.java +++ b/mallinkCallback/src/main/java/com/iformall/CallbackApplication.java @@ -31,6 +31,9 @@ public class CallbackApplication { @Value("${fm.open}") private boolean fmOpen; + @Value("${fm.upload_dir}") + private String uploadDir; + @Bean public boolean isFmException() { return fmException; @@ -46,6 +49,11 @@ public class CallbackApplication { return fmOpen; } + @Bean + public String fmUploadDir() { + return uploadDir; + } + public static void main(String[] args) { SpringApplication.run(CallbackApplication.class, args); } diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index 130f02de7..b67cd41aa 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -112,6 +112,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 open: true + upload_dir: /home/test/server/uploads/ logging: level: diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 9bcf78af2..8052cc255 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -96,6 +96,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 3 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkCallback/src/main/resources/application-test.yml b/mallinkCallback/src/main/resources/application-test.yml index 63a84a1d2..d51711c1f 100644 --- a/mallinkCallback/src/main/resources/application-test.yml +++ b/mallinkCallback/src/main/resources/application-test.yml @@ -96,6 +96,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 2 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java b/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java index dd73188bc..89620b07d 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/ConsumerApplication.java @@ -29,6 +29,9 @@ public class ConsumerApplication { @Value("${fm.open}") private boolean fmOpen; + @Value("${fm.upload_dir}") + private String uploadDir; + @Bean public boolean isFmException() { return fmException; @@ -44,6 +47,11 @@ public class ConsumerApplication { return fmOpen; } + @Bean + public String fmUploadDir() { + return uploadDir; + } + public static void main(String[] args) { SpringApplication.run(ConsumerApplication.class, args); diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index 7ea3938e0..3bc433ec1 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -107,6 +107,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 open: true + upload_dir: /home/test/server/uploads/ logging: level: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 9c1d723a2..1985d8629 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -82,6 +82,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 3 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkMQConsumer/src/main/resources/application-test.yml b/mallinkMQConsumer/src/main/resources/application-test.yml index 0c8e1c1b8..f7e9e0bd1 100644 --- a/mallinkMQConsumer/src/main/resources/application-test.yml +++ b/mallinkMQConsumer/src/main/resources/application-test.yml @@ -92,6 +92,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 2 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java index 640a82a1a..f60575a28 100644 --- a/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java +++ b/mallinkSchedule/src/main/java/com/iformall/ScheduleApplication.java @@ -29,6 +29,9 @@ public class ScheduleApplication { @Value("${fm.open}") private boolean fmOpen; + @Value("${fm.upload_dir}") + private String uploadDir; + @Bean public boolean isFmException() { return fmException; @@ -44,6 +47,11 @@ public class ScheduleApplication { return fmOpen; } + @Bean + public String fmUploadDir() { + return uploadDir; + } + public static void main(String[] args) { SpringApplication.run(ScheduleApplication.class, args); diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index b3e0219b0..2aff90875 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -107,6 +107,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 open: true + upload_dir: /home/test/server/uploads/ logging: level: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index d0ae227af..96732f75b 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -92,6 +92,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 3 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml index f9ac46554..d40b7338a 100644 --- a/mallinkSchedule/src/main/resources/application-test.yml +++ b/mallinkSchedule/src/main/resources/application-test.yml @@ -92,6 +92,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 2 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 57e342b1f..23d0e932a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -42,6 +42,9 @@ import java.util.*; public class WxPropertyContractServiceImpl implements WxPropertyContractService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private String fmUploadDir; + @Autowired WxPropertyContractMapper wxPropertyContractMapper; @@ -797,7 +800,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService String filesuffix = wxPropertyContract.getFilepath().substring(wxPropertyContract.getFilepath().lastIndexOf(".")); String filename = UUID.randomUUID() + filesuffix; - String filepath = Constant.fileDirectory; + String filepath = fmUploadDir; String destPath = filepath + filename; File dest = new File(destPath); File pDest = dest.getParentFile(); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java index 01ab10361..01fcbe2a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java @@ -53,6 +53,9 @@ import java.util.*; public class WxRentContractServiceImpl implements WxRentContractService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private String fmUploadDir; + @Autowired WxRentContractMapper wxRentContractMapper; @@ -1153,7 +1156,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { WxRentContract wxRentContract = wxRentContractMapper.selectByPrimaryKey(id); String filesuffix = wxRentContract.getFilepath().substring(wxRentContract.getFilepath().lastIndexOf(".")); String filename = UUID.randomUUID() + filesuffix; - String filepath = Constant.fileDirectory; + String filepath = fmUploadDir; String destPath = filepath + filename; File dest = new File(destPath); File pDest = dest.getParentFile(); @@ -1404,7 +1407,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { logger.info("没有租赁及物业合同模板"); return; } - String filepath = Constant.fileDirectory; + String filepath = fmUploadDir; String filename = UUID.randomUUID() + ".docx"; String exportFileName = result.get("merchantName").toString() + "合同.docx"; exportWord(templatePath, filepath, filename, exportFileName, result, request, response); diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index ae6f0b6d8..e6b5ac894 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -27,7 +27,6 @@ public class Constant { // 获取mall信息 public static final String MALL_KEY_PREV = "mall:"; - public static final String fileDirectory = "/tmp/uploads/"; - public static final String importMemPrev = "importmem/"; + public static final String importMemPrev = "importmem:"; public static final String adminPage = "https://admin.malls.iformall.com"; } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/SysApplication.java b/mallinkSysAdmin/src/main/java/com/iformall/SysApplication.java index 98252e9b9..c7983e27c 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/SysApplication.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/SysApplication.java @@ -31,6 +31,9 @@ public class SysApplication { @Value("${fm.open}") private boolean fmOpen; + @Value("${fm.upload_dir}") + private String uploadDir; + @Bean public boolean isFmException() { return fmException; @@ -46,6 +49,11 @@ public class SysApplication { return fmOpen; } + @Bean + public String fmUploadDir() { + return uploadDir; + } + public static void main(String[] args) { SpringApplication.run(SysApplication.class, args); } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 133f7ea0e..d1de62baa 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -40,6 +40,9 @@ public class WxAppinfoController extends BaseController { @Autowired private boolean isFmOpen; + @Autowired + private String fmUploadDir; + @Autowired private WxAppinfoService wxAppinfoService; @@ -155,7 +158,7 @@ public class WxAppinfoController extends BaseController { } - String filepath = Constant.fileDirectory; + String filepath = fmUploadDir; String fileName = name + ".png"; String destPath1 = filepath + "1_" + fileName; String destPath = filepath + fileName; diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index 9074089da..e6268efe5 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -30,6 +30,8 @@ import java.util.*; public class WxMsgController extends BaseController { private final Logger logger = LoggerFactory.getLogger(this.getClass()); + @Autowired + private String fmUploadDir; @Autowired private WxMsgService wxMsgService; @@ -89,11 +91,11 @@ public class WxMsgController extends BaseController { } String filename = UUID.randomUUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".")); - File path = new File(Constant.fileDirectory); + File path = new File(fmUploadDir); if (!path.exists()) { path.mkdirs(); } - String filepath = Constant.fileDirectory + File.separator + filename; + String filepath = fmUploadDir + filename; try { FileOutputStream out = new FileOutputStream(new File(filepath)); IOUtils.write(file.getBytes(), out); diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 264043846..ad49857f9 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -45,6 +45,9 @@ public class UploadController extends BaseController { @Autowired private AwsProperty awsProperty; + @Autowired + private String fmUploadDir; + @Autowired private MallResourceService mallResourceService; @@ -175,8 +178,8 @@ public class UploadController extends BaseController { FileOutputStream fos = null; String imgFormat = ImgUtil.getImgFormat(fileFormat); if(StringUtils.isNotBlank(imgFormat)) { - String localImgFileName = Constant.fileDirectory + File.separator + tempFileName + "-1" + fileFormat; - String localNewImgFileName = Constant.fileDirectory + File.separator + tempFileName + fileFormat; + String localImgFileName = fmUploadDir + tempFileName + "-1" + fileFormat; + String localNewImgFileName = fmUploadDir + tempFileName + fileFormat; BufferedInputStream fs = null; File localFile = new File(localImgFileName); fos = new FileOutputStream(localFile); diff --git a/mallinkSysAdmin/src/main/resources/application-dev.yml b/mallinkSysAdmin/src/main/resources/application-dev.yml index 685d52320..004b7cf79 100644 --- a/mallinkSysAdmin/src/main/resources/application-dev.yml +++ b/mallinkSysAdmin/src/main/resources/application-dev.yml @@ -114,6 +114,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 open: true + upload_dir: /home/test/server/uploads/ ueditor: config: config.json diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index 4daed2fce..6191f87b1 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -98,6 +98,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 3 open: true + upload_dir: /home/ec2-user/server/uploads/ ueditor: config: config.json diff --git a/mallinkSysAdmin/src/main/resources/application-test.yml b/mallinkSysAdmin/src/main/resources/application-test.yml index 14866dd7b..5c5226404 100644 --- a/mallinkSysAdmin/src/main/resources/application-test.yml +++ b/mallinkSysAdmin/src/main/resources/application-test.yml @@ -98,6 +98,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 2 open: true + upload_dir: /home/ec2-user/server/uploads/ ueditor: config: config.json diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java b/mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java index 69664250c..419e51ff7 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/SocketServerApplication.java @@ -28,6 +28,9 @@ public class SocketServerApplication { @Value("${fm.open}") private boolean fmOpen; + @Value("${fm.upload_dir}") + private String uploadDir; + @Bean public boolean isFmException() { return fmException; @@ -43,6 +46,11 @@ public class SocketServerApplication { return fmOpen; } + @Bean + public String fmUploadDir() { + return uploadDir; + } + public static void main(String[] args) { SpringApplication.run(SocketServerApplication.class, args); diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index 12e7647ff..8f644ddce 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -107,6 +107,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 open: true + upload_dir: /home/test/server/uploads/ logging: level: diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index bfb6943bd..d80ca6b8b 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -92,6 +92,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 3 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: diff --git a/mallinkWebSocketServer/src/main/resources/application-test.yml b/mallinkWebSocketServer/src/main/resources/application-test.yml index c11465283..17bf84400 100644 --- a/mallinkWebSocketServer/src/main/resources/application-test.yml +++ b/mallinkWebSocketServer/src/main/resources/application-test.yml @@ -92,6 +92,7 @@ fm: exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 2 open: true + upload_dir: /home/ec2-user/server/uploads/ logging: level: