!185 v3.2.6.0

Merge pull request !185 from 码匠君/develop
herodotus-ecosystem · May 23, 2024 · cc2f83a · cc2f83a
2 parents 76daea4 + 64e9513
commit cc2f83a
Show file tree

Hide file tree

Showing 10 changed files with 381 additions and 311 deletions.
diff --git a/README.md b/README.md
@@ -6,16 +6,16 @@
 
 <p align="center">
     <a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-1.2.4-blue.svg?logo=spring" alt="Spring Authorization Server 1.2.4"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-3.2.5-blue.svg?logo=spring" alt="Spring Boot 3.2.5"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://shields.io/badge/Spring%20Boot-3.2.6-blue.svg?logo=spring" alt="Spring Boot 3.2.6"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud-2023.0.1-blue.svg?logo=spring" alt="Spring Cloud 2023.0.1"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://shields.io/badge/Spring%20Cloud%20Alibaba-2023.0.1.0-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2023.0.1.0"></a>
     <a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.13.1--2022.0.4-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.13.1-2022.0.4"></a>
     <a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://shields.io/badge/Nacos-2.3.1-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.3.1"></a>
 </p>
 <p align="center">
-    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-3.2.5.4-red.svg?logo=spring" alt="Version 3.2.5.4"></a>
-    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.5.4-red.svg?logo=spring" alt="Dante Engine 3.2.5.4"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.5.4-red.svg?logo=spring" alt="Dante OSS 3.2.5.4"></a>
+    <a href="#" target="_blank"><img src="https://shields.io/badge/Version-3.2.6.0-red.svg?logo=spring" alt="Version 3.2.6.0"></a>
+    <a href="https://gitee.com/herodotus/dante-engine" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.2.6.0-red.svg?logo=spring" alt="Dante Engine 3.2.6.0"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.2.6.0-red.svg?logo=spring" alt="Dante OSS 3.2.6.0"></a>
     <a href="https://bell-sw.com/pages/downloads/#downloads" target="_blank"><img src="https://img.shields.io/badge/JDK-17%2B-green.svg?logo=openjdk" alt="Java 17"></a>
     <a href="./LICENSE"><img src="https://shields.io/badge/License-Apache--2.0-blue.svg?logo=apache" alt="License Apache 2.0"></a>
     <a href="https://www.herodotus.cn"><img src="https://visitor-badge.laobi.icu/badge?page_id=dante-cloud&title=Total%20Visits" alt="Total Visits"></a>
@@ -143,7 +143,7 @@ Dante Cloud (但丁，原 Eurynome Cloud) 是以**「高质量代码、低安全
 
 | 组件                          | 版本            |
 | ----------------------------- | --------------- |
-| `Spring Boot`                 | 3.2.5           |
+| `Spring Boot`                 | 3.2.6           |
 | `Spring Cloud`                | 2023.0.1        |
 | `Spring Cloud Alibaba`        | 2023.0.1.0      |
 | `Spring Cloud Tencent`        | 1.13.1-2022.0.4 |
@@ -198,14 +198,14 @@ Dante Cloud (但丁，原 Eurynome Cloud) 是以**「高质量代码、低安全
 
 ### 二、分支说明
 
-| 分支名称               | 对应 Spring 生态版本                     | 对应 JDK 版本 | 用途                    | 现状                                                                                 |
-| ---------------------- | ---------------------------------------- | ------------- | ----------------------- | ------------------------------------------------------------------------------------ |
-| master                 | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 17        | 主要发布分支            | 可使用，但 Spring Cloud Alibaba、Tencent 等生态并未发布正式适配版，请谨慎选择使用    |
-| develop                | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 17        | Development 分支        | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用     |
-| reactive-develop       | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 21        | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用                                   |
-| 3.1.X                  | Spring Boot 3.1 和 Spring Cloud 2022.0.X | JDK 17        | Stable 代码分支         | 稳定可用版本分支，2024 年 5 月，Spring Boot 3.3 发布后将会停止维护                   |
-| 2.7.X                  | Spring Boot 2.7 和 Spring Cloud 2021.0.X | JDK 8         | 历史代码分支            | 基于 Spring Boot 2.7 时代开发的代码分支，不再维护                                    |
-| spring-security-oauth2 | Spring Boot 2.6 和 Spring Cloud 2021.0.X | JDK 8         | 历史代码分支            | 基于原 Spring Security OAuth2 实现的微服务，因相关组件均不在维护，所以该版本不再维护 |
+| 分支名称               | 对应 Spring 生态版本                     | 对应 JDK 版本 | 用途                    | 现状                                                                                           |
+| ---------------------- | ---------------------------------------- | ------------- | ----------------------- | ---------------------------------------------------------------------------------------------- |
+| master                 | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 17        | 主要发布分支            | 可使用，但 Spring Cloud Alibaba、Tencent 等生态并未发布正式适配版，请谨慎选择使用              |
+| develop                | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 17        | Development 分支        | 新功能、ISSUE 均以此分支作为开发，发布后会 PR 至 master 分支。开发分支不保证可用               |
+| reactive-develop       | Spring Boot 3.2 和 Spring Cloud 2023.0.1 | JDK 21        | 响应式 Development 分支 | 下一代响应式微服务版本开发分支。开发分支不保证可用                                             |
+| 3.1.X                  | Spring Boot 3.1 和 Spring Cloud 2022.0.X | JDK 17        | 历史代码，不再维护      | 基于 Spring Boot 3.1 时代开发的代码分支，稳定可用，不再维护                                    |
+| 2.7.X                  | Spring Boot 2.7 和 Spring Cloud 2021.0.X | JDK 8         | 历史代码，不再维护      | 基于 Spring Boot 2.7 时代开发的代码分支，稳定可用，不再维护                                    |
+| spring-security-oauth2 | Spring Boot 2.6 和 Spring Cloud 2021.0.X | JDK 8         | 历史代码，不再维护      | 基于原 Spring Security OAuth2 实现的微服务，稳定可用，因相关组件均不在维护，所以该版本不再维护 |
 
 ## [5]、工程结构
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dante-cloud-ui",
   "private": true,
-  "version": "3.2.5.4",
+  "version": "3.2.6.0",
   "type": "module",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -37,13 +37,13 @@
     "vue-i18n": "^9.13.1"
   },
   "devDependencies": {
-    "@changesets/cli": "^2.27.2",
+    "@changesets/cli": "^2.27.3",
     "@quasar/vite-plugin": "^1.7.0",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.12.12",
     "@types/qs": "^6.9.15",
-    "@typescript-eslint/eslint-plugin": "^7.9.0",
-    "@typescript-eslint/parser": "^7.9.0",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
     "@vitejs/plugin-vue": "^5.0.4",
     "commitizen": "^4.3.0",
     "cross-env": "^7.0.3",
@@ -56,11 +56,11 @@
     "eslint-plugin-quasar": "^1.1.0",
     "eslint-plugin-vue": "^9.26.0",
     "husky": "^9.0.11",
-    "lint-staged": "^15.2.2",
+    "lint-staged": "^15.2.4",
     "postcss": "^8.4.38",
     "postcss-html": "^1.7.0",
     "prettier": "^3.2.5",
-    "rollup": "4.17.2",
+    "rollup": "4.18.0",
     "rollup-plugin-visualizer": "^5.12.0",
     "sass": "^1.77.2",
     "stylelint": "^16.5.0",

diff --git a/packages/ui/container/herodotus/ui.yml b/packages/ui/container/herodotus/ui.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   ui:
-    image: dante-cloud-ui:3.2.5.4
+    image: dante-cloud-ui:3.2.6.0
     build:
       context: ../context
       dockerfile: Dockerfile

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dante/ui",
-  "version": "3.2.5.4",
+  "version": "3.2.6.0",
   "description": "",
   "keywords": [],
   "author": "",