From d711a70e3498c565f54f32905a4e43b927a40820 Mon Sep 17 00:00:00 2001
From: Jack <46790855@qq.com>
Date: Wed, 5 Nov 2025 15:12:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=89=93=E5=8C=85=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mall-account/src/main/resources/bootstrap-prod.yml | 1 -
 mall-admin/src/main/resources/bootstrap-prod.yml   | 1 -
 mall-auth/src/main/resources/bootstrap-prod.yml    | 1 -
 mall-cms/src/main/resources/bootstrap-prod.yml     | 1 -
 mall-gateway/src/main/resources/bootstrap-prod.yml | 1 -
 mall-im/src/main/resources/bootstrap-prod.yml      | 1 -
 mall-pay/src/main/resources/bootstrap-prod.yml     | 1 -
 mall-search/src/main/resources/bootstrap-prod.yml  | 1 -
 mall-shop/src/main/resources/bootstrap-prod.yml    | 1 -
 mall-sns/src/main/resources/bootstrap-prod.yml     | 1 -
 pom.xml                                            | 5 ++---
 11 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/mall-account/src/main/resources/bootstrap-prod.yml b/mall-account/src/main/resources/bootstrap-prod.yml
index 7098dbf8..9e070c80 100644
--- a/mall-account/src/main/resources/bootstrap-prod.yml
+++ b/mall-account/src/main/resources/bootstrap-prod.yml
@@ -52,7 +52,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/mall-admin/src/main/resources/bootstrap-prod.yml b/mall-admin/src/main/resources/bootstrap-prod.yml
index 206ff12c..8a7380ab 100644
--- a/mall-admin/src/main/resources/bootstrap-prod.yml
+++ b/mall-admin/src/main/resources/bootstrap-prod.yml
@@ -48,7 +48,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/mall-auth/src/main/resources/bootstrap-prod.yml b/mall-auth/src/main/resources/bootstrap-prod.yml
index e7efbb55..e89904b2 100644
--- a/mall-auth/src/main/resources/bootstrap-prod.yml
+++ b/mall-auth/src/main/resources/bootstrap-prod.yml
@@ -3,7 +3,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/mall-cms/src/main/resources/bootstrap-prod.yml b/mall-cms/src/main/resources/bootstrap-prod.yml
index 2f1ec9e6..4d3ec4d9 100644
--- a/mall-cms/src/main/resources/bootstrap-prod.yml
+++ b/mall-cms/src/main/resources/bootstrap-prod.yml
@@ -43,7 +43,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/mall-gateway/src/main/resources/bootstrap-prod.yml b/mall-gateway/src/main/resources/bootstrap-prod.yml
index 23fb4961..cc5388d0 100644
--- a/mall-gateway/src/main/resources/bootstrap-prod.yml
+++ b/mall-gateway/src/main/resources/bootstrap-prod.yml
@@ -14,7 +14,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/mall-im/src/main/resources/bootstrap-prod.yml b/mall-im/src/main/resources/bootstrap-prod.yml
index 00e39652..429d947b 100644
--- a/mall-im/src/main/resources/bootstrap-prod.yml
+++ b/mall-im/src/main/resources/bootstrap-prod.yml
@@ -43,7 +43,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/mall-pay/src/main/resources/bootstrap-prod.yml b/mall-pay/src/main/resources/bootstrap-prod.yml
index 8bf12ab4..f74ef90d 100644
--- a/mall-pay/src/main/resources/bootstrap-prod.yml
+++ b/mall-pay/src/main/resources/bootstrap-prod.yml
@@ -53,7 +53,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*）
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/mall-search/src/main/resources/bootstrap-prod.yml b/mall-search/src/main/resources/bootstrap-prod.yml
index 0ab631cf..e5c9edb3 100644
--- a/mall-search/src/main/resources/bootstrap-prod.yml
+++ b/mall-search/src/main/resources/bootstrap-prod.yml
@@ -54,7 +54,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/mall-shop/src/main/resources/bootstrap-prod.yml b/mall-shop/src/main/resources/bootstrap-prod.yml
index e98e5656..62c03131 100644
--- a/mall-shop/src/main/resources/bootstrap-prod.yml
+++ b/mall-shop/src/main/resources/bootstrap-prod.yml
@@ -65,7 +65,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/mall-sns/src/main/resources/bootstrap-prod.yml b/mall-sns/src/main/resources/bootstrap-prod.yml
index bd17bb6d..ae9c4b8b 100644
--- a/mall-sns/src/main/resources/bootstrap-prod.yml
+++ b/mall-sns/src/main/resources/bootstrap-prod.yml
@@ -43,7 +43,6 @@ spring:
     nacos:
       discovery:
         server-addr: @nacos.server.address@
-        ip-pattern: 10.0.1.*
       config:
         server-addr: @nacos.server.address@
         file-extension: yaml
diff --git a/pom.xml b/pom.xml
index 4329fa4e..854ae63a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -563,11 +563,10 @@
                         <imageName>${docker.registry}/mall/${project.artifactId}:${project.version}</imageName>
                         <!-- Docker 远程管理地址-->
                         <dockerHost>${docker.host}</dockerHost>
-
-                        <!--推送镜像仓库校验安全证书，无安全证书无法推送-->
-                        <dockerCertPath>${docker.ca}</dockerCertPath>
                         <!-- 打包镜像到 docker registry 中心添加认证配置（账号密码在 maven 配置） -->
                         <pushImage>true</pushImage>
+                        <!--推送镜像仓库校验安全证书，无安全证书无法推送-->
+                        <dockerCertPath>${docker.ca}</dockerCertPath>
 
                         <!--定义基础镜像-->
                         <!--  <baseImage>java:8</baseImage>-->