浏览代码

环境整改

zhujinghui 4 年之前
父节点
当前提交
95ed87aed8

+ 10 - 13
4dkankan-application/src/main/resources/application-uat.properties

@@ -1,4 +1,3 @@
-
 #注册中心
 spring.cloud.nacos.discovery.server-addr=10.71.5.163:80
 
@@ -13,7 +12,7 @@ spring.servlet.multipart.max-request-size=1000MB
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.location=/mnt/data/
 #redis
-spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000,10.71.184.188:7000,10.71.184.222:7000,10.71.184.200:7000
+spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000
 spring.redis.database=0
 spring.redis.password=QBzhHTxfcYLTs0n5J5VQ
 spring.redis.timeout=3000ms
@@ -41,7 +40,7 @@ swagger.version=2.0
 #rabbitmq
 #spring.rabbitmq.host=8.135.98.231
 #spring.rabbitmq.port=30672
-spring.rabbitmq.address=10.71.5.163:5672,10.71.5.164:5672
+spring.rabbitmq.address=10.71.5.163:5379,10.71.5.164:5379
 spring.rabbitmq.username=admin
 spring.rabbitmq.password=fcb@admin_4dage
 spring.rabbitmq.virtual-host=/
@@ -62,13 +61,13 @@ oss.secrey=mqVRTWbWcn4sNMoWmnRq6eToWr9BIy
 oss.bucket=fcb-vrkanfang-uat
 oss.type=oss
 
-main.url=https://vr-web01-uat-fcb.com.cn/
-main.intranet.url=https://vr-mc01-uat-fcb.com/
+main.url=https://vr-web01-uat.fcb.com.cn/
+main.intranet.url=https://vr-mc01-uat.fcb.com.cn/
 scene.url=show.html?m=
 scene.pro.url=showProMobile.html?m=
 scene.pro.new.url=smobile.html?m=
 
-prefix.ali=https://fcb-vrkanfang-uat.os-cn-shenzhen.aliyuncs.com/
+prefix.ali=https://vr-web02-uat.fcb.com.cn/
 
 #服务器环境,dev为测试环境,formal为正式环境
 environment=dev
@@ -76,11 +75,11 @@ environment=dev
 #mq的任务key
 rabbitmq.queue=QUEUE_MODELING_A
 #mq当排队任务超过这个数量时启用弹性升缩
-mq.base.num=300
+mq.base.num=0
 #弹性伸缩组id
-scaling.group.id=asg-wz92989gdhgek3ktdlsw
+scaling.group.id=asg-wz913nslhup18v3gzcj6
 #弹性伸缩规则id
-scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz97gv4s2nod1cxznynx
+scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz9dxefnhbn0aftfnk0v
 
 #服务器类型,aliyun或hqyun
 ecs.type=aliyun
@@ -89,8 +88,6 @@ knife4j.basic.enable=true
 knife4j.basic.username=apiadmin
 knife4j.basic.password=fdkankancui
 
-#log
-logging.path=/4Dkankan/logs/
-logging.config=classpath:logback-spring.xml
-logging.level.com.fdkankan=debug
+
+
 

+ 0 - 423
4dkankan-common/src/main/java/com/fdkankan/common/jedis/JedisUtil.java

