1111

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

@@ -124,15 +124,15 @@ public class ConstantFilePath {
 
     public static final String SCENE_CACHE = SCENE_PATH + "%s/caches/";
 
-    public static final String SCENE_DATA_PATH_V4 = SCENE_V4_PATH + "%S/data/";
+    public static final String SCENE_DATA_PATH_V4 = SCENE_V4_PATH + "%s/data/";
 
-    public static final String SCENE_IMAGES_PATH_V4 = SCENE_V4_PATH + "%S/images/";
+    public static final String SCENE_IMAGES_PATH_V4 = SCENE_V4_PATH + "%s/images/";
 
-    public static final String SCENE_VIDEOS_PATH_V4 = SCENE_V4_PATH + "%S/videos/";
+    public static final String SCENE_VIDEOS_PATH_V4 = SCENE_V4_PATH + "%s/videos/";
 
-    public static final String SCENE_VOICES_PATH_V4 = SCENE_V4_PATH + "%S/voices/";
+    public static final String SCENE_VOICES_PATH_V4 = SCENE_V4_PATH + "%s/voices/";
 
-    public static final String SCENE_USER_PATH_V4 = SCENE_V4_PATH + "%S/user/";
+    public static final String SCENE_USER_PATH_V4 = SCENE_V4_PATH + "%s/user/";
 
     /**
      * 文件转换目录

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

@@ -11,7 +11,8 @@ public enum FileBizType {
     SCREENSHOT("screenshot", "初始画面"),
     BOX_VIDEO("box-video", "视频"),
     TAG_ICON("tag-icon", "热点图标"),
-    LINK_STYLE("link-style", "场景关联图标")
+    LINK_STYLE("link-style", "场景关联图标"),
+    WATERMARK("waterMark", "水印")
     ;
 
     private String code;

4dkankan-common-utils/src/main/java/com/fdkankan/common/util/JwtUtil.java

@@ -92,15 +92,19 @@ public class JwtUtil {
      */
     public static Boolean isVerify(String token, String userName) {
 
-        //得到DefaultJwtParser
-        Claims claims = Jwts.parser()
+        try {
+            //得到DefaultJwtParser
+            Claims claims = Jwts.parser()
                 //设置签名的秘钥
                 .setSigningKey(SECRET)
                 //设置需要解析的jwt
                 .parseClaimsJws(token).getBody();
 
-        if (claims.get("userName").equals(userName)) {
-            return true;
+            if (claims.get("userName").equals(userName)) {
+                return true;
+            }
+        }catch (Exception e){
+            return false;
         }
         return false;
     }

4dkankan-utils-rabbitmq/src/main/java/com/fdkankan/rabbitmq/config/RabbitMqConfig.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
+import org.springframework.boot.autoconfigure.data.redis.JedisClientConfigurationBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -26,7 +27,6 @@ public class RabbitMqConfig {
     @Resource
     private ProducerCallback producerCallback;
 
-
     /**
      * 指定序列化转换器，否则mq消息存进去
      * @return

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

@@ -57,7 +57,7 @@ public class RedisKey {
     /**
      * 场景浏览量
      */
-    public static String SCENE_VISIT_CNT = "scene:visit:cnt:scenecode:%s";
+    public static String SCENE_VISIT_CNT = "scene:visit:cnt";
 
 
     /**
@@ -142,5 +142,10 @@ public class RedisKey {
     public static final String  MANAGE_PERM_USER ="manage_perm_user:%s";
     public static final String  MANAGE_ROLE_USER ="manage_role_user:%s";
 
+    /**
+     * 马赛克列表
+     */
+    public static final String SCENE_MOSAIC_DATA = "scene:mosaic:num:%s";
+
 
 }

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

@@ -118,6 +118,16 @@ public class RedisLockKey {
      */
     public static String LOCK_SCENE_UPGRADE_FAILED_ROLLBACK = "lock:scene:upgrade:failed:rollback";
 
+    /**
+     * 马赛克数据恢复锁
+     */
+    public static String LOCK_MOSAIC_DATA_SYNC = "lock:mosaic:data:sync:num:%s";
+
+    /**
+     * 马赛克数据写文件锁
+     */
+    public static String LOCK_MOSAIC_JSON = "lock:mosaic:json:num:%s";
+
 
 
 }