Skip to content

Commit bd6b0a5

Browse files
authored
Merge pull request #153 from qianmoQ/1.16.0-SNAPSHOT
1.16.0 snapshot
2 parents e1ef098 + 73c79be commit bd6b0a5

10 files changed

Lines changed: 19 additions & 10 deletions

File tree

.github/workflows/publish-release.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branch:
66
- 'master'
7+
types: [closed]
78

89
jobs:
910
release:
@@ -79,7 +80,7 @@ jobs:
7980
asset_path: ./release/latest-mac.yml
8081
asset_name: latest-mac-inter.yml
8182
asset_content_type: application/x-yaml
82-
83+
8384
- name: Download and upload to qiniu
8485
run: |
8586
wget https://devtools.qiniu.com/qshell-v2.6.2-darwin-amd64.tar.gz
@@ -129,4 +130,4 @@ jobs:
129130
# echo '--------- End ---------'
130131
./qshell account 5eua7TZfgnNb81gmVUBcw4x7PpQuy-v9v1iFyD1R zCwoByIkA9AnlK0qO0DGveH7dKDXLG3CRqZ2mlTW dbm_qiniu
131132
./qshell fput edurtio-other dbm/releases/windows/x64/dbm-${{ needs.release.outputs.version }}-windows-x64-nsis-installer.exe ./release/dbm-${{ needs.release.outputs.version }}-windows-x64-nsis-installer.exe
132-
133+
80.6 KB
Loading
24.3 KB
Loading
34.1 KB
Loading
36.7 KB
Loading
109 KB
Loading

docs/docs/development/version/1.16.0-development.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,14 @@ DBM Version for `1.16.0` is development!
4141

4242
---
4343

44+
- Fix Monitor --> Processor document image pointing error
45+
4446
#### Bug
4547

4648
---
4749

50+
- Fix the release error that the new version of the CI tool was not merged with the code release error
51+
4852
#### Contributors (In no particular order)
4953

5054
---

docs/docs/reference/Monitor-Processor.md renamed to docs/docs/reference/monitor/monitor-processor.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This document mainly introduces how we use the Processor monitoring function pro
1010

1111
After the mouse moves to the `Monitor` menu, a drop-down box will automatically pop up. Select the `Processor` sub-menu in the drop-down box and click it, and it will jump to the corresponding management page. His snapshot is similar to the following screenshot:
1212

13-
![](https://images.edurt.io/2021/11/02/16358536985404.jpg)
13+
![](../../assets/images/others/monitor/processor/img.png)
1414

1515
> By default, the selection item after `Server` on the top left is blank, you need to manually select a data source
1616
@@ -20,11 +20,11 @@ After the mouse moves to the `Monitor` menu, a drop-down box will automatically
2020

2121
On the right side of the top menu, there will be a `Threshold` (unit/ms) value input window, which is used for our update time interval. When we turn on the `Auto` function on the right, the software will input the value according to `Threshold` Automatically refresh the data.
2222

23-
![](https://images.edurt.io/2021/11/02/16358538862636.jpg)
23+
![](../../assets/images/others/monitor/processor/img_1.png)
2424

2525
The chart in the middle part is used to mark the total number of processes of the current query of the currently selected server. The chart has a maximum of 20 points by default, and each time point will automatically cover the previous expired data points.
2626

27-
![](https://images.edurt.io/2021/11/02/16358539745671.jpg)
27+
![](../../assets/images/others/monitor/processor/img_2.png)
2828

2929
The bottom data table is used to render the detailed process of the server's specific query at our current time. It provides the following indicators:
3030

@@ -51,9 +51,9 @@ We also provide two operations in the detailed list:
5151

5252
###### Kill
5353

54-
When our query takes a long time, we can click the <img src="https://images.edurt.io/2021/11/02/16358545339160.jpg" width="40" /> button, and it will A window like the following pops up:
54+
When our query takes a long time, we can click the :fontawesome-solid-stop:{.red} button, and it will A window like the following pops up:
5555

56-
![](https://images.edurt.io/2021/11/02/16358546469724.jpg)
56+
![](../../assets/images/others/monitor/processor/img_3.png)
5757

5858
The window gives us two important tips, which need to be read carefully. If you are sure to perform the operation, enter the unique data marked under the `Necessary` prompt in the input box, and then click the `OK` button.
5959

@@ -65,8 +65,8 @@ KILL QUERY WHERE query_id = 'f57ae2a8-8aeb-4f71-b395-43d7065ac564'
6565

6666
###### DDL
6767

68-
When we need to view the specific SQL of this query, we can click the <img src="https://images.edurt.io/2021/11/02/16358548333386.jpg" width="40" /> button, and it will A window like the following pops up:
68+
When we need to view the specific SQL of this query, we can click the :octicons-search-16:{.blue} button, and it will A window like the following pops up:
6969

70-
![](https://images.edurt.io/2021/11/02/16358548788950.jpg)
70+
![](../../assets/images/others/monitor/processor/img_4.png)
7171

7272
The editor is the specific SQL statement we query this time.

docs/mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ nav:
156156
- Management:
157157
- Datasource: reference/management/management_datasource.md
158158
- Monitor:
159-
- Processor: reference/Monitor-Processor.md
159+
- Processor: reference/monitor/monitor-processor.md
160160
- Connection: reference/monitor/monitor_connection.md
161161
- Mutations: reference/monitor/monitor_mutations.md
162162
- Query: reference/monitor/monitor_query.md

electron-builder.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ releaseInfo:
1717
1818
---
1919
20+
- Fix Monitor --> Processor document image pointing error
21+
2022
#### Optimize
2123
2224
----
@@ -27,6 +29,8 @@ releaseInfo:
2729
2830
---
2931
32+
- Fix the release error that the new version of the CI tool was not merged with the code release error
33+
3034
#### UI
3135
3236
---

0 commit comments

Comments
 (0)