diff --git a/pom.xml b/pom.xml index 7134bdb0..2c1649a7 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,9 @@ 2.14.5 4.8.1.B + + + 4.0.2 @@ -279,6 +282,20 @@ ${weixin-java-miniapp.version} + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + + - + - SELECT t1.TABLE_NAME , t1.TABLE_COMMENT , @@ -35,7 +35,7 @@ - SELECT TABLE_NAME , TABLE_COMMENT , @@ -50,7 +50,7 @@ - SELECT COLUMN_NAME, DATA_TYPE, diff --git a/src/test/java/com/youlai/boot/plugin/mybatis/MyDataPermissionHandlerTest.java b/src/test/java/com/youlai/boot/config/MyDataPermissionHandlerTest.java similarity index 93% rename from src/test/java/com/youlai/boot/plugin/mybatis/MyDataPermissionHandlerTest.java rename to src/test/java/com/youlai/boot/config/MyDataPermissionHandlerTest.java index 95ecf4e0..503850f2 100644 --- a/src/test/java/com/youlai/boot/plugin/mybatis/MyDataPermissionHandlerTest.java +++ b/src/test/java/com/youlai/boot/config/MyDataPermissionHandlerTest.java @@ -1,4 +1,4 @@ -package com.youlai.boot.plugin.mybatis; +package com.youlai.boot.config; import com.youlai.boot.security.model.RoleDataScope; import com.youlai.boot.security.model.SysUserDetails; @@ -115,7 +115,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 返回原始where assertThat(result).isSameAs(where); @@ -134,7 +134,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 添加部门过滤条件 assertThat(result).isNotNull(); @@ -154,7 +154,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 添加用户过滤条件 assertThat(result).isNotNull(); @@ -174,7 +174,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 添加自定义部门IN条件 assertThat(result).isNotNull(); @@ -197,7 +197,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 添加1=0条件(无权限) assertThat(result).isNotNull(); @@ -217,7 +217,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 添加子查询条件 assertThat(result).isNotNull(); @@ -250,7 +250,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 返回原始where,不添加过滤条件 assertThat(result).isSameAs(where); @@ -273,7 +273,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 生成OR连接的合并条件 assertThat(result).isNotNull(); @@ -298,7 +298,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 生成OR连接的IN条件 assertThat(result).isNotNull(); @@ -319,7 +319,7 @@ class MyDataPermissionHandlerTest { // when Expression result = handler.getSqlSegment(where, - "com.youlai.boot.plugin.mybatis.TestDataPermissionMapper.selectList"); + "com.youlai.boot.config.TestDataPermissionMapper.selectList"); // then: 结果应该包含原始where和数据权限条件 assertThat(result).isInstanceOf(AndExpression.class); diff --git a/src/test/java/com/youlai/boot/plugin/mybatis/TestDataPermissionMapper.java b/src/test/java/com/youlai/boot/config/TestDataPermissionMapper.java similarity index 95% rename from src/test/java/com/youlai/boot/plugin/mybatis/TestDataPermissionMapper.java rename to src/test/java/com/youlai/boot/config/TestDataPermissionMapper.java index 850bc2a3..5bee480f 100644 --- a/src/test/java/com/youlai/boot/plugin/mybatis/TestDataPermissionMapper.java +++ b/src/test/java/com/youlai/boot/config/TestDataPermissionMapper.java @@ -1,4 +1,4 @@ -package com.youlai.boot.plugin.mybatis; +package com.youlai.boot.config; import com.youlai.boot.common.annotation.DataPermission;