bug fix

src/main/java/com/gogirl/application/store/store/impl/CareerCmdServiceImpl.java

@@ -128,7 +128,10 @@ public class CareerCmdServiceImpl implements CareerCmdService {
         List<WorksImages> worksImages = worksImagesMapper.selectList(new LambdaQueryWrapper<WorksImages>().in(WorksImages::getWorksId, ids));
         Map<Long, List<WorksImages>> map = worksImages.stream().collect(Collectors.groupingBy(WorksImages::getWorksId));
         page.getRecords().forEach(works -> {
-            works.setWorksImagesList(new HashSet<>(map.get(works.getId())));
+            List<WorksImages> worksImagesList = map.get(works.getId());
+            if (ListUtil.isNotEmpty(worksImagesList)) {
+                works.setWorksImagesList(new HashSet<>(worksImagesList));
+            }
         });
         return page;
     }

src/main/java/com/gogirl/assembler/WorksAssembler.java

@@ -2,6 +2,7 @@ package com.gogirl.assembler;
 
 import com.gogirl.domain.store.career.Works;
 import com.gogirl.domain.store.career.WorksImages;
+import com.gogirl.infrastructure.common.util.ListUtil;
 import com.gogirl.shared.store.query.dto.WorksDTO;
 import com.gogirl.shared.store.query.dto.WorksImagesDTO;
 import lombok.AllArgsConstructor;
@@ -22,12 +23,14 @@ public class WorksAssembler implements Function<Works, WorksDTO> {
         WorksDTO worksDTO = new WorksDTO();
         BeanUtils.copyProperties(works, worksDTO);
 
-        worksDTO.setWorksImagesDTOList(
-                works.getWorksImagesList()
-                        .stream()
-                        .map(worksImagesDTOAssembler)
-                        .collect(Collectors.toList())
-        );
+        if(ListUtil.isNotEmpty(works.getWorksImagesList())){
+            worksDTO.setWorksImagesDTOList(
+                    works.getWorksImagesList()
+                            .stream()
+                            .map(worksImagesDTOAssembler)
+                            .collect(Collectors.toList())
+            );
+        }
         return worksDTO;
     }
 

src/main/java/com/gogirl/infrastructure/util/ImageUtil.java

@@ -10,26 +10,21 @@ import com.qiniu.storage.model.DefaultPutRet;
 import com.qiniu.util.Auth;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 
 public class ImageUtil {
-    public static String saveImage(String picturePath, MultipartFile file) throws IOException {
-        //     System.setProperty("sun.jnu.encoding","utf-8");
-        String fileName;
-        fileName = new String(file.getOriginalFilename().replaceAll(",", ""));
-//			fileName = new String(file.getOriginalFilename().replaceAll(",", "").getBytes("utf8"), System.getProperty("sun.jnu.encoding"));
-        File filePicture = new File(picturePath + fileName);
-        if (!filePicture.getParentFile().exists()) {
-            filePicture.getParentFile().mkdirs();
+    public static String saveImage(String picturePath, MultipartFile multipartFile) throws IOException {
+        String fileName = multipartFile.getOriginalFilename();
+        String fileSuffix = fileName.substring(fileName.lastIndexOf("."), fileName.length());
+        String localFileName = System.currentTimeMillis() + fileSuffix;
+        String filePath = picturePath + File.separator + localFileName;
+        File localFile = new File(filePath);
+        File imagePath = new File(picturePath);
+        if (!imagePath.exists()) {
+            imagePath.mkdirs();
         }
-        if (!filePicture.exists()) {
-            filePicture.createNewFile();
-        }
-        file.transferTo(filePicture);
-        String qiniuName = qiniuUpload(filePicture);
-//	    }
-        return qiniuName;
+        multipartFile.transferTo(localFile);
+        return qiniuUpload(localFile);
     }
 
     public static String qiniuUpload(File localFilePath) {
@@ -38,13 +33,11 @@ public class ImageUtil {
         //...其他参数参考类注释
         UploadManager uploadManager = new UploadManager(cfg);
         //...生成上传凭证，然后准备上传
-//      String accessKey = "MHRIqINwea8MnhFHXhARWofsKzF6WTqPzOp92VHy";
-//      String secretKey = "TjZPPnshhkysa40VOjyzdCUJBn4E-QUD0kBoEQwk";
         String accessKey = "RWQXlbVA7oe3BxnPuFtqkAJocQZkWTwrwYyldklr";
         String secretKey = "tS2gxsQO26mGoFZJI-x8WSH9X5aPgYMJcyoJdak5";
         String bucket = "begogirls";
         //如果是Windows情况下，格式是 D:\\qiniu\\test.png
-//        String localFilePath = "E://test.jpg";
+
         //默认不指定key的情况下，以文件内容的hash值作为文件名
         String key = null;
         Auth auth = Auth.create(accessKey, secretKey);

src/main/resources/application-dev.yml

@@ -25,9 +25,11 @@ spring:
 
   #数据源配置
   datasource:
-    url: jdbc:mysql://localhost:3306/gogril_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://gz-cdb-c0sq6eax.sql.tencentcdb.com:60779/gogirl_pre?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
+    #    url: jdbc:mysql://localhost:3306/gogril_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&&zeroDateTimeBehavior=convertToNull
     username: root
-    password: "123456"
+#    password: "123456"
+    password: "#7kfnymAM$Y9-Ntf"
     driver-class-name: com.mysql.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
@@ -60,7 +62,7 @@ gogirl:
   notify-balance-wx-pay: "http://t.begogirls.com/customer/pay/notifyBalanceWxPay"
 
   #服务器图片临时地址
-  picture-path: /upload/grouppic/
+  picture-path: /Users/huluobin/upload/pictures/
 
   end-time: "22:00:00"
   start-time: "10:00:00"

src/main/resources/application.yml

 spring:
   profiles:
-    active: pre
+    active: dev
   servlet:
     #文件上传最大容量
     multipart:
@@ -10,6 +10,7 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
 
+
 #mybatis 配置
 mybatis:
   mapper-locations:
@@ -36,4 +37,5 @@ server:
     io-threads: 6
     worker-threads: 1000
     direct-buffers: true
-    buffer-size: 1024
+    buffer-size: 1024
\ No newline at end of file
+  max-http-header-size: 16000