diff --git a/README.md b/README.md index 13268b6c..42a0e5e2 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,12 @@

Build Status - Build Status + Build Status Coverage Status - Downloads + Downloads

-- based on Spring Cloud Hoxton 、Spring Boot 2.2、 OAuth2 RBAC web framework +- based on Spring Cloud Hoxton 、Spring Boot 2.3、 OAuth2 RBAC web framework - Idea based on data-driven view, if you don't use vue, you can get started quickly - provide support for common containers like Docker、Kubernetes、Rancher2 - provide lambda 、stream api 、webflux production practice @@ -36,7 +36,7 @@ dependencies | version ---|--- -Spring Boot | 2.2.7.RELEASE +Spring Boot | 2.3.0.RELEASE Spring Cloud | Hoxton.SR4 Spring Security OAuth2 | 2.3.6 Mybatis Plus | 3.3.1 diff --git a/README.zh.md b/README.zh.md index e80982e0..7d4defe9 100644 --- a/README.zh.md +++ b/README.zh.md @@ -3,12 +3,12 @@

Build Status - Build Status + Build Status Coverage Status - Downloads + Downloads

-- 基于 Spring Cloud Hoxton 、Spring Boot 2.2、 OAuth2 的RBAC权限管理系统 +- 基于 Spring Cloud Hoxton 、Spring Boot 2.3、 OAuth2 的RBAC权限管理系统 - 基于数据驱动视图的理念封装 element-ui,即使没有 vue 的使用经验也能快速上手 - 提供对常见容器化支持 Docker、Kubernetes、Rancher2 支持 - 提供 lambda 、stream api 、webflux 的生产实践 @@ -35,7 +35,7 @@ 依赖 | 版本 ---|--- -Spring Boot | 2.2.7.RELEASE +Spring Boot | 2.3.0.RELEASE Spring Cloud | Hoxton.SR4 Spring Security OAuth2 | 2.3.6 Mybatis Plus | 3.3.1 diff --git a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java index 82e8e0b6..a27c8a48 100755 --- a/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java +++ b/pig-codegen/src/main/java/com/pig4cloud/pig/codegen/service/impl/GenDatasourceConfServiceImpl.java @@ -22,11 +22,12 @@ import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; import com.baomidou.dynamic.datasource.creator.DataSourceCreator; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.pig4cloud.pig.codegen.service.GenDatasourceConfService; import com.pig4cloud.pig.codegen.entity.GenDatasourceConf; import com.pig4cloud.pig.codegen.mapper.GenDatasourceConfMapper; +import com.pig4cloud.pig.codegen.service.GenDatasourceConfService; +import com.pig4cloud.pig.common.core.util.SpringContextHolder; import com.pig4cloud.pig.common.datasource.support.DataSourceConstants; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.jasypt.encryption.StringEncryptor; import org.springframework.stereotype.Service; @@ -43,11 +44,10 @@ import java.sql.SQLException; */ @Slf4j @Service -@AllArgsConstructor +@RequiredArgsConstructor public class GenDatasourceConfServiceImpl extends ServiceImpl implements GenDatasourceConfService { - private DynamicRoutingDataSource dynamicRoutingDataSource; private final StringEncryptor stringEncryptor; - private DataSourceCreator dataSourceCreator; + private final DataSourceCreator dataSourceCreator; /** * 保存数据源并且加密 @@ -83,8 +83,8 @@ public class GenDatasourceConfServiceImpl extends ServiceImplhttps://www.pig4cloud.com - 2.2.7.RELEASE + 2.3.0.RELEASE Hoxton.SR4 2.2.1.RELEASE UTF-8 @@ -67,6 +67,7 @@ spring-boot-configuration-processor true + com.github.ulisesbocchio jasypt-spring-boot-starter