From 02a54b7923225c260705a07b2328d074a6ea624d Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Tue, 12 May 2020 12:32:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9lombok=E5=85=A8=E5=8F=82?=
 =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=99=A8=E4=BA=A7=E7=94=9F=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{YxWechatMenuDTO.java => YxWechatMenuDto.java} |  0
 ...YxWechatReplyDTO.java => YxWechatReplyDto.java} |  0
 .../mp/service/impl/YxArticleServiceImpl.java      | 14 ++++++--------
 3 files changed, 6 insertions(+), 8 deletions(-)
 rename yshop-mp/src/main/java/co/yixiang/mp/service/dto/{YxWechatMenuDTO.java => YxWechatMenuDto.java} (100%)
 rename yshop-mp/src/main/java/co/yixiang/mp/service/dto/{YxWechatReplyDTO.java => YxWechatReplyDto.java} (100%)

diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDTO.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDto.java
similarity index 100%
rename from yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDTO.java
rename to yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatMenuDto.java
diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDTO.java b/yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDto.java
similarity index 100%
rename from yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDTO.java
rename to yshop-mp/src/main/java/co/yixiang/mp/service/dto/YxWechatReplyDto.java
diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java
index 383ed29b..b4dd2223 100644
--- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java
+++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java
@@ -8,12 +8,9 @@ import co.yixiang.mp.config.WxMpConfiguration;
 import co.yixiang.mp.domain.YxArticle;
 import co.yixiang.common.service.impl.BaseServiceImpl;
 import co.yixiang.mp.utils.URLUtils;
-import lombok.AllArgsConstructor;
 import co.yixiang.dozer.service.IGenerator;
-import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import co.yixiang.common.utils.QueryHelpPlus;
-import co.yixiang.utils.ValidationUtil;
 import co.yixiang.utils.FileUtil;
 import co.yixiang.mp.service.YxArticleService;
 import co.yixiang.mp.service.dto.YxArticleDto;
@@ -38,10 +35,7 @@ import org.springframework.transaction.annotation.Transactional;
 //import org.springframework.cache.annotation.CacheConfig;
 //import org.springframework.cache.annotation.CacheEvict;
 //import org.springframework.cache.annotation.Cacheable;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import co.yixiang.utils.PageUtil;
-import co.yixiang.utils.QueryHelp;
 
 import java.io.File;
 import java.util.List;
@@ -57,7 +51,6 @@ import java.util.LinkedHashMap;
 */
 @Slf4j
 @Service
-@AllArgsConstructor
 //@CacheConfig(cacheNames = "yxArticle")
 @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
 public class YxArticleServiceImpl extends BaseServiceImpl<YxArticleMapper, YxArticle> implements YxArticleService {
@@ -65,6 +58,11 @@ public class YxArticleServiceImpl extends BaseServiceImpl<YxArticleMapper, YxArt
     private final IGenerator generator;
     @Value("${file.path}")
     private String uploadDirStr;
+
+    public YxArticleServiceImpl(IGenerator generator) {
+        this.generator = generator;
+    }
+
     @Override
     //@Cacheable
     public Map<String, Object> queryAll(YxArticleQueryCriteria criteria, Pageable pageable) {
@@ -171,7 +169,7 @@ public class YxArticleServiceImpl extends BaseServiceImpl<YxArticleMapper, YxArt
     private WxMpMaterialUploadResult uploadPhotoToWx(WxMpService wxMpService, String picPath) throws WxErrorException {
         WxMpMaterial wxMpMaterial = new WxMpMaterial();
 
-        String filename = String.valueOf( System.currentTimeMillis() ) + ".png";
+        String filename = String.valueOf( (int)System.currentTimeMillis() ) + ".png";
         String downloadPath = uploadDirStr + filename;
         long size = HttpUtil.downloadFile(picPath, cn.hutool.core.io.FileUtil.file(downloadPath));
         picPath = downloadPath;