Merge branch 'master' of http://dev.ccwin-in.com:3000/eam/eam

win-dependencies/pom.xml

@@ -214,6 +214,10 @@
                 <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
                 <version>${shardingsphere.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.microsoft.sqlserver</groupId>
+                <artifactId>mssql-jdbc</artifactId>
+            </dependency>
             <dependency>
                 <groupId>com.github.yulichang</groupId>
                 <artifactId>mybatis-plus-join-boot-starter</artifactId> <!-- MyBatis 联表查询 -->

win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/config/WinDataSourceAutoConfiguration.java

@@ -8,6 +8,7 @@ import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourcePrope
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
 import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceProperties;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.win.framework.datasource.core.enums.DataSourceEnum;
 import com.win.framework.datasource.core.filter.DruidAdRemoveFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringBootConfiguration;
@@ -64,7 +65,7 @@ public class WinDataSourceAutoConfiguration {
             @Override
             public Map<String, DataSource> loadDataSources() {
                 Map<String, DataSource> dataSourceMap = createDataSourceMap(datasourceMap);
-                dataSourceMap.put("sharding", shardingSphereDataSource);
+                dataSourceMap.put(DataSourceEnum.SHARDING, shardingSphereDataSource);
                 //打开下面的代码可以把 shardingjdbc 管理的数据源也交给动态数据源管理 (根据自己需要选择开启)
                 //dataSourceMap.putAll(((MasterSlaveDataSource) masterSlaveDataSource).getDataSourceMap());
                 return dataSourceMap;
@@ -83,7 +84,7 @@ public class WinDataSourceAutoConfiguration {
     @Bean
     public DataSource dataSource(DynamicDataSourceProvider dynamicDataSourceProvider) {
         DynamicRoutingDataSource dataSource = new DynamicRoutingDataSource();
-        dataSource.setPrimary(properties.getPrimary());//设sharding为主库
+        dataSource.setPrimary(DataSourceEnum.SHARDING);//设sharding为主库
         dataSource.setStrict(properties.getStrict());
         dataSource.setStrategy(properties.getStrategy());
         dataSource.setProvider(dynamicDataSourceProvider);

win-framework/win-spring-boot-starter-mybatis/src/main/java/com/win/framework/datasource/core/enums/DataSourceEnum.java

@@ -19,4 +19,9 @@ public interface DataSourceEnum {
      */
     String MASTER = "master";
 
+    /**
+     * 主库，推荐使用 {@link com.baomidou.dynamic.datasource.annotation.Master} 注解
+     */
+    String SQL_SERVER = "sqlServer";
+
 }

win-server/src/main/resources/application-dev.yaml

@@ -81,7 +81,7 @@ spring:
   datasource:
     dynamic:
       strict: true
-      primary: sharding
+      primary: master
       datasource:
         master:
           type: ${spring.shardingsphere.datasource.master.type}
@@ -89,6 +89,12 @@ spring:
           url: ${spring.shardingsphere.datasource.master.url}
           username: ${spring.shardingsphere.datasource.master.username}
           password: ${spring.shardingsphere.datasource.master.password}
+        sql-server:
+          type: com.alibaba.druid.pool.DruidDataSource
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+          url: jdbc:sqlserver://192.168.11.3:1433;SelectMethod=Cursor;DatabaseName=FWQCJ_WMS_NEWTEST;trustServerCertificate=true
+          username: sa
+          password: Microsoft@2022
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis: