Skip to content

Commit b559be7

Browse files
committed
Merge branch 'jdk17-dev' into jdk17
2 parents c6cbc08 + a7a9fcb commit b559be7

File tree

8 files changed

+196
-179
lines changed

8 files changed

+196
-179
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ pig 提供了详细的[部署文档 wiki.pig4cloud.com](https://www.yuque.com/pi
5252

5353
| 依赖 | 版本 |
5454
|-----------------------------|------------|
55-
| Spring Boot | 3.4.1 |
55+
| Spring Boot | 3.4.2 |
5656
| Spring Cloud | 2024.0.0 |
5757
| Spring Cloud Alibaba | 2023.0.3.2 |
5858
| Spring Authorization Server | 1.4.1 |

db/pig_config.sql

Lines changed: 177 additions & 160 deletions
Large diffs are not rendered by default.

pig-common/pig-common-bom/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<properties>
1717
<!-- 项目版本号 -->
1818
<revision>3.8.3</revision>
19-
<spring-boot.version>3.4.1</spring-boot.version>
19+
<spring-boot.version>3.4.2</spring-boot.version>
2020
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2121
<maven.compiler.source>17</maven.compiler.source>
2222
<maven.compiler.target>17</maven.compiler.target>
2323
<git.commit.plugin>9.0.1</git.commit.plugin>
2424
<fastjson.version>1.2.83_noneautotype</fastjson.version>
25-
<springdoc.version>2.8.3</springdoc.version>
26-
<swagger.core.version>2.2.27</swagger.core.version>
25+
<springdoc.version>2.8.4</springdoc.version>
26+
<swagger.core.version>2.2.28</swagger.core.version>
2727
<mybatis-plus.version>3.5.10.1</mybatis-plus.version>
28-
<mysql.version>9.0.0</mysql.version>
28+
<mysql.version>9.2.0</mysql.version>
2929
<dynamic-ds.version>4.3.1</dynamic-ds.version>
3030
<seata.version>1.7.0</seata.version>
3131
<excel.version>3.4.0</excel.version>

pig-register/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<description>nacos 注册配置中心</description>
2929

3030
<properties>
31-
<nacos.version>2.4.3</nacos.version>
31+
<nacos.version>2.5.0</nacos.version>
3232
<tomcat.version>9.0.98</tomcat.version>
3333
<spring-boot.version>2.7.18</spring-boot.version>
3434
<spring-boot-admin.version>2.7.16</spring-boot-admin.version>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2.4.3
1+
version=2.5.0

pig-register/src/main/resources/static/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<link rel="stylesheet" type="text/css" href="console-ui/public/css/icon.css">
3636
<link rel="stylesheet" type="text/css" href="console-ui/public/css/font-awesome.css">
3737
<!-- 第三方css结束 -->
38-
<link href="./css/main.css?6d7b5e4fd7099b3cad92" rel="stylesheet"></head>
38+
<link href="./css/main.css?14a4b9dd6e3788d1f3d9" rel="stylesheet"></head>
3939

4040
<body>
4141
<div id="root" style="overflow:hidden"></div>
@@ -56,6 +56,6 @@
5656
<script src="console-ui/public/js/merge.js"></script>
5757
<script src="console-ui/public/js/loader.js"></script>
5858
<!-- 第三方js结束 -->
59-
<script type="text/javascript" src="./js/main.js?6d7b5e4fd7099b3cad92"></script></body>
59+
<script type="text/javascript" src="./js/main.js?14a4b9dd6e3788d1f3d9"></script></body>
6060

6161
</html>

pig-register/src/main/resources/static/js/main.js

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<properties>
3030
<!-- 项目版本号 -->
3131
<revision>3.8.3</revision>
32-
<spring-boot.version>3.4.1</spring-boot.version>
32+
<spring-boot.version>3.4.2</spring-boot.version>
3333
<spring-cloud.version>2024.0.0</spring-cloud.version>
3434
<spring-cloud-alibaba.version>2023.0.3.2</spring-cloud-alibaba.version>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)