Merge branch 'master' into feature-v4-20220801

# Conflicts:
#	4dkankan-utils-fyun/src/main/java/com/fdkankan/fyun/oss/UploadToOssUtil.java
#	4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/ComputerUtil.java
#	4dkankan-utils-model/src/main/java/com/fdkankan/model/utils/CreateObjUtil.java

4dkankan-common-utils/src/main/java/com/fdkankan/common/constant/FileBizType.java

@@ -12,7 +12,8 @@ public enum FileBizType {
     BOX_VIDEO("box-video", "视频"),
     TAG_ICON("tag-icon", "热点图标"),
     LINK_STYLE("link-style", "场景关联图标"),
-    WATERMARK("waterMark", "水印")
+    WATERMARK("waterMark", "水印"),
+    BOX_POSTER("box-poster", "空间视频封面图")
     ;
 
     private String code;

4dkankan-utils-redis/src/main/java/com/fdkankan/redis/constant/RedisKey.java

@@ -152,5 +152,10 @@ public class RedisKey {
      */
     public static final String SCENE_MOSAIC_DATA = "scene:mosaic:num:%s";
 
+    /**
+     * 滤镜列表
+     */
+    public static final String SCENE_filter_DATA = "scene:filter:num:%s";
+
 
 }

4dkankan-utils-redis/src/main/java/com/fdkankan/redis/constant/RedisLockKey.java

@@ -1,5 +1,9 @@
 package com.fdkankan.redis.constant;
 
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONUtil;
+
 /**
  * <p>
  *   分布式锁key定义
@@ -128,6 +132,15 @@ public class RedisLockKey {
      */
     public static String LOCK_MOSAIC_JSON = "lock:mosaic:json:num:%s";
 
+    /**
+     * 滤镜数据写文件锁
+     */
+    public static String LOCK_filter_JSON = "lock:filter:json:num:%s";
+
+    /**
+     * 滤镜数据恢复锁
+     */
+    public static String LOCK_FILTER_DATA_SYNC = "lock:filter:data:sync:num:%s";
 
 
 }