From e60763e771d5061863cedaae1fb0593d04c5df8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E4=B8=83?= Date: Sun, 29 Nov 2020 17:08:03 +0800 Subject: [PATCH] :tada: :tada: :tada: v3.11 --- pigx-auth/pom.xml | 2 +- pigx-common/pigx-common-bom/pom.xml | 2 +- pigx-common/pigx-common-core/pom.xml | 2 +- pigx-common/pigx-common-data/pom.xml | 2 +- pigx-common/pigx-common-datasource/pom.xml | 2 +- .../datasource/config/JdbcDynamicDataSourceProvider.java | 2 ++ .../pigx/common/datasource/support/DataSourceConstants.java | 5 +++++ pigx-common/pigx-common-feign/pom.xml | 2 +- pigx-common/pigx-common-gateway/pom.xml | 2 +- pigx-common/pigx-common-gray/pom.xml | 2 +- pigx-common/pigx-common-job/pom.xml | 2 +- pigx-common/pigx-common-log/pom.xml | 2 +- pigx-common/pigx-common-oss/pom.xml | 2 +- pigx-common/pigx-common-security/pom.xml | 2 +- pigx-common/pigx-common-sentinel/pom.xml | 2 +- pigx-common/pigx-common-sequence/pom.xml | 2 +- pigx-common/pigx-common-swagger/pom.xml | 2 +- pigx-common/pigx-common-test/pom.xml | 2 +- pigx-common/pigx-common-transaction/pom.xml | 2 +- pigx-common/pigx-common-xss/pom.xml | 2 +- pigx-common/pom.xml | 2 +- pigx-gateway/pom.xml | 2 +- pigx-register/pom.xml | 2 +- pigx-upms/pigx-upms-api/pom.xml | 2 +- pigx-upms/pigx-upms-biz/pom.xml | 2 +- pigx-upms/pom.xml | 2 +- pigx-visual/pigx-bi-platform/pom.xml | 2 +- pigx-visual/pigx-codegen/pom.xml | 2 +- .../pigx/codegen/controller/GenDsConfController.java | 3 +++ pigx-visual/pigx-daemon-elastic-job/pom.xml | 2 +- pigx-visual/pigx-daemon-quartz/pom.xml | 2 +- pigx-visual/pigx-monitor/pom.xml | 2 +- pigx-visual/pigx-mp-platform/pom.xml | 2 +- pigx-visual/pigx-oa-platform/pom.xml | 2 +- pigx-visual/pigx-pay-platform/pom.xml | 2 +- pigx-visual/pigx-sentinel-dashboard/pom.xml | 2 +- pigx-visual/pigx-sso-client-demo/pom.xml | 2 +- pigx-visual/pigx-tx-manager/pom.xml | 2 +- pigx-visual/pigx-xxl-job-admin/pom.xml | 2 +- pigx-visual/pom.xml | 2 +- pom.xml | 2 +- 41 files changed, 48 insertions(+), 38 deletions(-) diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 3aded1f96..4c70c6e2e 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.10.0 + 3.11.0 pigx-auth diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index c58612c97..8ceaab3b9 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -17,7 +17,7 @@ pigx 公共版本控制 - 3.10.0 + 3.11.0 3.4.1 3.2.0 1.2.3 diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 80c3fc82e..815138f89 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-core diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index 962175b37..03dea5409 100644 --- a/pigx-common/pigx-common-data/pom.xml +++ b/pigx-common/pigx-common-data/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-data diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index 6b644b69f..a0c3a83d3 100644 --- a/pigx-common/pigx-common-datasource/pom.xml +++ b/pigx-common/pigx-common-datasource/pom.xml @@ -5,7 +5,7 @@ pigx-common com.pig4cloud - 3.10.0 + 3.11.0 4.0.0 diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/JdbcDynamicDataSourceProvider.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/JdbcDynamicDataSourceProvider.java index 38a235d56..7cbf48dd5 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/JdbcDynamicDataSourceProvider.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/JdbcDynamicDataSourceProvider.java @@ -63,6 +63,7 @@ public class JdbcDynamicDataSourceProvider extends AbstractJdbcDataSourceProvide String password = rs.getString(DataSourceConstants.DS_USER_PWD); String url = rs.getString(DataSourceConstants.DS_JDBC_URL); DataSourceProperty property = new DataSourceProperty(); + property.setDriverClassName(DataSourceConstants.DS_DRIVER); property.setUsername(username); property.setPassword(stringEncryptor.decrypt(password)); property.setUrl(url); @@ -74,6 +75,7 @@ public class JdbcDynamicDataSourceProvider extends AbstractJdbcDataSourceProvide property.setUsername(properties.getUsername()); property.setPassword(properties.getPassword()); property.setUrl(properties.getUrl()); + property.setDriverClassName(DataSourceConstants.DS_DRIVER); map.put(DataSourceConstants.DS_MASTER, property); return map; } diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java index 07a34ea62..38730f4b5 100644 --- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java +++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java @@ -33,4 +33,9 @@ public interface DataSourceConstants { */ String DS_USER_PWD = "password"; + /** + * 默认驱动名称 + */ + String DS_DRIVER = "com.mysql.cj.jdbc.Driver"; + } diff --git a/pigx-common/pigx-common-feign/pom.xml b/pigx-common/pigx-common-feign/pom.xml index 6cf421650..98eb84b26 100755 --- a/pigx-common/pigx-common-feign/pom.xml +++ b/pigx-common/pigx-common-feign/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 4.0.0 diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index 84b8c86b4..b11a789c7 100644 --- a/pigx-common/pigx-common-gateway/pom.xml +++ b/pigx-common/pigx-common-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-gateway diff --git a/pigx-common/pigx-common-gray/pom.xml b/pigx-common/pigx-common-gray/pom.xml index f94cc05e2..0d8f5e699 100644 --- a/pigx-common/pigx-common-gray/pom.xml +++ b/pigx-common/pigx-common-gray/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-gray diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index 898a8f727..f3868eeb1 100644 --- a/pigx-common/pigx-common-job/pom.xml +++ b/pigx-common/pigx-common-job/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index 44ac46d97..bb6ac1ebc 100644 --- a/pigx-common/pigx-common-log/pom.xml +++ b/pigx-common/pigx-common-log/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-log diff --git a/pigx-common/pigx-common-oss/pom.xml b/pigx-common/pigx-common-oss/pom.xml index f9d83b995..d6e78a486 100755 --- a/pigx-common/pigx-common-oss/pom.xml +++ b/pigx-common/pigx-common-oss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-oss diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 46906f33f..1e6654e4c 100644 --- a/pigx-common/pigx-common-security/pom.xml +++ b/pigx-common/pigx-common-security/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-security diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml index 1dd3bb26a..1227f64de 100755 --- a/pigx-common/pigx-common-sentinel/pom.xml +++ b/pigx-common/pigx-common-sentinel/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 4.0.0 diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index 414b2965a..e3ce9a789 100755 --- a/pigx-common/pigx-common-sequence/pom.xml +++ b/pigx-common/pigx-common-sequence/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-sequence diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 276ab4228..586eb65ef 100644 --- a/pigx-common/pigx-common-swagger/pom.xml +++ b/pigx-common/pigx-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-swagger diff --git a/pigx-common/pigx-common-test/pom.xml b/pigx-common/pigx-common-test/pom.xml index 0b623405c..eb6c834e1 100755 --- a/pigx-common/pigx-common-test/pom.xml +++ b/pigx-common/pigx-common-test/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-test diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml index 1313be95d..29ddef8a1 100644 --- a/pigx-common/pigx-common-transaction/pom.xml +++ b/pigx-common/pigx-common-transaction/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-transaction diff --git a/pigx-common/pigx-common-xss/pom.xml b/pigx-common/pigx-common-xss/pom.xml index 20a7d89b5..5265a5e5f 100755 --- a/pigx-common/pigx-common-xss/pom.xml +++ b/pigx-common/pigx-common-xss/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.10.0 + 3.11.0 pigx-common-xss diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index e07721832..21f0916dc 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.10.0 + 3.11.0 pigx-common diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index 144d80d62..88739af14 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.10.0 + 3.11.0 pigx-gateway diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 22ab362fb..865763e8a 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 3.10.0 + 3.11.0 pigx-register diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index 26b452964..9fcace2c4 100644 --- a/pigx-upms/pigx-upms-api/pom.xml +++ b/pigx-upms/pigx-upms-api/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.10.0 + 3.11.0 pigx-upms-api diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 8e83c6e8a..e6a314af2 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-upms - 3.10.0 + 3.11.0 pigx-upms-biz diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index f60b4e33c..a8526f8e6 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.10.0 + 3.11.0 pigx-upms diff --git a/pigx-visual/pigx-bi-platform/pom.xml b/pigx-visual/pigx-bi-platform/pom.xml index 2725c6a0f..57a71ffc7 100755 --- a/pigx-visual/pigx-bi-platform/pom.xml +++ b/pigx-visual/pigx-bi-platform/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-bi-platform diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 41aaa11b3..3d696b7ef 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-codegen diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java index 625770821..c8aa7ae2e 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java @@ -22,6 +22,7 @@ import com.pig4cloud.pigx.codegen.entity.GenDatasourceConf; import com.pig4cloud.pigx.codegen.service.GenDatasourceConfService; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; +import com.pig4cloud.pigx.common.xss.core.XssCleanIgnore; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -75,6 +76,7 @@ public class GenDsConfController { */ @SysLog("新增数据源表") @PostMapping + @XssCleanIgnore public R save(@RequestBody GenDatasourceConf datasourceConf) { return R.ok(datasourceConfService.saveDsByEnc(datasourceConf)); } @@ -86,6 +88,7 @@ public class GenDsConfController { */ @SysLog("修改数据源表") @PutMapping + @XssCleanIgnore public R updateById(@RequestBody GenDatasourceConf conf) { return R.ok(datasourceConfService.updateDsByEnc(conf)); } diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index 07aeefe7d..732f20a26 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-daemon-elastic-job diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index 9c6034982..d5dbdbe24 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 4.0.0 diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index f4c68bb24..65705c43c 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-monitor diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index 4de46fc5c..61cfcbef6 100755 --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-mp-platform diff --git a/pigx-visual/pigx-oa-platform/pom.xml b/pigx-visual/pigx-oa-platform/pom.xml index 66abed936..fc78f7e41 100644 --- a/pigx-visual/pigx-oa-platform/pom.xml +++ b/pigx-visual/pigx-oa-platform/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-oa-platform diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 5345047c3..b5e60207f 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-pay-platform diff --git a/pigx-visual/pigx-sentinel-dashboard/pom.xml b/pigx-visual/pigx-sentinel-dashboard/pom.xml index cfd74c39d..c49f91eff 100755 --- a/pigx-visual/pigx-sentinel-dashboard/pom.xml +++ b/pigx-visual/pigx-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-sentinel-dashboard diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml index c39491007..6fa394f60 100644 --- a/pigx-visual/pigx-sso-client-demo/pom.xml +++ b/pigx-visual/pigx-sso-client-demo/pom.xml @@ -29,7 +29,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml index 9071917b0..10a15a95d 100644 --- a/pigx-visual/pigx-tx-manager/pom.xml +++ b/pigx-visual/pigx-tx-manager/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-tx-manager diff --git a/pigx-visual/pigx-xxl-job-admin/pom.xml b/pigx-visual/pigx-xxl-job-admin/pom.xml index cdc7eb818..37133c971 100755 --- a/pigx-visual/pigx-xxl-job-admin/pom.xml +++ b/pigx-visual/pigx-xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.pig4cloud pigx-visual - 3.10.0 + 3.11.0 pigx-xxl-job-admin diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index c92ef2b9b..7aa42228a 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.10.0 + 3.11.0 pigx-visual diff --git a/pom.xml b/pom.xml index 19c7009f3..30680903e 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.10.0 + 3.11.0 ${project.artifactId} pom