diff --git a/README.md b/README.md index cc3efb63..9a82feb4 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ | 依赖 | 版本 | | ---------------------- | ------------- | -| Spring Boot | 2.5.1 | +| Spring Boot | 2.5.2 | | Spring Cloud | 2020.0.3 | | Spring Cloud Alibaba | 2021.1| | Spring Security OAuth2 | 2.3.6 | @@ -98,7 +98,7 @@ mvn archetype:generate \ -Dpackage=com.pig4cloud.pig.demo \ -DarchetypeGroupId=com.pig4cloud.archetype \ -DarchetypeArtifactId=pig-gen \ - -DarchetypeVersion=3.2.0 \ + -DarchetypeVersion=3.2.2 \ -DarchetypeCatalog=local ``` diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml index dcb85c1d..fbedd4ea 100755 --- a/pig-auth/pom.xml +++ b/pig-auth/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.2.1 + 3.2.2 pig-auth @@ -44,19 +44,19 @@ com.pig4cloud pig-common-feign - 3.2.1 + 3.2.2 com.pig4cloud pig-upms-api - 3.2.1 + 3.2.2 com.pig4cloud pig-common-security - 3.2.1 + 3.2.2 diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml index 80f978cd..7cf5627c 100755 --- a/pig-common/pig-common-core/pom.xml +++ b/pig-common/pig-common-core/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.2.1 + 3.2.2 pig-common-core diff --git a/pig-common/pig-common-datasource/pom.xml b/pig-common/pig-common-datasource/pom.xml index 5f4c2127..f42c7b04 100644 --- a/pig-common/pig-common-datasource/pom.xml +++ b/pig-common/pig-common-datasource/pom.xml @@ -21,7 +21,7 @@ pig-common com.pig4cloud - 3.2.1 + 3.2.2 4.0.0 diff --git a/pig-common/pig-common-feign/pom.xml b/pig-common/pig-common-feign/pom.xml index b4036a04..fa14d23a 100755 --- a/pig-common/pig-common-feign/pom.xml +++ b/pig-common/pig-common-feign/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.2.1 + 3.2.2 4.0.0 @@ -33,7 +33,7 @@ com.pig4cloud pig-common-core - 3.2.1 + 3.2.2 com.alibaba.cloud diff --git a/pig-common/pig-common-job/pom.xml b/pig-common/pig-common-job/pom.xml index ce17e54c..3de0b67b 100755 --- a/pig-common/pig-common-job/pom.xml +++ b/pig-common/pig-common-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pig-common - 3.2.1 + 3.2.2 pig-common-job diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml index 56cc4cfe..8be4a061 100755 --- a/pig-common/pig-common-log/pom.xml +++ b/pig-common/pig-common-log/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.2.1 + 3.2.2 pig-common-log @@ -35,13 +35,13 @@ com.pig4cloud pig-common-core - 3.2.1 + 3.2.2 com.pig4cloud pig-upms-api - 3.2.1 + 3.2.2 diff --git a/pig-common/pig-common-mybatis/pom.xml b/pig-common/pig-common-mybatis/pom.xml index 0436e48c..d02991b8 100755 --- a/pig-common/pig-common-mybatis/pom.xml +++ b/pig-common/pig-common-mybatis/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.2.1 + 3.2.2 pig-common-mybatis diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml index ae69d2e0..1d4c21cf 100755 --- a/pig-common/pig-common-security/pom.xml +++ b/pig-common/pig-common-security/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.2.1 + 3.2.2 pig-common-security @@ -35,7 +35,7 @@ com.pig4cloud pig-common-core - 3.2.1 + 3.2.2 @@ -46,7 +46,7 @@ com.pig4cloud pig-upms-api - 3.2.1 + 3.2.2 diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml index 04495032..4e8d5768 100644 --- a/pig-common/pig-common-swagger/pom.xml +++ b/pig-common/pig-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pig-common - 3.2.1 + 3.2.2 pig-common-swagger diff --git a/pig-common/pig-common-test/pom.xml b/pig-common/pig-common-test/pom.xml index 96e4e5f4..bb00cb4e 100755 --- a/pig-common/pig-common-test/pom.xml +++ b/pig-common/pig-common-test/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-common - 3.2.1 + 3.2.2 pig-common-test @@ -18,7 +18,7 @@ com.pig4cloud pig-common-security - 3.2.1 + 3.2.2 org.springframework.security diff --git a/pig-common/pom.xml b/pig-common/pom.xml index a65f295d..3e0c78b4 100755 --- a/pig-common/pom.xml +++ b/pig-common/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.2.1 + 3.2.2 pig-common diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml index 5b7316a2..f0b98919 100755 --- a/pig-gateway/pom.xml +++ b/pig-gateway/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.2.1 + 3.2.2 pig-gateway diff --git a/pig-register/pom.xml b/pig-register/pom.xml index b815d92c..9c81b7d4 100755 --- a/pig-register/pom.xml +++ b/pig-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pig - 3.2.1 + 3.2.2 pig-register diff --git a/pig-upms/pig-upms-api/pom.xml b/pig-upms/pig-upms-api/pom.xml index 0449c71a..242b2756 100755 --- a/pig-upms/pig-upms-api/pom.xml +++ b/pig-upms/pig-upms-api/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 3.2.1 + 3.2.2 pig-upms-api diff --git a/pig-upms/pig-upms-biz/pom.xml b/pig-upms/pig-upms-biz/pom.xml index ab2efc38..9e127ada 100644 --- a/pig-upms/pig-upms-biz/pom.xml +++ b/pig-upms/pig-upms-biz/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 3.2.1 + 3.2.2 pig-upms-biz diff --git a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java index bc8d865c..89fd0e94 100644 --- a/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java +++ b/pig-upms/pig-upms-biz/src/main/java/com/pig4cloud/pig/admin/service/impl/SysMenuServiceImpl.java @@ -31,13 +31,13 @@ import com.pig4cloud.pig.common.core.constant.CacheConstants; import com.pig4cloud.pig.common.core.constant.CommonConstants; import com.pig4cloud.pig.common.core.constant.enums.MenuTypeEnum; import lombok.RequiredArgsConstructor; -import org.jetbrains.annotations.NotNull; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; +import javax.validation.constraints.NotNull; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml index 4535aeba..9d93b2db 100755 --- a/pig-upms/pom.xml +++ b/pig-upms/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.2.1 + 3.2.2 pig-upms diff --git a/pig-visual/pig-codegen/pom.xml b/pig-visual/pig-codegen/pom.xml index f057797a..00208006 100755 --- a/pig-visual/pig-codegen/pom.xml +++ b/pig-visual/pig-codegen/pom.xml @@ -22,7 +22,7 @@ com.pig4cloud pig-visual - 3.2.1 + 3.2.2 pig-codegen diff --git a/pig-visual/pig-monitor/pom.xml b/pig-visual/pig-monitor/pom.xml index e1000f30..bd4c3bf5 100755 --- a/pig-visual/pig-monitor/pom.xml +++ b/pig-visual/pig-monitor/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-visual - 3.2.1 + 3.2.2 pig-monitor diff --git a/pig-visual/pig-sentinel-dashboard/pom.xml b/pig-visual/pig-sentinel-dashboard/pom.xml index 6c7630f0..174385a2 100755 --- a/pig-visual/pig-sentinel-dashboard/pom.xml +++ b/pig-visual/pig-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-visual - 3.2.1 + 3.2.2 pig-sentinel-dashboard diff --git a/pig-visual/pig-xxl-job-admin/pom.xml b/pig-visual/pig-xxl-job-admin/pom.xml index baa9e2cb..513ec3e2 100644 --- a/pig-visual/pig-xxl-job-admin/pom.xml +++ b/pig-visual/pig-xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.pig4cloud pig-visual - 3.2.1 + 3.2.2 pig-xxl-job-admin diff --git a/pig-visual/pom.xml b/pig-visual/pom.xml index 90680091..1a86cfbf 100755 --- a/pig-visual/pom.xml +++ b/pig-visual/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.2.1 + 3.2.2 pig-visual diff --git a/pom.xml b/pom.xml index f9aae79f..d7891857 100755 --- a/pom.xml +++ b/pom.xml @@ -23,18 +23,18 @@ com.pig4cloud pig-cloud-dependencies-parent - 3.2.1 + 3.2.2 com.pig4cloud pig ${project.artifactId} - 3.2.1 + 3.2.2 pom https://www.pig4cloud.com - 2.5.1 + 2.5.2 2020.0.3 2021.1 UTF-8