Explorar el Código

fix: 修复测试导致build失败

ChenSiTong hace 6 años
padre
commit
1e104fa83c

+ 0 - 72
src/main/java/nju/seec/helper/InitDataComponent.java

@@ -1,72 +0,0 @@
-//package nju.seec.helper;
-//
-//import com.github.javafaker.Faker;
-//import com.google.common.collect.ImmutableList;
-//import nju.seec.helper.dao.CourseDAO;
-//import nju.seec.helper.dao.UserDAO;
-//import nju.seec.helper.entity.Course;
-//import nju.seec.helper.entity.User;
-//import nju.seec.helper.util.EncryptUtils;
-//import nju.seec.helper.util.enums.UserType;
-//import org.springframework.boot.ApplicationArguments;
-//import org.springframework.boot.ApplicationRunner;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.List;
-//
-///**
-// * @author cst
-// */
-//@Component
-//public class InitDataComponent implements ApplicationRunner {
-//    private final UserDAO userDAO;
-//    private final CourseDAO courseDAO;
-//
-//    public InitDataComponent(UserDAO userDAO, CourseDAO courseDAO) {
-//        this.userDAO = userDAO;
-//        this.courseDAO = courseDAO;
-//    }
-//
-//    @Override
-//    public void run(ApplicationArguments args) {
-//        Faker faker = new Faker();
-//        // init user
-//        String teacherName = faker.name().name();
-//        List<User> users = ImmutableList.of(
-//                new User().setName(teacherName)
-//                        .setEmail(faker.internet().emailAddress())
-//                        .setPhone(faker.phoneNumber().phoneNumber())
-//                        .setPassword(EncryptUtils.encode("teacher"))
-//                        .setType(UserType.TEACHER),
-//                new User().setName(faker.name().name())
-//                        .setEmail(faker.internet().emailAddress())
-//                        .setPhone(faker.phoneNumber().phoneNumber())
-//                        .setPassword(EncryptUtils.encode("student"))
-//                        .setType(UserType.STUDENT)
-//        );
-//        userDAO.saveAll(users);
-//
-//        // init course
-//        List<Course> courses = ImmutableList.of(
-//                new Course().setTeacherId(1)
-//                        .setTeacherName(teacherName)
-//                        .setName(faker.educator().course())
-//                        .setBio("")
-//                        .setCode(EncryptUtils.encode("123456"))
-//                        .setCover(""),
-//                new Course().setTeacherId(1)
-//                        .setTeacherName(teacherName)
-//                        .setName(faker.educator().course())
-//                        .setBio("")
-//                        .setCode(EncryptUtils.encode("123456"))
-//                        .setCover(""),
-//                new Course().setTeacherId(1)
-//                        .setTeacherName(teacherName)
-//                        .setName(faker.educator().course())
-//                        .setBio("")
-//                        .setCode(EncryptUtils.encode("123456"))
-//                        .setCover("")
-//        );
-//        courseDAO.saveAll(courses);
-//    }
-//}

+ 0 - 16
src/main/java/nju/seec/helper/ServletInitializer.java

@@ -1,16 +0,0 @@
-//package nju.seec.helper;
-//
-//import org.springframework.boot.builder.SpringApplicationBuilder;
-//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-//
-///**
-// * @author cst
-// */
-//public class ServletInitializer extends SpringBootServletInitializer {
-//
-//    @Override
-//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-//        return application.sources(HelperApplication.class);
-//    }
-//
-//}

+ 0 - 39
src/main/java/nju/seec/helper/config/Swagger2Config.java

@@ -1,39 +0,0 @@
-//package nju.seec.helper.config;
-//
-//import io.swagger.annotations.Api;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import springfox.documentation.builders.ApiInfoBuilder;
-//import springfox.documentation.builders.PathSelectors;
-//import springfox.documentation.builders.RequestHandlerSelectors;
-//import springfox.documentation.service.ApiInfo;
-//import springfox.documentation.service.Contact;
-//import springfox.documentation.spi.DocumentationType;
-//import springfox.documentation.spring.web.plugins.Docket;
-//import springfox.documentation.swagger2.annotations.EnableSwagger2;
-//
-///**
-// * @author cst
-// */
-//@Configuration
-//@EnableSwagger2
-//public class Swagger2Config {
-//    @Bean
-//    public Docket createDocket() {
-//        return new Docket(DocumentationType.SWAGGER_2)
-//                .apiInfo(apiInfo())
-//                .select()
-//                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
-//                .paths(PathSelectors.any())
-//                .build();
-//    }
-//
-//    private ApiInfo apiInfo() {
-//        return new ApiInfoBuilder()
-//                .title("SEEC-Helper后端API文档")
-//                .contact(new Contact("ChenSiTong", "", "chen_st@foxmail.com"))
-//                .description("")
-//                .version("1.0")
-//                .build();
-//    }
-//}

+ 0 - 1
src/main/java/nju/seec/helper/controller/CommentController.java

@@ -2,7 +2,6 @@ package nju.seec.helper.controller;
 
 import nju.seec.helper.aspect.auth.Auth;
 import nju.seec.helper.controller.response.PageResponse;
-import nju.seec.helper.controller.websocket.CommentWebsocket;
 import nju.seec.helper.dto.CommentDTO;
 import nju.seec.helper.dto.LoginUser;
 import nju.seec.helper.service.CommentService;

+ 14 - 6
src/main/java/nju/seec/helper/controller/websocket/CommentWebsocket.java → src/main/java/nju/seec/helper/controller/CommentWebsocket.java

@@ -1,8 +1,8 @@
-package nju.seec.helper.controller.websocket;
+package nju.seec.helper.controller;
 
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Component;
 
 import javax.websocket.OnClose;
 import javax.websocket.OnError;
@@ -20,9 +20,9 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * @author cst
  */
 @ServerEndpoint("/api/ws/comment/slide/{slideId}")
-@RestController
 @Slf4j
 @EqualsAndHashCode
+@Component
 public class CommentWebsocket {
     private static Map<Integer, Set<CommentWebsocket>> COMMENT_WEBSOCKET_MAP = new ConcurrentHashMap<>();
     private Integer slideId;
@@ -34,7 +34,7 @@ public class CommentWebsocket {
         session.setMaxIdleTimeout(3 * 60 * 60 * 1000);
         this.session = session;
         this.slideId = slideId;
-        if (COMMENT_WEBSOCKET_MAP.get(slideId) == null) {
+        if (!COMMENT_WEBSOCKET_MAP.containsKey(slideId)) {
             COMMENT_WEBSOCKET_MAP.put(slideId, new CopyOnWriteArraySet<>());
         }
         COMMENT_WEBSOCKET_MAP.get(slideId).add(this);
@@ -51,7 +51,15 @@ public class CommentWebsocket {
     }
 
     public static void sendAllMessage(Integer slideId, String message) {
-        COMMENT_WEBSOCKET_MAP.getOrDefault(slideId, Collections.emptySet())
-                .forEach(commentWebsocket -> commentWebsocket.session.getAsyncRemote().sendText(message));
+        COMMENT_WEBSOCKET_MAP
+                .getOrDefault(slideId, Collections.emptySet())
+                .parallelStream()
+                .forEach(commentWebsocket -> {
+                    try {
+                        commentWebsocket.session.getAsyncRemote().sendText(message);
+                    } catch (Exception e) {
+                        log.error(e.getLocalizedMessage());
+                    }
+                });
     }
 }

+ 1 - 1
src/test/java/nju/seec/helper/HelperApplicationTests.java

@@ -3,7 +3,7 @@ package nju.seec.helper;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class HelperApplicationTests {
 
     @Test