!213 v3.3.5.0

Merge pull request !213 from 码匠君/develop
herodotus-ecosystem · Oct 24, 2024 · 12b0374 · 12b0374
2 parents 9653a3a + cf33b91
commit 12b0374
Show file tree

Hide file tree

Showing 16 changed files with 364 additions and 434 deletions.
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -2,7 +2,6 @@
   "extends": [
     "stylelint-config-standard-scss",
     "stylelint-config-recommended-vue/scss",
-    "stylelint-config-prettier",
     "stylelint-config-recess-order"
   ]
 }
diff --git a/README.md b/README.md
@@ -5,17 +5,17 @@
 ---
 
 <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.3.2-blue.svg?logo=spring" alt="Spring Authorization Server 1.3.2"></a>
-    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.3.4-blue.svg?logo=spring" alt="Spring Boot 3.3.4"></a>
+    <a href="https://github.com/spring-projects/spring-authorization-server" target="_blank"><img src="https://img.shields.io/badge/Spring%20Authorization%20Server-1.3.3-blue.svg?logo=spring" alt="Spring Authorization Server 1.3.3"></a>
+    <a href="https://spring.io/projects/spring-boot" target="_blank"><img src="https://img.shields.io/badge/Spring%20Boot-3.3.5-blue.svg?logo=spring" alt="Spring Boot 3.3.5"></a>
     <a href="https://spring.io/projects/spring-cloud" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud-2023.0.3-blue.svg?logo=spring" alt="Spring Cloud 2023.0.3"></a>
     <a href="https://github.com/alibaba/spring-cloud-alibaba" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Alibaba-2023.0.1.2-blue.svg?logo=alibabadotcom" alt="Spring Cloud Alibaba 2023.0.1.2"></a>
     <a href="https://github.com/Tencent/spring-cloud-tencent" target="_blank"><img src="https://img.shields.io/badge/Spring%20Cloud%20Tencent-1.14.0--2023.0.0-blue.svg?logo=tencentqq" alt="Spring Cloud Tencent 1.14.0--2023.0.0-SNAPSHOT"></a>
     <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.3.4.3-red.svg?logo=spring" alt="Version 3.3.4.3"></a>
-    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.4.3-red.svg?logo=spring" alt="Dante Engine 3.3.4.3"></a>
-    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.4.3-red.svg?logo=spring" alt="Dante OSS 3.3.4.3"></a>
+    <a href="#" target="_blank"><img src="https://img.shields.io/badge/Version-3.3.5.0-red.svg?logo=spring" alt="Version 3.3.5.0"></a>
+    <a href="https://www.herodotus.cn" target="_blank"><img src="https://img.shields.io/badge/Dante%20Engine-3.3.5.0-red.svg?logo=spring" alt="Dante Engine 3.3.5.0"></a>
+    <a href="https://gitee.com/herodotus/dante-oss" target="_blank"><img src="https://img.shields.io/badge/Dante%20OSS-3.3.5.0-red.svg?logo=spring" alt="Dante OSS 3.3.5.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://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>
@@ -55,8 +55,8 @@
 
 ## Dante Cloud 响应式版本特性
 
-- `Spring Boot` 已升级至 3.3.4
-- `Spring Authorization Server` 已升级至 1.3.2
+- `Spring Boot` 已升级至 3.3.5
+- `Spring Authorization Server` 已升级至 1.3.3
 - 全面采用 Java 21，默认开启虚拟线程，以改善阻塞操作的处理降低系统资源的消耗
 - 支持传统的 `阻塞式` 微服务与基于 `Reactor` 和 `WebFlux` 的 `响应式` 微服务同时运行在一套系统之中
 - 不强制使用 `响应式` 方式开发，可根据自身项目对资源吞吐量、资源消耗、特殊功能性能保障的需求，灵活的选择是采用 `响应式` 还是 `阻塞式` 来开发对应的服务。
@@ -156,11 +156,11 @@
 
 | 组件                        | 版本            |
 | --------------------------- | --------------- |
-| Spring Boot                 | 3.3.4           |
+| Spring Boot                 | 3.3.5           |
 | Spring Cloud                | 2023.0.3        |
 | Spring Cloud Alibaba        | 2023.0.1.2      |
 | Spring Cloud Tencent        | 1.14.0-2023.0.0 |
-| Spring Authorization Server | 1.3.2           |
+| Spring Authorization Server | 1.3.3           |
 | Spring Boot Admin           | 3.3.3           |
 | Nacos                       | 2.4.3           |
 | Sentinel                    | 1.8.8           |
