From 10a6bb7a4011d659609eaa46d4566e628e38d204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Thu, 4 May 2023 00:00:10 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E5=A4=9A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sample/DynamicDataSourceSample.java       | 41 -------------------
 .../youlai/system/service/SysDictService.java |  8 ----
 .../service/impl/SysDictServiceImpl.java      | 20 ---------
 .../service/impl/SysRoleServiceImpl.java      |  1 -
 src/main/resources/application-dev.yml        | 24 +++--------
 src/main/resources/application.yml            |  5 +--
 .../youlai/system/DynamicDataSourceTest.java  | 24 -----------
 7 files changed, 6 insertions(+), 117 deletions(-)
 delete mode 100644 src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java
 delete mode 100644 src/test/java/com/youlai/system/DynamicDataSourceTest.java

diff --git a/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java b/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java
deleted file mode 100644
index c5a418f2..00000000
--- a/src/main/java/com/youlai/system/sample/DynamicDataSourceSample.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.youlai.system.sample;
-
-import cn.hutool.core.util.RandomUtil;
-import com.youlai.system.pojo.entity.SysDictType;
-import com.youlai.system.service.SysDictService;
-import com.youlai.system.service.SysDictTypeService;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 动态数据源案例
- *
- * @author haoxr
- * @date 2023/4/24
- */
-@Component
-@RequiredArgsConstructor
-public class DynamicDataSourceSample {
-
-    private final SysDictTypeService dictTypeService;
-
-    private final SysDictService dictService;
-
-
-    @Transactional
-    public boolean updateMaster(Long dictTypeId,String newTypeCode) {
-
-        SysDictType dictType = dictTypeService.getById(dictTypeId);
-        String originalTypeCode = dictType.getCode();
-        dictType.setCode(newTypeCode);
-        boolean result = dictTypeService.updateById(dictType);
-
-        if (result) {
-            result = dictService.updateSlave(originalTypeCode, newTypeCode);
-        }
-        return result;
-    }
-
-
-}
diff --git a/src/main/java/com/youlai/system/service/SysDictService.java b/src/main/java/com/youlai/system/service/SysDictService.java
index f3f2f3b2..e7671c9a 100644
--- a/src/main/java/com/youlai/system/service/SysDictService.java
+++ b/src/main/java/com/youlai/system/service/SysDictService.java
@@ -66,12 +66,4 @@ public interface SysDictService extends IService<SysDict> {
      */
     List<Option> listDictOptions(String typeCode);
 
-    /**
-     * 修改字典类型编码
-     *
-     * @param originalTypeCode
-     * @param newTypeCode
-     * @return
-     */
-    boolean updateSlave(String originalTypeCode, String newTypeCode);
 }
diff --git a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
index 20a0faad..6116ad00 100644
--- a/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysDictServiceImpl.java
@@ -3,9 +3,7 @@ package com.youlai.system.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.system.converter.DictConverter;
@@ -160,24 +158,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
                 .collect(Collectors.toList());
         return options;
     }
-
-    /**
-     * 修改字典类型编码(多数据源测试)
-     *
-     * @param originalTypeCode
-     * @param newTypeCode
-     * @return
-     */
-    @DS("slave")
-    @Override
-    public boolean updateSlave(String originalTypeCode, String newTypeCode) {
-        boolean result = this.update(new LambdaUpdateWrapper<SysDict>()
-                .eq(SysDict::getTypeCode, originalTypeCode)
-                .set(SysDict::getTypeCode, newTypeCode)
-        );
-        return result;
-    }
-
 }
 
 
diff --git a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
index 7b499bbf..2e51da2f 100644
--- a/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysRoleServiceImpl.java
@@ -3,7 +3,6 @@ package com.youlai.system.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8f498106..e8eeb863 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,25 +3,11 @@ server:
 
 spring:
   datasource:
-    # 动态切换数据源
-    dynamic:
-      # 默认库,默认master
-      primary: master
-      # 是否严格模式，默认false；严格模式下未匹配到数据源直接报错, 非严格模式下则使用默认数据源primary所设置的数据源
-      strict: false
-      datasource:
-        master:
-          type: com.alibaba.druid.pool.DruidDataSource
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://www.youlai.tech:3306/youlai_boot?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&allowMultiQueries=true
-          username: youlai
-          password: 123456
-        slave:
-          type: com.alibaba.druid.pool.DruidDataSource
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://www.youlai.tech:3306/youlai_boot_slave?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&allowMultiQueries=true
-          username: youlai
-          password: 123456
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://www.youlai.tech:3306/youlai_boot?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&allowMultiQueries=true
+    username: youlai
+    password: 123456
   data:
     redis:
       database: 6
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a921d541..8a6efa79 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -2,7 +2,4 @@ spring:
   application:
     name: youlai-boot
   profiles:
-    active: dev
-  mvc:
-    path-match:
-      matching-strategy: ant_path_matcher
\ No newline at end of file
+    active: dev
\ No newline at end of file
diff --git a/src/test/java/com/youlai/system/DynamicDataSourceTest.java b/src/test/java/com/youlai/system/DynamicDataSourceTest.java
deleted file mode 100644
index 1d665d6b..00000000
--- a/src/test/java/com/youlai/system/DynamicDataSourceTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.youlai.system;
-
-import cn.hutool.core.util.RandomUtil;
-import com.youlai.system.sample.DynamicDataSourceSample;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest
-@Slf4j
-class DynamicDataSourceTest {
-
-    @Autowired
-    private DynamicDataSourceSample dynamicDataSourceSample;
-
-
-    @Test
-    void testDynamicDataSourceWithTransactional() {
-        String newTypeCod = RandomUtil.randomString(RandomUtil.BASE_CHAR, 6).toUpperCase();
-        boolean result = dynamicDataSourceSample.updateMaster(2L, newTypeCod);
-        log.info("testDynamicDataSourceWithTransactional result:{}", result);
-    }
-}
\ No newline at end of file