Merge branch 'master' into dev-windows

# Conflicts:
#	yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/utils/EXAUtils.java

yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml

@@ -43,18 +43,18 @@
             <artifactId>postgresql</artifactId>
             <optional>true</optional>
         </dependency>
-<!--        <dependency>-->
+        <dependency>
-<!--            <groupId>com.microsoft.sqlserver</groupId>-->
+            <groupId>com.microsoft.sqlserver</groupId>
-<!--            <artifactId>mssql-jdbc</artifactId>-->
+            <artifactId>mssql-jdbc</artifactId>
-<!--            <version>11.2.0.jre11</version>-->
+            <version>11.2.0.jre11</version>
 
-<!--            <optional>true</optional>-->
+            <optional>true</optional>
-<!--        </dependency>-->
+        </dependency>
-<!--        <dependency>-->
+        <dependency>
-<!--        <groupId>com.microsoft.sqlserver</groupId>-->
+        <groupId>com.microsoft.sqlserver</groupId>
-<!--        <artifactId>sqljdbc4</artifactId>-->
+        <artifactId>sqljdbc4</artifactId>
-<!--        <version>4.0</version>-->
+        <version>4.0</version>
-<!--        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>com.dameng</groupId>
             <artifactId>DmJdbcDriver18</artifactId>

yudao-server/src/main/resources/application-local.yaml

@@ -66,8 +66,9 @@ spring:
         slave: # 模拟从库，可根据自己需要修改
 #          lazy: true # 开启懒加载，保证启动速度
 #          url: jdbc:mysql://120.26.116.243:3306/alert?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-          url: jdbc:mysql://120.26.116.243:3306/alert?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          url: jdbc:sqlserver://120.27.236.75:1433;DatabaseName=alert # SQLServer 连接的示例
-          username: root
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+          username: sa
           password: powerSIS#123
   #        tdengine: # IoT 数据库（需要 IoT 物联网再开启噢！）
   #          url: jdbc:TAOS-RS://127.0.0.1:6041/ruoyi_vue_pro