diff --git a/orion-ops-dependencies/pom.xml b/orion-ops-dependencies/pom.xml index 0b3d30a8..38473e11 100644 --- a/orion-ops-dependencies/pom.xml +++ b/orion-ops-dependencies/pom.xml @@ -15,23 +15,24 @@ 1.0.0 - 2.7.11 + 2.7.17 + 2.7.15 + 1.5.0 1.0.6 1.9.7 1.18.26 1.6.15 4.1.0 1.5.5.Final - 3.5.3.1 - 3.5.3.1 - 1.4.6 + 3.5.3.1 + 3.5.3.1 + 1.4.6 2.3 1.2.16 3.18.0 - 2.7.10 - 2.14.2 - 4.11.0 - 1.0.7 + 2.14.2 + 4.11.0 + 1.0.7 7.2.11.RELEASE @@ -203,12 +204,12 @@ com.baomidou mybatis-plus-boot-starter - ${mybatis-plus.version} + ${mybatis.plus.version} com.baomidou mybatis-plus-generator - ${mybatis-plus-generator.version} + ${mybatis.plus.generator.version} org.apache.velocity @@ -218,7 +219,7 @@ com.github.yulichang mybatis-plus-join-boot-starter - ${mybatis-plus-join.version} + ${mybatis.plus.join.version} @@ -245,19 +246,19 @@ de.codecentric spring-boot-admin-starter-server - ${spring-boot-admin.version} + ${spring.boot.admin.version} de.codecentric spring-boot-admin-starter-client - ${spring-boot-admin.version} + ${spring.boot.admin.version} com.alibaba transmittable-thread-local - ${transmittable-thread-local.version} + ${transmittable.thread.local.version} @@ -285,14 +286,14 @@ org.mockito mockito-inline - ${mockito-inline.version} + ${mockito.inline.version} com.github.fppt jedis-mock - ${jedis-mock.version} + ${jedis.mock.version} @@ -304,4 +305,35 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten.maven.plugin.version} + + resolveCiFriendliesOnly + true + + + + + flatten + + flatten + process-resources + + + + clean + + flatten.clean + clean + + + + + + \ No newline at end of file diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java index 2a7732f2..7ace0747 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-security/src/main/java/com/orion/ops/framework/security/core/strategy/WebsocketAuthorizeRequestsCustomizer.java @@ -15,7 +15,7 @@ public class WebsocketAuthorizeRequestsCustomizer extends AuthorizeRequestsCusto @Override public void customize(ExpressionUrlAuthorizationConfigurer.ExpressionInterceptUrlRegistry registry) { // websocket 允许匿名访问 - registry.antMatchers("/keep-alive/**").permitAll(); + registry.antMatchers("/orion/keep-alive/**").permitAll(); } } diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/OrionSwaggerAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/OrionSwaggerAutoConfiguration.java index 0c284259..5068f180 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/OrionSwaggerAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/OrionSwaggerAutoConfiguration.java @@ -39,7 +39,7 @@ import java.util.Optional; */ @Profile({"dev"}) @ConditionalOnClass({OpenAPI.class}) -@EnableConfigurationProperties(SwaggerProperties.class) +@EnableConfigurationProperties(SwaggerConfig.class) @ConditionalOnProperty(prefix = "springdoc.api-docs", name = "enabled", havingValue = "true", matchIfMissing = true) @AutoConfiguration @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_SWAGGER) @@ -53,7 +53,7 @@ public class OrionSwaggerAutoConfiguration { * @return OpenAPI */ @Bean - public OpenAPI openApi(SwaggerProperties properties) { + public OpenAPI openApi(SwaggerConfig properties) { Map securitySchemas = this.buildSecuritySchemes(); OpenAPI api = new OpenAPI() // 接口信息 @@ -68,7 +68,7 @@ public class OrionSwaggerAutoConfiguration { /** * api 摘要信息 */ - private Info buildInfo(SwaggerProperties properties) { + private Info buildInfo(SwaggerConfig properties) { return new Info() .title(properties.getTitle()) .description(properties.getDescription()) @@ -117,7 +117,7 @@ public class OrionSwaggerAutoConfiguration { */ @Bean public GroupedOpenApi allGroupedOpenApi(ConfigurableListableBeanFactory beanFactory, - SwaggerProperties properties) { + SwaggerConfig properties) { // 全部 GroupedOpenApi all = this.buildGroupedOpenApi("全部", "*"); // 注册模块分组 api diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/SwaggerProperties.java b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/SwaggerConfig.java similarity index 95% rename from orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/SwaggerProperties.java rename to orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/SwaggerConfig.java index def6a8d0..6bed89a7 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/SwaggerProperties.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/java/com/orion/ops/framework/swagger/config/SwaggerConfig.java @@ -6,13 +6,15 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import java.util.Map; /** + * swagger 配置 + * * @author Jiahang Li * @version 1.0.0 * @since 2023/6/21 11:13 */ @Data @ConfigurationProperties("orion.swagger") -public class SwaggerProperties { +public class SwaggerConfig { /** * 标题 diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json index 2ef1d928..4795f857 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json +++ b/orion-ops-framework/orion-ops-spring-boot-starter-swagger/src/main/resources/META-INF/spring-configuration-metadata.json @@ -2,8 +2,8 @@ "groups": [ { "name": "orion.swagger", - "type": "com.orion.ops.framework.swagger.config.SwaggerProperties", - "sourceType": "com.orion.ops.framework.swagger.config.SwaggerProperties" + "type": "com.orion.ops.framework.swagger.config.SwaggerConfig", + "sourceType": "com.orion.ops.framework.swagger.config.SwaggerConfig" } ], "properties": [ diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/OrionWebsocketAutoConfiguration.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/OrionWebsocketAutoConfiguration.java index a91ba2e3..c547a78a 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/OrionWebsocketAutoConfiguration.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/OrionWebsocketAutoConfiguration.java @@ -1,8 +1,7 @@ package com.orion.ops.framework.websocket.config; import com.orion.ops.framework.common.constant.AutoConfigureOrderConst; -import com.orion.ops.framework.websocket.core.WebsocketContainerConfig; -import com.orion.ops.framework.websocket.interceptor.UserHandshakeInterceptor; +import com.orion.ops.framework.websocket.core.interceptor.UserHandshakeInterceptor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -21,14 +20,14 @@ import org.springframework.web.socket.server.standard.ServletServerContainerFact @EnableWebSocket @AutoConfiguration @AutoConfigureOrder(AutoConfigureOrderConst.FRAMEWORK_WEBSOCKET) -@EnableConfigurationProperties(WebsocketContainerConfig.class) +@EnableConfigurationProperties(WebsocketConfig.class) public class OrionWebsocketAutoConfiguration { /** * @return websocket 缓冲区大小配置 */ @Bean - public ServletServerContainerFactoryBean servletServerContainerFactoryBean(WebsocketContainerConfig config) { + public ServletServerContainerFactoryBean servletServerContainerFactoryBean(WebsocketConfig config) { ServletServerContainerFactoryBean factory = new ServletServerContainerFactoryBean(); factory.setMaxBinaryMessageBufferSize(config.getBinaryBufferSize()); factory.setMaxTextMessageBufferSize(config.getBinaryBufferSize()); diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/WebsocketContainerConfig.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/WebsocketConfig.java similarity index 85% rename from orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/WebsocketContainerConfig.java rename to orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/WebsocketConfig.java index e388766b..36a7e556 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/WebsocketContainerConfig.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/config/WebsocketConfig.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.websocket.core; +package com.orion.ops.framework.websocket.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -12,7 +12,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; */ @Data @ConfigurationProperties("spring.websocket") -public class WebsocketContainerConfig { +public class WebsocketConfig { /** * 二进制消息缓冲区大小 byte diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsAttr.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsAttr.java similarity index 83% rename from orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsAttr.java rename to orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsAttr.java index 2eb2ceb9..8dd48c81 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsAttr.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsAttr.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.websocket.constant; +package com.orion.ops.framework.websocket.core.constant; /** * websocket 属性 diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseCode.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsCloseCode.java similarity index 97% rename from orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseCode.java rename to orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsCloseCode.java index f878a56f..c5a32480 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseCode.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsCloseCode.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.websocket.constant; +package com.orion.ops.framework.websocket.core.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseReason.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsCloseReason.java similarity index 92% rename from orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseReason.java rename to orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsCloseReason.java index 05f9eb53..a7c8ae8b 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsCloseReason.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsCloseReason.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.websocket.constant; +package com.orion.ops.framework.websocket.core.constant; /** * ws服务端关闭reason diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsProtocol.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsProtocol.java similarity index 96% rename from orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsProtocol.java rename to orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsProtocol.java index 7fb23051..e8b5efdb 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/constant/WsProtocol.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/constant/WsProtocol.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.websocket.constant; +package com.orion.ops.framework.websocket.core.constant; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Strings; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/interceptor/UserHandshakeInterceptor.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/interceptor/UserHandshakeInterceptor.java similarity index 90% rename from orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/interceptor/UserHandshakeInterceptor.java rename to orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/interceptor/UserHandshakeInterceptor.java index 45d94c42..76af99ef 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/interceptor/UserHandshakeInterceptor.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/interceptor/UserHandshakeInterceptor.java @@ -1,7 +1,7 @@ -package com.orion.ops.framework.websocket.interceptor; +package com.orion.ops.framework.websocket.core.interceptor; import com.orion.ops.framework.common.security.SecurityHolder; -import com.orion.ops.framework.websocket.constant.WsAttr; +import com.orion.ops.framework.websocket.core.constant.WsAttr; import org.springframework.http.server.ServerHttpRequest; import org.springframework.http.server.ServerHttpResponse; import org.springframework.web.socket.WebSocketHandler; diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/utils/WebSockets.java b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/utils/WebSockets.java similarity index 96% rename from orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/utils/WebSockets.java rename to orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/utils/WebSockets.java index f1709602..7ced55a4 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/utils/WebSockets.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-websocket/src/main/java/com/orion/ops/framework/websocket/core/utils/WebSockets.java @@ -1,4 +1,4 @@ -package com.orion.ops.framework.websocket.utils; +package com.orion.ops.framework.websocket.core.utils; import com.orion.lang.exception.AuthenticationException; import com.orion.lang.exception.ConnectionRuntimeException; @@ -6,7 +6,7 @@ import com.orion.lang.exception.DisabledException; import com.orion.lang.exception.TimeoutException; import com.orion.lang.utils.Exceptions; import com.orion.lang.utils.Urls; -import com.orion.ops.framework.websocket.constant.WsCloseCode; +import com.orion.ops.framework.websocket.core.constant.WsCloseCode; import lombok.extern.slf4j.Slf4j; import org.springframework.http.server.ServerHttpRequest; import org.springframework.web.socket.CloseStatus; diff --git a/orion-ops-launch/pom.xml b/orion-ops-launch/pom.xml index f92c6832..b97bef2a 100644 --- a/orion-ops-launch/pom.xml +++ b/orion-ops-launch/pom.xml @@ -115,7 +115,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.7.11 + 2.7.17 true diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml b/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml index 75e0d154..b5c5ab34 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml +++ b/orion-ops-module-asset/orion-ops-module-asset-service/pom.xml @@ -41,6 +41,12 @@ orion-ops-spring-boot-starter-web + + + com.orion.ops + orion-ops-spring-boot-starter-websocket + + com.orion.ops diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/interceptor/TerminalInterceptor.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/interceptor/TerminalInterceptor.java new file mode 100644 index 00000000..5ee5984f --- /dev/null +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/interceptor/TerminalInterceptor.java @@ -0,0 +1,63 @@ +package com.orion.ops.module.asset.interceptor; + +import com.orion.ops.framework.websocket.core.interceptor.UserHandshakeInterceptor; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; +import org.springframework.web.socket.*; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +import javax.annotation.Resource; + +/** + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/12/27 23:53 + */ +@Configuration +public class TerminalInterceptor implements WebSocketConfigurer { + + // https://blog.csdn.net/oNew_Lifeo/article/details/130003676 + // https://wstool.js.org/ + + @Resource + private UserHandshakeInterceptor userHandshakeInterceptor; + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(new WebSocketHandler1(), "/orion/keep-alive/host/terminal") + .addInterceptors(userHandshakeInterceptor) + .setAllowedOrigins("*"); + System.out.println("123"); + } + + static class WebSocketHandler1 implements WebSocketHandler { + + @Override + public void afterConnectionEstablished(WebSocketSession session) throws Exception { + System.out.println(1); + } + + @Override + public void handleMessage(WebSocketSession session, WebSocketMessage message) throws Exception { + System.out.println(message); + } + + @Override + public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception { + System.out.println(1); + } + + @Override + public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception { + System.out.println(1); + } + + @Override + public boolean supportsPartialMessages() { + return false; + } + } + +} diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/interceptor/TerminalInterceptor1.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/interceptor/TerminalInterceptor1.java new file mode 100644 index 00000000..37d4a545 --- /dev/null +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/interceptor/TerminalInterceptor1.java @@ -0,0 +1,37 @@ +package com.orion.ops.module.asset.interceptor; + +import com.orion.ops.framework.websocket.core.interceptor.UserHandshakeInterceptor; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +import javax.annotation.Resource; + +/** + * @author Jiahang Li + * @version 1.0.0 + * @since 2023/12/27 23:53 + */ +// @Configuration +public class TerminalInterceptor1 implements WebSocketConfigurer { + + @Resource + private UserHandshakeInterceptor userHandshakeInterceptor; + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(new TextWebSocketHandler() { + @Override + protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { + System.out.println(message); + } + }, "/orion/keep-alive/host/terminal1") + .addInterceptors(userHandshakeInterceptor) + .setAllowedOrigins("*"); + System.out.println("1231"); + } +} diff --git a/pom.xml b/pom.xml index 54319968..3bdfad5e 100644 --- a/pom.xml +++ b/pom.xml @@ -25,10 +25,11 @@ 1.0.0 8 8 - 3.0.0-M5 - 3.8.1 - 1.18.26 - 2.7.11 + 3.0.0-M5 + 3.8.1 + 1.5.0 + 1.18.30 + 2.7.17 1.5.5.Final UTF-8 @@ -52,13 +53,13 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} + ${maven.surefire.plugin.version} org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} + ${maven.compiler.plugin.version} @@ -79,8 +80,41 @@ + + org.codehaus.mojo + flatten-maven-plugin + + + + + + org.codehaus.mojo + flatten-maven-plugin + ${flatten.maven.plugin.version} + + resolveCiFriendliesOnly + true + + + + + flatten + + flatten + process-resources + + + + clean + + flatten.clean + clean + + + +