zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🎉 🎉 🎉 v3.11

Browse Source
This commit is contained in:
小七 committed 2020-11-30 10:26:49 +08:00
1 parent 317fb80c01
commit e60763e771
41 files changed
+48 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pigx-auth/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-auth</artifactId>
pigx-common/pigx-common-bom/pom.xml
+1 -1
View File
@@ -17,7 +17,7 @@
<description>pigx 公共版本控制</description>
<properties>
<pigx.version>3.10.0</pigx.version>
<pigx.version>3.11.0</pigx.version>
<mybatis-plus.version>3.4.1</mybatis-plus.version>
<dynamic-ds.version>3.2.0</dynamic-ds.version>
<druid.version>1.2.3</druid.version>
pigx-common/pigx-common-core/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-core</artifactId>
pigx-common/pigx-common-data/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-data</artifactId>
pigx-common/pigx-common-datasource/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>pigx-common</artifactId>
<groupId>com.pig4cloud</groupId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/JdbcDynamicDataSourceProvider.java
+2
View File
@@ -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;
}
pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java
+5
View File
@@ -33,4 +33,9 @@ public interface DataSourceConstants {
*/
String DS_USER_PWD = "password";
/**
* 默认驱动名称
*/
String DS_DRIVER = "com.mysql.cj.jdbc.Driver";
}
pigx-common/pigx-common-feign/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-common/pigx-common-gateway/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-gateway</artifactId>
pigx-common/pigx-common-gray/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-gray</artifactId>
pigx-common/pigx-common-job/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-job</artifactId>
pigx-common/pigx-common-log/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-log</artifactId>
pigx-common/pigx-common-oss/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-oss</artifactId>
pigx-common/pigx-common-security/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-security</artifactId>
pigx-common/pigx-common-sentinel/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-common/pigx-common-sequence/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-sequence</artifactId>
pigx-common/pigx-common-swagger/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-swagger</artifactId>
pigx-common/pigx-common-test/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-test</artifactId>
pigx-common/pigx-common-transaction/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-transaction</artifactId>
pigx-common/pigx-common-xss/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common-xss</artifactId>
pigx-common/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-common</artifactId>
pigx-gateway/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-gateway</artifactId>
pigx-register/pom.xml
+1 -1
View File
@@ -18,7 +18,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-register</artifactId>
pigx-upms/pigx-upms-api/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-upms-api</artifactId>
pigx-upms/pigx-upms-biz/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-upms-biz</artifactId>
pigx-upms/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-upms</artifactId>
pigx-visual/pigx-bi-platform/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-bi-platform</artifactId>
pigx-visual/pigx-codegen/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-codegen</artifactId>
pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/GenDsConfController.java
+3
View File
@@ -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));
}
pigx-visual/pigx-daemon-elastic-job/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-daemon-elastic-job</artifactId>
pigx-visual/pigx-daemon-quartz/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
pigx-visual/pigx-monitor/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-monitor</artifactId>
pigx-visual/pigx-mp-platform/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-mp-platform</artifactId>
pigx-visual/pigx-oa-platform/pom.xml
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-oa-platform</artifactId>
pigx-visual/pigx-pay-platform/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-pay-platform</artifactId>
pigx-visual/pigx-sentinel-dashboard/pom.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-sentinel-dashboard</artifactId>
pigx-visual/pigx-sso-client-demo/pom.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<dependencies>
pigx-visual/pigx-tx-manager/pom.xml
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-tx-manager</artifactId>
pigx-visual/pigx-xxl-job-admin/pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-xxl-job-admin</artifactId>
pigx-visual/pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
</parent>
<artifactId>pigx-visual</artifactId>
pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>3.10.0</version>
<version>3.11.0</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<organization>