🎉 初步兼容sqlserver

blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.xml

@@ -260,8 +260,6 @@
                     category = 1
                   AND is_deleted = 0
                   AND id IN ( SELECT menu_id FROM blade_scope_data WHERE is_deleted = 0 AND menu_id IS NOT NULL )
-                ORDER BY
-                    sort
             ) menu
 
         UNION ALL
@@ -296,8 +294,6 @@
                     category = 1
                   AND is_deleted = 0
                   AND id IN ( SELECT menu_id FROM blade_scope_api WHERE is_deleted = 0 AND menu_id IS NOT NULL )
-                ORDER BY
-                    sort
             ) menu
 
         UNION ALL

blade-service/blade-system/src/main/java/org/springblade/system/mapper/RegionMapper.xml

@@ -95,6 +95,7 @@
                 and region.name like concat(concat('%', #{param2.name}),'%')
             </if>
         </where>
+        ORDER BY region.code
     </select>
 
     <select id="exportRegion" resultType="org.springblade.system.excel.RegionExcel">

doc/nacos/blade-dev.yaml

@@ -15,8 +15,9 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     #driver-class-name: org.postgresql.Driver
     #driver-class-name: oracle.jdbc.OracleDriver
+    #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     druid:
-      # MySql、PostgreSQL校验
+      # MySql、PostgreSQL、SqlServer校验
       validation-query: select 1
       # Oracle校验
       #validation-query: select 1 from dual
@@ -42,6 +43,10 @@ blade:
       #url: jdbc:oracle:thin:@127.0.0.1:49161:orcl
       #username: BLADEX
       #password: oracle
+      # SqlServer
+      #url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=bladex
+      #username: bladex
+      #password: bladex
   document:
     resources:
       - name: 授权模块

doc/nacos/blade-prod.yaml

@@ -17,8 +17,9 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     #driver-class-name: org.postgresql.Driver
     #driver-class-name: oracle.jdbc.OracleDriver
+    #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     druid:
-      # MySql、PostgreSQL校验
+      # MySql、PostgreSQL、SqlServer校验
       validation-query: select 1
       # Oracle校验
       #validation-query: select 1 from dual

doc/nacos/blade-test.yaml

@@ -16,8 +16,9 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     #driver-class-name: org.postgresql.Driver
     #driver-class-name: oracle.jdbc.OracleDriver
+    #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     druid:
-      # MySql、PostgreSQL校验
+      # MySql、PostgreSQL、SqlServer校验
       validation-query: select 1
       # Oracle校验
       #validation-query: select 1 from dual

doc/sql/mysql/bladex-saber-mysql.sql

@@ -689,7 +689,7 @@ CREATE TABLE `blade_user`  (
   `email` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱',
   `phone` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机',
   `birthday` datetime(0) NULL DEFAULT NULL COMMENT '生日',
-  `sex` smallint(6) NULL DEFAULT NULL COMMENT '性别',
+  `sex` int(2) NULL DEFAULT NULL COMMENT '性别',
   `role_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色id',
   `dept_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门id',
   `post_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '岗位id',

doc/sql/mysql/bladex-sword-mysql.sql

@@ -689,7 +689,7 @@ CREATE TABLE `blade_user`  (
   `email` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '邮箱',
   `phone` varchar(45) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '手机',
   `birthday` datetime(0) NULL DEFAULT NULL COMMENT '生日',
-  `sex` smallint(6) NULL DEFAULT NULL COMMENT '性别',
+  `sex` int(2) NULL DEFAULT NULL COMMENT '性别',
   `role_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色id',
   `dept_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门id',
   `post_id` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '岗位id',