diff --git a/k8s/template-yaml/k8s-3nacos.yaml b/k8s/template-yaml/k8s-3nacos.yaml index f2d891b6..c022fec9 100644 --- a/k8s/template-yaml/k8s-3nacos.yaml +++ b/k8s/template-yaml/k8s-3nacos.yaml @@ -36,6 +36,7 @@ spec: ports: - containerPort: 8848 - containerPort: 9848 + - containerPort: 9849 restartPolicy: Always --- @@ -58,5 +59,9 @@ spec: name: web - port: 9848 targetPort: 9848 - nodePort: 31204 + nodePort: 32203 name: podsa + - port: 9849 + targetPort: 9849 + nodePort: 32204 + name: tcp-9849 \ No newline at end of file diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index c162d673..95a9dfdd 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc:8848 username: nacos password: h1n2x3j4y5@ retry: enabled: true - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 config: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 + username: nacos + password: h1n2x3j4y5@ # 配置中心地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index 6fdd00d4..d389a43a 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -14,16 +14,16 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc:8848 username: nacos password: h1n2x3j4y5@ retry: enabled: true - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 config: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 + username: nacos + password: h1n2x3j4y5@ # 配置中心地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc:8848 # 配置文件格式 file-extension: yml # 共享配置 @@ -44,7 +44,7 @@ spring: datasource: ds1: nacos: - server-addr: 172.20.32.181:8848 + server-addr: 172.20.32.181:18848 dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml b/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml index a6a0584e..22eaf828 100644 --- a/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/management-platform/src/main/resources/bootstrap.yml @@ -19,11 +19,9 @@ spring: password: h1n2x3j4y5@ retry: enabled: true -# namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 config: username: nacos password: h1n2x3j4y5@ -# namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 # 配置中心地址 server-addr: nacos-ci4s.argo.svc:8848 # 配置文件格式 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 70194530..490b9bd0 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -13,17 +13,17 @@ spring: cloud: nacos: discovery: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 # 服务注册地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc:8848 username: nacos password: h1n2x3j4y5@ retry: enabled: true config: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 + username: nacos + password: h1n2x3j4y5@ # 配置中心地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc: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 fc4cd8ec..c2124e33 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -13,17 +13,17 @@ spring: cloud: nacos: discovery: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 # 服务注册地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc:8848 username: nacos password: h1n2x3j4y5@ retry: enabled: true config: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 + username: nacos + password: h1n2x3j4y5@ # 配置中心地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc: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 7a337187..389235a0 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -13,17 +13,17 @@ spring: cloud: nacos: discovery: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 # 服务注册地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc:8848 username: nacos password: h1n2x3j4y5@ retry: enabled: true config: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 + username: nacos + password: h1n2x3j4y5@ # 配置中心地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc: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 fa1d6384..4172ade8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -14,10 +14,14 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.20.32.181:18847 + server-addr: nacos-ci4s.argo.svc:8848 + username: nacos + password: h1n2x3j4y5@ config: + username: nacos + password: h1n2x3j4y5@ # 配置中心地址 - server-addr: 172.20.32.181:18847 + server-addr: nacos-ci4s.argo.svc:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index ea02575b..c3f3ead1 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -13,17 +13,17 @@ spring: cloud: nacos: discovery: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 # 服务注册地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc:8848 username: nacos password: h1n2x3j4y5@ retry: enabled: true config: - namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01 + username: nacos + password: h1n2x3j4y5@ # 配置中心地址 - server-addr: 172.20.32.181:8848 + server-addr: nacos-ci4s.argo.svc:8848 # 配置文件格式 file-extension: yml # 共享配置