Merge branch 'jdk17-dev' into jdk17

pig-mesh · Feb 5, 2025 · b559be7 · b559be7
2 parents c6cbc08 + a7a9fcb
commit b559be7
Show file tree

Hide file tree

Showing 8 changed files with 196 additions and 179 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ pig 提供了详细的[部署文档 wiki.pig4cloud.com](https://www.yuque.com/pi
 
 | 依赖                          | 版本         |
 |-----------------------------|------------|
-| Spring Boot                 | 3.4.1      |
+| Spring Boot                 | 3.4.2      |
 | Spring Cloud                | 2024.0.0   |
 | Spring Cloud Alibaba        | 2023.0.3.2 |
 | Spring Authorization Server | 1.4.1      |

diff --git a/db/pig_config.sql b/db/pig_config.sql
diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml
@@ -16,16 +16,16 @@
     <properties>
         <!-- 项目版本号 -->
         <revision>3.8.3</revision>
-        <spring-boot.version>3.4.1</spring-boot.version>
+        <spring-boot.version>3.4.2</spring-boot.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <git.commit.plugin>9.0.1</git.commit.plugin>
         <fastjson.version>1.2.83_noneautotype</fastjson.version>
-        <springdoc.version>2.8.3</springdoc.version>
-        <swagger.core.version>2.2.27</swagger.core.version>
+        <springdoc.version>2.8.4</springdoc.version>
+        <swagger.core.version>2.2.28</swagger.core.version>
         <mybatis-plus.version>3.5.10.1</mybatis-plus.version>
-        <mysql.version>9.0.0</mysql.version>
+        <mysql.version>9.2.0</mysql.version>
         <dynamic-ds.version>4.3.1</dynamic-ds.version>
         <seata.version>1.7.0</seata.version>
         <excel.version>3.4.0</excel.version>

diff --git a/pig-register/pom.xml b/pig-register/pom.xml
@@ -28,7 +28,7 @@
     <description>nacos 注册配置中心</description>
 
     <properties>
-        <nacos.version>2.4.3</nacos.version>
+        <nacos.version>2.5.0</nacos.version>
         <tomcat.version>9.0.98</tomcat.version>
         <spring-boot.version>2.7.18</spring-boot.version>
         <spring-boot-admin.version>2.7.16</spring-boot-admin.version>

diff --git a/pig-register/src/main/resources/nacos-version.txt b/pig-register/src/main/resources/nacos-version.txt
@@ -1 +1 @@
-version=2.4.3
+version=2.5.0
diff --git a/pig-register/src/main/resources/static/index.html b/pig-register/src/main/resources/static/index.html
@@ -35,7 +35,7 @@
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
 	<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
 	<!-- 第三方css结束 -->
-<link href="./css/main.css?6d7b5e4fd7099b3cad92" rel="stylesheet"></head>
+<link href="./css/main.css?14a4b9dd6e3788d1f3d9" rel="stylesheet"></head>
 
 <body>
 	<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
 	<script src="console-ui/public/js/merge.js"></script>
 	<script src="console-ui/public/js/loader.js"></script>
 	<!-- 第三方js结束 -->
-<script type="text/javascript" src="./js/main.js?6d7b5e4fd7099b3cad92"></script></body>
+<script type="text/javascript" src="./js/main.js?14a4b9dd6e3788d1f3d9"></script></body>
 
 </html>
diff --git a/pig-register/src/main/resources/static/js/main.js b/pig-register/src/main/resources/static/js/main.js
diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
     <properties>
         <!-- 项目版本号 -->
         <revision>3.8.3</revision>
-        <spring-boot.version>3.4.1</spring-boot.version>
+        <spring-boot.version>3.4.2</spring-boot.version>
         <spring-cloud.version>2024.0.0</spring-cloud.version>
         <spring-cloud-alibaba.version>2023.0.3.2</spring-cloud-alibaba.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>