diff --git a/README.md b/README.md index 25845a45..56d5fea5 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Spring Cloud | Hoxton.SR8 Spring Cloud Alibaba | 2.2.3.RELEASE Spring Security OAuth2 | 2.3.6 Mybatis Plus | 3.4.0 -hutool | 5.4.3 +hutool | 5.4.4 Avue | 2.6.15 diff --git a/README.zh.md b/README.zh.md index d821cab6..748ef152 100644 --- a/README.zh.md +++ b/README.zh.md @@ -40,7 +40,7 @@ Spring Cloud | Hoxton.SR8 Spring Cloud Alibaba | 2.2.3.RELEASE Spring Security OAuth2 | 2.3.6 Mybatis Plus | 3.4.0 -hutool | 5.4.3 +hutool | 5.4.4 Avue | 2.6.15 diff --git a/pig-auth/Dockerfile b/pig-auth/Dockerfile index 1293c2be..5cf7383e 100755 --- a/pig-auth/Dockerfile +++ b/pig-auth/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:8-jre as builder -WORKDIR build +FROM moxm/java:1.8-full as builder +WORKDIR /build ARG JAR_FILE=target/pig-auth.jar COPY ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar @@ -10,10 +10,10 @@ ENV TZ=Asia/Shanghai ENV JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" WORKDIR pig-auth -COPY --from=builder build/dependencies/ ./ -COPY --from=builder build/snapshot-dependencies/ ./ -COPY --from=builder build/spring-boot-loader/ ./ -COPY --from=builder build/application/ ./ +COPY --from=builder /build/dependencies/ ./ +COPY --from=builder /build/snapshot-dependencies/ ./ +COPY --from=builder /build/spring-boot-loader/ ./ +COPY --from=builder /build/application/ ./ EXPOSE 3000 diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml index c03b510e..9fe4c74e 100755 --- a/pig-auth/pom.xml +++ b/pig-auth/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.9.2-snapshot + 2.10.0 pig-auth @@ -44,19 +44,19 @@ com.pig4cloud pig-common-sentinel - 2.9.2-snapshot + 2.10.0 com.pig4cloud pig-upms-api - 2.9.2-snapshot + 2.10.0 com.pig4cloud pig-common-security - 2.9.2-snapshot + 2.10.0 diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml index 0bb065c6..b58dd867 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 - 2.9.2-snapshot + 2.10.0 pig-common-core diff --git a/pig-common/pig-common-datasource/pom.xml b/pig-common/pig-common-datasource/pom.xml index b7c2a6a2..0b2a1825 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 - 2.9.2-snapshot + 2.10.0 4.0.0 diff --git a/pig-common/pig-common-job/pom.xml b/pig-common/pig-common-job/pom.xml index f71d863c..94dbfd2a 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 - 2.9.2-snapshot + 2.10.0 pig-common-job diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml index 1c6b957c..1e348458 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 - 2.9.2-snapshot + 2.10.0 pig-common-log @@ -35,13 +35,13 @@ com.pig4cloud pig-common-core - 2.9.2-snapshot + 2.10.0 com.pig4cloud pig-upms-api - 2.9.2-snapshot + 2.10.0 diff --git a/pig-common/pig-common-mybatis/pom.xml b/pig-common/pig-common-mybatis/pom.xml index 18630965..63d66963 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 - 2.9.2-snapshot + 2.10.0 pig-common-mybatis diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml index e1515045..a5f9c7aa 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 - 2.9.2-snapshot + 2.10.0 pig-common-security @@ -35,7 +35,7 @@ com.pig4cloud pig-common-core - 2.9.2-snapshot + 2.10.0 @@ -50,7 +50,7 @@ com.pig4cloud pig-upms-api - 2.9.2-snapshot + 2.10.0 diff --git a/pig-common/pig-common-sentinel/pom.xml b/pig-common/pig-common-sentinel/pom.xml index e847e5af..fe4393bc 100755 --- a/pig-common/pig-common-sentinel/pom.xml +++ b/pig-common/pig-common-sentinel/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 2.9.2-snapshot + 2.10.0 4.0.0 @@ -32,7 +32,7 @@ com.pig4cloud pig-common-core - 2.9.2-snapshot + 2.10.0 com.alibaba.cloud diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml index 8af4ab1c..6d4e900b 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 - 2.9.2-snapshot + 2.10.0 pig-common-swagger diff --git a/pig-common/pig-common-test/pom.xml b/pig-common/pig-common-test/pom.xml index 4c3df35e..180603a6 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 - 2.9.2-snapshot + 2.10.0 pig-common-test @@ -18,7 +18,7 @@ com.pig4cloud pig-common-security - 2.9.2-snapshot + 2.10.0 org.springframework.security diff --git a/pig-common/pom.xml b/pig-common/pom.xml index 79e7eaad..87911d11 100755 --- a/pig-common/pom.xml +++ b/pig-common/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.9.2-snapshot + 2.10.0 pig-common diff --git a/pig-gateway/Dockerfile b/pig-gateway/Dockerfile index c96e071a..d33353eb 100755 --- a/pig-gateway/Dockerfile +++ b/pig-gateway/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:8-jre as builder -WORKDIR build +FROM moxm/java:1.8-full as builder +WORKDIR /build ARG JAR_FILE=target/pig-gateway.jar COPY ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar @@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" WORKDIR pig-gateway -COPY --from=builder build/dependencies/ ./ -COPY --from=builder build/snapshot-dependencies/ ./ -COPY --from=builder build/spring-boot-loader/ ./ -COPY --from=builder build/application/ ./ +COPY --from=builder /build/dependencies/ ./ +COPY --from=builder /build/snapshot-dependencies/ ./ +COPY --from=builder /build/spring-boot-loader/ ./ +COPY --from=builder /build/application/ ./ EXPOSE 9999 diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml index b8e17734..8fbb4f02 100755 --- a/pig-gateway/pom.xml +++ b/pig-gateway/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.9.2-snapshot + 2.10.0 pig-gateway @@ -57,9 +57,8 @@ com.pig4cloud pig-common-sentinel - 2.9.2-snapshot - + com.pig4cloud.plugin easy-captcha @@ -67,14 +66,8 @@ - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} + com.pig4cloud + pig-common-swagger diff --git a/pig-register/Dockerfile b/pig-register/Dockerfile index aff18413..6645aaaa 100644 --- a/pig-register/Dockerfile +++ b/pig-register/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:8-jre as builder -WORKDIR build +FROM moxm/java:1.8-full as builder +WORKDIR /build ARG JAR_FILE=target/pig-register.jar COPY ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar @@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" WORKDIR pig-register -COPY --from=builder build/dependencies/ ./ -COPY --from=builder build/snapshot-dependencies/ ./ -COPY --from=builder build/spring-boot-loader/ ./ -COPY --from=builder build/application/ ./ +COPY --from=builder /build/dependencies/ ./ +COPY --from=builder /build/snapshot-dependencies/ ./ +COPY --from=builder /build/spring-boot-loader/ ./ +COPY --from=builder /build/application/ ./ EXPOSE 8848 diff --git a/pig-register/pom.xml b/pig-register/pom.xml index 239f478d..2b9a67f4 100755 --- a/pig-register/pom.xml +++ b/pig-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pig - 2.9.2-snapshot + 2.10.0 pig-register diff --git a/pig-upms/pig-upms-api/pom.xml b/pig-upms/pig-upms-api/pom.xml index 4ceb0198..87e7944e 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 - 2.9.2-snapshot + 2.10.0 pig-upms-api @@ -35,7 +35,6 @@ com.pig4cloud pig-common-core - 2.9.2-snapshot diff --git a/pig-upms/pig-upms-biz/Dockerfile b/pig-upms/pig-upms-biz/Dockerfile index 43a4484a..10f98efa 100644 --- a/pig-upms/pig-upms-biz/Dockerfile +++ b/pig-upms/pig-upms-biz/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:8-jre as builder -WORKDIR build +FROM moxm/java:1.8-full as builder +WORKDIR /build ARG JAR_FILE=target/pig-upms-biz.jar COPY ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar @@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" WORKDIR pig-upms -COPY --from=builder build/dependencies/ ./ -COPY --from=builder build/snapshot-dependencies/ ./ -COPY --from=builder build/spring-boot-loader/ ./ -COPY --from=builder build/application/ ./ +COPY --from=builder /build/dependencies/ ./ +COPY --from=builder /build/snapshot-dependencies/ ./ +COPY --from=builder /build/spring-boot-loader/ ./ +COPY --from=builder /build/application/ ./ EXPOSE 4000 diff --git a/pig-upms/pig-upms-biz/pom.xml b/pig-upms/pig-upms-biz/pom.xml index 1c1cc6f6..97d5dda5 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 - 2.9.2-snapshot + 2.10.0 pig-upms-biz @@ -34,31 +34,26 @@ com.pig4cloud pig-upms-api - 2.9.2-snapshot com.pig4cloud pig-common-security - 2.9.2-snapshot com.pig4cloud pig-common-log - 2.9.2-snapshot com.pig4cloud pig-common-swagger - 2.9.2-snapshot com.pig4cloud pig-common-mybatis - 2.9.2-snapshot @@ -74,7 +69,6 @@ com.pig4cloud pig-common-sentinel - 2.9.2-snapshot diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml index ddf1fb75..9727cdda 100755 --- a/pig-upms/pom.xml +++ b/pig-upms/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.9.2-snapshot + 2.10.0 pig-upms diff --git a/pig-visual/pig-codegen/Dockerfile b/pig-visual/pig-codegen/Dockerfile index f32a3c04..b2ae3377 100644 --- a/pig-visual/pig-codegen/Dockerfile +++ b/pig-visual/pig-codegen/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:8-jre as builder -WORKDIR build +FROM moxm/java:1.8-full as builder +WORKDIR /build ARG JAR_FILE=target/pig-codegen.jar COPY ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar @@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" WORKDIR pig-codegen -COPY --from=builder build/dependencies/ ./ -COPY --from=builder build/snapshot-dependencies/ ./ -COPY --from=builder build/spring-boot-loader/ ./ -COPY --from=builder build/application/ ./ +COPY --from=builder /build/dependencies/ ./ +COPY --from=builder /build/snapshot-dependencies/ ./ +COPY --from=builder /build/spring-boot-loader/ ./ +COPY --from=builder /build/application/ ./ EXPOSE 5002 diff --git a/pig-visual/pig-codegen/pom.xml b/pig-visual/pig-codegen/pom.xml index 1f26e729..c558f364 100755 --- a/pig-visual/pig-codegen/pom.xml +++ b/pig-visual/pig-codegen/pom.xml @@ -22,7 +22,7 @@ com.pig4cloud pig-visual - 2.9.2-snapshot + 2.10.0 pig-codegen @@ -35,7 +35,6 @@ com.pig4cloud pig-common-swagger - 2.9.2-snapshot @@ -51,36 +50,30 @@ com.pig4cloud pig-common-sentinel - 2.9.2-snapshot com.pig4cloud pig-common-datasource - 2.9.2-snapshot com.pig4cloud pig-common-mybatis - 2.9.2-snapshot com.pig4cloud pig-common-core - 2.9.2-snapshot com.pig4cloud pig-common-log - 2.9.2-snapshot com.pig4cloud pig-common-security - 2.9.2-snapshot diff --git a/pig-visual/pig-monitor/Dockerfile b/pig-visual/pig-monitor/Dockerfile index 7d0da58d..98e1e3cc 100755 --- a/pig-visual/pig-monitor/Dockerfile +++ b/pig-visual/pig-monitor/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:8-jre as builder -WORKDIR build +FROM moxm/java:1.8-full as builder +WORKDIR /build ARG JAR_FILE=target/pig-monitor.jar COPY ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar @@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" WORKDIR pig-monitor -COPY --from=builder build/dependencies/ ./ -COPY --from=builder build/snapshot-dependencies/ ./ -COPY --from=builder build/spring-boot-loader/ ./ -COPY --from=builder build/application/ ./ +COPY --from=builder /build/dependencies/ ./ +COPY --from=builder /build/snapshot-dependencies/ ./ +COPY --from=builder /build/spring-boot-loader/ ./ +COPY --from=builder /build/application/ ./ EXPOSE 5001 diff --git a/pig-visual/pig-monitor/pom.xml b/pig-visual/pig-monitor/pom.xml index 626c5978..c2e5e756 100755 --- a/pig-visual/pig-monitor/pom.xml +++ b/pig-visual/pig-monitor/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-visual - 2.9.2-snapshot + 2.10.0 pig-monitor @@ -50,7 +50,6 @@ com.pig4cloud pig-common-sentinel - 2.9.2-snapshot diff --git a/pig-visual/pig-sentinel-dashboard/Dockerfile b/pig-visual/pig-sentinel-dashboard/Dockerfile index 830f9d1c..1c60d776 100644 --- a/pig-visual/pig-sentinel-dashboard/Dockerfile +++ b/pig-visual/pig-sentinel-dashboard/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:8-jre as builder -WORKDIR build +FROM moxm/java:1.8-full as builder +WORKDIR /build ARG JAR_FILE=target/pig-sentinel-dashboard.jar COPY ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar @@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" WORKDIR pig-sentinel-dashboard -COPY --from=builder build/dependencies/ ./ -COPY --from=builder build/snapshot-dependencies/ ./ -COPY --from=builder build/spring-boot-loader/ ./ -COPY --from=builder build/application/ ./ +COPY --from=builder /build/dependencies/ ./ +COPY --from=builder /build/snapshot-dependencies/ ./ +COPY --from=builder /build/spring-boot-loader/ ./ +COPY --from=builder /build/application/ ./ EXPOSE 5003 diff --git a/pig-visual/pig-sentinel-dashboard/pom.xml b/pig-visual/pig-sentinel-dashboard/pom.xml index 1ce25211..5ba035d8 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 - 2.9.2-snapshot + 2.10.0 pig-sentinel-dashboard diff --git a/pig-visual/pig-xxl-job-admin/Dockerfile b/pig-visual/pig-xxl-job-admin/Dockerfile index f0fd2bb4..4fab252b 100644 --- a/pig-visual/pig-xxl-job-admin/Dockerfile +++ b/pig-visual/pig-xxl-job-admin/Dockerfile @@ -1,5 +1,5 @@ -FROM openjdk:8-jre as builder -WORKDIR build +FROM moxm/java:1.8-full as builder +WORKDIR /build ARG JAR_FILE=target/pig-xxl-job-admin.jar COPY ${JAR_FILE} app.jar RUN java -Djarmode=layertools -jar app.jar extract && rm app.jar @@ -9,10 +9,10 @@ LABEL maintainer="jclazz@outlook.com" ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" WORKDIR pig-xxl-job-admin -COPY --from=builder build/dependencies/ ./ -COPY --from=builder build/snapshot-dependencies/ ./ -COPY --from=builder build/spring-boot-loader/ ./ -COPY --from=builder build/application/ ./ +COPY --from=builder /build/dependencies/ ./ +COPY --from=builder /build/snapshot-dependencies/ ./ +COPY --from=builder /build/spring-boot-loader/ ./ +COPY --from=builder /build/application/ ./ EXPOSE 5004 diff --git a/pig-visual/pig-xxl-job-admin/pom.xml b/pig-visual/pig-xxl-job-admin/pom.xml index c504842b..ab44cdfe 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 - 2.9.2-snapshot + 2.10.0 pig-xxl-job-admin diff --git a/pig-visual/pom.xml b/pig-visual/pom.xml index 034345a3..98a8dedc 100755 --- a/pig-visual/pom.xml +++ b/pig-visual/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 2.9.2-snapshot + 2.10.0 pig-visual diff --git a/pom.xml b/pom.xml index e0a351a9..752c663e 100755 --- a/pom.xml +++ b/pom.xml @@ -20,14 +20,15 @@ 4.0.0 + com.pig4cloud pig-cloud-dependencies-parent - Hoxton.SR8 + 2.10.0 com.pig4cloud pig - 2.9.2-snapshot + 2.10.0 ${project.artifactId} pom https://www.pig4cloud.com @@ -39,26 +40,24 @@ UTF-8 1.8 1.8 - 2.2.5 - 0.0.23 2.3.0 - 5.4.3 + 5.4.4 3.4.0 3.2.0 2.0.0 1.7 2.1.0 1.2.73 - 2.9.2 + 3.0.0 1.5.24 2.2.0 2.3.6.RELEASE 0.32.0 - http://172.17.0.111:2375 - 172.17.0.111 - library - admin - Harbor12345 + http://172.16.1.192:2375 + registry.cn-qingdao.aliyuncs.com + pig4cloud + 154987607@qq.com + qq154987607 @@ -110,6 +109,7 @@ + org.springframework.boot spring-boot-dependencies @@ -117,6 +117,7 @@ pom import + org.springframework.cloud spring-cloud-dependencies @@ -124,7 +125,7 @@ pom import - + com.alibaba.cloud spring-cloud-alibaba-dependencies @@ -132,42 +133,6 @@ pom import - - - org.springframework.security.oauth - spring-security-oauth2 - ${security.oauth.version} - - - - io.swagger - swagger-models - ${swagger.core.version} - - - io.swagger - swagger-annotations - ${swagger.core.version} - - - - com.alibaba - fastjson - ${fastjson.version} - - - - org.springframework.boot - spring-boot-starter-web - ${spring-boot.version} - - - - spring-boot-starter-tomcat - org.springframework.boot - - - @@ -228,50 +193,8 @@ - - - - pl.project13.maven - git-commit-id-plugin - ${git.commit.plugin} - - - - io.spring.javaformat - spring-javaformat-maven-plugin - ${spring.checkstyle.plugin} - - - - - - aliyun - aliyun - https://maven.aliyun.com/repository/public - - true - - - false - - - - - - - aliyun-plugin - https://maven.aliyun.com/repository/public - - true - - - false - - - - dev