Skip to content

Commit

Permalink
!218 v3.4.0.1
Browse files Browse the repository at this point in the history
Merge pull request !218 from 码匠君/develop
  • Loading branch information
herodotus-ecosystem authored and gitee-org committed Dec 14, 2024
2 parents b269679 + db57f21 commit dcfcdcf
Show file tree
Hide file tree
Showing 13 changed files with 516 additions and 470 deletions.
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<a href="https://nacos.io/zh-cn/index.html" target="_blank"><img src="https://img.shields.io/badge/Nacos-2.4.3-brightgreen.svg?logo=alibabadotcom" alt="Nacos 2.4.3"></a>
</p>
<p align="center">
<a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.4.0.0-red.svg?logo=spring" alt="Version 3.4.0.0"></a>
<a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.4.0.0-red.svg?logo=spring" alt="Dante Engine 3.4.0.0"></a>
<a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.4.0.0-red.svg?logo=spring" alt="Dante OSS 3.4.0.0"></a>
<a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.4.0.1-red.svg?logo=spring" alt="Version 3.4.0.1"></a>
<a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.4.0.1-red.svg?logo=spring" alt="Dante Engine 3.4.0.1"></a>
<a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.4.0.1-red.svg?logo=spring" alt="Dante OSS 3.4.0.1"></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://img.shields.io/badge/License-AGPL--3.0-blue.svg?logo=apache" alt="License AGPL 3.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>
Expand Down Expand Up @@ -217,14 +217,14 @@

### 二、分支说明

| 分支名称 | 对应 Spring 生态版本 | 对应 JDK 版本 | 用途 | 现状 |
|:----------------------:|-----------------------------------------|-----------|----------------|-------------------------------------------------------------|
| master | Spring Boot 3.4 和 Spring Cloud 2024.0.0 | JDK 17 | 主要发布分支 | 推荐使用代码分支 |
| develop | Spring Boot 3.4 和 Spring Cloud 2024.0.0 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发,发布后会 PR 至 master 分支 |
| 3.2.X-3.3.X | Spring Boot 3.3 和 Spring Cloud 2023.0.X | JDK 17 | 稳定版本分支 | 稳定版本分支 |
| 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 实现的微服务,稳定可用,因相关组件均不在维护,所以该版本不再维护 |
| 分支名称 | 对应 Spring 生态版本 | 对应 JDK 版本 | 用途 | 现状 |
| :--------------------: | ---------------------------------------- | ------------- | ------------------ | ---------------------------------------------------------------------------------------------- |
| master | Spring Boot 3.4 和 Spring Cloud 2024.0.0 | JDK 17 | 主要发布分支 | 推荐使用代码分支 |
| develop | Spring Boot 3.4 和 Spring Cloud 2024.0.0 | JDK 17 | Development 分支 | 新功能、ISSUE 均以此分支作为开发,发布后会 PR 至 master 分支 |
| 3.2.X-3.3.X | Spring Boot 3.3 和 Spring Cloud 2023.0.X | JDK 17 | 稳定版本分支 | 稳定版本分支 |
| 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 实现的微服务,稳定可用,因相关组件均不在维护,所以该版本不再维护 |

## [6]、工程结构

Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dante-cloud-ui",
"private": true,
"version": "3.4.0.0",
"version": "3.4.0.1",
"type": "module",
"scripts": {
"preinstall": "npx only-allow pnpm",
Expand Down Expand Up @@ -32,44 +32,44 @@
"pinia": "^2.3.0",
"pinia-plugin-persistedstate": "^4.1.3",
"qs": "^6.13.1",
"quasar": "^2.17.4",
"quasar": "^2.17.5",
"vue": "^3.5.13",
"vue-i18n": "^10.0.5"
},
"devDependencies": {
"@changesets/cli": "^2.27.10",
"@quasar/vite-plugin": "^1.8.1",
"@types/lodash-es": "^4.17.12",
"@types/node": "^22.10.1",
"@types/node": "^22.10.2",
"@types/qs": "^6.9.17",
"@typescript-eslint/eslint-plugin": "^8.17.0",
"@typescript-eslint/parser": "^8.17.0",
"@typescript-eslint/eslint-plugin": "^8.18.0",
"@typescript-eslint/parser": "^8.18.0",
"@vitejs/plugin-vue": "^5.2.1",
"commitizen": "^4.3.1",
"cross-env": "^7.0.3",
"cz-conventional-changelog": "^3.3.0",
"dotenv": "^16.4.7",
"eslint": "^9.16.0",
"eslint": "^9.17.0",
"eslint-config-prettier": "^9.1.0",
"eslint-define-config": "^2.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-quasar": "^1.1.0",
"eslint-plugin-vue": "^9.32.0",
"husky": "^9.1.7",
"lint-staged": "^15.2.10",
"lint-staged": "^15.2.11",
"postcss": "^8.4.49",
"postcss-html": "^1.7.0",
"prettier": "^3.4.2",
"rollup": "4.28.1",
"rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.82.0",
"sass": "^1.83.0",
"stylelint": "^16.11.0",
"stylelint-config-recess-order": "^5.1.1",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard-scss": "^14.0.0",
"terser": "^5.37.0",
"typescript": "^5.6.3",
"unplugin-auto-import": "^0.18.6",
"unplugin-auto-import": "^0.19.0",
"unplugin-icons": "^0.21.0",
"unplugin-vue-components": "^0.27.5",
"vite": "^5.4.11",
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dante/ui",
"version": "3.4.0.0",
"version": "3.4.0.1",
"description": "",
"keywords": [],
"author": "",
Expand Down Expand Up @@ -41,7 +41,7 @@
"xlsx": "^0.18.5"
},
"devDependencies": {
"@types/node": "22.10.1",
"@types/node": "22.10.2",
"@types/vkbeautify": "^0.99.4"
}
}
Loading

0 comments on commit dcfcdcf

Please sign in to comment.