Merge remote-tracking branch 'origin/master'

simulation-oauth-server/pom.xml

@@ -111,11 +111,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

simulation-oauth-server/src/test/java/com/css/simulation/oauth/server/Test.java

@@ -1,25 +0,0 @@
-package com.css.simulation.oauth.server;
-
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.util.Set;
-
-@SpringBootTest
-@RunWith(SpringRunner.class)
-public class Test {
-    @Autowired
-    StringRedisTemplate redisTemplate;
-
-
-    @org.junit.Test
-    public void test() {
-        Set<String> keys = redisTemplate.keys("access:*");
-        int size = keys.size();
-        System.out.println(size);
-    }
-
-}

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -953,7 +953,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                     //mp4视频文件
                     minioParameter1.setObjectName(s);
                     ResponseBodyVO<String> preview = fileDownService.getPreviewUrl(minioParameter1);
-                    list1.add(preview.getMessage());
+                    list1.add(preview.getInfo());
                 }
 
             }