From 4e42ba6fe14fd6b27dccb22837808f75bbc22688 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Tue, 7 Mar 2023 15:53:35 +0800 Subject: [PATCH] =?UTF-8?q?:rocket:=20=E8=AE=BE=E7=BD=AEnacos=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-cloud/docker-compose.yml | 74 ++++++++----------- kicc-auth/src/main/resources/bootstrap.yml | 1 + kicc-gateway/src/main/resources/bootstrap.yml | 1 + .../src/main/resources/bootstrap.yml | 1 + .../src/main/resources/bootstrap.yml | 1 + .../src/main/resources/bootstrap.yml | 1 + .../src/main/resources/bootstrap.yml | 1 + .../src/main/resources/bootstrap.yml | 1 + .../src/main/resources/bootstrap.yml | 1 + .../src/main/resources/bootstrap.yml | 1 + .../src/main/resources/bootstrap.yml | 1 + pom.xml | 6 +- 12 files changed, 44 insertions(+), 46 deletions(-) diff --git a/docker-cloud/docker-compose.yml b/docker-cloud/docker-compose.yml index 1aaecea9..f014d428 100644 --- a/docker-cloud/docker-compose.yml +++ b/docker-cloud/docker-compose.yml @@ -10,14 +10,13 @@ services: image: nacos/nacos-server:2.0.0 hostname: kicc-register container_name: nacos - network_mode: host restart: always env_file: - nacos/.env -# ports: -# - 8848:8848 -# - 9848:9848 -# - 9849:9849 + ports: + - 8848:8848 + - 9848:9848 + - 9849:9849 volumes: - /usr/software/dockerDatabase/nacos/logs:/home/nacos/logs - /usr/software/dockerDatabase/nacos/data:/home/nacos/data @@ -29,84 +28,78 @@ services: context: ../kicc-register restart: always container_name: kicc-register - network_mode: host hostname: kicc-register image: kicc-register -# ports: -# - 8848:8848 -# # 服务端口,注意通过阅读官方文档,发现nacos2.x使用docker部署时一定要保持映射端口一致 -# # 不一样会出现本地服务访问不了服务端nacos: https://nacos.io/zh-cn/docs/2.0.0-compatibility.html -# # 经过测试使用docker部署时候,还需要开启对应供应商服务器的防火墙端口,不开第三方外部客户端连不上,会报错 -# - 9848:9848 -# - 9849:9849 + ports: + - 8848:8848 + # 服务端口,注意通过阅读官方文档,发现nacos2.x使用docker部署时一定要保持映射端口一致 + # 不一样会出现本地服务访问不了服务端nacos: https://nacos.io/zh-cn/docs/2.0.0-compatibility.html + # 经过测试使用docker部署时候,还需要开启对应供应商服务器的防火墙端口,不开第三方外部客户端连不上,会报错 + - 9848:9848 + - 9849:9849 # gateway配置 kicc-gateway: build: context: ../kicc-gateway container_name: kicc-gateway - network_mode: host image: kicc-gateway hostname: kicc-gateway restart: always -# ports: -# - 9999:9999 + ports: + - 9999:9999 # oauth2.0配置 kicc-auth: build: context: ../kicc-auth container_name: kicc-auth - network_mode: host environment: GATEWAY_HOST: 192.168.3.10 image: kicc-auth hostname: kicc-auth restart: always -# ports: -# - 3000:3000 + ports: + - 3000:3000 # system-biz配置 kicc-system: build: context: ../kicc-platform/kicc-platform-biz/kicc-system-biz container_name: kicc-system - network_mode: host environment: GATEWAY_HOST: 192.168.3.10 image: kicc-system-biz hostname: kicc-system restart: always -# ports: -# - 4000:4000 + ports: + - 4000:4000 # common-biz配置 kicc-common: build: context: ../kicc-platform/kicc-platform-biz/kicc-common-biz container_name: kicc-common - network_mode: host environment: GATEWAY_HOST: 192.168.3.10 image: kicc-common-biz hostname: kicc-common restart: always -# ports: -# - 8000:8000 + ports: + - 8000:8000 # monitor-biz配置 kicc-monitor: build: context: ../kicc-platform/kicc-platform-biz/kicc-monitor-biz container_name: kicc-monitor - network_mode: host environment: GATEWAY_HOST: 192.168.3.10 image: kicc-monitor-biz hostname: kicc-monitor restart: always -# ports: -# - 6000:6000 + ports: + - 6000:6000 # 新建业务工程docker-compose模板 # 注释命名规范:【xxx-biz】 @@ -115,60 +108,55 @@ services: build: context: ../kicc-platform/kicc-platform-biz/kicc-template-biz container_name: kicc-template - network_mode: host image: kicc-template-biz hostname: kicc-template restart: always -# ports: -# - 1111:1111 + ports: + - 1111:1111 # rocketmq-visual-dashboard配置 kicc-visual-rocketmq: build: context: ../kicc-visual/kicc-rocketmq-dashboard container_name: kicc-visual-rocketmq - network_mode: host image: kicc-rocketmq-dashboard hostname: kicc-visual-rocketmq restart: always -# ports: -# - 8058:8058 + ports: + - 8058:8058 # sentinel-visual-dashboard配置 kicc-visual-sentinel: build: context: ../kicc-visual/kicc-sentinel-dashboard container_name: kicc-visual-sentinel - network_mode: host image: kicc-sentinel-dashboard hostname: kicc-visual-sentinel restart: always -# ports: -# - 8056:8056 + ports: + - 8056:8056 # kicc-visual-job配置 kicc-visual-job: build: context: ../kicc-visual/kicc-xxl-job-admin container_name: kicc-visual-job - network_mode: host image: kicc-xxl-job-admin hostname: kicc-visual-job restart: always -# ports: -# - 8057:8057 + ports: + - 8057:8057 # spring-admin配置 kicc-visual-monitor: build: context: ../kicc-visual/kicc-monitor container_name: kicc-visual-monitor - network_mode: host restart: always image: kicc-monitor hostname: kicc-visual-monitor -# ports: -# - 8061:8061 + ports: + - 8061:8061 volumes: nacos_conf: diff --git a/kicc-auth/src/main/resources/bootstrap.yml b/kicc-auth/src/main/resources/bootstrap.yml index c6f452ed..1c48fb51 100644 --- a/kicc-auth/src/main/resources/bootstrap.yml +++ b/kicc-auth/src/main/resources/bootstrap.yml @@ -7,6 +7,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ diff --git a/kicc-gateway/src/main/resources/bootstrap.yml b/kicc-gateway/src/main/resources/bootstrap.yml index 41c98e5a..7bdfb8c0 100644 --- a/kicc-gateway/src/main/resources/bootstrap.yml +++ b/kicc-gateway/src/main/resources/bootstrap.yml @@ -7,6 +7,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml index d35d8f80..ef9f43c9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/bootstrap.yml @@ -7,6 +7,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml index 3fb820f3..5b5f675d 100644 --- a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml @@ -7,6 +7,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml index 0f98f600..947a33ab 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/bootstrap.yml @@ -11,6 +11,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml index 7d4c2f03..a307889e 100644 --- a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml @@ -7,6 +7,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: diff --git a/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml b/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml index 7475a289..ab85ab41 100644 --- a/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml +++ b/kicc-visual/kicc-monitor/src/main/resources/bootstrap.yml @@ -7,6 +7,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: diff --git a/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml b/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml index 304f8fb3..15065a75 100644 --- a/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml +++ b/kicc-visual/kicc-rocketmq-dashboard/src/main/resources/bootstrap.yml @@ -18,6 +18,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: diff --git a/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml b/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml index af704606..c4b2181d 100644 --- a/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml +++ b/kicc-visual/kicc-sentinel-dashboard/src/main/resources/bootstrap.yml @@ -10,6 +10,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: diff --git a/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml b/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml index 9d9c799e..282ae5f9 100644 --- a/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml +++ b/kicc-visual/kicc-xxl-job-admin/src/main/resources/bootstrap.yml @@ -9,6 +9,7 @@ spring: cloud: nacos: discovery: + ip: @profiles.ip@ server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} metadata: management.context-path: ${server.servlet.context-path}/actuator diff --git a/pom.xml b/pom.xml index fba179df..8be7785b 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ kicc-dev DEV-GROUP - 192.168.3.10 + 192.168.3.10 @@ -247,7 +247,7 @@ kicc-prod PROD-GROUP - 127.0.0.1 + 127.0.0.1 @@ -256,7 +256,7 @@ kicc-test TEST-GROUP - 127.0.0.1 + 127.0.0.1