diff --git a/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/FluentJdbcTest.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/FluentJdbcTest.java index 1cfa788..e1ae872 100644 --- a/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/FluentJdbcTest.java +++ b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/FluentJdbcTest.java @@ -37,7 +37,7 @@ public class FluentJdbcTest { new Driver(), "jdbc:mysql://127.0.0.1:3306/epi_project?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai", "root", - "Unicom#2018" + "oI3WtMO8h%mSYARp" ); // 准备待测试用例 List> cases = Arrays.asList( diff --git a/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/cases/FluentSqlTestCase.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/cases/FluentSqlTestCase.java index d6c1d03..f4acd9b 100644 --- a/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/cases/FluentSqlTestCase.java +++ b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/cases/FluentSqlTestCase.java @@ -33,7 +33,7 @@ public class FluentSqlTestCase extends AbstractTestCase> { // 基于构造器自动绑定注册,在实际应用中使用@Bean声明即可,可参考下面的demo new JdbcTemplateFluentSQLOperations(new JdbcTemplate(dataSource)); // 启用调试 - FluentSqlDebugger.enable(); +// FluentSqlDebugger.enable(); } /** diff --git a/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/cases/MybatisTestCase.java b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/cases/MybatisTestCase.java index 0cb6332..b08067b 100644 --- a/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/cases/MybatisTestCase.java +++ b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/cases/MybatisTestCase.java @@ -1,6 +1,7 @@ package group.flyfish.framework.cases; import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; +import group.flyfish.fluent.utils.data.ObjectMappers; import group.flyfish.framework.TestCase; import group.flyfish.framework.entity.SaasQuota; import group.flyfish.framework.entity.SaasTenant; @@ -40,6 +41,7 @@ public class MybatisTestCase extends AbstractTestCase> { Configuration configuration = new Configuration(environment); configuration.addMapper(TenantContextMapper.class); TypeHandlerRegistry registry = configuration.getTypeHandlerRegistry(); + JacksonTypeHandler.setObjectMapper(ObjectMappers.shared()); registry.register(SaasTenant.DataSourceConfig.class, JacksonTypeHandler.class); registry.register(SaasQuota.class, JacksonTypeHandler.class); registry.register(SaasTenant.StorageConfig.class, JacksonTypeHandler.class); diff --git a/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/mapper/TenantContextMapper.xml b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/mapper/TenantContextMapper.xml index 64aacff..3932c5e 100644 --- a/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/mapper/TenantContextMapper.xml +++ b/fluent-sql-spring-jdbc/src/test/java/group/flyfish/framework/mapper/TenantContextMapper.xml @@ -10,7 +10,7 @@ - + @@ -24,7 +24,7 @@ t1.`storage` as `storage`, t1.`status` as `status`, t1.`enable` as `enable`, - t2.`quota_config` as `quotaConfig`, + t2.`quota_config` as `quota`, t2.`order_time` as `orderTime`, t2.`expire_time` as `expireTime`, t2.`order_type` as `orderType`