From b757a292f7240208b8f1009efbd4eff00501ac17 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Thu, 11 Aug 2022 12:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AC=E4=B8=8Emacbook-air-m2=E7=BB=A7?=
 =?UTF-8?q?=E6=89=BF=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-cloud/docker-compose.yml                             | 2 +-
 kicc-auth/src/main/resources/bootstrap.yml                  | 3 +--
 kicc-gateway/src/main/resources/bootstrap.yml               | 3 +--
 kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile  | 2 +-
 .../kicc-common-biz/src/main/resources/bootstrap.yml        | 5 ++---
 .../kicc-monitor-biz/src/main/resources/bootstrap.yml       | 3 +--
 .../kicc-system-biz/src/main/resources/bootstrap.yml        | 3 +--
 kicc-register/src/main/resources/bootstrap.yml              | 4 ++--
 pom.xml                                                     | 6 ++++++
 9 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/docker-cloud/docker-compose.yml b/docker-cloud/docker-compose.yml
index 1b433d09..532d1052 100644
--- a/docker-cloud/docker-compose.yml
+++ b/docker-cloud/docker-compose.yml
@@ -76,7 +76,7 @@ services:
     hostname: kicc-common
     restart: always
     ports:
-      - 5000:5000
+      - 8000:8000
 
   # 新建业务工程docker-compose模板
   # 注释命名规范:【xxx-biz】
diff --git a/kicc-auth/src/main/resources/bootstrap.yml b/kicc-auth/src/main/resources/bootstrap.yml
index 230d051a..8f2e80d3 100644
--- a/kicc-auth/src/main/resources/bootstrap.yml
+++ b/kicc-auth/src/main/resources/bootstrap.yml
@@ -7,8 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
-        #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
diff --git a/kicc-gateway/src/main/resources/bootstrap.yml b/kicc-gateway/src/main/resources/bootstrap.yml
index 23c5ec83..41c98e5a 100644
--- a/kicc-gateway/src/main/resources/bootstrap.yml
+++ b/kicc-gateway/src/main/resources/bootstrap.yml
@@ -7,8 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
-        #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile
index 3529c99c..5b5e2890 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile
@@ -8,7 +8,7 @@ ARG JAR_FILE=target/kicc-common-biz.jar
 
 COPY ${JAR_FILE} app.jar
 
-EXPOSE 5000
+EXPOSE 8000
 
 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 
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 a9c3ce32..68298077 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
@@ -1,5 +1,5 @@
 server:
-  port: 5000
+  port: 8000
 
 spring:
   application:
@@ -7,8 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
-        #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
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 9efeafe2..3fb820f3 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,8 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
-        #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
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 cd6bf267..7ee73a86 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
@@ -7,8 +7,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:127.0.0.1}:${NACOS_PORT:8848}
-        #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848}
         namespace: @profiles.namespace@
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
diff --git a/kicc-register/src/main/resources/bootstrap.yml b/kicc-register/src/main/resources/bootstrap.yml
index bd0bc9e9..fc897b49 100644
--- a/kicc-register/src/main/resources/bootstrap.yml
+++ b/kicc-register/src/main/resources/bootstrap.yml
@@ -5,10 +5,10 @@ server:
 db:
   num: 1
   user: ${MYSQL_USER:root}
-  password: ${MYSQL_PWD:kanglai@2022}
+  password: ${MYSQL_PWD:root}
   #password: ${MYSQL_PWD:kanglai@2022}
   url:
-    0: jdbc:mysql://${MYSQL_HOST:192.168.3.8}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    0: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     #0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
 
 nacos:
diff --git a/pom.xml b/pom.xml
index b220f6be..ae169465 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,6 +89,12 @@
 			<artifactId>velocity-engine-core</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<!--添加 MacBook-Air-M2 DNS解析器,由于netty内部没有支持AppleM2芯片mac的本地DN解析器,nacos服务连接会出错-->
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-resolver-dns-native-macos</artifactId>
+			<classifier>osx-aarch_64</classifier>
+		</dependency>
 	</dependencies>
 
 	<modules>