From d0a1f5857f646eb5b41c46ee73d871c39f5019aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <2270033969@qq.com>
Date: Sat, 8 Mar 2025 13:28:56 +0800
Subject: [PATCH] chore(nacos): update nacos version to 2.5.0 and add tomcat
dependencies
---
pigx-register/pom.xml | 29 ++++++++++++++-----
.../src/main/resources/application.yml | 11 ++++---
.../src/main/resources/nacos-version.txt | 2 +-
.../src/main/resources/static/index.html | 6 ++--
.../src/main/resources/static/js/main.js | 18 ++++++------
5 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml
index 860a25f11..b85e940c2 100644
--- a/pigx-register/pom.xml
+++ b/pigx-register/pom.xml
@@ -27,8 +27,8 @@
nacos 注册配置中心
- 2.4.3
- 2.7.18
+ 2.5.0
+ 9.0.98
2.7.16
@@ -85,13 +85,26 @@
-
+
- org.springframework.boot
- spring-boot-dependencies
- ${spring-boot.version}
- pom
- import
+ org.apache.tomcat.embed
+ tomcat-embed-websocket
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+ ${tomcat.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-el
+ ${tomcat.version}
+
+
+ org.apache.tomcat
+ tomcat-annotations-api
+ ${tomcat.version}
diff --git a/pigx-register/src/main/resources/application.yml b/pigx-register/src/main/resources/application.yml
index ce290237b..9dbeaa9e1 100644
--- a/pigx-register/src/main/resources/application.yml
+++ b/pigx-register/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8848
+ port: 8848 # nacos 端口,看文档:https://sourl.cn/Czg3h6
tomcat:
basedir: logs
error:
@@ -29,18 +29,21 @@ nacos:
urls: /actuator/**,/,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/**
spring:
- datasource:
- platform: mysql #这个过期属性不能修改,nacos 代码对此有硬编码
+ application:
+ name: @project.artifactId@
security:
enabled: true
boot: # 接入 spring boot admin
admin:
client:
- url: http://pigx-monitor:5001
+ url: http://pig-monitor:5001
username: pig
password: pig
instance:
service-host-type: ip
+ sql:
+ init:
+ platform: mysql
useAddressServer: true
diff --git a/pigx-register/src/main/resources/nacos-version.txt b/pigx-register/src/main/resources/nacos-version.txt
index 298f5603d..152a88e7e 100644
--- a/pigx-register/src/main/resources/nacos-version.txt
+++ b/pigx-register/src/main/resources/nacos-version.txt
@@ -1 +1 @@
-version=2.4.3
+version=2.5.0
diff --git a/pigx-register/src/main/resources/static/index.html b/pigx-register/src/main/resources/static/index.html
index 8ce40b63c..947aecd64 100644
--- a/pigx-register/src/main/resources/static/index.html
+++ b/pigx-register/src/main/resources/static/index.html
@@ -35,7 +35,8 @@
-
+
+
@@ -56,6 +57,7 @@
-
+
+