diff --git a/db/Dockerfile b/db/Dockerfile index d37855415..93b66c750 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -4,18 +4,18 @@ MAINTAINER lengleng(wangiegie@gmail.com) RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -COPY ./db/1schema.sql /docker-entrypoint-initdb.d +COPY ./1schema.sql /docker-entrypoint-initdb.d -COPY ./db/2pigxx.sql /docker-entrypoint-initdb.d +COPY ./2pigxx.sql /docker-entrypoint-initdb.d -COPY ./db/3pigxx_ac.sql /docker-entrypoint-initdb.d +COPY ./3pigxx_ac.sql /docker-entrypoint-initdb.d -COPY ./db/4pigxx_job.sql /docker-entrypoint-initdb.d +COPY ./4pigxx_job.sql /docker-entrypoint-initdb.d -COPY ./db/5pigxx_mp.sql /docker-entrypoint-initdb.d +COPY ./5pigxx_mp.sql /docker-entrypoint-initdb.d -COPY ./db/6pigxx_config.sql /docker-entrypoint-initdb.d +COPY ./6pigxx_config.sql /docker-entrypoint-initdb.d -COPY ./db/7pigxx_pay.sql /docker-entrypoint-initdb.d +COPY ./7pigxx_pay.sql /docker-entrypoint-initdb.d -COPY ./db/8pigxx_codegen.sql /docker-entrypoint-initdb.d \ No newline at end of file +COPY ./8pigxx_codegen.sql /docker-entrypoint-initdb.d \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 9331f1fb4..18f524e01 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,7 @@ version: '2' services: pigx-mysql: build: - context: ./ - dockerfile: ./db/Dockerfile + context: ./db environment: MYSQL_ROOT_PASSWORD: root restart: always @@ -57,8 +56,7 @@ services: pigx-register: build: - context: ./ - dockerfile: ./pigx-register/Dockerfile + context: ./pigx-register restart: always container_name: pigx-register image: pigx-register @@ -67,8 +65,7 @@ services: pigx-gateway: build: - context: ./ - dockerfile: ./pigx-gateway/Dockerfile + context: ./pigx-gateway restart: always container_name: pigx-gateway image: pigx-gateway @@ -77,24 +74,21 @@ services: pigx-auth: build: - context: ./ - dockerfile: ./pigx-auth/Dockerfile + context: ./pigx-auth restart: always container_name: pigx-auth image: pigx-auth pigx-upms: build: - context: ./ - dockerfile: ./pigx-upms/pigx-upms-biz/Dockerfile + context: ./pigx-upms/pigx-upms-biz restart: always container_name: pigx-upms image: pigx-upms pigx-monitor: build: - context: ./ - dockerfile: ./pigx-visual/pigx-monitor/Dockerfile + context: ./pigx-visual/pigx-monitor restart: always image: pigx-monitor container_name: pigx-monitor @@ -103,56 +97,49 @@ services: pigx-daemon-quartz: build: - context: ./ - dockerfile: ./pigx-visual/pigx-daemon-quartz/Dockerfile + context: ./pigx-visual/pigx-daemon-quartz restart: always image: pigx-daemon-quartz container_name: pigx-daemon-quartz pigx-daemon-elastic-job: build: - context: ./ - dockerfile: ./pigx-visual/pigx-daemon-elastic-job/Dockerfile + context: ./pigx-visual/pigx-daemon-elastic-job restart: always image: pigx-daemon-elastic-job container_name: pigx-daemon-elastic-job pigx-codegen: build: - context: ./ - dockerfile: ./pigx-visual/pigx-codegen/Dockerfile + context: ./pigx-visual/pigx-codegen restart: always image: pigx-codegen container_name: pigx-codegen pigx-mp-platform: build: - context: ./ - dockerfile: ./pigx-visual/pigx-mp-platform/Dockerfile + context: ./pigx-visual/pigx-mp-platform restart: always image: pigx-mp-platform container_name: pigx-mp-platform pigx-pay-platform: build: - context: ./ - dockerfile: ./pigx-visual/pigx-pay-platform/Dockerfile + context: ./pigx-visual/pigx-pay-platform restart: always image: pigx-pay-platform container_name: pigx-pay-platform pigx-oa-platform: build: - context: ./ - dockerfile: ./pigx-visual/pigx-oa-platform/Dockerfile + context: ./pigx-visual/pigx-oa-platform restart: always image: pigx-oa-platform container_name: pigx-oa-platform pigx-tx-manager: build: - context: ./ - dockerfile: ./pigx-visual/pigx-tx-manager/Dockerfile + context: ./pigx-visual/pigx-tx-manager restart: always image: pigx-tx-manager container_name: pigx-tx-manager @@ -162,8 +149,7 @@ services: pigx-sentinel: build: - context: ./ - dockerfile: ./pigx-visual/pigx-sentinel-dashboard/Dockerfile + context: ./pigx-visual/pigx-sentinel-dashboard restart: always image: pigx-sentinel container_name: pigx-sentinel diff --git a/pigx-auth/Dockerfile b/pigx-auth/Dockerfile index 0d3b938e0..29eb6d65f 100644 --- a/pigx-auth/Dockerfile +++ b/pigx-auth/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-auth EXPOSE 3000 -ADD ./pigx-auth/target/pigx-auth.jar ./ +ADD ./target/pigx-auth.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-auth.jar diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 0adc34f60..fbb50c7a2 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.6.0 + 3.7.0 pigx-auth @@ -107,7 +107,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 73e9930db..40bba17ee 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -17,8 +17,8 @@ pigx 公共版本控制 - 3.6.0 - 3.3.0 + 3.7.0 + 3.3.1 1.1.21 8.0.18 1.5.22 @@ -152,7 +152,7 @@ com.pig4cloud.plugin spring-cloud-maven-plugin - 1.0.0 + 1.0.1 package diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index e5127da49..73df2e903 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 - 3.6.0 + 3.7.0 pigx-common-core diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml index 6159ce3ce..e66a9f2f3 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 - 3.6.0 + 3.7.0 pigx-common-data diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml index 0725599d5..d8703af69 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 - 3.6.0 + 3.7.0 4.0.0 diff --git a/pigx-common/pigx-common-gateway/pom.xml b/pigx-common/pigx-common-gateway/pom.xml index c97fff40c..5688cdff9 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 - 3.6.0 + 3.7.0 pigx-common-gateway diff --git a/pigx-common/pigx-common-gray/pom.xml b/pigx-common/pigx-common-gray/pom.xml index 343520e64..ffa07c47e 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 - 3.6.0 + 3.7.0 pigx-common-gray diff --git a/pigx-common/pigx-common-job/pom.xml b/pigx-common/pigx-common-job/pom.xml index 2db6a36fd..d78d7d9a6 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 - 3.6.0 + 3.7.0 pigx-common-job diff --git a/pigx-common/pigx-common-log/pom.xml b/pigx-common/pigx-common-log/pom.xml index b73fb8640..26d0deb9a 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 - 3.6.0 + 3.7.0 pigx-common-log diff --git a/pigx-common/pigx-common-minio/pom.xml b/pigx-common/pigx-common-minio/pom.xml index 7f14d1a01..d0c0e2104 100755 --- a/pigx-common/pigx-common-minio/pom.xml +++ b/pigx-common/pigx-common-minio/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-common - 3.6.0 + 3.7.0 pigx-common-minio diff --git a/pigx-common/pigx-common-security/pom.xml b/pigx-common/pigx-common-security/pom.xml index 2521e7fab..2fc4ac855 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 - 3.6.0 + 3.7.0 pigx-common-security diff --git a/pigx-common/pigx-common-sentinel/pom.xml b/pigx-common/pigx-common-sentinel/pom.xml index 349b437e4..bf214eac4 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 - 3.6.0 + 3.7.0 4.0.0 diff --git a/pigx-common/pigx-common-sequence/pom.xml b/pigx-common/pigx-common-sequence/pom.xml index f33ab5f03..4cd443a51 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 - 3.6.0 + 3.7.0 pigx-common-sequence diff --git a/pigx-common/pigx-common-swagger/pom.xml b/pigx-common/pigx-common-swagger/pom.xml index 0b122d958..76c21e5db 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 - 3.6.0 + 3.7.0 pigx-common-swagger diff --git a/pigx-common/pigx-common-transaction/pom.xml b/pigx-common/pigx-common-transaction/pom.xml index 3d70feadc..88f21b515 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 - 3.6.0 + 3.7.0 pigx-common-transaction diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index 7d2bcbf31..fbea41d91 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.6.0 + 3.7.0 pigx-common diff --git a/pigx-gateway/Dockerfile b/pigx-gateway/Dockerfile index 8333b52c2..43b1df2d7 100644 --- a/pigx-gateway/Dockerfile +++ b/pigx-gateway/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-gateway EXPOSE 9999 -ADD ./pigx-gateway/target/pigx-gateway.jar ./ +ADD ./target/pigx-gateway.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-gateway.jar diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index c97f8f620..b6120b475 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.6.0 + 3.7.0 pigx-gateway @@ -103,7 +103,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/RouterFunctionConfiguration.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/RouterFunctionConfiguration.java index 2b46c6c55..df089e42f 100644 --- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/RouterFunctionConfiguration.java +++ b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/RouterFunctionConfiguration.java @@ -21,7 +21,7 @@ import com.pig4cloud.pigx.gateway.handler.ImageCodeHandler; import com.pig4cloud.pigx.gateway.handler.SwaggerResourceHandler; import com.pig4cloud.pigx.gateway.handler.SwaggerSecurityHandler; import com.pig4cloud.pigx.gateway.handler.SwaggerUiHandler; -import lombok.AllArgsConstructor; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -37,12 +37,12 @@ import org.springframework.web.reactive.function.server.RouterFunctions; */ @Slf4j @Configuration -@AllArgsConstructor +@RequiredArgsConstructor public class RouterFunctionConfiguration { private final SwaggerResourceHandler swaggerResourceHandler; private final SwaggerSecurityHandler swaggerSecurityHandler; private final SwaggerUiHandler swaggerUiHandler; - private final ImageCodeHandler imageCodeHandler; + private ImageCodeHandler imageCodeHandler; @Bean public RouterFunction routerFunction() { diff --git a/pigx-register/Dockerfile b/pigx-register/Dockerfile index 00e73b26e..e34b0f879 100644 --- a/pigx-register/Dockerfile +++ b/pigx-register/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /pigx-register EXPOSE 8848 -ADD ./pigx-register/target/pigx-register.jar ./ +ADD ./target/pigx-register.jar ./ CMD sleep 60;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-register.jar diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 11ca0bcfb..44c4c339e 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pigx - 3.6.0 + 3.7.0 pigx-register @@ -71,7 +71,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-upms/pigx-upms-api/pom.xml b/pigx-upms/pigx-upms-api/pom.xml index 8374f78af..8ac0af4ea 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 - 3.6.0 + 3.7.0 pigx-upms-api diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java index ee50284cf..99d67b30a 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java @@ -68,10 +68,10 @@ public class SysOauthClientDetails extends Model { @ApiModelProperty(value = "作用域") private String scope; /** - * 授权方式（A,B,C） + * 授权方式[A,B,C] */ @ApiModelProperty(value = "授权方式") - private String authorizedGrantTypes; + private String[] authorizedGrantTypes; /** * 回调地址 */ diff --git a/pigx-upms/pigx-upms-biz/Dockerfile b/pigx-upms/pigx-upms-biz/Dockerfile index a5cab04bc..1662f32c2 100644 --- a/pigx-upms/pigx-upms-biz/Dockerfile +++ b/pigx-upms/pigx-upms-biz/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-upms EXPOSE 4000 -ADD ./pigx-upms/pigx-upms-biz/target/pigx-upms-biz.jar ./ +ADD ./target/pigx-upms-biz.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-upms-biz.jar diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 431898c68..c4e4f9888 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 - 3.6.0 + 3.7.0 pigx-upms-biz @@ -121,7 +121,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-upms/pom.xml b/pigx-upms/pom.xml index 62547ba5a..0296cdf6b 100644 --- a/pigx-upms/pom.xml +++ b/pigx-upms/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.6.0 + 3.7.0 pigx-upms diff --git a/pigx-visual/pigx-codegen/Dockerfile b/pigx-visual/pigx-codegen/Dockerfile index cd8188629..0fa2f9a56 100644 --- a/pigx-visual/pigx-codegen/Dockerfile +++ b/pigx-visual/pigx-codegen/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-codegen EXPOSE 5003 -ADD ./pigx-visual/pigx-codegen/target/pigx-codegen.jar ./ +ADD ./target/pigx-codegen.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-codegen.jar diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 923e0850b..559d0fce8 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pigx-visual - 3.6.0 + 3.7.0 pigx-codegen @@ -93,7 +93,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-daemon-elastic-job/Dockerfile b/pigx-visual/pigx-daemon-elastic-job/Dockerfile index 47419db58..9926c1653 100644 --- a/pigx-visual/pigx-daemon-elastic-job/Dockerfile +++ b/pigx-visual/pigx-daemon-elastic-job/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-daemon-elastic-job EXPOSE 5002 -ADD ./pigx-visual/pigx-daemon-elastic-job/target/pigx-daemon-elastic-job.jar ./ +ADD ./target/pigx-daemon-elastic-job.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-elastic-job.jar diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index 054d7e5f4..1f6c3b236 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 - 3.6.0 + 3.7.0 pigx-daemon-elastic-job @@ -110,7 +110,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-daemon-quartz/Dockerfile b/pigx-visual/pigx-daemon-quartz/Dockerfile index 3305ac04b..c5f86e69f 100644 --- a/pigx-visual/pigx-daemon-quartz/Dockerfile +++ b/pigx-visual/pigx-daemon-quartz/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-daemon-quartz EXPOSE 5007 -ADD ./pigx-visual/pigx-daemon-quartz/target/pigx-daemon-quartz.jar ./ +ADD ./target/pigx-daemon-quartz.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon-quartz.jar diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index d04cce9ee..1fef99056 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 - 3.6.0 + 3.7.0 4.0.0 @@ -88,7 +88,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-monitor/Dockerfile b/pigx-visual/pigx-monitor/Dockerfile index 3ebf8dbb2..09f633248 100644 --- a/pigx-visual/pigx-monitor/Dockerfile +++ b/pigx-visual/pigx-monitor/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-monitor EXPOSE 5001 -ADD ./pigx-visual/pigx-monitor/target/pigx-monitor.jar ./ +ADD ./target/pigx-monitor.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-monitor.jar diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index 5f7497b17..40dfb2d73 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx-visual - 3.6.0 + 3.7.0 pigx-monitor @@ -91,7 +91,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-mp-platform/.rebel.xml.bak b/pigx-visual/pigx-mp-platform/.rebel.xml.bak deleted file mode 100644 index d9e3a84dc..000000000 --- a/pigx-visual/pigx-mp-platform/.rebel.xml.bak +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - diff --git a/pigx-visual/pigx-mp-platform/Dockerfile b/pigx-visual/pigx-mp-platform/Dockerfile index e8f380a59..c3fb3eff4 100644 --- a/pigx-visual/pigx-mp-platform/Dockerfile +++ b/pigx-visual/pigx-mp-platform/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-mp-platform EXPOSE 6000 -ADD ./pigx-visual/pigx-mp-platform/target/pigx-mp-platform.jar ./ +ADD ./target/pigx-mp-platform.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-mp-platform.jar diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index 16d92498a..b8ab54fcd 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 - 3.6.0 + 3.7.0 pigx-mp-platform @@ -92,7 +92,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-oa-platform/Dockerfile b/pigx-visual/pigx-oa-platform/Dockerfile index 34bcfe2e2..e1808e710 100644 --- a/pigx-visual/pigx-oa-platform/Dockerfile +++ b/pigx-visual/pigx-oa-platform/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-oa-platform EXPOSE 5005 -ADD ./pigx-visual/pigx-oa-platform/target/pigx-oa-platform.jar ./ +ADD ./target/pigx-oa-platform.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-oa-platform.jar diff --git a/pigx-visual/pigx-oa-platform/pom.xml b/pigx-visual/pigx-oa-platform/pom.xml index 89c02b71f..6b6b52d3b 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 - 3.6.0 + 3.7.0 pigx-oa-platform @@ -150,7 +150,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-pay-platform/Dockerfile b/pigx-visual/pigx-pay-platform/Dockerfile index 255ac7f48..84b81bda9 100644 --- a/pigx-visual/pigx-pay-platform/Dockerfile +++ b/pigx-visual/pigx-pay-platform/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-pay-platform EXPOSE 5010 -ADD ./pigx-visual/pigx-pay-platform/target/pigx-pay-platform.jar ./ +ADD ./target/pigx-pay-platform.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-pay-platform.jar diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index 9f80dafe9..8320800f7 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 - 3.6.0 + 3.7.0 pigx-pay-platform @@ -110,7 +110,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-sentinel-dashboard/Dockerfile b/pigx-visual/pigx-sentinel-dashboard/Dockerfile index 89f3ae7d5..f92f55c59 100644 --- a/pigx-visual/pigx-sentinel-dashboard/Dockerfile +++ b/pigx-visual/pigx-sentinel-dashboard/Dockerfile @@ -10,6 +10,6 @@ WORKDIR /pigx-sentinel-dashboard EXPOSE 5020 -ADD ./pigx-visual/pigx-sentinel-dashboard/target/pigx-sentinel-dashboard.jar ./ +ADD ./target/pigx-sentinel-dashboard.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-sentinel-dashboard.jar diff --git a/pigx-visual/pigx-sentinel-dashboard/pom.xml b/pigx-visual/pigx-sentinel-dashboard/pom.xml index 4cbccc614..bdcff7a92 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 - 3.6.0 + 3.7.0 pigx-sentinel-dashboard @@ -109,7 +109,7 @@ spring-boot-maven-plugin - com.spotify + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml index ed72d6d2c..d87941658 100755 --- a/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml +++ b/pigx-visual/pigx-sentinel-dashboard/src/main/resources/application.yml @@ -10,7 +10,8 @@ logging: org: springframework: web: info - file: ${user.home}/logs/csp/sentinel-dashboard.log + file: + name: ${user.home}/logs/csp/sentinel-dashboard.log pattern: file: '%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n' diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml index 801b54a80..34fac1a40 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 - 3.6.0 + 3.7.0 diff --git a/pigx-visual/pigx-tx-manager/Dockerfile b/pigx-visual/pigx-tx-manager/Dockerfile index 6b80fa3a9..beddc57dc 100644 --- a/pigx-visual/pigx-tx-manager/Dockerfile +++ b/pigx-visual/pigx-tx-manager/Dockerfile @@ -11,6 +11,6 @@ WORKDIR /pigx-tx-manager EXPOSE 5004 EXPOSE 9998 -ADD ./pigx-visual/pigx-tx-manager/target/pigx-tx-manager.jar ./ +ADD ./target/pigx-tx-manager.jar ./ CMD sleep 120;java -Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom -jar pigx-tx-manager.jar diff --git a/pigx-visual/pigx-tx-manager/pom.xml b/pigx-visual/pigx-tx-manager/pom.xml index eb38c7007..a3dd26431 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 - 3.6.0 + 3.7.0 pigx-tx-manager diff --git a/pigx-visual/pom.xml b/pigx-visual/pom.xml index a8ea3b63e..f111e637c 100644 --- a/pigx-visual/pom.xml +++ b/pigx-visual/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.6.0 + 3.7.0 pigx-visual diff --git a/pom.xml b/pom.xml index 990127bac..6f4ce2d79 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pigx - 3.6.0 + 3.7.0 ${project.artifactId} pom @@ -33,7 +33,7 @@ - 2.2.2.RELEASE + 2.2.3.RELEASE Hoxton.SR1 2.1.1.RELEASE Cairo-SR8 @@ -55,9 +55,12 @@ 2.1.1 2.3.6.RELEASE 5.22.0 - http://192.168.0.13:4243 - 0.4.12 - 192.168.0.13:5000 + http://172.17.0.111:2375 + 172.17.0.111 + library + admin + Harbor12345 + 0.32.0 @@ -190,22 +193,26 @@ - com.spotify + io.fabric8 docker-maven-plugin ${docker.plugin.version} - ${registry.url}/${project.name}:0.0.1 - ${docker.url} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - docker-hub - https://index.docker.io/v1/ + ${docker.host} + ${docker.registry} + + + ${docker.username} + ${docker.password} + + + + + ${docker.host}/${docker.namespace}/${project.name}:${project.version} + + ${project.basedir}/Dockerfile + + +