From dcc7da87e4dc4cb759dc2462e8c7fbf751e87e86 Mon Sep 17 00:00:00 2001 From: zhoyou <18525788842@163.com> Date: Mon, 17 Feb 2020 14:28:43 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E6=80=A7=E8=83=BD=E5=BE=85=E8=B0=83?= =?UTF-8?q?=E8=AF=95=EF=BC=8C=E7=AC=AC=E4=BA=8C=E7=89=88=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base-auth/auth-server/pom.xml | 56 +++++++++---------- .../src/main/resources/bootstrap.yml | 4 +- .../base-code-generator/pom.xml | 56 +++++++++---------- .../src/main/resources/bootstrap.yml | 4 +- .../base-gateway/gateway-server/pom.xml | 56 +++++++++---------- .../src/main/resources/bootstrap.yml | 4 +- .../neuray-pm-provider-admin/pom.xml | 56 +++++++++---------- .../src/main/resources/bootstrap.yml | 4 +- 8 files changed, 120 insertions(+), 120 deletions(-) diff --git a/neuray-pm-base-server/base-auth/auth-server/pom.xml b/neuray-pm-base-server/base-auth/auth-server/pom.xml index 2a5aa1f..12a6cd4 100644 --- a/neuray-pm-base-server/base-auth/auth-server/pom.xml +++ b/neuray-pm-base-server/base-auth/auth-server/pom.xml @@ -146,34 +146,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/neuray-pm-base-server/base-auth/auth-server/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/bootstrap.yml index a07b212..f808239 100644 --- a/neuray-pm-base-server/base-auth/auth-server/src/main/resources/bootstrap.yml +++ b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/bootstrap.yml @@ -6,9 +6,9 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 config: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 group: NEURAY-PM-DEV fileExtension: yaml diff --git a/neuray-pm-base-server/base-code-generator/pom.xml b/neuray-pm-base-server/base-code-generator/pom.xml index e0d1c6d..3c2d655 100644 --- a/neuray-pm-base-server/base-code-generator/pom.xml +++ b/neuray-pm-base-server/base-code-generator/pom.xml @@ -128,34 +128,34 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml index 6e7e8a4..bdcbede 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml +++ b/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml @@ -6,8 +6,8 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 config: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 group: NEURAY-PM-DEV fileExtension: yaml diff --git a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml index f5931f2..86fce50 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml +++ b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml @@ -102,34 +102,34 @@ 1.8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml index 0989ae4..d2910cb 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml +++ b/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml @@ -6,9 +6,9 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 config: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 group: NEURAY-PM-DEV fileExtension: yaml diff --git a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml index 4027a39..f861113 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml @@ -85,34 +85,34 @@ 1.8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml index 777483c..058c8ad 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml @@ -6,8 +6,8 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 config: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 group: NEURAY-PM-DEV fileExtension: yaml -- Gitee From deee01850021ee1cbd07710f6689ca7156a6a1a0 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Fri, 20 Mar 2020 09:11:23 +0800 Subject: [PATCH 02/25] update neuray-pm-provider/neuray-pm-provider-mail/pom.xml. --- .../neuray-pm-provider-mail/pom.xml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/neuray-pm-provider/neuray-pm-provider-mail/pom.xml b/neuray-pm-provider/neuray-pm-provider-mail/pom.xml index 7eb375c..5b2fe98 100644 --- a/neuray-pm-provider/neuray-pm-provider-mail/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-mail/pom.xml @@ -64,11 +64,48 @@ + neuray-pm-mail org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + -- Gitee From 228e9ef7cec31a82e74b0fd2bb2bee0bf03b825c Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Fri, 20 Mar 2020 09:13:19 +0800 Subject: [PATCH 03/25] update neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml. --- .../neuray-pm-jobmonitor-center/pom.xml | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml b/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml index 1476893..4bafd3f 100644 --- a/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml +++ b/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml @@ -67,5 +67,49 @@ - + + neuray-pm-job-center + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + -- Gitee From d0ad5fb1e74f458c5bcc4de4a05084de0dad17cb Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Fri, 20 Mar 2020 09:14:22 +0800 Subject: [PATCH 04/25] update neuray-pm-job/neuray-pm-admin-job/pom.xml. --- neuray-pm-job/neuray-pm-admin-job/pom.xml | 55 +++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/neuray-pm-job/neuray-pm-admin-job/pom.xml b/neuray-pm-job/neuray-pm-admin-job/pom.xml index fd75de9..b145896 100644 --- a/neuray-pm-job/neuray-pm-admin-job/pom.xml +++ b/neuray-pm-job/neuray-pm-admin-job/pom.xml @@ -84,4 +84,59 @@ ${pom.basedir}/src/lib/taobao-sdk-java-auto_1479188381469-20200228.jar + + neuray-pm-job + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + -- Gitee From 7c5631fe3ab46d28bd446eef827d8951be006b29 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Fri, 20 Mar 2020 09:15:08 +0800 Subject: [PATCH 05/25] update neuray-pm-wb/pom.xml. --- neuray-pm-wb/pom.xml | 53 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/neuray-pm-wb/pom.xml b/neuray-pm-wb/pom.xml index 5e927ba..0d10918 100644 --- a/neuray-pm-wb/pom.xml +++ b/neuray-pm-wb/pom.xml @@ -139,11 +139,58 @@ - + + neuray-pm-wb + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + - org.springframework.boot - spring-boot-maven-plugin + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + -- Gitee From ef5f05ecdc3593475d2a2ca8824565a12ce106be Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Fri, 20 Mar 2020 09:36:10 +0800 Subject: [PATCH 06/25] update neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/bootstrap.yml. --- .../neuray-pm-provider-mail/src/main/resources/bootstrap.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/bootstrap.yml b/neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/bootstrap.yml index f8f25d9..1fef7ba 100644 --- a/neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/bootstrap.yml +++ b/neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/bootstrap.yml @@ -6,8 +6,8 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 config: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 group: NEURAY-PM-DEV fileExtension: yaml -- Gitee From 9880d7bda9e42a0e4ec5098d6a4d2518426abae5 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Fri, 20 Mar 2020 09:37:11 +0800 Subject: [PATCH 07/25] update neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml. --- .../neuray-pm-admin-job/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml b/neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml index 68d36a2..6981d37 100644 --- a/neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml +++ b/neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml @@ -6,4 +6,4 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 -- Gitee From ce75148c4d2cb57b3e022183b9a1d7bac9526f71 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Fri, 20 Mar 2020 09:59:58 +0800 Subject: [PATCH 08/25] update neuray-pm-wb/src/main/resources/bootstrap.yml. --- neuray-pm-wb/src/main/resources/bootstrap.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neuray-pm-wb/src/main/resources/bootstrap.yml b/neuray-pm-wb/src/main/resources/bootstrap.yml index 67024c3..ba3b377 100644 --- a/neuray-pm-wb/src/main/resources/bootstrap.yml +++ b/neuray-pm-wb/src/main/resources/bootstrap.yml @@ -6,8 +6,8 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 config: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 group: NEURAY-PM-DEV fileExtension: yaml -- Gitee From d1b513af21c5698b6aaf2cab79e17dfc32c9f28f Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Fri, 20 Mar 2020 10:27:59 +0800 Subject: [PATCH 09/25] update neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml. --- .../src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml b/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml index 1df92e8..8703ff6 100644 --- a/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml +++ b/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml @@ -25,7 +25,7 @@ spring: pool-name: HikariCP password: 123456 type: com.zaxxer.hikari.HikariDataSource - url: jdbc:mysql://192.168.1.205:3306/xxl_job?Unicode=true&characterEncoding=UTF-8 + url: jdbc:mysql://172.17.1.208:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai username: root freemarker: charset: UTF-8 -- Gitee From c65ae7cfd74f68fbba0b0e10f5cf3c2343806e93 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Fri, 20 Mar 2020 10:30:51 +0800 Subject: [PATCH 10/25] update neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml. --- .../src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml b/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml index 8703ff6..575ebed 100644 --- a/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml +++ b/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/application.yml @@ -25,7 +25,7 @@ spring: pool-name: HikariCP password: 123456 type: com.zaxxer.hikari.HikariDataSource - url: jdbc:mysql://172.17.1.208:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.1.205:3306/xxl_job?Unicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai username: root freemarker: charset: UTF-8 -- Gitee From 94d4321c8742d926b17930d1e76d46dbdeccd908 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Tue, 7 Apr 2020 16:40:18 +0800 Subject: [PATCH 11/25] update neuray-pm-base-server/base-gateway/gateway-server/pom.xml. --- neuray-pm-base-server/base-gateway/gateway-server/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml index 86fce50..eaaa09a 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml +++ b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml @@ -119,6 +119,10 @@ ${docker.pre}/${project.artifactId}:${project.version} ${docker.host} java:8 + + /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + echo 'Asia/Shanghai' >/etc/timezone + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] -- Gitee From f320cea29119c2cc187c0c4aa6884d969819ec3e Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Tue, 7 Apr 2020 16:40:54 +0800 Subject: [PATCH 12/25] update neuray-pm-base-server/base-auth/auth-server/pom.xml. --- neuray-pm-base-server/base-auth/auth-server/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neuray-pm-base-server/base-auth/auth-server/pom.xml b/neuray-pm-base-server/base-auth/auth-server/pom.xml index 12a6cd4..841624f 100644 --- a/neuray-pm-base-server/base-auth/auth-server/pom.xml +++ b/neuray-pm-base-server/base-auth/auth-server/pom.xml @@ -163,6 +163,10 @@ ${docker.pre}/${project.artifactId}:${project.version} ${docker.host} java:8 + + /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + echo 'Asia/Shanghai' >/etc/timezone + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] -- Gitee From a19418722cfda833ceacaf9353cd0269fdfac871 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Tue, 7 Apr 2020 16:41:19 +0800 Subject: [PATCH 13/25] update neuray-pm-base-server/base-code-generator/pom.xml. --- neuray-pm-base-server/base-code-generator/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neuray-pm-base-server/base-code-generator/pom.xml b/neuray-pm-base-server/base-code-generator/pom.xml index 3c2d655..e742963 100644 --- a/neuray-pm-base-server/base-code-generator/pom.xml +++ b/neuray-pm-base-server/base-code-generator/pom.xml @@ -145,6 +145,10 @@ ${docker.pre}/${project.artifactId}:${project.version} ${docker.host} java:8 + + /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + echo 'Asia/Shanghai' >/etc/timezone + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] -- Gitee From 5f3a6093dc52d7df2100b68da31365d2cbcda5f7 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Tue, 7 Apr 2020 16:42:06 +0800 Subject: [PATCH 14/25] update neuray-pm-job/neuray-pm-admin-job/pom.xml. --- neuray-pm-job/neuray-pm-admin-job/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neuray-pm-job/neuray-pm-admin-job/pom.xml b/neuray-pm-job/neuray-pm-admin-job/pom.xml index b145896..4fa36e2 100644 --- a/neuray-pm-job/neuray-pm-admin-job/pom.xml +++ b/neuray-pm-job/neuray-pm-admin-job/pom.xml @@ -126,6 +126,10 @@ ${docker.pre}/${project.artifactId}:${project.version} ${docker.host} java:8 + + /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + echo 'Asia/Shanghai' >/etc/timezone + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] -- Gitee From 923a08c2c911d475e376c0a8fc28f9e01fe6751c Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Tue, 7 Apr 2020 16:42:35 +0800 Subject: [PATCH 15/25] update neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml. --- neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml b/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml index 4bafd3f..7d58040 100644 --- a/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml +++ b/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml @@ -99,6 +99,10 @@ ${docker.pre}/${project.artifactId}:${project.version} ${docker.host} java:8 + + /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + echo 'Asia/Shanghai' >/etc/timezone + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] -- Gitee From c4fee050e0cef1d00358baeec4a295a4297a4260 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Tue, 7 Apr 2020 16:43:03 +0800 Subject: [PATCH 16/25] update neuray-pm-provider/neuray-pm-provider-admin/pom.xml. --- neuray-pm-provider/neuray-pm-provider-admin/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml index f861113..6f48589 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml @@ -102,6 +102,10 @@ ${docker.pre}/${project.artifactId}:${project.version} ${docker.host} java:8 + + /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + echo 'Asia/Shanghai' >/etc/timezone + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] -- Gitee From fa15a2fe29c7d1d592177de990300d724f1d6af2 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Tue, 7 Apr 2020 16:43:24 +0800 Subject: [PATCH 17/25] update neuray-pm-provider/neuray-pm-provider-mail/pom.xml. --- neuray-pm-provider/neuray-pm-provider-mail/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neuray-pm-provider/neuray-pm-provider-mail/pom.xml b/neuray-pm-provider/neuray-pm-provider-mail/pom.xml index 5b2fe98..82848fc 100644 --- a/neuray-pm-provider/neuray-pm-provider-mail/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-mail/pom.xml @@ -95,6 +95,10 @@ ${docker.pre}/${project.artifactId}:${project.version} ${docker.host} java:8 + + /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + echo 'Asia/Shanghai' >/etc/timezone + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] -- Gitee From eee70ad18f57055f1ea447721d201773cfb58927 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Tue, 7 Apr 2020 16:43:44 +0800 Subject: [PATCH 18/25] update neuray-pm-provider/neuray-pm-provider-wb/pom.xml. --- neuray-pm-provider/neuray-pm-provider-wb/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neuray-pm-provider/neuray-pm-provider-wb/pom.xml b/neuray-pm-provider/neuray-pm-provider-wb/pom.xml index a1b7a0f..9163166 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-wb/pom.xml @@ -177,6 +177,10 @@ ${docker.pre}/${project.artifactId}:${project.version} ${docker.host} java:8 + + /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + echo 'Asia/Shanghai' >/etc/timezone + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] -- Gitee From ba3714ebf9f9dcf9fabd414e57285957d1b5a68a Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Wed, 8 Apr 2020 11:46:10 +0800 Subject: [PATCH 19/25] update neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml. --- .../neuray-pm-admin-job/src/main/resources/bootstrap.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml b/neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml index 09fa76c..b24a5c0 100644 --- a/neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml +++ b/neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml @@ -6,8 +6,8 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 config: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 group: NEURAY-PM-DEV fileExtension: yaml \ No newline at end of file -- Gitee From f6a23b50d37dceb9740a0d67e6deaab84cd0e0b4 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Wed, 8 Apr 2020 11:46:37 +0800 Subject: [PATCH 20/25] update neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/bootstrap.yml. --- .../src/main/resources/bootstrap.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/bootstrap.yml b/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/bootstrap.yml index 04c25f0..7c493a9 100644 --- a/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/bootstrap.yml +++ b/neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/bootstrap.yml @@ -6,8 +6,8 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 config: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 group: NEURAY-PM-DEV fileExtension: yaml \ No newline at end of file -- Gitee From ffc1c4c5ce763e8c498b2c9372639ef1d679413d Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Wed, 8 Apr 2020 13:38:36 +0800 Subject: [PATCH 21/25] update .gitattributes. --- .gitattributes | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitattributes b/.gitattributes index da85161..026c411 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,15 @@ neuray-pm-base-server/base-auth/auth-server/pom.xml merge=ours neuray-pm-base-server/base-code-generator/pom.xml merge=ours neuray-pm-base-server/base-gateway/gateway-server/pom.xml merge=ours neuray-pm-provider/neuray-pm-provider-admin/pom.xml merge=ours +neuray-pm-job/neuray-pm-admin-job/pom.xml merge=ours +neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml merge=ours +neuray-pm-provider/neuray-pm-provider-mail/pom.xml merge=ours +neuray-pm-provider/neuray-pm-wb/pom.xml merge=ours +neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml merge=ours +neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/bootstrap.yml merge=ours +neuray-pm-base-server/base-auth/auth-server/src/main/resources/bootstrap.yml merge=ours +neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml merge=ours +neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml merge=ours +neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml merge=ours +neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/bootstrap.yml merge=ours +neuray-pm-provider/neuray-pm-wb/src/main/resources/bootstrap.yml merge=ours \ No newline at end of file -- Gitee From 6ddee2124c87c3cfd41092389a28920be9da55ec Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Mon, 8 Jun 2020 13:56:31 +0800 Subject: [PATCH 22/25] update neuray-pm-base-server/base-dfsfile-client/pom.xml. --- .../base-dfsfile-client/pom.xml | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/neuray-pm-base-server/base-dfsfile-client/pom.xml b/neuray-pm-base-server/base-dfsfile-client/pom.xml index d585c1d..4c5b671 100644 --- a/neuray-pm-base-server/base-dfsfile-client/pom.xml +++ b/neuray-pm-base-server/base-dfsfile-client/pom.xml @@ -101,11 +101,52 @@ + neuray-dfsfile org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + + /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime + echo 'Asia/Shanghai' >/etc/timezone + + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + -- Gitee From acc0d33a706ae4aad1428aeb20097ab9853ccc70 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Mon, 8 Jun 2020 15:20:33 +0800 Subject: [PATCH 23/25] update .gitattributes. --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 026c411..f6b5ab5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,8 @@ neuray-pm-provider/neuray-pm-provider-admin/pom.xml merge=ours neuray-pm-job/neuray-pm-admin-job/pom.xml merge=ours neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml merge=ours neuray-pm-provider/neuray-pm-provider-mail/pom.xml merge=ours +neuray-pm-base-server/base-dfsfile-client/pom.xml merge=ours +neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml merge=ours neuray-pm-provider/neuray-pm-wb/pom.xml merge=ours neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml merge=ours neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/bootstrap.yml merge=ours -- Gitee From 4781e46badc12f53a4b02e92f9d9f866a7a3111e Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Mon, 8 Jun 2020 15:21:07 +0800 Subject: [PATCH 24/25] update .gitattributes. --- .gitattributes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index f6b5ab5..56507a9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,7 +6,6 @@ neuray-pm-job/neuray-pm-admin-job/pom.xml merge=ours neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml merge=ours neuray-pm-provider/neuray-pm-provider-mail/pom.xml merge=ours neuray-pm-base-server/base-dfsfile-client/pom.xml merge=ours -neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml merge=ours neuray-pm-provider/neuray-pm-wb/pom.xml merge=ours neuray-pm-job/neuray-pm-admin-job/src/main/resources/bootstrap.yml merge=ours neuray-pm-job/neuray-pm-jobmonitor-center/src/main/resources/bootstrap.yml merge=ours @@ -15,4 +14,5 @@ neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml merge neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml merge=ours neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml merge=ours neuray-pm-provider/neuray-pm-provider-mail/src/main/resources/bootstrap.yml merge=ours -neuray-pm-provider/neuray-pm-wb/src/main/resources/bootstrap.yml merge=ours \ No newline at end of file +neuray-pm-provider/neuray-pm-wb/src/main/resources/bootstrap.yml merge=ours +neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml merge=ours \ No newline at end of file -- Gitee From a80df3c17a10c46b2838d13ebe156e1beec5942f Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Mon, 8 Jun 2020 15:37:27 +0800 Subject: [PATCH 25/25] update neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml. --- .../base-dfsfile-client/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml index ff79162..f12a8cc 100644 --- a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml +++ b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 + server-addr: 192.168.1.205:8848 config: server-addr: 192.168.1.205:8848 group: NEURAY-PM-DEV -- Gitee