diff --git a/README.md b/README.md index 39adeb59..c5743f5f 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ docker compose -f docker/compose/blossom-mysql8.yaml up -d | 白驹过隙 | 支付宝用户-\*发 | 支付宝用户-\*琛 | 支付宝匿名用户 | | 疾风剑豪索隆 | 放羊的星星 | 立冬 | 给你一支烟 | | 林诗 | Criesgod | 支付宝用户-\*伟 | 黑醋栗和丁香 | -| Mr_tg000 | | | | +| Mr_tg000 | Lucky | | | --- diff --git a/SPONSORS.md b/SPONSORS.md index a372d8e4..29cc9bd2 100644 --- a/SPONSORS.md +++ b/SPONSORS.md @@ -8,4 +8,4 @@ | 白驹过隙 | 支付宝用户-\*发 | 支付宝用户-\*琛 | 支付宝匿名用户 | | 疾风剑豪索隆 | 放羊的星星 | 立冬 | 给你一支烟 | | 林诗 | Criesgod | 支付宝用户-\*伟 | 黑醋栗和丁香 | -| Mr_tg000 | | | | +| Mr_tg000 | Lucky | | | diff --git a/blossom-backend/backend/pom.xml b/blossom-backend/backend/pom.xml index 81b7e770..7c1d013e 100644 --- a/blossom-backend/backend/pom.xml +++ b/blossom-backend/backend/pom.xml @@ -5,7 +5,7 @@ blossom-backend com.blossom - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/common/common-base/pom.xml b/blossom-backend/common/common-base/pom.xml index 7e467266..958a4684 100644 --- a/blossom-backend/common/common-base/pom.xml +++ b/blossom-backend/common/common-base/pom.xml @@ -5,7 +5,7 @@ common com.blossom - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 jar diff --git a/blossom-backend/common/common-cache/pom.xml b/blossom-backend/common/common-cache/pom.xml index 2dbfd735..eefdd7da 100644 --- a/blossom-backend/common/common-cache/pom.xml +++ b/blossom-backend/common/common-cache/pom.xml @@ -5,7 +5,7 @@ common com.blossom - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/common/common-db/pom.xml b/blossom-backend/common/common-db/pom.xml index d6dd470d..0f1475bc 100644 --- a/blossom-backend/common/common-db/pom.xml +++ b/blossom-backend/common/common-db/pom.xml @@ -5,7 +5,7 @@ common com.blossom - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/common/common-iaas/pom.xml b/blossom-backend/common/common-iaas/pom.xml index f05ae1fc..32d95887 100644 --- a/blossom-backend/common/common-iaas/pom.xml +++ b/blossom-backend/common/common-iaas/pom.xml @@ -5,7 +5,7 @@ common com.blossom - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/common/pom.xml b/blossom-backend/common/pom.xml index a0b46255..10bfd842 100644 --- a/blossom-backend/common/pom.xml +++ b/blossom-backend/common/pom.xml @@ -5,7 +5,7 @@ com.blossom blossom-backend - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 pom diff --git a/blossom-backend/expand-sentinel/expand-sentinel-metric/pom.xml b/blossom-backend/expand-sentinel/expand-sentinel-metric/pom.xml index e7bf86a6..19bc62d5 100644 --- a/blossom-backend/expand-sentinel/expand-sentinel-metric/pom.xml +++ b/blossom-backend/expand-sentinel/expand-sentinel-metric/pom.xml @@ -5,7 +5,7 @@ com.blossom expand-sentinel - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/expand-sentinel/expand-sentinel-springmvc/pom.xml b/blossom-backend/expand-sentinel/expand-sentinel-springmvc/pom.xml index e66c8b98..a4add9b2 100644 --- a/blossom-backend/expand-sentinel/expand-sentinel-springmvc/pom.xml +++ b/blossom-backend/expand-sentinel/expand-sentinel-springmvc/pom.xml @@ -5,7 +5,7 @@ com.blossom expand-sentinel - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/expand-sentinel/pom.xml b/blossom-backend/expand-sentinel/pom.xml index d9d35a54..41ade99b 100644 --- a/blossom-backend/expand-sentinel/pom.xml +++ b/blossom-backend/expand-sentinel/pom.xml @@ -5,7 +5,7 @@ blossom-backend com.blossom - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 pom diff --git a/blossom-backend/expand-tracker/expand-tracker-core/pom.xml b/blossom-backend/expand-tracker/expand-tracker-core/pom.xml index 96274d4a..90ab6c8e 100644 --- a/blossom-backend/expand-tracker/expand-tracker-core/pom.xml +++ b/blossom-backend/expand-tracker/expand-tracker-core/pom.xml @@ -5,7 +5,7 @@ expand-tracker com.blossom - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/expand-tracker/pom.xml b/blossom-backend/expand-tracker/pom.xml index d2dcf9bf..a80acb2b 100644 --- a/blossom-backend/expand-tracker/pom.xml +++ b/blossom-backend/expand-tracker/pom.xml @@ -5,7 +5,7 @@ blossom-backend com.blossom - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/pom.xml b/blossom-backend/pom.xml index bb0c98ed..fa06804e 100644 --- a/blossom-backend/pom.xml +++ b/blossom-backend/pom.xml @@ -14,11 +14,11 @@ com.blossom blossom-backend - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT 1.8 diff --git a/blossom-backend/smart-doc-2.6.7/pom.xml b/blossom-backend/smart-doc-2.6.7/pom.xml index 521d2a33..98f5f487 100644 --- a/blossom-backend/smart-doc-2.6.7/pom.xml +++ b/blossom-backend/smart-doc-2.6.7/pom.xml @@ -90,7 +90,7 @@ com.blossom backend - 1.10.0-SNAPSHOT + 1.11.0-SNAPSHOT diff --git a/blossom-backend/smart-doc-2.6.7/src/main/java/com/power/doc/ApiDocGen.java b/blossom-backend/smart-doc-2.6.7/src/main/java/com/power/doc/ApiDocGen.java index 2a46e185..b1bc33b8 100644 --- a/blossom-backend/smart-doc-2.6.7/src/main/java/com/power/doc/ApiDocGen.java +++ b/blossom-backend/smart-doc-2.6.7/src/main/java/com/power/doc/ApiDocGen.java @@ -34,7 +34,7 @@ public class ApiDocGen { private static String IP_DEVE = "http://127.0.0.1"; - private static String VERSION = "v1.10.0"; + private static String VERSION = "v1.11.0"; private static final List sourceCodePath = new ArrayList() {{ this.add("blossom-backend/common/common-base"); diff --git a/blossom-editor/package-lock.json b/blossom-editor/package-lock.json index d0c699a9..9d00fa4a 100644 --- a/blossom-editor/package-lock.json +++ b/blossom-editor/package-lock.json @@ -1,12 +1,12 @@ { "name": "blossom", - "version": "1.10.0", + "version": "1.11.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "blossom", - "version": "1.10.0", + "version": "1.11.0", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -52,7 +52,7 @@ "typescript": "^5.1.6", "unplugin-auto-import": "^0.16.7", "unplugin-vue-components": "^0.25.1", - "vite": "^4.4.9", + "vite": "^4.5.1", "vue": "^3.3.4", "vue-tsc": "^1.8.8" } diff --git a/blossom-editor/package.json b/blossom-editor/package.json index a94ced9e..92749019 100644 --- a/blossom-editor/package.json +++ b/blossom-editor/package.json @@ -1,7 +1,7 @@ { "name": "blossom", "productName": "Blossom", - "version": "1.10.0", + "version": "1.11.0", "description": "A markdown editor", "license": "MIT", "main": "./out/main/index.js", diff --git a/blossom-editor/src/renderer/index.html b/blossom-editor/src/renderer/index.html index 0c200b14..0429dc3c 100644 --- a/blossom-editor/src/renderer/index.html +++ b/blossom-editor/src/renderer/index.html @@ -387,7 +387,7 @@
加载中... -
Blossom | v1.10.0
+
Blossom | v1.11.0
diff --git a/blossom-editor/src/renderer/src/assets/constants/system.ts b/blossom-editor/src/renderer/src/assets/constants/system.ts index 9f524f4e..55486cfd 100644 --- a/blossom-editor/src/renderer/src/assets/constants/system.ts +++ b/blossom-editor/src/renderer/src/assets/constants/system.ts @@ -5,7 +5,7 @@ const blossom = { SYS: { NAME: 'Blossom', FULL_NAME: 'BLOSSOM-EDITOR', - VERSION: 'v1.10.0', + VERSION: 'v1.11.0', // DOC: 'https://www.wangyunf.com/blossom-doc/index', diff --git a/blossom-web/package-lock.json b/blossom-web/package-lock.json index a3ebde7b..b1bfc659 100644 --- a/blossom-web/package-lock.json +++ b/blossom-web/package-lock.json @@ -1,12 +1,12 @@ { "name": "blossom-web", - "version": "1.10.0", + "version": "1.11.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "blossom-web", - "version": "1.10.0", + "version": "1.11.0", "dependencies": { "axios": "^1.4.0", "echarts": "^5.4.3", diff --git a/blossom-web/package.json b/blossom-web/package.json index a1de54e1..012478f4 100644 --- a/blossom-web/package.json +++ b/blossom-web/package.json @@ -1,6 +1,6 @@ { "name": "blossom-web", - "version": "1.10.0", + "version": "1.11.0", "private": true, "scripts": { "dev": "vite", diff --git a/blossom-web/src/assets/constants/blossom.ts b/blossom-web/src/assets/constants/blossom.ts index af4e4530..32968511 100644 --- a/blossom-web/src/assets/constants/blossom.ts +++ b/blossom-web/src/assets/constants/blossom.ts @@ -1,5 +1,5 @@ const blossom = { - SYS: { VERSION: 'v1.10.0' } + SYS: { VERSION: 'v1.11.0' } } export default blossom diff --git a/doc/backend-api/index.html b/doc/backend-api/index.html index 01be79e8..91883768 100644 --- a/doc/backend-api/index.html +++ b/doc/backend-api/index.html @@ -5,10 +5,10 @@ 《Blossom 接口文档》 -　文档版本:v1.10.0 -　文档时间:2023-12-16 21:38:57 +　文档版本:v1.11.0 +　文档时间:2023-12-20 15:26:44 - +