更新

app-admin/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>huimv</artifactId>
+        <artifactId>huimv-nbcig</artifactId>
         <groupId>com.huimv</groupId>
         <version>3.9.0</version>
     </parent>

app-admin/src/main/java/com/huimv/web/controller/tool/TestController.java

@@ -5,7 +5,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.huimv.common.annotation.Anonymous;
+import com.huimv.common.core.domain.entity.SysUser;
+import com.huimv.system.service.ISysUserService;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -24,6 +27,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 
+import javax.annotation.Resource;
+
 /**
  * swagger 用户测试方法
  * 
@@ -34,13 +39,16 @@ import io.swagger.annotations.ApiOperation;
 @RequestMapping("/test/user")
 public class TestController extends BaseController
 {
+
+    @Resource
+    private ISysUserService userService;
+
     private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();
     {
         users.put(1, new UserEntity(1, "admin", "admin123", "15888888888"));
         users.put(2, new UserEntity(2, "ry", "admin123", "15666666666"));
     }
 
-//    @Anonymous
     @ApiOperation("获取用户列表")
     @GetMapping("/list")
     public R<List<UserEntity>> userList()
@@ -49,6 +57,25 @@ public class TestController extends BaseController
         return R.ok(userList);
     }
 
+
+    @ApiOperation("获取主库用户列表")
+    @GetMapping("/list/master")
+    public R<List<SysUser>> masterUserList()
+    {
+        List<SysUser> userList = new ArrayList<>(userService.selectUserList(new SysUser()));
+        return R.ok(userList);
+    }
+
+
+    @DS("slave")
+    @ApiOperation("获取从库用户列表")
+    @GetMapping("/list/slave")
+    public R<List<SysUser>> slaveUserList()
+    {
+        List<SysUser> userList = new ArrayList<>(userService.selectUserList(new SysUser()));
+        return R.ok(userList);
+    }
+
     @ApiOperation("获取用户详细")
     @ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
     @GetMapping("/{userId}")

app-admin/src/main/resources/application-druid.yml

@@ -1,21 +1,37 @@
 # 数据源配置
 spring:
     datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
+        dynamic:
+            primary: master #设置默认的数据源或者数据源组,默认值即为master
+            strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源.
+            datasource:
+                master:
+                    url: jdbc:mysql://localhost:3306/nbcig?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: 123456
+                    driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
+                slave:
+                    url: jdbc:mysql://122.112.224.199:3306/huimv-hebei?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: hm123456
+                    driver-class-name: com.mysql.cj.jdbc.Driver
+#    datasource:
+#        type: com.alibaba.druid.pool.DruidDataSource
+#        driverClassName: com.mysql.cj.jdbc.Driver
+#        druid:
+#            # 主库数据源
+#            master:
+#                url: jdbc:mysql://localhost:3306/nbcig?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: 123456
+#            # 从库数据源
+#            slave:
+#                # 从数据源开关/默认关闭
+#                enabled: false
+#                url:
+#                username:
+#                password:
         druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://localhost:3306/nbcig?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: 123456
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url: 
-                username: 
-                password: 
             # 初始连接数
             initialSize: 5
             # 最小连接池数量

app-common/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>huimv</artifactId>
+        <artifactId>huimv-nbcig</artifactId>
         <groupId>com.huimv</groupId>
         <version>3.9.0</version>
     </parent>
@@ -119,16 +119,6 @@
             <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
-        <!-- mybatis plus包 -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-extension</artifactId>
-        </dependency>
-
     </dependencies>
 
 </project>

app-framework/src/main/java/com/huimv/framework/aspectj/DataSourceAspect.java

@@ -27,8 +27,8 @@ public class DataSourceAspect
 {
     protected Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"
-            + "|| @within(com.ruoyi.common.annotation.DataSource)")
+    @Pointcut("@annotation(com.huimv.common.annotation.DataSource)"
+            + "|| @within(com.huimv.common.annotation.DataSource)")
     public void dsPointCut()
     {
 

app-framework/src/main/java/com/huimv/framework/config/DruidConfig.java

@@ -32,51 +32,51 @@ import com.huimv.framework.datasource.DynamicDataSource;
 @Configuration
 public class DruidConfig
 {
-    @Bean
-    @ConfigurationProperties("spring.datasource.druid.master")
-    public DataSource masterDataSource(DruidProperties druidProperties)
-    {
-        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
-        return druidProperties.dataSource(dataSource);
-    }
-
-    @Bean
-    @ConfigurationProperties("spring.datasource.druid.slave")
-    @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
-    public DataSource slaveDataSource(DruidProperties druidProperties)
-    {
-        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
-        return druidProperties.dataSource(dataSource);
-    }
-
-    @Bean(name = "dynamicDataSource")
-    @Primary
-    public DynamicDataSource dataSource(DataSource masterDataSource)
-    {
-        Map<Object, Object> targetDataSources = new HashMap<>();
-        targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
-        setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
-        return new DynamicDataSource(masterDataSource, targetDataSources);
-    }
-    
-    /**
-     * 设置数据源
-     * 
-     * @param targetDataSources 备选数据源集合
-     * @param sourceName 数据源名称
-     * @param beanName bean名称
-     */
-    public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName)
-    {
-        try
-        {
-            DataSource dataSource = SpringUtils.getBean(beanName);
-            targetDataSources.put(sourceName, dataSource);
-        }
-        catch (Exception e)
-        {
-        }
-    }
+//    @Bean
+//    @ConfigurationProperties("spring.datasource.druid.master")
+//    public DataSource masterDataSource(DruidProperties druidProperties)
+//    {
+//        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+//        return druidProperties.dataSource(dataSource);
+//    }
+//
+//    @Bean
+//    @ConfigurationProperties("spring.datasource.druid.slave")
+//    @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
+//    public DataSource slaveDataSource(DruidProperties druidProperties)
+//    {
+//        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
+//        return druidProperties.dataSource(dataSource);
+//    }
+//
+//    @Bean(name = "dynamicDataSource")
+//    @Primary
+//    public DynamicDataSource dataSource(DataSource masterDataSource)
+//    {
+//        Map<Object, Object> targetDataSources = new HashMap<>();
+//        targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
+//        setDataSource(targetDataSources, DataSourceType.SLAVE.name(), "slaveDataSource");
+//        return new DynamicDataSource(masterDataSource, targetDataSources);
+//    }
+//
+//    /**
+//     * 设置数据源
+//     *
+//     * @param targetDataSources 备选数据源集合
+//     * @param sourceName 数据源名称
+//     * @param beanName bean名称
+//     */
+//    public void setDataSource(Map<Object, Object> targetDataSources, String sourceName, String beanName)
+//    {
+//        try
+//        {
+//            DataSource dataSource = SpringUtils.getBean(beanName);
+//            targetDataSources.put(sourceName, dataSource);
+//        }
+//        catch (Exception e)
+//        {
+//        }
+//    }
 
     /**
      * 去除监控页面底部的广告

app-generator/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>huimv</artifactId>
+        <artifactId>huimv-nbcig</artifactId>
         <groupId>com.huimv</groupId>
         <version>3.9.0</version>
     </parent>

app-quartz/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>huimv</artifactId>
+        <artifactId>huimv-nbcig</artifactId>
         <groupId>com.huimv</groupId>
         <version>3.9.0</version>
     </parent>

app-system/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>huimv</artifactId>
+        <artifactId>huimv-nbcig</artifactId>
         <groupId>com.huimv</groupId>
         <version>3.9.0</version>
     </parent>

app-system/src/main/java/com/huimv/system/service/impl/SysConfigServiceImpl.java

@@ -5,12 +5,10 @@ import java.util.List;
 import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.huimv.common.annotation.DataSource;
 import com.huimv.common.constant.CacheConstants;
 import com.huimv.common.constant.UserConstants;
 import com.huimv.common.core.redis.RedisCache;
 import com.huimv.common.core.text.Convert;
-import com.huimv.common.enums.DataSourceType;
 import com.huimv.common.exception.ServiceException;
 import com.huimv.common.utils.StringUtils;
 import com.huimv.system.domain.SysConfig;
@@ -47,7 +45,7 @@ public class SysConfigServiceImpl implements ISysConfigService
      * @return 参数配置信息
      */
     @Override
-    @DataSource(DataSourceType.MASTER)
+//    @DataSource(DataSourceType.MASTER)
     public SysConfig selectConfigById(Long configId)
     {
         SysConfig config = new SysConfig();

pom.xml

@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	
     <groupId>com.huimv</groupId>
-    <artifactId>huimv</artifactId>
+    <artifactId>huimv-nbcig</artifactId>
     <version>3.9.0</version>
 
     <name>huimv</name>
-    <url>http://www.huimv.vip</url>
-    <description>若依管理系统</description>
+    <url>http://www.ruoyi.vip</url>
+    <description>本工程源于若依管理系统</description>
     
     <properties>
         <huimv.version>3.9.0</huimv.version>
@@ -230,6 +230,11 @@
                 <artifactId>mybatis-plus-extension</artifactId>
                 <version>${mybatis-plus.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>