From 54dd58673cdd146534dece15a4fd7c9780c5597f Mon Sep 17 00:00:00 2001 From: choqy Date: Tue, 23 Nov 2021 14:33:29 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8kubernetes.docker.internal=E6=9D=A5?= =?UTF-8?q?=E8=A7=A3=E5=86=B3docker=E4=B8=AD=E4=BA=92=E7=9B=B8=E8=AE=BF?= =?UTF-8?q?=E9=97=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/system/api/RemoteFileService.java | 4 ++-- .../main/java/com/ruoyi/system/api/RemoteLogService.java | 4 ++-- .../main/java/com/ruoyi/system/api/RemoteLoginService.java | 4 ++-- .../main/java/com/ruoyi/system/api/RemoteUserService.java | 4 ++-- ruoyi-auth/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-gateway/src/main/resources/bootstrap.yml | 6 +++--- .../lynn-magic-api/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml | 4 ++-- ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java index bc8b8d36..9ac6cfdc 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java @@ -14,8 +14,8 @@ import com.ruoyi.system.api.factory.RemoteFileFallbackFactory; * 文件服务 * * 若部署环境不同，IP无法相互访问如部分应用在docker中，部分在外部，则最好指定url，明确应用的访问地址 - * lynn.server.local 为指向本机的IP地址的本地域名，若使用则需要在hosts文件中添加 - * url = "http://lynn.server.local:9201/", + * kubernetes.docker.internal 为指向本机的IP地址的本地域名，若使用则需要在hosts文件中添加 + * url = "http://kubernetes.docker.internal:9201/", */ @FeignClient(contextId = "remoteFileService", value = ServiceNameConstants.FILE_SERVICE, fallbackFactory = RemoteFileFallbackFactory.class) public interface RemoteFileService diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java index b7ac770d..dbf25169 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java @@ -15,8 +15,8 @@ import com.ruoyi.system.api.factory.RemoteLogFallbackFactory; * 日志服务 * * 若部署环境不同，IP无法相互访问如部分应用在docker中，部分在外部，则最好指定url，明确应用的访问地址 - * lynn.server.local 为指向本机的IP地址的本地域名，若使用则需要在hosts文件中添加 - * url = "http://lynn.server.local:9201/", + * kubernetes.docker.internal 为指向本机的IP地址的本地域名，若使用则需要在hosts文件中添加 + * url = "http://kubernetes.docker.internal:9201/", */ @FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteLogFallbackFactory.class) public interface RemoteLogService diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLoginService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLoginService.java index d41717d1..50f4fa4e 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLoginService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLoginService.java @@ -15,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestHeader; * 无界面登录服务 * * 若部署环境不同，IP无法相互访问如部分应用在docker中，部分在外部，则最好指定url，明确应用的访问地址 - * lynn.server.local 为指向本机的IP地址的本地域名，若使用则需要在hosts文件中添加 - * url = "http://lynn.server.local:9200/", + * kubernetes.docker.internal 为指向本机的IP地址的本地域名，若使用则需要在hosts文件中添加 + * url = "http://kubernetes.docker.internal:9200/", */ @FeignClient(contextId = "remoteLoginService",value = ServiceNameConstants.AUTH_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) public interface RemoteLoginService { diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java index 8b365b4c..754ffc6f 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java @@ -17,8 +17,8 @@ import com.ruoyi.system.api.model.LoginUser; * 用户服务 * * 若部署环境不同，IP无法相互访问如部分应用在docker中，部分在外部，则最好指定url，明确应用的访问地址 - * lynn.server.local 为指向本机的IP地址的本地域名，若使用则需要在hosts文件中添加 - * url = "http://lynn.server.local:9200/", + * kubernetes.docker.internal 为指向本机的IP地址的本地域名，若使用则需要在hosts文件中添加 + * url = "http://kubernetes.docker.internal:9200/", */ @FeignClient(contextId = "remoteUserService",value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) public interface RemoteUserService diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index 72605c9e..06c8746b 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 config: # 配置中心地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index dffb2b35..4bcdfc95 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -16,10 +16,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 config: # 配置中心地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -30,7 +30,7 @@ spring: eager: true transport: # 控制台地址 - dashboard: 192.168.1.100:8718 + dashboard: kubernetes.docker.internal:8718 # nacos配置持久化 datasource: ds1: diff --git a/ruoyi-modules/lynn-magic-api/src/main/resources/bootstrap.yml b/ruoyi-modules/lynn-magic-api/src/main/resources/bootstrap.yml index 00b6be8b..32a5ced7 100644 --- a/ruoyi-modules/lynn-magic-api/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/lynn-magic-api/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 config: # 配置中心地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index bcd6f934..c5d06a38 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 config: # 配置中心地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index bca72e35..e1accc1d 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 config: # 配置中心地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index cae6cd66..8078483a 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 config: # 配置中心地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index f2b14e2a..9923c6c4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 config: # 配置中心地址 - server-addr: lynn.server.local:8848 + server-addr: kubernetes.docker.internal:8848 # 配置文件格式 file-extension: yml # 共享配置