修改地址信息

eureka-web/build.gradle

@@ -34,10 +34,11 @@ docker{
 }
 
 task dockerBuilder(type: Docker) {
-    registry='docker.tonyandmoney.cn'
+    registry='registry.cn-hangzhou.aliyuncs.com'
     applicationName = 'tuonq-config'
     tagVersion = jar.version
-    addFile("./${jar.baseName}-${jar.version}.jar","app.jar")
+    addFile("./${jar.baseName}-${jar.version}.jar","/app.jar")
+    addFile("*.yml","/config")
     entryPoint(["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-Duser.timezone=GMT+08","-jar",'app.jar'])
     exposePort(12121)
     doFirst {
@@ -45,25 +46,14 @@ task dockerBuilder(type: Docker) {
             from jar
             into stageDir
         }
-    }
-    push = true
-}
-
-task innerDockerBuilder(type: Docker){
-    registry='registry.tuonq.cn:5000'
-    applicationName = 'tuonq-config'
-    tagVersion = jar.version
-    addFile("./${jar.baseName}-${jar.version}.jar","app.jar")
-    entryPoint(["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-Duser.timezone=GMT+08","-jar",'app.jar'])
-    exposePort(12121)
-    doFirst {
         copy {
-            from jar
+            from "${buildDir}/resources/main"
+            include "*.yml"
             into stageDir
         }
     }
     push = true
 }
 
-dockerBuilder.dependsOn(bootJar)
-innerDockerBuilder.dependsOn(bootJar)
+
+dockerBuilder.dependsOn(bootJar)

eureka-web/src/main/resources/application-dev.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     username: root
     password: tuonq520
-    url: jdbc:mysql://192.168.42.1:5201/tuonq_config?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://10.8.0.1:5201/tuonq_config?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
 
   session:
     store-type: redis
@@ -10,18 +10,21 @@ spring:
   rabbitmq:
     username: tuonq
     password: tuonq520
-    host: 192.168.42.1
+    host: 10.8.0.1
     port: 5672
   redis:
-    sentinel:
-      master: tuonq
-      nodes: 192.168.42.1:26379
-
+    cluster:
+      nodes:
+        - 10.8.0.1:6379
+        - 10.8.0.1:6377
+#    sentinel:
+#      master: tuonq
+#      nodes: 10.8.0.1:26379
 
 
 eureka:
   instance:
-    ip-address: 192.168.42.12
+    ip-address: 10.8.0.6
   client:
     service-url:
       defaultZone: http://${eureka.instance.ip-address}:${server.port}/eureka/

eureka-web/src/main/resources/application-sit.yml

@@ -2,7 +2,7 @@ spring:
   datasource:
     username: root
     password: tuonq520
-    url: jdbc:mysql://192.168.42.1:5201/tuonq_config?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://10.8.0.1:5201/tuonq_config?useUnicode=true&characterEncoding=utf-8&useSSL=false&zeroDateTimeBehavior=convertToNull
 
   # 用docker swarm部署，注意一下数据库的连接名称
 
@@ -12,17 +12,21 @@ spring:
   rabbitmq:
     username: tuonq
     password: tuonq520
-    host: 192.168.42.1
+    host: 10.8.0.1
     port: 5672
   redis:
-    sentinel:
-      master: tuonq
-      nodes: tuonq_sentinel:26379
+    cluster:
+      nodes:
+        - 10.8.0.1:6379
+        - 10.8.0.1:6377
+#    sentinel:
+#      master: tuonq
+#      nodes: tuonq_sentinel:26379
 
 eureka:
   instance:
     prefer-ip-address: true
-    ip-address: 192.168.42.1
+    ip-address: 10.8.0.1
   client:
     service-url:
       defaultZone: http://config.tonyandmoney.cn/eureka/

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip