Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/common/CommonController.java

@@ -1,5 +1,6 @@
 package com.gree.mall.miniapp.controller.common;
 
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gree.mall.miniapp.annotation.ApiNotAuth;
@@ -81,7 +82,9 @@ public class CommonController {
     public ResponseHelper<CommonFile> upload(
             @ApiParam(required = true, value = "附件") @RequestParam(required = true) MultipartFile file
     ) throws IOException, RemoteServiceException {
+        log.info("文件上传开始时间 {}", DateUtil.formatDateTime(DateUtil.date()));
         CommonFile commonFile = commonLogic.uploadFile(file);
+        log.info("文件上传结束时间 {}", DateUtil.formatDateTime(DateUtil.date()));
         return ResponseHelper.success(commonFile);
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/workorder/ChangeOrderController.java

@@ -1,5 +1,6 @@
 package com.gree.mall.miniapp.controller.workorder;
 
+import cn.hutool.core.date.DateUtil;
 import com.gree.mall.miniapp.bean.order.WorkerOrderDetail;
 import com.gree.mall.miniapp.bean.workorder.PgOrderProductDetailCount;
 import com.gree.mall.miniapp.bean.workorder.PgOrderProductDetailVO;
@@ -17,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.constraints.NotBlank;
-import java.io.IOException;
 import java.text.ParseException;
 import java.util.List;
 
@@ -141,7 +141,9 @@ public class ChangeOrderController {
 
             HttpServletRequest request
     ) throws Exception {
+        log.info("打水印开始时间 {}", DateUtil.formatDateTime(DateUtil.date()));
         String pic = changeOrderLogic.imageGenerateWatermark(productDetailId,patch,positionName);
+        log.info("打水印结束时间 {}", DateUtil.formatDateTime(DateUtil.date()));
         return ResponseHelper.success(pic);
     }