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 0442c9c4cdef33c2a36e8d54ab54cccbebcf3f21..cb19d849ab5b51886bb1228938c798ea9850a0c6 100644 --- a/neuray-pm-base-server/base-auth/auth-server/pom.xml +++ b/neuray-pm-base-server/base-auth/auth-server/pom.xml @@ -135,6 +135,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-auth/auth-server/src/main/resources/application.yml b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml index f844e735a1a29334de01cfb1dbfaf39b17693b39..46ed62e6520a690dd8f39a2f1ee5e71d0468172c 100644 --- a/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml @@ -81,12 +81,12 @@ eureka: statusPageUrlPath: /actuator/info healthCheckUrlPath: /actuator/health # docker 部署开启 -# prefer-ip-address: true -# ip-address: 127.0.0.1 + ###docker部署开启 + prefer-ip-address: true client: serviceUrl: # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 diff --git a/neuray-pm-base-server/base-center/pom.xml b/neuray-pm-base-server/base-center/pom.xml index 972fcf5faeafa005b82b52157b97e8a0b108452f..a8fa24a0b781629b7e580e1f792376a563c6a4ee 100644 --- a/neuray-pm-base-server/base-center/pom.xml +++ b/neuray-pm-base-server/base-center/pom.xml @@ -34,6 +34,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-center/src/main/resources/application.yml b/neuray-pm-base-server/base-center/src/main/resources/application.yml index 683aaa8c84675f9dd4bf5a41703ffc09420a7a1e..f11dd9995ac9c36183e1e8f4262e6e847a556007 100644 --- a/neuray-pm-base-server/base-center/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-center/src/main/resources/application.yml @@ -10,4 +10,7 @@ eureka: registerWithEureka: false #false:不作为一个客户端注册到注册中心 fetchRegistry: false #为true时,可以启动,但报异常:Cannot execute request on any known server service-url: - defaultZone: http://127.0.0.1:8070/eureka + defaultZone: http://192.168.1.205:8070/eureka + ###docker部署开启 + instance: + prefer-ip-address: true diff --git a/neuray-pm-base-server/base-code-generator/pom.xml b/neuray-pm-base-server/base-code-generator/pom.xml index 4cd16e3866bef2fe2e34ec71d1832c1ac83e02f7..3033316c08b05bf0c058eb1093a0e906c1e20958 100644 --- a/neuray-pm-base-server/base-code-generator/pom.xml +++ b/neuray-pm-base-server/base-code-generator/pom.xml @@ -117,6 +117,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 5c98689e495f1bc2d10a13d117b7f6bada097c05..5c63a2e372feb44c6aa7ed2e1cf7413a69567dd9 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 @@ -4,12 +4,12 @@ eureka: healthCheckUrlPath: /actuator/health home-page-url-path: / # docker 部署开启 -# prefer-ip-address: true + prefer-ip-address: true # ip-address: 127.0.0.1 client: serviceUrl: # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 diff --git a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml index 91dd44ed8a3c7e71f3cf571e49b2ef3912db2161..f9c2caa71788a7a4b36018e0ca0e9e0af79bbb69 100644 --- a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml @@ -40,9 +40,12 @@ server: active: dev #eruka注册中心 eureka: + ###docker部署开启 + instance: + prefer-ip-address: true client: service-url: - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 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 1c3f7ec2368dede46745176486502270aec6bd5f..0f779a378bdd9ef3537c84abc4e51b01ff68ef36 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml +++ b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml @@ -86,32 +86,38 @@ org.apache.maven.plugins - maven-resources-plugin + maven-compiler-plugin + + 1.8 + 1.8 + + + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} - prepare-dockerfile - validate + build-image + package - copy-resources + build - - ${project.build.directory}/docker - - - ${project.basedir}/src/main/docker - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 1.8 - 1.8 + ${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 b8789d63a562add4d1f3effdfdd317b45a2625d0..dd6012bc1cc92cde1c68b2c0795418b36e43f0f4 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 @@ -4,12 +4,12 @@ eureka: healthCheckUrlPath: /actuator/health home-page-url-path: / # docker 部署开启 -# prefer-ip-address: true + prefer-ip-address: true # ip-address: 127.0.0.1 client: serviceUrl: # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 diff --git a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml index d48b71f60d2f2e470682dec07e674e18b9b5484b..f861113982088dce1f93cde3004323ee38886bd1 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml @@ -85,6 +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/application.yml b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml index b05380e11f314b139e28b2244967038061f0d78f..660caa527be7225c67663860a7b0885a7374a137 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml @@ -53,12 +53,12 @@ eureka: statusPageUrlPath: /actuator/info healthCheckUrlPath: /actuator/health # docker 部署开启 -# prefer-ip-address: true + prefer-ip-address: true # ip-address: 127.0.0.1 client: serviceUrl: # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 diff --git a/pom.xml b/pom.xml index c8ecc28db5fb746a72bc8a31fee3490568eb7825..941a3a73b30fe54c68e26788b7596a84b71f701e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,9 @@ 3.4.1 1.8 1.8 + neuray-pm + http://192.168.1.205:2375 + 1.1.0