变更版本

blossom-backend/backend/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blossom-backend</artifactId>
         <groupId>com.blossom</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blossom-backend/common/common-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>common</artifactId>
         <groupId>com.blossom</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>

blossom-backend/common/common-cache/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>common</artifactId>
         <groupId>com.blossom</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blossom-backend/common/common-db/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>common</artifactId>
         <groupId>com.blossom</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blossom-backend/common/common-iaas/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>common</artifactId>
         <groupId>com.blossom</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blossom-backend/common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.blossom</groupId>
         <artifactId>blossom-backend</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

blossom-backend/expand-sentinel/expand-sentinel-metric/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.blossom</groupId>
         <artifactId>expand-sentinel</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blossom-backend/expand-sentinel/expand-sentinel-springmvc/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.blossom</groupId>
         <artifactId>expand-sentinel</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blossom-backend/expand-sentinel/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blossom-backend</artifactId>
         <groupId>com.blossom</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

blossom-backend/expand-tracker/expand-tracker-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>expand-tracker</artifactId>
         <groupId>com.blossom</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blossom-backend/expand-tracker/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blossom-backend</artifactId>
         <groupId>com.blossom</groupId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

blossom-backend/pom.xml

@@ -14,11 +14,11 @@
 
     <groupId>com.blossom</groupId>
     <artifactId>blossom-backend</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.8.0-SNAPSHOT</version>
 
     <!-- 版本控制 -->
     <properties>
-        <revision>1.7.0-SNAPSHOT</revision>
+        <revision>1.8.0-SNAPSHOT</revision>
 
         <!-- 编译设置 -->
         <java.version>1.8</java.version>

blossom-backend/smart-doc-2.6.7/pom.xml

@@ -90,7 +90,7 @@
         <dependency>
             <groupId>com.blossom</groupId>
             <artifactId>backend</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
+            <version>1.8.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

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<String> sourceCodePath = new ArrayList<String>() {{
         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";
 

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": {

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",

blossom-editor/src/renderer/index.html

@@ -165,7 +165,7 @@
         <br>
         <span style="font-size: 13px;">加载中...</span>
       </div>
-      <div class="html-loading-version">V1.7.2</div>
+      <div class="html-loading-version">V1.8.0</div>
     </div>
     <script type="module" src="/src/main.ts"></script>
   </div>

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',

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": {

blossom-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blossom-web",
-  "version": "1.7.2",
+  "version": "1.8.0",
   "private": true,
   "scripts": {
     "dev": "vite",

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 备案号

doc/backend-api/search.js

@@ -378,14 +378,26 @@ api[1].list[7].list.push({
 api[1].list[7].list.push({
     order: '5',
     deprecated: 'false',
-    url: 'http://127.0.0.1/article/stat/line/open',
+    url: 'http://127.0.0.1/article/stat/words/list',
-    desc: '文章字数折线图 [OP]',
+    desc: '字数统计列表',
 });
 api[1].list[7].list.push({
     order: '6',
     deprecated: 'false',
+    url: 'http://127.0.0.1/article/stat/words/save',
+    desc: '保存字数统计信息',
+});
+api[1].list[7].list.push({
+    order: '7',
+    deprecated: 'false',
+    url: 'http://127.0.0.1/article/stat/line/open',
+    desc: '文章字数折线图 [OP]',
+});
+api[1].list[7].list.push({
+    order: '8',
+    deprecated: 'false',
     url: 'http://127.0.0.1/article/stat/line',
-    desc: '字数折线图',
+    desc: '近36月字数折线图',
 });
 api[1].list.push({
     alias: 'PictureController',
@@ -557,45 +569,57 @@ api[1].list[12].list.push({
 api[1].list[12].list.push({
     order: '4',
     deprecated: 'false',
+    url: 'http://127.0.0.1/todo/task/tags',
+    desc: '标签列表',
+});
+api[1].list[12].list.push({
+    order: '5',
+    deprecated: 'false',
     url: 'http://127.0.0.1/todo/task/stat',
     desc: '统计',
 });
 api[1].list[12].list.push({
-    order: '5',
+    order: '6',
     deprecated: 'false',
     url: 'http://127.0.0.1/todo/task/add',
     desc: '新增任务',
 });
 api[1].list[12].list.push({
-    order: '6',
+    order: '7',
     deprecated: 'false',
     url: 'http://127.0.0.1/todo/task/upd',
     desc: '修改任务',
 });
 api[1].list[12].list.push({
-    order: '7',
+    order: '8',
     deprecated: 'false',
     url: 'http://127.0.0.1/todo/task/waiting',
     desc: '事项移动到待办',
 });
 api[1].list[12].list.push({
-    order: '8',
+    order: '9',
     deprecated: 'false',
     url: 'http://127.0.0.1/todo/task/processing',
     desc: '事项移动到进行中',
 });
 api[1].list[12].list.push({
-    order: '9',
+    order: '10',
     deprecated: 'false',
     url: 'http://127.0.0.1/todo/task/completed',
     desc: '事项移动到完成',
 });
 api[1].list[12].list.push({
-    order: '10',
+    order: '11',
     deprecated: 'false',
     url: 'http://127.0.0.1/todo/task/del',
     desc: '删除事项',
 });
+api[1].list[12].list.push({
+    order: '12',
+    deprecated: 'false',
+    url: 'http://127.0.0.1/todo/task/transfer',
+    desc: '转移事项',
+});
 api[1].list.push({
     alias: 'NoteController',
     order: '14',
@@ -776,6 +800,13 @@ api[5].list.push({
     desc: '文件夹类型 [FolderTypeEnum]',
     list: []
 })
+api[5].list.push({
+    alias: '系统参数表配置内容',
+    order: '100',
+    link: '系统参数表配置内容',
+    desc: '系统参数表配置内容',
+    list: []
+})
 document.onkeydown = keyDownSearch;
 function keyDownSearch(e) {
     const theEvent = e;