diff --git a/ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java b/ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java index 0ee1fc1bc..b94a7c46d 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/config/SaTokenConfig.java @@ -1,16 +1,13 @@ package org.dromara.web.config; -import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpLogic; import org.dromara.common.core.factory.YmlPropertySourceFactory; import org.dromara.common.satoken.core.service.SaPermissionImpl; import org.dromara.common.satoken.handler.SaTokenExceptionHandler; -import org.dromara.common.tenant.core.TenantSaTokenDao; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.PropertySource; /** @@ -37,13 +34,13 @@ public class SaTokenConfig { } /** - * 自定义dao层存储 + * 自定义dao层存储,todo satoken适配多租户用,目前不需要 */ - @Bean - @Primary - public SaTokenDao tenantSaTokenDao() { - return new TenantSaTokenDao(); - } +// @Bean +// @Primary +// public SaTokenDao tenantSaTokenDao() { +// return new TenantSaTokenDao(); +// } /** * diff --git a/ruoyi-common/ruoyi-common-sse/pom.xml b/ruoyi-common/ruoyi-common-sse/pom.xml index ae44c988e..88f89a147 100644 --- a/ruoyi-common/ruoyi-common-sse/pom.xml +++ b/ruoyi-common/ruoyi-common-sse/pom.xml @@ -32,5 +32,9 @@ org.dromara ruoyi-common-json + + org.springframework + spring-webmvc +