diff --git a/.gitattributes b/.gitattributes index da85161b368c27db80635c7931d9fbe91a585814..56507a9d96ba426688439973186f05480b5ea71b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,17 @@ 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-base-server/base-dfsfile-client/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 +neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml merge=ours \ No newline at end of file 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 2a5aa1fba73a0388565dee650ce7495b2aca31b7..841624fe4cadc8b76b95d65a242bacc45987c3d8 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,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 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 + + + + 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 e810ae939d93d4f6651c9003c93399f6063d77b5..f80823965da7c39e8fd70c19e230aaa6184beb24 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,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 diff --git a/neuray-pm-base-server/base-code-generator/pom.xml b/neuray-pm-base-server/base-code-generator/pom.xml index e0d1c6d4d19dc5db1a9337067f1e81dfeaf531cf..e742963e47537bfbdaa775c7109292497b33e51c 100644 --- a/neuray-pm-base-server/base-code-generator/pom.xml +++ b/neuray-pm-base-server/base-code-generator/pom.xml @@ -128,34 +128,38 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 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 + + + + 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 eab0e290dbe1d6f7efc071658e29dce12cf80c05..bdcbedec550405f1170a8c58f63adb9bf3533c3c 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,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 diff --git a/neuray-pm-base-server/base-dfsfile-client/pom.xml b/neuray-pm-base-server/base-dfsfile-client/pom.xml index 815dffa62b7dc88ee7fbb04036f86282a5da1d6e..78c64b8e804dfa75c6f456ac7fc357b4a418c34d 100644 --- a/neuray-pm-base-server/base-dfsfile-client/pom.xml +++ b/neuray-pm-base-server/base-dfsfile-client/pom.xml @@ -107,11 +107,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 + + + + 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 ff7916246b9f8dd7c2b19575644873d497aacdfc..f12a8cc8a8857a4bfc36d62878a72508628ba245 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 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 f5931f2c90210696bfb87605f333b0e0b4506f8b..eaaa09a15e703c3d5820f315fc350b2a4fa95914 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,38 @@ 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 + + + + 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 c5995d8c5dc972b842a8abf095fad4451dcd46ef..d2910cbf388e6dfc090835914a218d33847003d1 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,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 diff --git a/neuray-pm-job/neuray-pm-admin-job/pom.xml b/neuray-pm-job/neuray-pm-admin-job/pom.xml index 8e7f25d5566bf5e3dd0f42a3922758140a816704..14dd124f172f4dbba8ece4cebe99b032b688d8d1 100644 --- a/neuray-pm-job/neuray-pm-admin-job/pom.xml +++ b/neuray-pm-job/neuray-pm-admin-job/pom.xml @@ -90,4 +90,63 @@ ${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 + + /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 + + + + + + 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 5178cbd9079d539ec908ff91685ff2bbc44bf094..31c6b5b611c66c175f80abe7362140e6c49c69de 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,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 diff --git a/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml b/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml index 1ab7843366d2469e4e58a9398e811f3a2b8e0617..b38d05567df6060e420b6234e0b9825ac74c74ec 100644 --- a/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml +++ b/neuray-pm-job/neuray-pm-jobmonitor-center/pom.xml @@ -77,5 +77,53 @@ ${alibaba.nacos.version} - + + 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 + + /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 + + + + + + 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 d786fdcc431a5bef39765d45b1d60b194855235a..b97dab6fc37378db377d2116d60b58c6b8400f19 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,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 diff --git a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml index 4027a39f8d6e133e0b9300fec9767c9e6f671589..6f4858902094b7ae12e4e9e1261f6e2ac36bc8b2 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml @@ -85,34 +85,38 @@ 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 + + + + 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 79f9c09e489abbfaf3cda5fc67c9c022f0e7a6e5..058c8ad47458a1afee7dd43489661730994e563c 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,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 diff --git a/neuray-pm-provider/neuray-pm-provider-mail/pom.xml b/neuray-pm-provider/neuray-pm-provider-mail/pom.xml index 7eb375cd4a3000d322dedc48238da8820931d0be..82848fccaaf645fbaeda96e007bc5e3b6ce41c5f 100644 --- a/neuray-pm-provider/neuray-pm-provider-mail/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-mail/pom.xml @@ -64,11 +64,52 @@ + 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 + + /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 + + + + 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 5b8858c98761297c481fd2965014b40907e21f67..1fef7ba8541a98000be208877851e3a5d0d2cb07 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,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 diff --git a/neuray-pm-provider/neuray-pm-provider-wb/pom.xml b/neuray-pm-provider/neuray-pm-provider-wb/pom.xml index 578cd9c149899e6f93b2a8a54ef0f4651572b9c9..15ec951570e6a5bc1fa666664cc6f5c60db25b77 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-wb/pom.xml @@ -147,11 +147,62 @@ - + + 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 + + /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 + + + diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/bootstrap.yml b/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/bootstrap.yml index 9ee25a1ff67539dbdc61a84afad0fc4f7261161b..ba3b377a2dcc24a0c84e97216dea357a3cdd4d03 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/resources/bootstrap.yml +++ b/neuray-pm-provider/neuray-pm-provider-wb/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