@@ -340,6 +340,7 @@ Dante Cloud 已通过由第三方进行的软件出厂安全测试以及等保
 |  49  |      [Sukari](https://gitee.com/Sukari)       | :white_check_mark: |  50  |        [生活](https://gitee.com/liveok)        | :white_check_mark: |  51  | [hero_zhjms](https://gitee.com/hero_zhjms) | :white_check_mark: |  52  |         [panza](https://gitee.com/panza)         | :white_check_mark: |
 |  53  |       [nian8](https://gitee.com/nian8)        | :white_check_mark: |  54  |      [永恒](https://gitee.com/eternycyh)       | :white_check_mark: |  55  |   [klaus_pd](https://gitee.com/klaus_pd)   | :white_check_mark: |  56  |    [starry](https://gitee.com/starry_fanxin)     | :white_check_mark: |
 |  57  |    [George96](https://gitee.com/george96)     | :white_check_mark: |  58  |  [chenfeida](https://gitee.com/cheffd_admin)   | :white_check_mark: |  59  |    [zt](https://gitee.com/javazhangtao)    | :white_check_mark: |  60  |         [曹维裕](https://gitee.com/dsky)         | :white_check_mark: |
+|  61  |     [弥悠](https://gitee.com/netherworld)     | :white_check_mark: |  62  |                                                | :white_check_mark: |  63  |                                            | :white_check_mark: |  64  |                                                  | :white_check_mark: |
 
 ## [14]、鸣谢
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dante-cloud-ui",
   "private": true,
-  "version": "3.3.4.3",
+  "version": "3.3.5.0",
   "type": "module",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
@@ -32,39 +32,38 @@
     "pinia": "^2.2.4",
     "pinia-plugin-persistedstate": "^4.1.1",
     "qs": "^6.13.0",
-    "quasar": "^2.17.0",
+    "quasar": "^2.17.1",
     "vue": "^3.5.12",
     "vue-i18n": "^10.0.4"
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.9",
-    "@quasar/vite-plugin": "^1.7.0",
+    "@quasar/vite-plugin": "^1.8.0",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.7.6",
+    "@types/node": "^22.7.9",
     "@types/qs": "^6.9.16",
-    "@typescript-eslint/eslint-plugin": "^8.10.0",
-    "@typescript-eslint/parser": "^8.10.0",
+    "@typescript-eslint/eslint-plugin": "^8.11.0",
+    "@typescript-eslint/parser": "^8.11.0",
     "@vitejs/plugin-vue": "^5.1.4",
     "commitizen": "^4.3.1",
     "cross-env": "^7.0.3",
     "cz-conventional-changelog": "^3.3.0",
     "dotenv": "^16.4.5",
-    "eslint": "^9.12.0",
+    "eslint": "^9.13.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.29.0",
+    "eslint-plugin-vue": "^9.29.1",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
     "postcss": "^8.4.47",
     "postcss-html": "^1.7.0",
     "prettier": "^3.3.3",
     "rollup": "4.24.0",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.80.2",
+    "sass": "^1.80.4",
     "stylelint": "^16.10.0",
-    "stylelint-config-prettier": "^9.0.5",
     "stylelint-config-recess-order": "^5.1.1",
     "stylelint-config-recommended-vue": "^1.5.0",
     "stylelint-config-standard-scss": "^13.1.0",
@@ -73,9 +72,9 @@
     "unplugin-auto-import": "^0.18.3",
     "unplugin-icons": "^0.19.3",
     "unplugin-vue-components": "^0.27.4",
-    "vite": "^5.4.9",
+    "vite": "^5.4.10",
     "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-dts": "4.2.4",
+    "vite-plugin-dts": "4.3.0",
     "vite-plugin-html": "^3.2.2",
     "vue-tsc": "^2.1.6"
   }

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dante/ui",
-  "version": "3.3.4.3",
+  "version": "3.3.5.0",
   "description": "",
   "keywords": [],
   "author": "",
@@ -41,7 +41,7 @@
     "xlsx": "^0.18.5"
   },
   "devDependencies": {
-    "@types/node": "22.7.6",
+    "@types/node": "22.7.9",
     "@types/vkbeautify": "^0.99.4"
   }
 }
diff --git a/packages/ui/vite.config.ts → packages/ui/vite.config.mts b/packages/ui/vite.config.ts → packages/ui/vite.config.mts
@@ -28,7 +28,7 @@ export default ({ mode }) => {
         template: { transformAssetUrls }
       }),
       quasar({
-        sassVariables: 'src/static/styles/quasar.variables.sass'
+        sassVariables: '/@/static/styles/quasar.variables.sass'
       }),
       AutoImport({
         dts: true,
@@ -71,7 +71,7 @@ export default ({ mode }) => {
     css: {
       preprocessorOptions: {
         scss: {
-          additionalData: `@use "./src/static/styles/global.scss" as *;`
+          additionalData: '@use "/@/static/styles/global.scss" as *;'
         }
       }
     },