From 53ad4969b0c67be6ac8fdbd39f3cf99d14b4bc80 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 03 七月 2023 10:15:37 +0800
Subject: [PATCH] update dynamic-ds 3.6.1 => 4.0.0 支持 SpringBoot3
---
/dev/null | 46 ----------------------------------------------
ruoyi-common/ruoyi-common-mybatis/pom.xml | 2 +-
pom.xml | 4 ++--
3 files changed, 3 insertions(+), 49 deletions(-)
diff --git a/pom.xml b/pom.xml
index e9cf386..33fa3bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<spring-boot-admin.version>3.0.4</spring-boot-admin.version>
<redisson.version>3.20.1</redisson.version>
<lock4j.version>2.2.4</lock4j.version>
- <dynamic-ds.version>3.6.1</dynamic-ds.version>
+ <dynamic-ds.version>4.0.0</dynamic-ds.version>
<alibaba-ttl.version>2.14.2</alibaba-ttl.version>
<powerjob.version>4.3.3</powerjob.version>
<mapstruct-plus.version>1.3.1</mapstruct-plus.version>
@@ -201,7 +201,7 @@
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
<version>${dynamic-ds.version}</version>
</dependency>
diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml
index 3acb608..51199b4 100644
--- a/ruoyi-common/ruoyi-common-mybatis/pom.xml
+++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml
@@ -29,7 +29,7 @@
<!-- dynamic-datasource 澶氭暟鎹簮-->
<dependency>
<groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+ <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
</dependency>
<dependency>
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/baomidou/dynamic/datasource/processor/jakarta/DsJakartaHeaderProcessor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/baomidou/dynamic/datasource/processor/jakarta/DsJakartaHeaderProcessor.java
deleted file mode 100644
index f0a50a2..0000000
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/baomidou/dynamic/datasource/processor/jakarta/DsJakartaHeaderProcessor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 漏 2018 organization baomidou
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.baomidou.dynamic.datasource.processor.jakarta;
-
-import com.baomidou.dynamic.datasource.processor.DsProcessor;
-import jakarta.servlet.http.HttpServletRequest;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-/**
- * @author TaoYu
- * @since 3.6.0
- */
-public class DsJakartaHeaderProcessor extends DsProcessor {
-
- /**
- * header prefix
- */
- private static final String HEADER_PREFIX = "#header";
-
- @Override
- public boolean matches(String key) {
- return key.startsWith(HEADER_PREFIX);
- }
-
- @Override
- public String doDetermineDatasource(MethodInvocation invocation, String key) {
- HttpServletRequest request = (HttpServletRequest) ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- return request.getHeader(key.substring(8));
- }
-}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/baomidou/dynamic/datasource/processor/jakarta/DsJakartaSessionProcessor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/baomidou/dynamic/datasource/processor/jakarta/DsJakartaSessionProcessor.java
deleted file mode 100644
index 0ea8a13..0000000
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/baomidou/dynamic/datasource/processor/jakarta/DsJakartaSessionProcessor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 漏 2018 organization baomidou
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.baomidou.dynamic.datasource.processor.jakarta;
-
-import com.baomidou.dynamic.datasource.processor.DsProcessor;
-import jakarta.servlet.http.HttpServletRequest;
-import org.aopalliance.intercept.MethodInvocation;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-
-/**
- * @author TaoYu
- * @since 3.6.0
- */
-public class DsJakartaSessionProcessor extends DsProcessor {
-
- /**
- * session寮�澶�
- */
- private static final String SESSION_PREFIX = "#session";
-
- @Override
- public boolean matches(String key) {
- return key.startsWith(SESSION_PREFIX);
- }
-
- @Override
- public String doDetermineDatasource(MethodInvocation invocation, String key) {
- HttpServletRequest request = (HttpServletRequest) ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
- return request.getSession().getAttribute(key.substring(9)).toString();
- }
-}
--
Gitblit v1.9.3