111

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

@@ -14,7 +14,9 @@ public enum FileBizType {
     LINK_STYLE("link-style", "场景关联图标"),
     WATERMARK("waterMark", "水印"),
     BOX_POSTER("box-poster", "空间视频封面图"),
-    BILLBOARD_ICON("billboard-icon", "指示牌")
+    BILLBOARD_ICON("billboard-icon", "指示牌"),
+
+    CUT_MODEL("cutModel", "模型裁剪"),
     ;
 
     private String code;

4dkankan-common-web/src/main/java/com/fdkankan/web/interceptor/CheckInnerApiPermitAspect.java

@@ -11,6 +11,7 @@ import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -19,6 +20,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 @Log4j2
 @Aspect
 @Component
+@ConditionalOnProperty(name = "inner.check", havingValue = "true")
 @Order(101)
 public class CheckInnerApiPermitAspect {
 

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

@@ -129,6 +129,8 @@ public class RedisKey {
      */
     public static final String SCENE_BILLBOARDS = "scene:billboards:num:%s";
 
+    public static final String SCENE_CUT_MODEL = "scene:cutmodel:num:%s";
+
     /**
      * 场景下载任务列表
      */

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

@@ -100,6 +100,11 @@ public class RedisLockKey {
     public static String LOCK_BILLBOARDS_SYNC = "lock:billboards:sync:num:%s";
 
     /**
+     * 裁剪模型数据恢复锁
+     */
+    public static String LOCK_CUT_MODEL_SYNC = "lock:cutmodel:sync:num:%s";
+
+    /**
      * 热点数据写文件锁
      */
     public static String LOCK_HOT_JSON = "lock:hot:json:num:%s";
@@ -114,6 +119,7 @@ public class RedisLockKey {
      */
     public static String LOCK_SCENE_DOWNLOAD_ING = "lock:scene:downloads:ing";
 
+
     /**
      * 加载场景中断下载列表锁
      */