diff --git a/im-client/pom.xml b/im-client/pom.xml index 774bafb..4634ec7 100644 --- a/im-client/pom.xml +++ b/im-client/pom.xml @@ -5,7 +5,7 @@ box-im com.bx - 2.0.0 + 3.0.0 4.0.0 @@ -15,7 +15,7 @@ com.bx im-commom - 2.0.0 + 3.0.0 \ No newline at end of file diff --git a/im-commom/pom.xml b/im-commom/pom.xml index a019f36..92599d1 100644 --- a/im-commom/pom.xml +++ b/im-commom/pom.xml @@ -5,16 +5,11 @@ box-im com.bx - 2.0.0 + 3.0.0 4.0.0 im-commom - - - 8 - 8 - - + jar org.projectlombok diff --git a/im-platform/pom.xml b/im-platform/pom.xml index 05b2590..65ef8ab 100644 --- a/im-platform/pom.xml +++ b/im-platform/pom.xml @@ -5,18 +5,16 @@ box-im com.bx - 2.0.0 + 3.0.0 4.0.0 - im-platform - com.bx im-client - 2.0.0 + 3.0.0 org.springframework.boot @@ -53,11 +51,6 @@ org.aspectj aspectjweaver - - - org.springframework.boot - spring-boot-starter-data-redis - org.springframework.security spring-security-crypto @@ -99,14 +92,12 @@ ${knife4j.version} - ${project.artifactId} org.springframework.boot spring-boot-maven-plugin - 3.3.1 diff --git a/im-platform/src/main/java/com/bx/implatform/config/MvcConfig.java b/im-platform/src/main/java/com/bx/implatform/config/MvcConfig.java index 4ee1d19..2dee3c9 100644 --- a/im-platform/src/main/java/com/bx/implatform/config/MvcConfig.java +++ b/im-platform/src/main/java/com/bx/implatform/config/MvcConfig.java @@ -19,13 +19,10 @@ public class MvcConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(xssInterceptor) - .addPathPatterns("/**") - .excludePathPatterns("/error"); - registry.addInterceptor(authInterceptor) - .addPathPatterns("/**") - .excludePathPatterns("/login", "/logout", "/register", "/refreshToken", - "/swagger-resources/**", "/webjars/**", "/v2/**", "/swagger-ui.html/**"); + registry.addInterceptor(xssInterceptor).addPathPatterns("/**").excludePathPatterns("/error"); + registry.addInterceptor(authInterceptor).addPathPatterns("/**") + .excludePathPatterns("/login", "/logout", "/register", "/refreshToken", "/swagger/**", "/v3/api-docs/**", + "/swagger-resources/**", "/swagger-ui.html", "/swagger-ui/**", "/doc.html"); } @Bean diff --git a/im-platform/src/main/java/com/bx/implatform/config/SwaggerConfig.java b/im-platform/src/main/java/com/bx/implatform/config/SwaggerConfig.java index 5c5841f..9ab109a 100644 --- a/im-platform/src/main/java/com/bx/implatform/config/SwaggerConfig.java +++ b/im-platform/src/main/java/com/bx/implatform/config/SwaggerConfig.java @@ -16,7 +16,7 @@ public class SwaggerConfig { public GroupedOpenApi userApi() { String[] paths = {"/**"}; String[] packagedToMatch = {"com.bx"}; - return GroupedOpenApi.builder().group("BoxIM") + return GroupedOpenApi.builder().group("IM-Platform") .pathsToMatch(paths) .packagesToScan(packagedToMatch).build(); } @@ -26,8 +26,8 @@ public class SwaggerConfig { Contact contact = new Contact(); contact.setName("Blue"); return new OpenAPI().info(new Info() - .title("Box-IM") - .description("盒子IM") + .title("盒子IM") + .description("盒子IM业务平台服务") .contact(contact) .version("3.0") .termsOfService("https://www.boxim.online") diff --git a/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java b/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java index 49c0e34..840838f 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java @@ -13,7 +13,7 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -@Tag(name = "用户登录和注册") +@Tag(name = "注册登陆") @RestController @RequiredArgsConstructor public class LoginController { diff --git a/im-platform/src/main/java/com/bx/implatform/controller/UserController.java b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java index dd6c133..422298f 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/UserController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/UserController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@Tag(name = "用户") +@Tag(name = "用户相关") @RestController @RequestMapping("/user") @RequiredArgsConstructor diff --git a/im-platform/src/main/java/com/bx/implatform/controller/WebrtcGroupController.java b/im-platform/src/main/java/com/bx/implatform/controller/WebrtcGroupController.java index fa3bf62..2639da2 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/WebrtcGroupController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/WebrtcGroupController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; * @date: 2024-06-01 * @version: 1.0 */ -@Tag(name = "webrtc视频多人通话") +@Tag(name = "多人通话") @RestController @RequestMapping("/webrtc/group") @RequiredArgsConstructor diff --git a/im-platform/src/main/java/com/bx/implatform/controller/WebrtcPrivateController.java b/im-platform/src/main/java/com/bx/implatform/controller/WebrtcPrivateController.java index c0d4728..9ae38e8 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/WebrtcPrivateController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/WebrtcPrivateController.java @@ -9,7 +9,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -@Tag(name = "webrtc视频单人通话") +@Tag(name = "单人通话") @RestController @RequestMapping("/webrtc/private") @RequiredArgsConstructor diff --git a/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java b/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java index b3bd248..3cd0f43 100644 --- a/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java +++ b/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java @@ -37,7 +37,7 @@ public class AuthInterceptor implements HandlerInterceptor { } String strJson = JwtUtil.getInfo(token); UserSession userSession = JSON.parseObject(strJson, UserSession.class); - //验证 token + // 验证 token if (!JwtUtil.checkSign(token, jwtProperties.getAccessTokenSecret())) { log.error("token已失效,用户:{}", userSession.getUserName()); log.error("token:{}", token); diff --git a/im-platform/src/main/resources/static/favicon.ico b/im-platform/src/main/resources/static/favicon.ico new file mode 100644 index 0000000..8cd39d4 Binary files /dev/null and b/im-platform/src/main/resources/static/favicon.ico differ diff --git a/im-server/pom.xml b/im-server/pom.xml index 3b6fe90..2e6edbf 100644 --- a/im-server/pom.xml +++ b/im-server/pom.xml @@ -5,7 +5,7 @@ box-im com.bx - 2.0.0 + 3.0.0 4.0.0 @@ -16,27 +16,20 @@ com.bx im-commom - 2.0.0 + 3.0.0 io.netty netty-all 4.1.42.Final - - - org.springframework.boot - spring-boot-starter-data-redis - - ${project.artifactId} org.springframework.boot spring-boot-maven-plugin - 3.3.1 diff --git a/pom.xml b/pom.xml index f5511d8..a00400d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ box-im com.bx pom - 2.0.0 + 3.0.0 org.springframework.boot spring-boot-starter-parent @@ -70,37 +70,6 @@ hutool-all ${hutool.version} - - org.apache.poi - poi-ooxml - 4.1.2 - - - commons-io - commons-io - 2.6 - - - dom4j - dom4j - 1.6.1 - - - org.codehaus.jackson - jackson-mapper-asl - 1.9.13 - - - javax.interceptor - javax.interceptor-api - 1.2 - - - org.springframework.security - spring-security-jwt - 1.0.10.RELEASE - - @@ -116,4 +85,6 @@ + + \ No newline at end of file