diff --git a/wemirr-platform-framework/db-spring-boot-starter/src/main/java/com/wemirr/framework/db/dynamic/SchemaUtil.java b/wemirr-platform-framework/db-spring-boot-starter/src/main/java/com/wemirr/framework/db/dynamic/SchemaUtil.java index 4116f5f0a76ae933818eacbd0f0e92042ee614c4..dc08ca9240aaac95d6cc9b3979f8bc1e08ae1099 100644 --- a/wemirr-platform-framework/db-spring-boot-starter/src/main/java/com/wemirr/framework/db/dynamic/SchemaUtil.java +++ b/wemirr-platform-framework/db-spring-boot-starter/src/main/java/com/wemirr/framework/db/dynamic/SchemaUtil.java @@ -32,7 +32,7 @@ public class SchemaUtil { Db db = Db.use(hikari); List schemas = db.query(checkSchemaSql, String.class, schemaName); if (schemas.isEmpty()) { - String createSchemaSql = StrUtil.format("CREATE DATABASE {} CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", schemaName); + String createSchemaSql = StrUtil.format("CREATE DATABASE IF NOT EXISTS {} CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci", schemaName); db.execute(createSchemaSql); log.debug("MySQL Schema 创建成功: {}", schemaName); } else { diff --git a/wemirr-platform-framework/websocket-spring-boot-starter/src/main/java/com/wemirr/framework/websocket/memory/MemoryWebSocketConfiguration.java b/wemirr-platform-framework/websocket-spring-boot-starter/src/main/java/com/wemirr/framework/websocket/memory/MemoryWebSocketConfiguration.java index 288740f4df2fefdcace138d304c53a1dc8dbc503..37ebe10920b02a9cab64ad3edf4ccd1bf120c830 100644 --- a/wemirr-platform-framework/websocket-spring-boot-starter/src/main/java/com/wemirr/framework/websocket/memory/MemoryWebSocketConfiguration.java +++ b/wemirr-platform-framework/websocket-spring-boot-starter/src/main/java/com/wemirr/framework/websocket/memory/MemoryWebSocketConfiguration.java @@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; /** * 内存管理websocket配置 @@ -34,8 +35,14 @@ import org.springframework.context.annotation.Configuration; */ @Configuration @EnableConfigurationProperties(WebSocketProperties.class) +@ConditionalOnProperty(name = "spring.websocket.manager.type", havingValue = "MEMORY", matchIfMissing = true) public class MemoryWebSocketConfiguration { + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } + @Bean(WebSocketManager.WEBSOCKET_MANAGER_NAME) @ConditionalOnMissingBean(name = WebSocketManager.WEBSOCKET_MANAGER_NAME) public WebSocketManager webSocketManager() {