@@ -1,423 +0,0 @@
-package com.fdkankan.common.jedis;
-
-import lombok.extern.log4j.Log4j2;
-import redis.clients.jedis.*;
-
-import java.io.*;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.ReentrantLock;
-
-
-/**
- * Redis client base on jedis 根据继承类的不同,
- * jedis实例方式不用:JedisSimpleFactry/JedisPoolFactry/ShardedJedisPoolFactry
- * <p>
- * 2015-7-10 18:34:07
- * <p>
- * # for redis (sharded.jedis.address=host01:port,host02:port)
- * sharded.jedis.address=127.0.0.1:6379,127.0.0.1:6379,127.0.0.1:6379
- */
-@Log4j2
-public class JedisUtil {
-    
-    private static final int DEFAULT_EXPIRE_TIME = 7200; // 默认过期时间,单位/秒, 60*60*2=2H, 两小时
-    private static String address;
-    private static JedisPoolConfig config;
-
-    public static void init(String address, JedisPoolConfig config) {
-        JedisUtil.address = address;
-        JedisUtil.config = config;
-    }
-
-    // ------------------------ ShardedJedisPool ------------------------
-    /**
-     * 方式01: Redis单节点 + Jedis单例 : Redis单节点压力过重, Jedis单例存在并发瓶颈 》》不可用于线上
-     * new Jedis("127.0.0.1", 6379).get("cache_key");
-     * 方式02: Redis单节点 + JedisPool单节点连接池 》》 Redis单节点压力过重,负载和容灾比较差
-     * new JedisPool(new JedisPoolConfig(), "127.0.0.1", 6379, 10000).getResource().get("cache_key");
-     * 方式03: Redis集群(通过client端集群,一致性哈希方式实现) + Jedis多节点连接池 》》Redis集群,负载和容灾较好, ShardedJedisPool一致性哈希分片,读写均匀,动态扩充
-     * new ShardedJedisPool(new JedisPoolConfig(), new LinkedList<JedisShardInfo>());
-     */
-
-    private static ShardedJedisPool shardedJedisPool;
-    private static ReentrantLock INSTANCE_INIT_LOCL = new ReentrantLock(false);
-
-
-    private static final String LOCK_SUCCESS = "OK";
-    private static final String SET_IF_NOT_EXIST = "NX";
-    private static final String SET_WITH_EXPIRE_TIME = "PX";
-    private static final Long RELEASE_SUCCESS = 1L;
-
-    /**
-     * 获取ShardedJedis实例
-     *
-     * @return
-     */
-    private static ShardedJedis getInstance() {
-        if (shardedJedisPool == null) {
-            try {
-                if (INSTANCE_INIT_LOCL.tryLock(2, TimeUnit.SECONDS)) {
-                    try {
-                        if (shardedJedisPool == null) {
-                            // JedisShardInfo List
-                            List<JedisShardInfo> jedisShardInfos = new LinkedList<JedisShardInfo>();
-
-                            String[] addressArr = address.split(",");
-                            for (int i = 0; i < addressArr.length; i++) {
-                                String[] addressInfo = addressArr[i].split(":");
-                                String host = addressInfo[0];
-                                int port = Integer.valueOf(addressInfo[1]);
-                                JedisShardInfo jedisShardInfo = new JedisShardInfo(host, port, 10000);
-                                jedisShardInfos.add(jedisShardInfo);
-                            }
-                            shardedJedisPool = new ShardedJedisPool(config, jedisShardInfos);
-                            log.info(">>>>>>>>>>> xxl-sso, JedisUtil.ShardedJedisPool init success.");
-                        }
-
-                    } finally {
-                        INSTANCE_INIT_LOCL.unlock();
-                    }
-                }
-
-            } catch (InterruptedException e) {
-                log.error("系统异常:", e);
-            }
-        }
-
-        if (shardedJedisPool == null) {
-            throw new NullPointerException(">>>>>>>>>>> xxl-sso, JedisUtil.ShardedJedisPool is null.");
-        }
-
-        ShardedJedis shardedJedis = shardedJedisPool.getResource();
-        return shardedJedis;
-    }
-
-    // ------------------------ serialize and unserialize ------------------------
-
-    /**
-     * 将对象-->byte[] (由于jedis中不支持直接存储object所以转换成byte[]存入)
-     *
-     * @param object
-     * @return
-     */
-    private static byte[] serialize(Object object) {
-        ObjectOutputStream oos = null;
-        ByteArrayOutputStream baos = null;
-        try {
-            // 序列化
-            baos = new ByteArrayOutputStream();
-            oos = new ObjectOutputStream(baos);
-            oos.writeObject(object);
-            byte[] bytes = baos.toByteArray();
-            return bytes;
-        } catch (Exception e) {
-            log.error("{}", e);
-        } finally {
-            try {
-                oos.close();
-                baos.close();
-            } catch (IOException e) {
-                log.error("{}", e);
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 将byte[] -->Object
-     *
-     * @param bytes
-     * @return
-     */
-    private static Object unserialize(byte[] bytes) {
-        ByteArrayInputStream bais = null;
-        try {
-            // 反序列化
-            bais = new ByteArrayInputStream(bytes);
-            ObjectInputStream ois = new ObjectInputStream(bais);
-            return ois.readObject();
-        } catch (Exception e) {
-            log.error("{}", e);
-        } finally {
-            try {
-                bais.close();
-            } catch (IOException e) {
-                log.error("{}", e);
-            }
-        }
-        return null;
-    }
-
-    // ------------------------ jedis util ------------------------
-    /**
-     * 存储简单的字符串或者是Object 因为jedis没有分装直接存储Object的方法,所以在存储对象需斟酌下
-     * 存储对象的字段是不是非常多而且是不是每个字段都用到,如果是的话那建议直接存储对象,
-     * 否则建议用集合的方式存储,因为redis可以针对集合进行日常的操作很方便而且还可以节省空间
-     */
-
-    /**
-     * Set String
-     *
-     * @param key
-     * @param value
-     * @param seconds 存活时间,单位/秒
-     * @return
-     */
-    public static String setStringValue(String key, String value, int seconds) {
-        String result = null;
-        ShardedJedis client = getInstance();
-        try {
-            result = client.setex(key, seconds, value);
-        } catch (Exception e) {
-            log.info("{}", e);
-        } finally {
-            client.close();
-        }
-        return result;
-    }
-
-    /**
-     * Set String (默认存活时间, 2H)
-     *
-     * @param key
-     * @param value
-     * @return
-     */
-    public static String setStringValue(String key, String value) {
-        return setStringValue(key, value, DEFAULT_EXPIRE_TIME);
-    }
-
-    /**
-     * Set Object
-     *
-     * @param key
-     * @param obj
-     * @param seconds 存活时间,单位/秒
-     */
-    public static String setObjectValue(String key, Object obj, int seconds) {
-        String result = null;
-        ShardedJedis client = getInstance();
-        try {
-            result = client.setex(key.getBytes(), seconds, serialize(obj));
-        } catch (Exception e) {
-            log.info("{}", e);
-        } finally {
-            client.close();
-        }
-        return result;
-    }
-
-    /**
-     * Set Object (默认存活时间, 2H)
-     *
-     * @param key
-     * @param obj
-     * @return
-     */
-    public static String setObjectValue(String key, Object obj) {
-        return setObjectValue(key, obj, DEFAULT_EXPIRE_TIME);
-    }
-
-    /**
-     * Get String
-     *
-     * @param key
-     * @return
-     */
-    public static String getStringValue(String key) {
-        String value = null;
-        ShardedJedis client = getInstance();
-        try {
-            value = client.get(key);
-        } catch (Exception e) {
-            log.info("", e);
-        } finally {
-            client.close();
-        }
-        return value;
-    }
-
-    /**
-     * Get Object
-     *
-     * @param key
-     * @return
-     */
-    public static Object getObjectValue(String key) {
-        Object obj = null;
-        ShardedJedis client = getInstance();
-        try {
-            byte[] bytes = client.get(key.getBytes());
-            if (bytes != null && bytes.length > 0) {
-                obj = unserialize(bytes);
-            }
-        } catch (Exception e) {
-            log.info("", e);
-        } finally {
-            client.close();
-        }
-        return obj;
-    }
-
-    /**
-     * Delete
-     *
-     * @param key
-     * @return Integer reply, specifically:
-     * an integer greater than 0 if one or more keys were removed
-     * 0 if none of the specified key existed
-     */
-    public static Long del(String key) {
-        Long result = null;
-        ShardedJedis client = getInstance();
-        try {
-            result = client.del(key);
-        } catch (Exception e) {
-            log.info("{}", e);
-        } finally {
-            client.close();
-        }
-        return result;
-    }
-
-    /**
-     * incrBy	value值加i
-     *
-     * @param key
-     * @param i
-     * @return new value after incr
-     */
-    public static Long incrBy(String key, int i) {
-        Long result = null;
-        ShardedJedis client = getInstance();
-        try {
-            result = client.incrBy(key, i);
-        } catch (Exception e) {
-            log.info("{}", e);
-        } finally {
-            client.close();
-        }
-        return result;
-    }
-
-    /**
-     * exists
-     *
-     * @param key
-     * @return Boolean reply, true if the key exists, otherwise false
-     */
-    public static boolean exists(String key) {
-        Boolean result = null;
-        ShardedJedis client = getInstance();
-        try {
-            result = client.exists(key);
-        } catch (Exception e) {
-            log.info("{}", e);
-        } finally {
-            client.close();
-        }
-        return result;
-    }
-
-    /**
-     * expire	重置存活时间
-     *
-     * @param key
-     * @param seconds 存活时间,单位/秒
-     * @return Integer reply, specifically:
-     * 1: the timeout was set.
-     * 0: the timeout was not set since the key already has an associated timeout (versions lt 2.1.3), or the key does not exist.
-     */
-    public static long expire(String key, int seconds) {
-        Long result = null;
-        ShardedJedis client = getInstance();
-        try {
-            result = client.expire(key, seconds);
-        } catch (Exception e) {
-            log.info("{}", e);
-        } finally {
-            client.close();
-        }
-        return result;
-    }
-
-    /**
-     * expireAt		设置存活截止时间
-     *
-     * @param key
-     * @param unixTime 存活截止时间戳
-     * @return
-     */
-    public static long expireAt(String key, long unixTime) {
-        Long result = null;
-        ShardedJedis client = getInstance();
-        try {
-            result = client.expireAt(key, unixTime);
-        } catch (Exception e) {
-            log.info("{}", e);
-        } finally {
-            client.close();
-        }
-        return result;
-    }
-
-    /**
-     * 尝试获取分布式锁
-     *
-     * @param lockKey    锁
-     * @param requestId  请求标识
-     * @param expireTime 超期时间
-     * @return 是否获取成功
-     */
-    public static boolean tryLock(String lockKey, String requestId, int expireTime) {
-        String result = getInstance().set(lockKey, requestId, SET_IF_NOT_EXIST, SET_WITH_EXPIRE_TIME, expireTime);
-        if (LOCK_SUCCESS.equals(result)) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * 释放分布式锁
-     *
-     * @param lockKey   锁
-     * @param requestId 请求标识
-     * @return 是否释放成功
-     */
-    public static boolean releaseLock(String lockKey, String requestId) {
-        Jedis jedis = (Jedis) getInstance().getShard(lockKey);
-        String script = "if redis.call('get', KEYS[1]) == ARGV[1] then return redis.call('del', KEYS[1]) else return 0 end";
-        Object result = jedis.eval(script, Collections.singletonList(lockKey), Collections.singletonList(requestId));
-        if (RELEASE_SUCCESS.equals(result)) {
-            return true;
-        }
-        return false;
-    }
-
-    public static void main(String[] args) {
-		/*init("127.0.0.1:6379");
-		setObjectValue("key", "666");
-		System.out.println(getObjectValue("key"));*/
-
-
-        String key = "key";
-        String request = UUID.randomUUID().toString();
-        try {
-            boolean lock = tryLock(key, request, 10 * 1000);
-            if (!lock) {
-                System.out.println("locked error");
-                return;
-            }
-            //do something
-        } finally {
-            releaseLock(key, request);
-        }
-
-
-    }
-
-}

+ 0 - 62
4dkankan-common/src/main/java/com/fdkankan/common/jedis/RedisConfig.java

@@ -1,62 +0,0 @@
-package com.fdkankan.common.jedis;
-
-import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import redis.clients.jedis.JedisPoolConfig;
-
-@Log4j2
-@Configuration
-@EnableCaching
-@ConfigurationProperties
-public class RedisConfig extends CachingConfigurerSupport implements InitializingBean {
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        log.warn("redis.address:"+address);
-        JedisUtil.init(address, jedisPoolConfig());
-    }
-
-    @Value("${spring.redis.database}")
-    private int database;
-    @Value("${spring.redis.host}")
-    private String host;
-    @Value("${spring.redis.port}")
-    private int port;
-    @Value("${spring.redis.password}")
-    private String password;
-    @Value("${spring.redis.timeout}")
-    private String timeout;
-    @Value("${spring.redis.jedis.pool.max-idle}")
-    private int maxIdle;
-    @Value("${spring.redis.jedis.pool.min-idle}")
-    private int minIdle;
-    @Value("${spring.redis.host}:${spring.redis.port}")
-    private String address;
-
-    /**
-     * 连接池配置
-     * @Description:
-     * @return
-     */
-    @Bean
-    public JedisPoolConfig jedisPoolConfig() {
-        JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
-        jedisPoolConfig.setMaxIdle(maxIdle);
-        jedisPoolConfig.setMinIdle(minIdle);
-//        jedisPoolConfig.setMaxTotal(maxTotal);			            // 最大连接数, 默认8个
-//        jedisPoolConfig.setMaxWaitMillis(maxWaitMillis);	        // 获取连接时的最大等待毫秒数(如果设置为阻塞时BlockWhenExhausted),如果超时就抛异常, 小于零:阻塞不确定的时间,  默认-1
-        jedisPoolConfig.setTestOnBorrow(true);		                // 在获取连接的时候检查有效性, 默认false
-        jedisPoolConfig.setTestOnReturn(true);                      // 调用returnObject方法时,是否进行有效检查
-        jedisPoolConfig.setTestWhileIdle(true);		                // Idle时进行连接扫描
-        jedisPoolConfig.setTimeBetweenEvictionRunsMillis(30000);	//表示idle object evitor两次扫描之间要sleep的毫秒数
-        jedisPoolConfig.setNumTestsPerEvictionRun(10);			    //表示idle object evitor每次扫描的最多的对象数
-        jedisPoolConfig.setMinEvictableIdleTimeMillis(60000);	    //表示一个对象至少停留在idle状态的最短时间,然后才能被idle object evitor扫描并驱逐;这一项只有在timeBetweenEvictionRunsMillis大于0时才有意义
-        return jedisPoolConfig;
-    }
-}

+ 96 - 0
4dkankan-modeling/src/main/resources/application-uat.properties

@@ -0,0 +1,96 @@
+#应用名
+spring.application.name=4dkankan-model
+#注册中心
+spring.cloud.nacos.discovery.server-addr=10.71.5.163:80
+
+#DB (new)
+spring.datasource.primary.url=jdbc:mysql://10.71.184.146:3306/db_4dkankan?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.primary.username=user_4dkankan_rw
+spring.datasource.primary.password=y2b9a42wRwGNKkJjCm1o
+spring.datasource.primary.driverClassName=com.mysql.jdbc.Driver
+
+spring.servlet.multipart.max-file-size=500MB
+spring.servlet.multipart.max-request-size=1000MB
+spring.servlet.multipart.enabled=true
+spring.servlet.multipart.location=/mnt/data/
+#redis
+spring.redis.cluster.nodes=10.71.184.237:7000,10.71.184.181:7000,10.71.184.217:7000,10.71.184.188:7000,10.71.184.222:7000,10.71.184.200:7000
+spring.redis.database=0
+spring.redis.password=QBzhHTxfcYLTs0n5J5VQ
+spring.redis.timeout=3000ms
+spring.redis.jedis.pool.max-idle=8
+spring.redis.jedis.pool.min-idle=0
+spring.redis.jedis.pool.max-active=8
+spring.redis.jedis.pool.max-wait=-1ms
+
+# file route
+file.route.hardDisk=/mnt/data/
+file.route.imageFolder=IMAGE
+file.route.documentFolder=VIDEO
+file.route.videoFolder=DOCUMENT
+file.route.musicFolder=MUSIC
+file.route.imageType=[".bmp", ".jpg", ".jpeg", ".png", ".tiff", ".gif", ".pcx", ".tga", ".exif", ".fpx", ".svg", ".psd",".cdr", ".pcd", ".dxf", ".ufo", ".eps", ".ai", ".raw", ".wmf"]
+file.route.documentType=[".txt", ".doc", ".docx", ".xls", ".htm", ".html", ".jsp", ".rtf", ".wpd", ".pdf", ".ppt",".js"]
+file.route.videoType=[".mp4", ".avi", ".mov", ".wmv", ".asf", ".navi", ".3gp", ".mkv", ".f4v", ".rmvb", ".webm"]
+file.route.musicType=[".mp3", ".wma", ".wav", ".mod", ".ra", ".cd", ".md", ".asf", ".aac", ".vqf", ".ape", ".mid", ".ogg",".m4a", ".vqf"]
+file.route.IPs=["0:0:0:0:0:0:0:1","192.168.0.100"]
+#swagger
+swagger.basePackage=com.fdkankan.web.controller
+swagger.title=四维看看2.0单机版
+swagger.description=api文档
+swagger.serviceUrl=http://39.108.220.65:8080
+swagger.version=2.0
+#rabbitmq
+#spring.rabbitmq.host=8.135.98.231
+#spring.rabbitmq.port=30672
+spring.rabbitmq.address=10.71.5.163:5379,10.71.5.164:5379
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=fcb@admin_4dage
+spring.rabbitmq.virtual-host=/
+spring.rabbitmq.connection-timeout=15000
+#confirm模式
+spring.rabbitmq.publisher-confirms=true
+#return机制
+spring.rabbitmq.publisher-returns=true
+#与return机制结合配置次属性
+spring.rabbitmq.template.mandatory=true
+
+spring.mvc.static-path-pattern=/**
+spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/, classpath:/static/, classpath:/web/, file:${server.file.location}
+
+oss.point=http://oss-cn-shenzhen-internal.aliyuncs.com
+oss.key=LTAI4FyDDFpGGjTJZEQH4yaK
+oss.secrey=mqVRTWbWcn4sNMoWmnRq6eToWr9BIy
+oss.bucket=fcb-vrkanfang-uat
+oss.type=oss
+
+main.url=https://vr-web01-uat-fcb.com.cn/
+main.intranet.url=https://vr-mc01-uat-fcb.com/
+scene.url=show.html?m=
+scene.pro.url=showProMobile.html?m=
+scene.pro.new.url=smobile.html?m=
+
+prefix.ali=https://fcb-vrkanfang-uat.os-cn-shenzhen.aliyuncs.com/
+
+#服务器环境,dev为测试环境,formal为正式环境
+environment=dev
+
+#mq的任务key
+rabbitmq.queue=QUEUE_MODELING_A
+#mq当排队任务超过这个数量时启用弹性升缩
+mq.base.num=300
+#弹性伸缩组id
+scaling.group.id=asg-wz92989gdhgek3ktdlsw
+#弹性伸缩规则id
+scaling.rule.ari=ari:acs:ess:cn-shenzhen:1899912233141089:scalingrule/asr-wz97gv4s2nod1cxznynx
+
+#服务器类型,aliyun或hqyun
+ecs.type=aliyun
+
+knife4j.basic.enable=true
+knife4j.basic.username=apiadmin
+knife4j.basic.password=fdkankancui
+
+
+
+

+ 1 - 2
4dkankan-web/src/main/java/com/fdkankan/web/controller/SceneFileController.java

@@ -13,7 +13,6 @@ import com.fdkankan.common.api.BaseController;
 import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.common.exception.BaseRuntimeException;
-import com.fdkankan.common.jedis.JedisUtil;
 import com.fdkankan.common.model.Result;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.RubberSheetingUtil;
@@ -579,7 +578,7 @@ public class SceneFileController extends BaseController {
         }
         String mac = strArr[0];
         String fileId = strArr[1];
-        String folderName = JedisUtil.getStringValue(fileId);
+        String folderName = redisTemplate.opsForValue().get(fileId);
         if(StringUtils.isEmpty(folderName)){
             SceneProEntity sceneProEntity = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", "A");
             if(sceneProEntity != null){