diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSourceConfig.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSourceConfig.java index b0d0d22df..56a0b870b 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSourceConfig.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSourceConfig.java @@ -1,10 +1,5 @@ package com.pig4cloud.pigx.common.datasource.config; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import javax.annotation.PostConstruct; import com.alibaba.druid.pool.DruidDataSource; import com.mysql.cj.jdbc.Driver; import com.pig4cloud.pigx.common.datasource.support.DataSourceConstants; @@ -13,12 +8,19 @@ import lombok.extern.slf4j.Slf4j; import org.jasypt.encryption.StringEncryptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.data.transaction.ChainedTransactionManager; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.jdbc.datasource.DriverManagerDataSource; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.TransactionManagementConfigurer; +import javax.annotation.PostConstruct; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + /** * @author lengleng * @date 2019-03-31 @@ -89,7 +91,9 @@ public class DynamicDataSourceConfig implements TransactionManagementConfigurer @Bean public PlatformTransactionManager txManager() { - return new DataSourceTransactionManager(dataSource()); + DataSourceTransactionManager transactionManager + = new DataSourceTransactionManager(dataSource()); + return new ChainedTransactionManager(transactionManager); } @Override diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDatasourceInterceptor.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDatasourceInterceptor.java index af25dc51d..68d5c2f34 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDatasourceInterceptor.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDatasourceInterceptor.java @@ -1,17 +1,15 @@ package com.pig4cloud.pigx.common.datasource.config; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import com.pig4cloud.pigx.common.datasource.support.DynamicDataSourceContextHolder; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.data.redis.core.HashOperations; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; import org.springframework.lang.Nullable; import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * @author lengleng * @date 2019-05-18 @@ -22,13 +20,9 @@ import org.springframework.web.servlet.HandlerInterceptor; @Component @AllArgsConstructor public class DynamicDatasourceInterceptor implements HandlerInterceptor { - private final RedisTemplate redisTemplate; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) { - redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(String.class)); - HashOperations vo = redisTemplate.opsForHash(); -// String dbName = vo.get("db_route_key", 1); DynamicDataSourceContextHolder.setDataSourceType(1); log.info("数据源切换:{}", 1); return true; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java index 3d7ba90c2..f4df30a49 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java @@ -27,6 +27,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; import java.time.LocalDateTime; /** @@ -53,7 +54,7 @@ public class SysDept extends Model { /** * 排序 */ - @NotBlank(message = "排序值不能为空") + @NotEmpty(message = "排序值不能为空") private Integer sort; /** * 创建时间 diff --git a/pigx-upms/pigx-upms-biz/src/test/java/com/pig4cloud/pigx/admin/PigxAdminApplicationTest.java b/pigx-upms/pigx-upms-biz/src/test/java/com/pig4cloud/pigx/admin/PigxAdminApplicationTest.java index 7e5c390d0..bf8f56e46 100644 --- a/pigx-upms/pigx-upms-biz/src/test/java/com/pig4cloud/pigx/admin/PigxAdminApplicationTest.java +++ b/pigx-upms/pigx-upms-biz/src/test/java/com/pig4cloud/pigx/admin/PigxAdminApplicationTest.java @@ -17,10 +17,11 @@ package com.pig4cloud.pigx.admin; -import com.ulisesbocchio.jasyptspringboot.encryptor.DefaultLazyEncryptor; -import org.jasypt.encryption.StringEncryptor; +import cn.hutool.core.date.DateUtil; import org.junit.Test; -import org.springframework.core.env.StandardEnvironment; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; /** * @author lengleng @@ -31,14 +32,12 @@ import org.springframework.core.env.StandardEnvironment; public class PigxAdminApplicationTest { @Test public void testJasypt() { - // 对应application-dev.yml 中配置的根密码 - System.setProperty("jasypt.encryptor.password", "pigx"); - StringEncryptor stringEncryptor = new DefaultLazyEncryptor(new StandardEnvironment()); + DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE; - //加密方法 - System.out.println(stringEncryptor.encrypt("root")); + String date = DateUtil.date().toDateStr(); - //解密方法 - System.out.println(stringEncryptor.decrypt("ltJPpR50wT0oIY9kfOe1Iw===")); + LocalDateTime dateTime = LocalDateTime.parse("2019-06-11",formatter); + + System.out.println(dateTime); } } diff --git a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayGoodsOrderServiceImpl.java b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayGoodsOrderServiceImpl.java index 2ed7de8a8..1cbcbf48a 100755 --- a/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayGoodsOrderServiceImpl.java +++ b/pigx-visual/pigx-pay/src/main/java/com/pig4cloud/pigx/pay/service/impl/PayGoodsOrderServiceImpl.java @@ -61,6 +61,7 @@ public class PayGoodsOrderServiceImpl extends ServiceImplUTF-8 1.8 1.8 - 2.1.4 - 4.5.8 + 2.1.5 + 4.5.10 0.0.9 2.9.2 - 1.9.3 + 1.9.4 2.10.0 1.7 4.1.0