From b8e6deacc8abd64f186fb368f873ed2f6144f0ae Mon Sep 17 00:00:00 2001 From: lbw Date: Fri, 14 Jan 2022 12:20:03 +0800 Subject: [PATCH] :bookmark: Releasing / Version tags. v4.3.0.snapshot --- pigx-auth/pom.xml | 2 +- pigx-common/pigx-common-bom/pom.xml | 11 +++++-- pigx-common/pigx-common-core/pom.xml | 2 +- pigx-common/pigx-common-data/pom.xml | 2 +- .../mybatis/MybatisPlusMetaObjectHandler.java | 3 +- pigx-common/pigx-common-datasource/pom.xml | 2 +- pigx-common/pigx-common-excel/pom.xml | 2 +- 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-idempotent/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 +- .../impl/db/provider/PostgreSqlProvider.java | 25 +++++++++++++++ .../db/provider/SqlServerSqlProvider.java | 25 +++++++++++++++ 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-websocket/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/admin/api/entity/SysPublicParam.java | 32 ++++++++++++++----- pigx-upms/pigx-upms-biz/pom.xml | 7 +++- pigx-upms/pom.xml | 2 +- pigx-visual/pigx-bi-platform/pom.xml | 12 ++++++- .../src/main/resources/bootstrap.yml | 3 +- pigx-visual/pigx-codegen/pom.xml | 6 ++-- .../src/main/resources/bootstrap.yml | 3 +- pigx-visual/pigx-daemon-elastic-job/pom.xml | 2 +- pigx-visual/pigx-daemon-quartz/pom.xml | 7 +++- .../src/main/resources/bootstrap.yml | 3 +- pigx-visual/pigx-monitor/pom.xml | 2 +- pigx-visual/pigx-mp-platform/pom.xml | 7 +++- pigx-visual/pigx-oa-platform/pom.xml | 12 ++++++- .../src/main/resources/bootstrap.yml | 3 +- pigx-visual/pigx-pay-platform/pom.xml | 8 ++++- .../src/main/resources/bootstrap.yml | 3 +- pigx-visual/pigx-report-platform/pom.xml | 14 +++++--- .../src/main/resources/bootstrap.yml | 1 + 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 | 9 +++++- 52 files changed, 193 insertions(+), 65 deletions(-) create mode 100644 pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/PostgreSqlProvider.java create mode 100644 pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/SqlServerSqlProvider.java diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 36ec82aa7..0a8ed564f 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 4.2.0 + 4.3.0-SNAPSHOT pigx-auth diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 5b4f32258..a1998f593 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -6,7 +6,7 @@ group.springframework spring-cloud-dependencies-parent - 2020.0.4 + 2021.0.0 @@ -17,12 +17,13 @@ pigx 公共版本控制 - 4.2.0 + 4.3.0-SNAPSHOT 3.4.3 3.4.1 1.2.8 8.0.27 21.3.0.0 + 8.4.1.jre8 1.5.22 4.2.0 2.7.6 @@ -182,6 +183,12 @@ ojdbc8 ${oracle.version} + + + com.microsoft.sqlserver + mssql-jdbc + ${sqlserver.version} + com.alibaba diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index cb1202ec4..31f3a327a 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-core diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index 6dbd85b9f..7a22f1b92 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-data diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java index f384a1eef..2cde63456 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusMetaObjectHandler.java @@ -2,7 +2,6 @@ package com.pig4cloud.pigx.common.data.mybatis; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.pig4cloud.pigx.common.core.constant.CommonConstants; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; import org.springframework.security.core.Authentication; @@ -30,7 +29,7 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler { fillValIfNullByName("updateTime", now, metaObject, false); fillValIfNullByName("createBy", getUserName(), metaObject, false); fillValIfNullByName("updateBy", getUserName(), metaObject, false); - fillValIfNullByName("delFlag", CommonConstants.STATUS_NORMAL, metaObject, false); + fillValIfNullByName("delFlag", 1, metaObject, false); } @Override diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index 4c4370728..41d877443 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 - 4.2.0 + 4.3.0-SNAPSHOT 4.0.0 diff --git a/pigx-common/pigx-common-excel/pom.xml b/pigx-common/pigx-common-excel/pom.xml index 8e27f1377..c5a3d7966 100644 --- a/pigx-common/pigx-common-excel/pom.xml +++ b/pigx-common/pigx-common-excel/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-common - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-excel diff --git a/pigx-common/pigx-common-feign/pom.xml b/pigx-common/pigx-common-feign/pom.xml index c7ac19afd..707d571dc 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 - 4.2.0 + 4.3.0-SNAPSHOT 4.0.0 diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index a9b8df3b9..1a00f7728 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-gateway diff --git a/pigx-common/pigx-common-gray/pom.xml b/pigx-common/pigx-common-gray/pom.xml index 86e76936f..625b2129a 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-gray diff --git a/pigx-common/pigx-common-idempotent/pom.xml b/pigx-common/pigx-common-idempotent/pom.xml index 138424fe7..196da41f3 100644 --- a/pigx-common/pigx-common-idempotent/pom.xml +++ b/pigx-common/pigx-common-idempotent/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-common - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-idempotent diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index 4251209d9..89c69a47a 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index 8678e42a0..136618f7b 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-log diff --git a/pigx-common/pigx-common-oss/pom.xml b/pigx-common/pigx-common-oss/pom.xml index 61e7a3c89..41a95b714 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-oss diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 73e048a45..fbfe7d690 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-security diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml index 3be10d339..57a6934e6 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 - 4.2.0 + 4.3.0-SNAPSHOT 4.0.0 diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index 4350c8906..141b62f94 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-sequence diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/PostgreSqlProvider.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/PostgreSqlProvider.java new file mode 100644 index 000000000..ae67cbab9 --- /dev/null +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/PostgreSqlProvider.java @@ -0,0 +1,25 @@ +package com.pig4cloud.pigx.common.sequence.range.impl.db.provider; + +import com.baomidou.mybatisplus.annotation.DbType; +import org.springframework.stereotype.Component; + +/** + * 数据源提供者 + * + * @author lengleng + * @date 2022-01-13 + */ +@Component +public class PostgreSqlProvider implements SqlProvider { + + @Override + public String getInsertRangeSql() { + return "INSERT INTO #tableName(id,name,value,gmt_create,gmt_modified)" + " VALUE(?,?,?,?,?)"; + } + + @Override + public Boolean support(DbType dbType) { + return DbType.POSTGRE_SQL.equals(dbType); + } + +} diff --git a/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/SqlServerSqlProvider.java b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/SqlServerSqlProvider.java new file mode 100644 index 000000000..81d0e1f83 --- /dev/null +++ b/pigx-common/pigx-common-sequence/src/main/java/com/pig4cloud/pigx/common/sequence/range/impl/db/provider/SqlServerSqlProvider.java @@ -0,0 +1,25 @@ +package com.pig4cloud.pigx.common.sequence.range.impl.db.provider; + +import com.baomidou.mybatisplus.annotation.DbType; +import org.springframework.stereotype.Component; + +/** + * SQL server 数据源提供者 + * + * @author lengleng + * @date 2022-01-13 + */ +@Component +public class SqlServerSqlProvider implements SqlProvider { + + @Override + public String getInsertRangeSql() { + return "INSERT INTO #tableName(id,name,value,gmt_create,gmt_modified)" + " VALUE(?,?,?,?,?)"; + } + + @Override + public Boolean support(DbType dbType) { + return DbType.SQL_SERVER.equals(dbType); + } + +} diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 415e8e035..d8d3620d7 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-swagger diff --git a/pigx-common/pigx-common-test/pom.xml b/pigx-common/pigx-common-test/pom.xml index 8abf26f08..e4083359b 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-test diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml index 19d8efba8..842a116c5 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-transaction diff --git a/pigx-common/pigx-common-websocket/pom.xml b/pigx-common/pigx-common-websocket/pom.xml index 05da113b6..cdf9d8325 100755 --- a/pigx-common/pigx-common-websocket/pom.xml +++ b/pigx-common/pigx-common-websocket/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-websocket diff --git a/pigx-common/pigx-common-xss/pom.xml b/pigx-common/pigx-common-xss/pom.xml index 960859a0e..4be58b1e3 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-common-xss diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index fbbd99164..b374fd935 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 4.2.0 + 4.3.0-SNAPSHOT pigx-common diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index c7ae38f36..7b6a20c1f 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 4.2.0 + 4.3.0-SNAPSHOT pigx-gateway diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 24b114a37..878509685 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 4.2.0 + 4.3.0-SNAPSHOT pigx-register diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index 9a019b8fc..bd037fa64 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-upms-api diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java index 2fe116ef6..5d3e29ec2 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysPublicParam.java @@ -24,6 +24,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.time.LocalDateTime; + /** * 公共参数配置 * @@ -68,14 +70,6 @@ public class SysPublicParam extends Model { @ApiModelProperty(value = "标识[1有效；2无效]", example = "1") private String status; - /** - * 删除状态（0：正常 1：已删除） - */ - @TableLogic - @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "状态[0-正常，1-删除]", example = "0") - private String delFlag; - /** * 公共参数编码 */ @@ -94,4 +88,26 @@ public class SysPublicParam extends Model { @ApiModelProperty(value = "类型[1-检索；2-原文...]", example = "1") private String publicType; + /** + * 删除标记 + */ + @TableLogic + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "删除标记,1:已删除,0:正常") + private String delFlag; + + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.UPDATE) + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + } diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 889f0e9e3..c6b330d54 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-upms-biz @@ -48,6 +48,11 @@ org.postgresql postgresql + + + com.microsoft.sqlserver + mssql-jdbc + com.pig4cloud diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index 5d9ff1880..2b01ba447 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 4.2.0 + 4.3.0-SNAPSHOT pigx-upms diff --git a/pigx-visual/pigx-bi-platform/pom.xml b/pigx-visual/pigx-bi-platform/pom.xml index 262e883ca..dc71e5b82 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-bi-platform @@ -70,6 +70,16 @@ mysql mysql-connector-java + + + com.oracle.database.jdbc + ojdbc8 + + + + org.postgresql + postgresql + diff --git a/pigx-visual/pigx-bi-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-bi-platform/src/main/resources/bootstrap.yml index ee5868e1b..987fcef8a 100644 --- a/pigx-visual/pigx-bi-platform/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-bi-platform/src/main/resources/bootstrap.yml @@ -14,5 +14,6 @@ spring: file-extension: yml shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: @db.type@ profiles: - active: @profiles.active@ \ No newline at end of file + active: @profiles.active@ diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index b4f7a1e7c..ecfc6eac6 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 4.2.0 + 4.3.0-SNAPSHOT pigx-codegen @@ -16,7 +16,6 @@ 0.0.1 - 4.0 11.5.0.0 1.10 @@ -64,8 +63,7 @@ com.microsoft.sqlserver - sqljdbc4 - ${sqlserver.version} + mssql-jdbc diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml index 5eb2ce49e..2468c3da8 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml @@ -13,5 +13,6 @@ spring: file-extension: yml shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: @db.type@ profiles: - active: @profiles.active@ \ No newline at end of file + active: @profiles.active@ diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index 4e80413c9..390b1073a 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-daemon-elastic-job diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index 889f98edc..7dd2a8c26 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 - 4.2.0 + 4.3.0-SNAPSHOT 4.0.0 @@ -49,6 +49,11 @@ com.oracle.database.jdbc ojdbc8 + + + org.postgresql + postgresql + com.alibaba diff --git a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml index e471e25f6..8d0b14ae5 100644 --- a/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-daemon-quartz/src/main/resources/bootstrap.yml @@ -16,5 +16,6 @@ spring: file-extension: yml shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: @db.type@ profiles: - active: @profiles.active@ \ No newline at end of file + active: @profiles.active@ diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 5002440e3..1d894171a 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 4.2.0 + 4.3.0-SNAPSHOT pigx-monitor diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index ebc233475..a965de285 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-mp-platform @@ -48,6 +48,11 @@ com.oracle.database.jdbc ojdbc8 + + + org.postgresql + postgresql + com.alibaba diff --git a/pigx-visual/pigx-oa-platform/pom.xml b/pigx-visual/pigx-oa-platform/pom.xml index a5151ddcd..057c1209a 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-oa-platform @@ -97,6 +97,16 @@ mysql mysql-connector-java + + + com.oracle.database.jdbc + ojdbc8 + + + + org.postgresql + postgresql + org.activiti activiti-modeler diff --git a/pigx-visual/pigx-oa-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-oa-platform/src/main/resources/bootstrap.yml index 83007d438..c3b6cf376 100644 --- a/pigx-visual/pigx-oa-platform/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-oa-platform/src/main/resources/bootstrap.yml @@ -13,5 +13,6 @@ spring: file-extension: yml shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: @db.type@ profiles: - active: @profiles.active@ \ No newline at end of file + active: @profiles.active@ diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 461c3e820..3f5afd5b0 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-pay-platform @@ -43,6 +43,12 @@ ojdbc8 + + + org.postgresql + postgresql + + com.alibaba diff --git a/pigx-visual/pigx-pay-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-pay-platform/src/main/resources/bootstrap.yml index df8ff50b0..c8ea5a749 100644 --- a/pigx-visual/pigx-pay-platform/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-pay-platform/src/main/resources/bootstrap.yml @@ -13,5 +13,6 @@ spring: file-extension: yml shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: @db.type@ profiles: - active: @profiles.active@ \ No newline at end of file + active: @profiles.active@ diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml index fb2fa4e1b..2d22c3f27 100644 --- a/pigx-visual/pigx-report-platform/pom.xml +++ b/pigx-visual/pigx-report-platform/pom.xml @@ -5,7 +5,7 @@ com.pig4cloud pigx-visual - 4.2.0 + 4.3.0-SNAPSHOT pigx-report-platform @@ -46,11 +46,15 @@ mysql-connector-java - - com.h2database - h2 - runtime + com.oracle.database.jdbc + ojdbc8 + + + + + org.postgresql + postgresql diff --git a/pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml b/pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml index c5044af08..8191e43f6 100644 --- a/pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-report-platform/src/main/resources/bootstrap.yml @@ -11,5 +11,6 @@ spring: file-extension: yml shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + namespace: @db.type@ profiles: active: @profiles.active@ diff --git a/pigx-visual/pigx-sentinel-dashboard/pom.xml b/pigx-visual/pigx-sentinel-dashboard/pom.xml index 0efe39e32..ae585ec42 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-sentinel-dashboard diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml index fdd695664..2ae95d132 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 - 4.2.0 + 4.3.0-SNAPSHOT diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml index b18ee576e..b19b589b8 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-tx-manager diff --git a/pigx-visual/pigx-xxl-job-admin/pom.xml b/pigx-visual/pigx-xxl-job-admin/pom.xml index 9b5aa04cc..dd4c6944e 100644 --- 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 - 4.2.0 + 4.3.0-SNAPSHOT pigx-xxl-job-admin diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index 73c411735..1e2cd6aee 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 4.2.0 + 4.3.0-SNAPSHOT pigx-visual diff --git a/pom.xml b/pom.xml index abd5994d4..2d8fa6278 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 4.2.0 + 4.3.0-SNAPSHOT ${project.artifactId} pom @@ -290,6 +290,13 @@ oracle + + mssql + + dev + mssql + + pg