From 2b27e7f3a221983332225fa53c2800f911eb4ba9 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Mon, 22 Mar 2021 15:23:01 +0800 Subject: [PATCH] 20210322v1.2 --- beneficiation/src/main/resources/application-test.yml | 2 +- cloudutil/src/main/resources/application-util-test.yml | 3 ++- tall/src/main/resources/application-test.yml | 3 ++- tall/src/main/resources/application.yml | 4 ++-- util/src/test/java/com/ccsens/util/OtherTest.java | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/beneficiation/src/main/resources/application-test.yml b/beneficiation/src/main/resources/application-test.yml index 51902270..ede1cd93 100644 --- a/beneficiation/src/main/resources/application-test.yml +++ b/beneficiation/src/main/resources/application-test.yml @@ -28,7 +28,7 @@ swagger: enable: true eureka: instance: - ip-address: 192.168.0.99 + ip-address: 127.0.0.1 file: path: /home/cloud/beneficiation/uploads/ signUpUrl: https://test.tall.wiki/compete/ diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index 5401183c..dc3cd5ed 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -83,7 +83,8 @@ eureka: # 指定eureka server通信地址,注意/eureka/小尾巴不能少 #defaultZone: http://admin:admin@peer1:8761/eureka/,http://admin:admin@peer2:8762/eureka/ # defaultZone: http://admin:admin@49.232.6.143:7010/eureka/ - defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ +# defaultZone: http://admin:admin@192.168.0.99:7010/eureka/ + defaultZone: http://admin:admin@192.168.31.13:7010/eureka/ # defaultZone: http://admin:admin@test.tall.wiki:7010/eureka/ instance: # 是否注册IP到eureka server,如不指定或设为false,那就回注册主机名到eureka server diff --git a/tall/src/main/resources/application-test.yml b/tall/src/main/resources/application-test.yml index 0d2c66c4..0e5548d4 100644 --- a/tall/src/main/resources/application-test.yml +++ b/tall/src/main/resources/application-test.yml @@ -32,7 +32,8 @@ swagger: enable: true eureka: instance: - ip-address: 192.168.0.99 +# ip-address: 192.168.0.99 + ip-address: 127.0.0.1 # ip-address: 49.233.89.188 #gatewayUrl: http://192.168.0.99/gateway/ #notGatewayUrl: http://192.168.0.99/ diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index 9e02c3e8..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: greenvalley - include: util-greenvalley,common + active: test + include: util-test,common diff --git a/util/src/test/java/com/ccsens/util/OtherTest.java b/util/src/test/java/com/ccsens/util/OtherTest.java index b5ce07f6..dd8d7733 100644 --- a/util/src/test/java/com/ccsens/util/OtherTest.java +++ b/util/src/test/java/com/ccsens/util/OtherTest.java @@ -119,4 +119,6 @@ public class OtherTest { System.out.println(Integer.toHexString(uc2)); } + + }