diff --git a/blossom-backend/backend/pom.xml b/blossom-backend/backend/pom.xml index 0c5cf0a..6e9e4d8 100644 --- a/blossom-backend/backend/pom.xml +++ b/blossom-backend/backend/pom.xml @@ -5,7 +5,7 @@ blossom-backend com.blossom - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/common/common-base/pom.xml b/blossom-backend/common/common-base/pom.xml index 51007a8..9984550 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.7.0-SNAPSHOT + 1.8.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 b337f45..2c07a23 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.7.0-SNAPSHOT + 1.8.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/common/common-db/pom.xml b/blossom-backend/common/common-db/pom.xml index 960616e..960d2c4 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.7.0-SNAPSHOT + 1.8.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/common/common-iaas/pom.xml b/blossom-backend/common/common-iaas/pom.xml index 0953950..cbc3985 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.7.0-SNAPSHOT + 1.8.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/common/pom.xml b/blossom-backend/common/pom.xml index 9ef64cc..717dd1d 100644 --- a/blossom-backend/common/pom.xml +++ b/blossom-backend/common/pom.xml @@ -5,7 +5,7 @@ com.blossom blossom-backend - 1.7.0-SNAPSHOT + 1.8.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 83c9824..9c34948 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.7.0-SNAPSHOT + 1.8.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 ffd24b3..a5d7b87 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.7.0-SNAPSHOT + 1.8.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/expand-sentinel/pom.xml b/blossom-backend/expand-sentinel/pom.xml index b2fe1ba..83c073b 100644 --- a/blossom-backend/expand-sentinel/pom.xml +++ b/blossom-backend/expand-sentinel/pom.xml @@ -5,7 +5,7 @@ blossom-backend com.blossom - 1.7.0-SNAPSHOT + 1.8.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 aa7b287..1a92c54 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.7.0-SNAPSHOT + 1.8.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/expand-tracker/pom.xml b/blossom-backend/expand-tracker/pom.xml index 2d28188..cf3aa53 100644 --- a/blossom-backend/expand-tracker/pom.xml +++ b/blossom-backend/expand-tracker/pom.xml @@ -5,7 +5,7 @@ blossom-backend com.blossom - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT 4.0.0 diff --git a/blossom-backend/pom.xml b/blossom-backend/pom.xml index bbfdaba..7380db0 100644 --- a/blossom-backend/pom.xml +++ b/blossom-backend/pom.xml @@ -14,11 +14,11 @@ com.blossom blossom-backend - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT - 1.7.0-SNAPSHOT + 1.8.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 205c11d..56466ab 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.7.0-SNAPSHOT + 1.8.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 67a3a8d..579ad43 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 @@ import java.util.List; public class ApiDocGen { private static String IP_DEVE = "http://127.0.0.1"; - private static String VERSION = "v1.7.0"; + private static String VERSION = "v1.8.0"; private static final List sourceCodePath = new ArrayList() {{ this.add("blossom-backend/common/common-base"); @@ -45,7 +45,7 @@ public class ApiDocGen { this.add("blossom-backend/expand-sentinel/expand-sentinel-metric"); }}; - private static final boolean genDictFromDB = false; + private static final boolean genDictFromDB = true; private static final String dictDbSetting = "dict-db.setting"; private static final String dictQuerySQL = "select param_name,param_desc from base_sys_param"; diff --git a/blossom-editor/package-lock.json b/blossom-editor/package-lock.json index 97ca943..905ca5e 100644 --- a/blossom-editor/package-lock.json +++ b/blossom-editor/package-lock.json @@ -1,12 +1,12 @@ { "name": "blossom", - "version": "1.7.2", + "version": "1.8.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "blossom", - "version": "1.7.2", + "version": "1.8.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/blossom-editor/package.json b/blossom-editor/package.json index 4a5adc9..4d56848 100644 --- a/blossom-editor/package.json +++ b/blossom-editor/package.json @@ -1,7 +1,7 @@ { "name": "blossom", "productName": "Blossom", - "version": "1.7.2", + "version": "1.8.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 df48422..94effd0 100644 --- a/blossom-editor/src/renderer/index.html +++ b/blossom-editor/src/renderer/index.html @@ -165,7 +165,7 @@
加载中... -
V1.7.2
+
V1.8.0
diff --git a/blossom-editor/src/renderer/src/assets/constants/system.ts b/blossom-editor/src/renderer/src/assets/constants/system.ts index 5b67009..5af2141 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: any = { SYS: { NAME: 'Blossom', FULL_NAME: 'BLOSSOM-EDITOR', - VERSION: 'v1.7.2', + VERSION: 'v1.8.0', // DOC: 'https://www.wangyunf.com/blossom-doc/index', diff --git a/blossom-web/package-lock.json b/blossom-web/package-lock.json index 28c3363..4851283 100644 --- a/blossom-web/package-lock.json +++ b/blossom-web/package-lock.json @@ -1,6 +1,6 @@ { "name": "blossom-web", - "version": "1.7.2", + "version": "1.8.0", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/blossom-web/package.json b/blossom-web/package.json index 2d0e3f9..681e61c 100644 --- a/blossom-web/package.json +++ b/blossom-web/package.json @@ -1,6 +1,6 @@ { "name": "blossom-web", - "version": "1.7.2", + "version": "1.8.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 18887ed..c36923f 100644 --- a/blossom-web/src/assets/constants/blossom.ts +++ b/blossom-web/src/assets/constants/blossom.ts @@ -7,7 +7,7 @@ const blossom: any = { NAME: 'Blossom', SHORT_NAME: 'BLOSSOM-WEB', // 版本 - VERSION: 'v1.7.2', + VERSION: 'v1.8.0', // 公网安备号 GONG_WANG_AN_BEI: 'X公网安备 XXXXXXXXXX号', // ICP 备案号 diff --git a/doc/backend-api/index.html b/doc/backend-api/index.html index bbf81be..1eebe32 100644 --- a/doc/backend-api/index.html +++ b/doc/backend-api/index.html @@ -5,10 +5,10 @@ 《Blossom 接口文档》 - 文档版本:v1.7.0 - 文档时间:2023-10-17 21:58:05 + 文档版本:v1.8.0 + 文档时间:2023-11-07 11:56:19 - +