Merge branch 'pre' into 'master'

Pre

See merge request !13

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/basicServices/AlOssController.java

@@ -6,7 +6,9 @@ import com.aliyun.oss.common.utils.BinaryUtil;
 import com.aliyun.oss.model.GenericResult;
 import com.aliyun.oss.model.ProcessObjectRequest;
 import com.aliyun.oss.model.PutObjectRequest;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.FilesUtils;
 import com.liquidnet.commons.lang.util.IDGenerator;
@@ -27,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.Formatter;
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -77,9 +80,12 @@ public class AlOssController {
 
         // file md5
         String fileMD5 = FilesUtils.getFileMD5(fileNew);
-        PlatformOssFiles platformOssFiles = platformOssFilesMapper.selectOne(Wrappers.lambdaQuery(PlatformOssFiles.class).eq(PlatformOssFiles::getMd5str, fileMD5));
+        List<PlatformOssFiles> platformOssFiles = platformOssFilesMapper.selectList(
+                Wrappers.lambdaQuery(PlatformOssFiles.class)
+                        .eq(PlatformOssFiles::getMd5str, fileMD5)
+        );
         UploadVo uploadVo = new UploadVo();
-        if (null == platformOssFiles) {
+        if (CollectionUtils.isEmpty(platformOssFiles)) {
             String filename = file.getResource().getFilename();// time.jpeg
             //这里文件名用了uuid 防止重复，可以根据自己的需要来写
             String uploadName = UUID.randomUUID() + filename.substring(filename.lastIndexOf("."));// 078a77e0-cf80-481b-824c-5935247cff15.jpeg
@@ -122,7 +128,8 @@ public class AlOssController {
 
             BeanUtils.copyProperties(platformOssFilesDate, uploadVo);
         } else {
-            BeanUtils.copyProperties(platformOssFiles, uploadVo);
+            PlatformOssFiles platformOssFilesOne = platformOssFiles.get(0);
+            BeanUtils.copyProperties(platformOssFilesOne, uploadVo);
         }
         return ResponseDto.success(uploadVo);
     }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -16,6 +16,7 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_LUCK_DRAW = "sweet:artists:luckDraw:uid:";
 
     public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO="sweet:wechatUser:unionId:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USER_INFO_STR="sweet:wechatUser:unionIdStr:";
     public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID="sweet:wechatUser:openId:";
     public final static String REDIS_KEY_SWEET_ANSWER_PHONE="sweet:answer:phone:";
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetWechatTemplateController.java

@@ -46,11 +46,16 @@ public class SweetWechatTemplateController {
     public ResponseDto followStatus(
             @RequestParam() String unionId
     ) {
-        boolean status = sweetTemplateService.followStatus(unionId);
+        boolean status = sweetTemplateService.followStatusStr(unionId);
         if (status) {
             return ResponseDto.success(1);
         } else {
-            return ResponseDto.success(2);
+            status = sweetTemplateService.followStatus(unionId);
+            if (status) {
+                return ResponseDto.success(1);
+            } else {
+                return ResponseDto.success(2);
+            }
         }
     }
 

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatTemplateServiceImpl.java

@@ -239,8 +239,20 @@ public class SweetWechatTemplateServiceImpl {
         return ResponseDto.success();
     }
 
+    public boolean followStatusStr(String unionId) {
+        String str = redisDataUtils.getSweetWechatUserStr(unionId);
+
+        if (null == str || str.isEmpty()) {
+            redisDataUtils.setSweetWechatUserStr(unionId);
+            return false;
+        } else {
+            return true;
+        }
+    }
+
     public boolean followStatus(String unionId) {
         SweetWechatUser sweetWechatUser = redisDataUtils.getSweetWechatUser(unionId);
+
         if (null != sweetWechatUser && !sweetWechatUser.getUnionId().isEmpty()) {
             return true;
         } else {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -344,6 +344,18 @@ public class RedisDataUtils {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO.concat(unionid);
         return (SweetWechatUser) redisUtil.get(redisKey);
     }
+    public String getSweetWechatUserStr(String unionid) {
+        if (unionid.isEmpty()) {
+            return "";
+        }
+        String key = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO_STR.concat(unionid);
+        String str = (String) redisUtil.get(key);
+        return str;
+    }
+    public void setSweetWechatUserStr(String unionid) {
+        String key = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO_STR.concat(unionid);
+        redisUtil.set(key, "1");
+    }
     public void delSweetWechatUser(String unionid, String openid) {
         if (!unionid.isEmpty()) {
             String redisKey = SweetConstant.REDIS_KEY_SWEET_WECHAT_USER_INFO.concat(unionid);