🔖 Releasing / Version tags. v4.3.0.snapshot

This commit is contained in:
lbw committed 2022-01-14 12:20:03 +08:00
1 parent 0aba0eaa48
commit b8e6deacc8
52 files changed
+193 -65

No files matched your search

+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-auth</artifactId>
+9 -2
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>group.springframework</groupId>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>2020.0.4</version>
<version>2021.0.0</version>
<relativePath/>
</parent>
@@ -17,12 +17,13 @@
<description>pigx 公共版本控制</description>
<properties>
<pigx.version>4.2.0</pigx.version>
<pigx.version>4.3.0-SNAPSHOT</pigx.version>
<mybatis-plus.version>3.4.3</mybatis-plus.version>
<dynamic-ds.version>3.4.1</dynamic-ds.version>
<druid.version>1.2.8</druid.version>
<mysql.connector.version>8.0.27</mysql.connector.version>
<oracle.version>21.3.0.0</oracle.version>
<sqlserver.version>8.4.1.jre8</sqlserver.version>
<swagger.core.version>1.5.22</swagger.core.version>
<mp.weixin.version>4.2.0</mp.weixin.version>
<ijpay.version>2.7.6</ijpay.version>
@@ -182,6 +183,12 @@
<artifactId>ojdbc8</artifactId>
<version>${oracle.version}</version>
</dependency>
<!-- mssql -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<version>${sqlserver.version}</version>
</dependency>
<!--fastjson-->
<dependency>
<groupId>com.alibaba</groupId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-core</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-data</artifactId>
@@ -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
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<artifactId>pigx-common</artifactId>
<groupId>com.pig4cloud</groupId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-excel</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-gateway</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-gray</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-idempotent</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-job</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-log</artifactId>
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-oss</artifactId>
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-security</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-sequence</artifactId>
@@ -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);
}
}
@@ -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);
}
}
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-swagger</artifactId>
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-test</artifactId>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-transaction</artifactId>
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-websocket</artifactId>
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-common</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common-xss</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-common</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-gateway</artifactId>
+1 -1
View File
@@ -18,7 +18,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-register</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-upms-api</artifactId>
@@ -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<SysPublicParam> {
@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<SysPublicParam> {
@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;
}
+6 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-upms</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-upms-biz</artifactId>
@@ -48,6 +48,11 @@
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<!--mssql-->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
</dependency>
<!--upms api、model 模块-->
<dependency>
<groupId>com.pig4cloud</groupId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-upms</artifactId>
+11 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-bi-platform</artifactId>
@@ -70,6 +70,16 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- ojdbc8 -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
</dependency>
<!--PG-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
</dependencies>
<build>
@@ -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@
active: @profiles.active@
+2 -4
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-codegen</artifactId>
@@ -16,7 +16,6 @@
<properties>
<screw.version>0.0.1</screw.version>
<sqlserver.version>4.0</sqlserver.version>
<db2.version>11.5.0.0</db2.version>
<configuration.version>1.10</configuration.version>
</properties>
@@ -64,8 +63,7 @@
<!-- sqlserver 驱动 -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>sqljdbc4</artifactId>
<version>${sqlserver.version}</version>
<artifactId>mssql-jdbc</artifactId>
</dependency>
<!-- db2 驱动-->
<dependency>
@@ -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@
active: @profiles.active@
+1 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-daemon-elastic-job</artifactId>
+6 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -49,6 +49,11 @@
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
</dependency>
<!--PG-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<!-- druid 连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
@@ -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@
active: @profiles.active@
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-monitor</artifactId>
+6 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-mp-platform</artifactId>
@@ -48,6 +48,11 @@
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
</dependency>
<!--PG-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<!-- druid 连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
+11 -1
View File
@@ -23,7 +23,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-oa-platform</artifactId>
@@ -97,6 +97,16 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- ojdbc8 -->
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
</dependency>
<!--PG-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.activiti</groupId>
<artifactId>activiti-modeler</artifactId>
@@ -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@
active: @profiles.active@
+7 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-pay-platform</artifactId>
@@ -43,6 +43,12 @@
<artifactId>ojdbc8</artifactId>
</dependency>
<!--PG-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<!-- druid 连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
@@ -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@
active: @profiles.active@
+9 -5
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-report-platform</artifactId>
@@ -46,11 +46,15 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
<!-- h2 -->
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>runtime</scope>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
</dependency>
<!--PG-->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
@@ -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@
+1 -1
View File
@@ -6,7 +6,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-sentinel-dashboard</artifactId>
+1 -1
View File
@@ -29,7 +29,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<dependencies>
+1 -1
View File
@@ -5,7 +5,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-tx-manager</artifactId>
+1 -1
View File
@@ -4,7 +4,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx-visual</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-xxl-job-admin</artifactId>
+1 -1
View File
@@ -24,7 +24,7 @@
<parent>
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
</parent>
<artifactId>pigx-visual</artifactId>
+8 -1
View File
@@ -24,7 +24,7 @@
<groupId>com.pig4cloud</groupId>
<artifactId>pigx</artifactId>
<version>4.2.0</version>
<version>4.3.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<organization>
@@ -290,6 +290,13 @@
<db.type>oracle</db.type>
</properties>
</profile>
<profile>
<id>mssql</id>
<properties>
<profiles.active>dev</profiles.active>
<db.type>mssql</db.type>
</properties>
</profile>
<profile>
<id>pg</id>
<properties>